From d73ce2b420e1d98882a9943b14f116e0cb5d001f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergen=20Yal=C3=A7=C4=B1n?= Date: Fri, 27 Sep 2024 13:26:17 +0300 Subject: [PATCH] Use different parameters name for auth and config group overrides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergen Yalçın (cherry picked from commit e8fdce8e90d942888b18582ec842832a7503d17f) --- Makefile | 6 ++++++ cluster/images/provider-aws/Makefile | 4 ++-- package/crossplane.yaml.tmpl | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 43e97edb5f..df945d3b2d 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,12 @@ export XPKG_REG_ORGS_NO_PROMOTE := $(XPKG_REG_ORGS_NO_PROMOTE) export XPKG_DIR := $(XPKG_DIR) export XPKG_IGNORE := $(XPKG_IGNORE) +CONFIG_CRD_GROUP = $(PROVIDER_NAME) +PROVIDER_AUTH_GROUP = $(PROVIDER_NAME) + +export CONFIG_CRD_GROUP := $(CONFIG_CRD_GROUP) +export PROVIDER_AUTH_GROUP := $(PROVIDER_AUTH_GROUP) + -include build/makelib/xpkg.mk # ==================================================================================== diff --git a/cluster/images/provider-aws/Makefile b/cluster/images/provider-aws/Makefile index 683f30d96b..4fac2ec65e 100755 --- a/cluster/images/provider-aws/Makefile +++ b/cluster/images/provider-aws/Makefile @@ -77,9 +77,9 @@ batch-process: $(UP) --auth-ext $(XPKG_DIR)/auth.yaml \ --crd-root $(XPKG_DIR)/crds \ --ignore $(XPKG_IGNORE) \ - --crd-group-override monolith=* --crd-group-override config=$(PROVIDER_NAME) \ + --crd-group-override monolith=* --crd-group-override config=$(CONFIG_CRD_GROUP) \ --package-metadata-template $(XPKG_DIR)/crossplane.yaml.tmpl \ - --template-var XpkgRegOrg=$(XPKG_REG_ORGS) --template-var DepConstraint="$(DEP_CONSTRAINT)" --template-var ProviderName=$(PROVIDER_NAME) \ + --template-var XpkgRegOrg=$(XPKG_REG_ORGS) --template-var DepConstraint="$(DEP_CONSTRAINT)" --template-var ProviderName=$(PROVIDER_NAME) --template-var ProviderAuthGroup=$(PROVIDER_AUTH_GROUP) \ --concurrency $(CONCURRENCY) \ --push-retry 10 || $(FAIL) @$(OK) Done processing smaller provider packages for: "$(SUBPACKAGES)" diff --git a/package/crossplane.yaml.tmpl b/package/crossplane.yaml.tmpl index 62cd0ee254..6157767ade 100644 --- a/package/crossplane.yaml.tmpl +++ b/package/crossplane.yaml.tmpl @@ -27,7 +27,7 @@ metadata: If you encounter an issue please reach out on support@upbound.io email address. This is a subpackage for the {{ .Service }} API group. friendly-name.meta.crossplane.io: Provider AWS ({{ .Service }}) - auth.upbound.io/group: {{ .ProviderName }}.upbound.io + auth.upbound.io/group: {{ .ProviderAuthGroup }}.upbound.io spec: {{ if ne .Service "monolith" }} crossplane: