From 46a89dd55252c076da4d529e4cb06e35229c9b50 Mon Sep 17 00:00:00 2001
From: Ciprian Hacman <ciprian@hakman.dev>
Date: Fri, 22 Apr 2022 21:21:09 +0300
Subject: [PATCH] Delete unused cloudbuild step

---
 Makefile        | 20 --------------------
 cloudbuild.yaml | 15 ---------------
 2 files changed, 35 deletions(-)

diff --git a/Makefile b/Makefile
index 974fb7c094..287ccf2bac 100644
--- a/Makefile
+++ b/Makefile
@@ -301,14 +301,6 @@ dns-controller-push: ko-dns-controller-push
 ko-dns-controller-push: ko
 	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller" ko build --tags ${DNS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./dns-controller/cmd/dns-controller/
 
-
-
-.PHONY: dns-controller-manifest
-dns-controller-manifest:
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller:${DNS_CONTROLLER_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller:${DNS_CONTROLLER_PUSH_TAG}-amd64
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller:${DNS_CONTROLLER_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller:${DNS_CONTROLLER_PUSH_TAG}-arm64
-	docker manifest push --purge ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}dns-controller:${DNS_CONTROLLER_PUSH_TAG}
-
 # --------------------------------------------------
 # development targets
 
@@ -735,12 +727,6 @@ kops-controller-push: ko-kops-controller-push
 ko-kops-controller-push: ko
 	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller" ko build --tags ${KOPS_CONTROLLER_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kops-controller/
 
-.PHONY: kops-controller-manifest
-kops-controller-manifest:
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller:${KOPS_CONTROLLER_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller:${KOPS_CONTROLLER_PUSH_TAG}-amd64
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller:${KOPS_CONTROLLER_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller:${KOPS_CONTROLLER_PUSH_TAG}-arm64
-	docker manifest push --purge ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kops-controller:${KOPS_CONTROLLER_PUSH_TAG}
-
 #------------------------------------------------------
 # kube-apiserver-healthcheck
 
@@ -751,12 +737,6 @@ kube-apiserver-healthcheck-push: ko-kube-apiserver-healthcheck-push
 ko-kube-apiserver-healthcheck-push: ko
 	KO_DOCKER_REPO="${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck" ko build --tags ${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/kube-apiserver-healthcheck/
 
-.PHONY: kube-apiserver-healthcheck-manifest
-kube-apiserver-healthcheck-manifest:
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck:${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck:${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG}-amd64
-	docker manifest create --amend ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck:${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck:${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG}-arm64
-	docker manifest push --purge ${DOCKER_REGISTRY}/${DOCKER_IMAGE_PREFIX}kube-apiserver-healthcheck:${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG}
-
 #------------------------------------------------------
 # CloudBuild artifacts
 #
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index e0b42c8eb5..9e1939f16e 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -34,21 +34,6 @@ steps:
   - LATEST_FILE=markers/${_PULL_BASE_REF}/latest-ci.txt
   args:
   - gcs-upload-and-tag
-# Push the manifests
-#- name: 'docker.io/library/golang:1.18.1-bullseye'
-#  id: manifests
-#  waitFor: [images]
-#  entrypoint: make
-#  env:
-#  - DOCKER_CLI_EXPERIMENTAL=enabled
-#  - CI=$_CI
-#  - PULL_BASE_REF=$_PULL_BASE_REF
-#  - DOCKER_REGISTRY=$_DOCKER_REGISTRY
-#  - DOCKER_IMAGE_PREFIX=$_DOCKER_IMAGE_PREFIX
-#  args:
-#  - kops-controller-manifest
-#  - dns-controller-manifest
-#  - kube-apiserver-healthcheck-manifest
 # Build cloudbuild artifacts (for attestation)
 - name: 'docker.io/library/golang:1.18.1-bullseye'
   id: cloudbuild-artifacts