From a843936e92092a9fd329632367f8768dbced1483 Mon Sep 17 00:00:00 2001
From: kranurag7 <anurag.kumar@syself.com>
Date: Thu, 29 Feb 2024 00:09:54 +0530
Subject: [PATCH] remove usage of latest tag in builder image

we don't use latest tag anywhere for workign with
builder image and this commit removes the same.

Signed-off-by: kranurag7 <anurag.kumar@syself.com>
---
 .../workflows/main-promote-builder-image.yaml | 28 -------------------
 Makefile                                      |  6 ----
 images/builder/Dockerfile                     |  3 --
 3 files changed, 37 deletions(-)
 delete mode 100644 .github/workflows/main-promote-builder-image.yaml

diff --git a/.github/workflows/main-promote-builder-image.yaml b/.github/workflows/main-promote-builder-image.yaml
deleted file mode 100644
index ffbbc012..00000000
--- a/.github/workflows/main-promote-builder-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Promote Latest tag to cspo Builder Image
-on: # yamllint disable-line rule:truthy
-  push:
-    branches:
-      - main
-    paths:
-      - "images/builder/Dockerfile"
-jobs:
-  promote-build-image:
-    name: Promote Latest tag to cspo Builder Image
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/sovereigncloudstack/cspo-builder:0.1.1
-      credentials:
-        username: ${{ github.actor }}
-        password: ${{ secrets.github_token }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Fixup git permissions
-        # https://github.com/actions/checkout/issues/766
-        shell: bash
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Promote Latest tag to cspo Builder Image
-        env:
-          PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          USERNAME: ${{ github.actor }}
-        run: make builder-image-promote-latest
diff --git a/Makefile b/Makefile
index 80a4ff40..214df535 100644
--- a/Makefile
+++ b/Makefile
@@ -475,12 +475,6 @@ set-manifest-pull-policy:
 	$(info Updating kustomize pull policy file for default resource)
 	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(TARGET_RESOURCE)
 
-builder-image-promote-latest:
-	./hack/ensure-env-variables.sh USERNAME PASSWORD
-	skopeo copy --src-creds=$(USERNAME):$(PASSWORD) --dest-creds=$(USERNAME):$(PASSWORD) \
-		docker://$(BUILDER_IMAGE):$(BUILDER_IMAGE_VERSION) \
-		docker://$(BUILDER_IMAGE):latest
-
 ##@ Generate
 ############
 # Generate #
diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
index 34502738..e9d50ed8 100644
--- a/images/builder/Dockerfile
+++ b/images/builder/Dockerfile
@@ -50,8 +50,6 @@ FROM docker.io/aquasec/trivy:0.49.0@sha256:c71420cd77f136e8e900f71d272fb89075f60
 ############################
 FROM docker.io/library/golang:1.21.6-bullseye@sha256:fa52abd182d334cfcdffdcc934e21fcfbc71c3cde568e606193ae7db045b1b8d
 
-# update: datasource=repology depName=debian_11/skopeo versioning=loose
-ENV SKOPEO_VERSION="1.2.2+dfsg1-1+b6"
 # update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
 ENV YAMLLINT_VERSION="v1.33.0"
 # update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
@@ -62,7 +60,6 @@ RUN apt-get update && \
     apt-get install -qy --no-install-recommends \
     gnupg python3 python3-pip \
     file zip unzip jq gettext \
-    skopeo=${SKOPEO_VERSION} \
     protobuf-compiler libprotobuf-dev \
     libsystemd-dev jq && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \