Skip to content

Commit 6f77ca5

Browse files
authored
Merge pull request #1710 from vincepri/remove-certmanager
Don't ship certmanager with CAPI
2 parents f380bc7 + e0fb83a commit 6f77ca5

File tree

3 files changed

+0
-6415
lines changed

3 files changed

+0
-6415
lines changed

Makefile

-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ RELEASE_NOTES := $(TOOLS_DIR)/$(RELEASE_NOTES_BIN)
4545
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
4646
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
4747
CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
48-
CERTMANAGER_UPDATE := $(TOOLS_BIN_DIR)/certmanager-update
4948

5049
# Define Docker related variables. Releases should modify and double check these vars.
5150
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
@@ -103,9 +102,6 @@ $(GOLANGCI_LINT): $(TOOLS_DIR)/go.mod # Build golangci-lint from tools folder.
103102
$(CONVERSION_GEN): $(TOOLS_DIR)/go.mod
104103
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/conversion-gen k8s.io/code-generator/cmd/conversion-gen
105104

106-
$(CERTMANAGER_UPDATE): $(TOOLS_DIR)/go.mod
107-
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/certmanager-update ./certmanager
108-
109105
$(RELEASE_NOTES) : $(TOOLS_DIR)/go.mod
110106
cd $(TOOLS_DIR) && go build -o $(RELEASE_NOTES_BIN) -tags tools ./release
111107

@@ -162,10 +158,6 @@ modules: ## Runs go mod to ensure modules are up to date.
162158
go mod tidy
163159
cd $(TOOLS_DIR); go mod tidy
164160

165-
.PHONY: update-certmanager
166-
update-certmanager: $(CERTMANAGER_UPDATE)
167-
VERSION=$(CERTMANAGER_VERSION) $(CERTMANAGER_UPDATE) > config/certmanager/cert-manager.yaml
168-
169161
## --------------------------------------
170162
## Docker
171163
## --------------------------------------
@@ -244,7 +236,6 @@ release: clean-release ## Builds and push container images using the latest git
244236
.PHONY: release-manifests
245237
release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a release
246238
kustomize build config/default > $(RELEASE_DIR)/cluster-api-components.yaml
247-
cat config/certmanager/cert-manager.yaml >> $(RELEASE_DIR)/cluster-api-components.yaml
248239

249240
release-binaries: ## Builds the binaries to publish with a release
250241
RELEASE_BINARY=./cmd/clusterctl GOOS=linux GOARCH=amd64 $(MAKE) release-binary

0 commit comments

Comments
 (0)