From e6cdf30cf13e9e4cebe841614c5f0ec26cabeb1f Mon Sep 17 00:00:00 2001 From: Chris Hein Date: Tue, 8 Jun 2021 16:11:14 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20control=20plane=20manifests=20we?= =?UTF-8?q?ren't=20being=20pushed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris Hein --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 325e2098..aaa6f4dd 100644 --- a/Makefile +++ b/Makefile @@ -266,6 +266,7 @@ docker-controlplane-build-%: .PHONY: docker-push-all ## Push all the architecture docker images docker-push-all: $(addprefix docker-infrastructure-push-,$(ALL_ARCH)) $(addprefix docker-controlplane-push-,$(ALL_ARCH)) $(MAKE) docker-push-core-manifest + $(MAKE) docker-push-nested-control-plane-manifest .PHONY: docker-push docker-push: @@ -289,6 +290,15 @@ docker-push-core-manifest: ## Push the fat manifest docker image for the core im $(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/default/manager_image_patch.yaml" $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/default/manager_pull_policy.yaml" +.PHONY: docker-push-nested-control-plane-manifest +docker-push-nested-control-plane-manifest: ## Push the fat manifest docker image for the nested control plane image. + ## Minimum docker version 18.06.0 is required for creating and pushing manifest images. + docker manifest create --amend $(CONTROLPLANE_CONTROLLER_IMG):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(CONTROLPLANE_CONTROLLER_IMG)\-&:$(TAG)~g") + @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${CONTROLPLANE_CONTROLLER_IMG}:${TAG} ${CONTROLPLANE_CONTROLLER_IMG}-$${arch}:${TAG}; done + docker manifest push --purge $(CONTROLPLANE_CONTROLLER_IMG):$(TAG) + $(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLPLANE_CONTROLLER_IMG) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./controlplane/nested/config/default/manager_image_patch.yaml" + $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./controlplane/nested/config/default/manager_pull_policy.yaml" + .PHONY: set-manifest-pull-policy set-manifest-pull-policy: $(info Updating kustomize pull policy file for manager resources)