Skip to content

Commit

Permalink
Handle the config/begin overlay for CSM
Browse files Browse the repository at this point in the history
When creating the config/begin overlay for CSM, carry forward the dws newName
value from the config/csm overlay kustomization. The CSM overlay exists
specifically to provide that newName value, so we don't want to lose it when
creating config/begin.

Signed-off-by: Dean Roehrich <[email protected]>
  • Loading branch information
roehrich-hpe committed Mar 29, 2024
1 parent 25c6c64 commit c039431
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified

edit-image: VERSION ?= $(shell cat .version)
edit-image: .version
$(KUSTOMIZE_IMAGE_TAG) config/begin $(OVERLAY) $(IMAGE_TAG_BASE) $(VERSION)
IMAGE_BASE=$(IMAGE_TAG_BASE); \
if [ "$(OVERLAY)" = "csm" ]; then IMAGE_BASE=$$(awk '/^ newName:/ && /\/dws$$/ {print $$2}' config/csm/kustomization.yaml); fi; \
$(KUSTOMIZE_IMAGE_TAG) config/begin $(OVERLAY) $${IMAGE_BASE} $(VERSION)

deploy: kustomize edit-image ## Deploy controller to the K8s cluster specified in ~/.kube/config.
./deploy.sh deploy $(KUSTOMIZE) config/begin
Expand Down

0 comments on commit c039431

Please sign in to comment.