From 55ae3fe040fcd16d62eb0cf12d363d51935f16fe Mon Sep 17 00:00:00 2001 From: Daniel Lipovetsky <3445370+dlipovetsky@users.noreply.github.com> Date: Mon, 25 Sep 2023 13:55:28 -0700 Subject: [PATCH] build: Fix kustomize path (#9) Previously, the path was absolute, and kustomize could be run from config/manager. A recent upstream change made the path relative. This makes the path absolute again. --- d2iq.Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/d2iq.Makefile b/d2iq.Makefile index ba6c9cd6f..403727554 100644 --- a/d2iq.Makefile +++ b/d2iq.Makefile @@ -22,10 +22,11 @@ docker-buildx-builder: # The upstream 'release-manifests' target does not correctly override the image. # We work around this by using `kustomize edit set image`. -release-manifests: kustomize - mkdir -p $(MANIFEST_DIR) - cd config/manager && $(KUSTOMIZE) edit set image projects.registry.vmware.com/vmware-cloud-director/cluster-api-provider-cloud-director=$(REGISTRY)/$(CAPVCD_IMG):$(VERSION) - $(KUSTOMIZE) build config/default > $(MANIFEST_DIR)/infrastructure-components.yaml +release-manifests: $(KUSTOMIZE) + mkdir -p templates && \ + cd config/manager && \ + $(GITROOT)/$(KUSTOMIZE) edit set image projects.registry.vmware.com/vmware-cloud-director/cluster-api-provider-cloud-director=$(REGISTRY)/$(CAPVCD_IMG):$(VERSION) + $(GITROOT)/$(KUSTOMIZE) build config/default > templates/infrastructure-components.yaml .PHONY: build-within-docker build-within-docker: vendor