removing aws-cli image (open-cluster-management-io#745)

Signed-off-by: suvaanshkumar <[email protected]>
mikeshng · Dec 6, 2024 · 2542976 · 2542976
1 parent aa4f092
commit 2542976
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 55 deletions.
diff --git a/.github/workflows/post.yml b/.github/workflows/post.yml
@@ -71,7 +71,6 @@ jobs:
           docker push quay.io/open-cluster-management/work:latest-${{ matrix.arch }}
           docker push quay.io/open-cluster-management/placement:latest-${{ matrix.arch }}
           docker push quay.io/open-cluster-management/addon-manager:latest-${{ matrix.arch }}
-          docker push quay.io/open-cluster-management/aws-cli:latest-${{ matrix.arch }}
   image-manifest:
     name: image manifest
     runs-on: ubuntu-latest
@@ -102,10 +101,6 @@ jobs:
           docker manifest create quay.io/open-cluster-management/addon-manager:latest \
             quay.io/open-cluster-management/addon-manager:latest-amd64 \
             quay.io/open-cluster-management/addon-manager:latest-arm64
-          # aws-cli
-          docker manifest create quay.io/open-cluster-management/aws-cli:latest \
-            quay.io/open-cluster-management/aws-cli:latest-amd64 \
-            quay.io/open-cluster-management/aws-cli:latest-arm64
       - name: annotate
         run: |
           # registration-operator
@@ -133,19 +128,13 @@ jobs:
             quay.io/open-cluster-management/addon-manager:latest-amd64 --arch amd64
           docker manifest annotate quay.io/open-cluster-management/addon-manager:latest \
             quay.io/open-cluster-management/addon-manager:latest-arm64 --arch arm64
-          # aws-cli
-          docker manifest annotate quay.io/open-cluster-management/aws-cli:latest \
-            quay.io/open-cluster-management/aws-cli:latest-amd64 --arch amd64
-          docker manifest annotate quay.io/open-cluster-management/aws-cli:latest \
-            quay.io/open-cluster-management/aws-cli:latest-arm64 --arch arm64
       - name: push
         run: |
           docker manifest push quay.io/open-cluster-management/registration-operator:latest
           docker manifest push quay.io/open-cluster-management/registration:latest
           docker manifest push quay.io/open-cluster-management/work:latest
           docker manifest push quay.io/open-cluster-management/placement:latest
           docker manifest push quay.io/open-cluster-management/addon-manager:latest
-          docker manifest push quay.io/open-cluster-management/aws-cli:latest
   trigger-clusteradm-e2e:
     needs: [ images, image-manifest ]
     name: trigger clusteradm e2e

diff --git a/.github/workflows/releaseimage.yml b/.github/workflows/releaseimage.yml
@@ -72,7 +72,6 @@ jobs:
           docker push quay.io/open-cluster-management/placement:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
           docker push quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
           docker push quay.io/open-cluster-management/addon-manager:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
-          docker push quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
   image-manifest:
     name: image manifest
     runs-on: ubuntu-latest
@@ -106,10 +105,6 @@ jobs:
           docker manifest create quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }} \
             quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 \
             quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-arm64
-          # aws-cli
-          docker manifest create quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
-            quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 \
-            quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-arm64
       - name: annotate
         run: |
           # registration
@@ -137,16 +132,10 @@ jobs:
             quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 --arch amd64
           docker manifest annotate quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }} \
             quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-arm64 --arch arm64
-          # aws-cli
-          docker manifest annotate quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
-            quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 --arch amd64
-          docker manifest annotate quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
-            quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-arm64 --arch arm64
       - name: push
         run: |
           docker manifest push quay.io/open-cluster-management/registration:${{ needs.env.outputs.RELEASE_VERSION }}
           docker manifest push quay.io/open-cluster-management/work:${{ needs.env.outputs.RELEASE_VERSION }}
           docker manifest push quay.io/open-cluster-management/placement:${{ needs.env.outputs.RELEASE_VERSION }}
           docker manifest push quay.io/open-cluster-management/addon-manager:${{ needs.env.outputs.RELEASE_VERSION }}
           docker manifest push quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}
-          docker manifest push quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}
diff --git a/Makefile b/Makefile
@@ -62,15 +62,12 @@ REGISTRATION_IMAGE ?= $(IMAGE_REGISTRY)/registration:$(IMAGE_TAG)
 PLACEMENT_IMAGE ?= $(IMAGE_REGISTRY)/placement:$(IMAGE_TAG)
 # ADDON_MANAGER_IMAGE can be set in the env to override calculated value
 ADDON_MANAGER_IMAGE ?= $(IMAGE_REGISTRY)/addon-manager:$(IMAGE_TAG)
-# AWS_CLI_IMAGE can be set in the env to override calculated value
-AWS_CLI_IMAGE ?= $(IMAGE_REGISTRY)/aws-cli:$(IMAGE_TAG)
 
 $(call build-image,registration,$(REGISTRATION_IMAGE),./build/Dockerfile.registration,.)
 $(call build-image,work,$(WORK_IMAGE),./build/Dockerfile.work,.)
 $(call build-image,placement,$(PLACEMENT_IMAGE),./build/Dockerfile.placement,.)
 $(call build-image,registration-operator,$(OPERATOR_IMAGE_NAME),./build/Dockerfile.registration-operator,.)
 $(call build-image,addon-manager,$(ADDON_MANAGER_IMAGE),./build/Dockerfile.addon,.)
-$(call build-image,aws-cli,$(AWS_CLI_IMAGE),./build/Dockerfile.aws-cli,.)
 
 copy-crd:
 	bash -x hack/copy-crds.sh $(YAML_PATCH)

diff --git a/build/Dockerfile.aws-cli b/build/Dockerfile.aws-cli