Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-1.14] Use different parameters name for auth and config group overrides #1516

Open
wants to merge 1 commit into
base: release-1.14
Choose a base branch
from
Open

[Backport release-1.14] Use different parameters name for auth and config group overrides #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ====================================================================================
Expand Down
4 changes: 2 additions & 2 deletions cluster/images/provider-aws/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion package/crossplane.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ metadata:
If you encounter an issue please reach out on [email protected] 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:
Expand Down
Loading