From 1cf2d3fe8fbf0aefb0d2baa70e8828e468667844 Mon Sep 17 00:00:00 2001 From: Deepak Sharma Date: Thu, 21 May 2020 20:15:26 +0530 Subject: [PATCH 1/3] noop --- spectro/prow/presubmit.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spectro/prow/presubmit.sh b/spectro/prow/presubmit.sh index d73530557ca0..18d6b30e5959 100644 --- a/spectro/prow/presubmit.sh +++ b/spectro/prow/presubmit.sh @@ -16,6 +16,7 @@ set -u set -x + create_images exit 0 From f6340ee900d64a2e4290fcf68902d95576061f63 Mon Sep 17 00:00:00 2001 From: Deepak Sharma Date: Thu, 21 May 2020 21:43:09 +0530 Subject: [PATCH 2/3] change tag --- spectro/prow/functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/spectro/prow/functions.sh b/spectro/prow/functions.sh index fd5c2852e32d..3a64558af133 100644 --- a/spectro/prow/functions.sh +++ b/spectro/prow/functions.sh @@ -48,6 +48,7 @@ build_vendor_manifest() { IMG_LOC="cluster-api/release" export IMG_LOC +export TAG="v0.3.6-spectro" export REGISTRY=${DOCKER_REGISTRY_PUBLIC}/${IMG_LOC} export STAGING_REGISTRY=${DOCKER_REGISTRY_PUBLIC}/${IMG_LOC} export PROD_REGISTRY=${DOCKER_REGISTRY_PUBLIC}/${IMG_LOC} From b83b31ce5659ca31fb5869226c72afbd720bf32f Mon Sep 17 00:00:00 2001 From: Deepak Sharma Date: Thu, 21 May 2020 22:27:28 +0530 Subject: [PATCH 3/3] remove arch name from image --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a38c7ef74c24..b06efa5c6df9 100644 --- a/Makefile +++ b/Makefile @@ -321,27 +321,27 @@ docker-build: ## Build the docker images for controller managers .PHONY: docker-build-core docker-build-core: ## Build the docker image for core controller manager - docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG) - $(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/manager/manager_image_patch.yaml" + docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG):$(TAG) + $(MAKE) set-manifest-image MANIFEST_IMG=$(CONTROLLER_IMG) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./config/manager/manager_image_patch.yaml" $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./config/manager/manager_pull_policy.yaml" .PHONY: docker-build-kubeadm-bootstrap docker-build-kubeadm-bootstrap: ## Build the docker image for kubeadm bootstrap controller manager - docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./bootstrap/kubeadm . -t $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG)-$(ARCH):$(TAG) - $(MAKE) set-manifest-image MANIFEST_IMG=$(KUBEADM_BOOTSTRAP_CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./bootstrap/kubeadm/config/manager/manager_image_patch.yaml" + docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./bootstrap/kubeadm . -t $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(TAG) + $(MAKE) set-manifest-image MANIFEST_IMG=$(KUBEADM_BOOTSTRAP_CONTROLLER_IMG) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./bootstrap/kubeadm/config/manager/manager_image_patch.yaml" $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./bootstrap/kubeadm/config/manager/manager_pull_policy.yaml" .PHONY: docker-build-kubeadm-control-plane docker-build-kubeadm-control-plane: ## Build the docker image for kubeadm control plane controller manager - docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./controlplane/kubeadm . -t $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG)-$(ARCH):$(TAG) - $(MAKE) set-manifest-image MANIFEST_IMG=$(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./controlplane/kubeadm/config/manager/manager_image_patch.yaml" + docker build --pull --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg package=./controlplane/kubeadm . -t $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(TAG) + $(MAKE) set-manifest-image MANIFEST_IMG=$(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG) MANIFEST_TAG=$(TAG) TARGET_RESOURCE="./controlplane/kubeadm/config/manager/manager_image_patch.yaml" $(MAKE) set-manifest-pull-policy TARGET_RESOURCE="./controlplane/kubeadm/config/manager/manager_pull_policy.yaml" .PHONY: docker-push docker-push: ## Push the docker images - docker push $(CONTROLLER_IMG)-$(ARCH):$(TAG) - docker push $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG)-$(ARCH):$(TAG) - docker push $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG)-$(ARCH):$(TAG) + docker push $(CONTROLLER_IMG):$(TAG) + docker push $(KUBEADM_BOOTSTRAP_CONTROLLER_IMG):$(TAG) + docker push $(KUBEADM_CONTROL_PLANE_CONTROLLER_IMG):$(TAG) ## -------------------------------------- ## Docker — All ARCH