@@ -149,7 +149,7 @@ PROD_REGISTRY ?= registry.k8s.io/capi-operator
149
149
150
150
# Image name
151
151
IMAGE_NAME ?= cluster-api-operator
152
- PACKAGE_NAME = cluster-api-operator
152
+ PACKAGE_NAME = cluster-api-operator-providers
153
153
CONTROLLER_IMG ?= $(REGISTRY ) /$(IMAGE_NAME )
154
154
CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG ) -$(ARCH ) :$(TAG )
155
155
@@ -180,6 +180,7 @@ endif
180
180
RELEASE_ALIAS_TAG ?= $(PULL_BASE_REF )
181
181
RELEASE_DIR := $(ROOT ) /out
182
182
CHART_DIR := $(RELEASE_DIR ) /charts/cluster-api-operator
183
+ CHART_PROVIDERS_DIR := $(RELEASE_DIR ) /charts/cluster-api-operator-providers
183
184
CHART_PACKAGE_DIR := $(RELEASE_DIR ) /package
184
185
185
186
# Set --output-base for conversion-gen if we are not within GOPATH
@@ -455,6 +456,9 @@ $(CHART_DIR):
455
456
$(CHART_PACKAGE_DIR ) :
456
457
mkdir -p $(CHART_PACKAGE_DIR )
457
458
459
+ $(CHART_PROVIDERS_DIR ) :
460
+ mkdir -p $(CHART_PROVIDERS_DIR ) /templates
461
+
458
462
.PHONY : release
459
463
release : clean-release $(RELEASE_DIR ) # # Builds and push container images using the latest git tag for the commit.
460
464
@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
485
489
$(KUSTOMIZE ) build ./config/default > $(RELEASE_DIR ) /operator-components.yaml
486
490
487
491
.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
489
494
cp -rf $(ROOT ) /hack/charts/cluster-api-operator/. $(CHART_DIR )
490
495
$(KUSTOMIZE ) build ./config/chart > $(CHART_DIR ) /templates/operator-components.yaml
491
496
$(HELM ) package $(CHART_DIR ) --app-version=$(HELM_CHART_TAG ) --version=$(HELM_CHART_TAG ) --destination=$(CHART_PACKAGE_DIR )
492
497
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
+
493
503
.PHONY : release-staging
494
504
release-staging : # # Builds and push container images and manifests to the staging bucket.
495
505
$(MAKE ) docker-build-all
@@ -561,7 +571,7 @@ test-e2e-run: $(GINKGO) $(ENVSUBST) $(HELM) ## Run e2e tests
561
571
-e2e.artifacts-folder=" $( ARTIFACTS) " \
562
572
-e2e.config=" $( E2E_CONF_FILE_ENVSUBST) " -e2e.components=$(RELEASE_DIR ) /operator-components.yaml \
563
573
-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 )
565
575
566
576
go-version : # # Print the go version we use to compile our binaries and images
567
577
@echo $(GO_VERSION )
0 commit comments