@@ -149,7 +149,7 @@ PROD_REGISTRY ?= registry.k8s.io/capi-operator
149149
150150# Image name
151151IMAGE_NAME ?= cluster-api-operator
152- PACKAGE_NAME = cluster-api-operator
152+ PACKAGE_NAME = cluster-api-operator-providers
153153CONTROLLER_IMG ?= $(REGISTRY ) /$(IMAGE_NAME )
154154CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG ) -$(ARCH ) :$(TAG )
155155
@@ -180,6 +180,7 @@ endif
180180RELEASE_ALIAS_TAG ?= $(PULL_BASE_REF )
181181RELEASE_DIR := $(ROOT ) /out
182182CHART_DIR := $(RELEASE_DIR ) /charts/cluster-api-operator
183+ CHART_PROVIDERS_DIR := $(RELEASE_DIR ) /charts/cluster-api-operator-providers
183184CHART_PACKAGE_DIR := $(RELEASE_DIR ) /package
184185
185186# Set --output-base for conversion-gen if we are not within GOPATH
@@ -455,6 +456,9 @@ $(CHART_DIR):
455456$(CHART_PACKAGE_DIR ) :
456457 mkdir -p $(CHART_PACKAGE_DIR )
457458
459+ $(CHART_PROVIDERS_DIR ) :
460+ mkdir -p $(CHART_PROVIDERS_DIR ) /templates
461+
458462.PHONY : release
459463release : clean-release $(RELEASE_DIR ) # # Builds and push container images using the latest git tag for the commit.
460464 @if [ -z " ${RELEASE_TAG} " ]; then echo " RELEASE_TAG is not set" ; exit 1; fi
@@ -485,11 +489,17 @@ release-manifests: $(KUSTOMIZE) $(RELEASE_DIR) ## Builds the manifests to publis
485489 $(KUSTOMIZE ) build ./config/default > $(RELEASE_DIR ) /operator-components.yaml
486490
487491.PHONY : release-chart
488- release-chart : $(HELM ) $(KUSTOMIZE ) $(RELEASE_DIR ) $(CHART_DIR ) $(CHART_PACKAGE_DIR ) # # Builds the chart to publish with a release
492+ release-chart : $(HELM ) $(KUSTOMIZE ) $(RELEASE_DIR ) $(CHART_DIR ) $(CHART_PROVIDERS_DIR ) $(CHART_PACKAGE_DIR ) # # Builds the chart to publish with a release
493+ # Processing the cluster-api-operator chart
489494 cp -rf $(ROOT ) /hack/charts/cluster-api-operator/. $(CHART_DIR )
490495 $(KUSTOMIZE ) build ./config/chart > $(CHART_DIR ) /templates/operator-components.yaml
491496 $(HELM ) package $(CHART_DIR ) --app-version=$(HELM_CHART_TAG ) --version=$(HELM_CHART_TAG ) --destination=$(CHART_PACKAGE_DIR )
492497
498+ # Processing the cluster-api-operator-providers chart
499+ cp -rf $(ROOT)/hack/charts/cluster-api-operator-providers/. $(CHART_PROVIDERS_DIR)
500+ $(HELM) dependency update $(CHART_PROVIDERS_DIR)
501+ $(HELM) package $(CHART_PROVIDERS_DIR) --app-version=$(HELM_CHART_TAG) --version=$(HELM_CHART_TAG) --destination=$(CHART_PACKAGE_DIR)
502+
493503.PHONY : release-staging
494504release-staging : # # Builds and push container images and manifests to the staging bucket.
495505 $(MAKE ) docker-build-all
@@ -561,7 +571,7 @@ test-e2e-run: $(GINKGO) $(ENVSUBST) $(HELM) ## Run e2e tests
561571 -e2e.artifacts-folder=" $( ARTIFACTS) " \
562572 -e2e.config=" $( E2E_CONF_FILE_ENVSUBST) " -e2e.components=$(RELEASE_DIR ) /operator-components.yaml \
563573 -e2e.skip-resource-cleanup=$(SKIP_CLEANUP ) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER ) \
564- -e2e.helm-binary-path=$(HELM ) -e2e.chart-path=$(CHART_PACKAGE_DIR ) /cluster-api-operator-$(HELM_CHART_TAG ) .tgz $(E2E_ARGS )
574+ -e2e.helm-binary-path=$(HELM ) -e2e.chart-path=$(CHART_PACKAGE_DIR ) /cluster-api-operator-providers- $(HELM_CHART_TAG ) .tgz $(E2E_ARGS )
565575
566576go-version : # # Print the go version we use to compile our binaries and images
567577 @echo $(GO_VERSION )
0 commit comments