Skip to content

Commit

Permalink
Remove invalid ClusterRoleBinding from CertManager
Browse files Browse the repository at this point in the history
Removes the cert-manager-leaderelection ClusterRoleBinding from
cert-manager v0.11.0 manifest
  • Loading branch information
Warren Fernandes committed Apr 20, 2020
1 parent ba3bd5c commit 65b5a88
Show file tree
Hide file tree
Showing 4 changed files with 6,365 additions and 22 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ GOBINDATA_CLUSTERCTL_DIR := cmd/clusterctl/config
CLOUDINIT_PKG_DIR := bootstrap/kubeadm/internal/cloudinit
CLOUDINIT_GENERATED := $(CLOUDINIT_PKG_DIR)/zz_generated.bindata.go
CLOUDINIT_SCRIPT := $(CLOUDINIT_PKG_DIR)/kubeadm-bootstrap-script.sh
CERTMANAGER_COMPONENTS_GENERATED_FILE := cert-manager.yaml

# Define Docker related variables. Releases should modify and double check these vars.
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
Expand Down Expand Up @@ -254,10 +253,8 @@ generate-bindata: $(KUSTOMIZE) $(GOBINDATA) clean-bindata $(CLOUDINIT_GENERATED)
# Package manifest YAML into a single file.
mkdir -p $(GOBINDATA_CLUSTERCTL_DIR)/manifest/
$(KUSTOMIZE) build $(GOBINDATA_CLUSTERCTL_DIR)/crd > $(GOBINDATA_CLUSTERCTL_DIR)/manifest/clusterctl-api.yaml
# Fetch the cert-manager manifest
curl -sL https://github.com/jetstack/cert-manager/releases/download/v0.11.0/cert-manager.yaml > "$(GOBINDATA_CLUSTERCTL_DIR)/manifest/${CERTMANAGER_COMPONENTS_GENERATED_FILE}"
# Generate go-bindata, add boilerplate, then cleanup.
$(GOBINDATA) -mode=420 -modtime=1 -pkg=config -o=$(GOBINDATA_CLUSTERCTL_DIR)/zz_generated.bindata.go $(GOBINDATA_CLUSTERCTL_DIR)/manifest/
$(GOBINDATA) -mode=420 -modtime=1 -pkg=config -o=$(GOBINDATA_CLUSTERCTL_DIR)/zz_generated.bindata.go $(GOBINDATA_CLUSTERCTL_DIR)/manifest/ $(GOBINDATA_CLUSTERCTL_DIR)/assets
cat ./hack/boilerplate/boilerplate.generatego.txt $(GOBINDATA_CLUSTERCTL_DIR)/zz_generated.bindata.go > $(GOBINDATA_CLUSTERCTL_DIR)/manifest/manifests.go
cp $(GOBINDATA_CLUSTERCTL_DIR)/manifest/manifests.go $(GOBINDATA_CLUSTERCTL_DIR)/zz_generated.bindata.go
# Cleanup the manifest folder.
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/cluster/cert_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
)

const (
embeddedCertManagerManifestPath = "cmd/clusterctl/config/manifest/cert-manager.yaml"
embeddedCertManagerManifestPath = "cmd/clusterctl/config/assets/cert-manager.yaml"

waitCertManagerInterval = 1 * time.Second
waitCertManagerDefaultTimeout = 10 * time.Minute
Expand Down
Loading

0 comments on commit 65b5a88

Please sign in to comment.