Merge pull request #289 from blackpiglet/remove_gcr

Remove GCR and update some action versions.

Author: blackpiglet

.github/workflows/pr.yaml

@@ -7,14 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
+    - name: Check out the code
+      uses: actions/checkout@v4
+
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version-file: 'go.mod'
       id: go
 
-    - name: Check out the code
-      uses: actions/checkout@v2
 
     - name: Make CI
       run: make ci

.github/workflows/push.yml

@@ -15,23 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: '1.22'
-      id: go
-
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
-    - id: 'auth'
-      uses: 'google-github-actions/auth@v2'
+    - name: Set up Go
+      uses: actions/setup-go@v5
       with:
-        credentials_json: '${{ secrets.GCS_SA_KEY }}'
-    - name: 'Setup Cloud SDK'
-      uses: google-github-actions/setup-gcloud@v2
-    - name: 'Use gcloud CLI'
-      run: gcloud info
+        go-version-file: 'go.mod'
+      id: go
 
     - name: Set up QEMU
       id: qemu
@@ -58,29 +49,9 @@ jobs:
         files: coverage.out
         verbose: true
 
-    # Use the JSON key in secret to login gcr.io
-    - uses: 'docker/login-action@v2'
-      with:
-        registry: 'gcr.io' # or REGION.docker.pkg.dev
-        username: '_json_key'
-        password: '${{ secrets.GCR_SA_KEY }}'
-
     # Only try to publish the container image from the root repo; forks don't have permission to do so and will always get failures.
     - name: Publish container image
       if: github.repository == 'vmware-tanzu/velero-plugin-for-microsoft-azure'
       run: |
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
-        VERSION=$(./hack/docker-push.sh | grep 'VERSION:' | awk -F: '{print $2}' | xargs)
-
-        # Upload velero-plugin-for-microsoft-azure image package to GCS
-        source hack/ci/build_util.sh
-        BIN=velero-plugin-for-microsoft-azure
-        GCS_BUCKET=velero-builds
-        VELERO_PLUGIN_IMAGE=${BIN}-${VERSION}
-        VELERO_PLUGIN_IMAGE_FILE=${VELERO_PLUGIN_IMAGE}.tar.gz
-        VELERO_PLUGIN_IMAGE_BACKUP_FILE=${VELERO_PLUGIN_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz
-
-        cp ${VELERO_PLUGIN_IMAGE_FILE} ${VELERO_PLUGIN_IMAGE_BACKUP_FILE}
-
-        uploader ${VELERO_PLUGIN_IMAGE_FILE} ${GCS_BUCKET}
-        uploader ${VELERO_PLUGIN_IMAGE_BACKUP_FILE} ${GCS_BUCKET}
+        ./hack/docker-push.sh

Makefile

@@ -20,11 +20,9 @@ PKG := github.com/vmware-tanzu/velero-plugin-for-microsoft-azure
 
 # Where to push the docker image.
 REGISTRY ?= velero
-GCR_REGISTRY ?= gcr.io/velero-gcp
 
 # Image name
 IMAGE ?= $(REGISTRY)/$(BIN)
-GCR_IMAGE ?= $(GCR_REGISTRY)/$(BIN)
 
 # We allow the Dockerfile to be configurable to enable the use of custom Dockerfiles
 # that pull base images from different registries.
@@ -42,10 +40,8 @@ TAG_LATEST ?= false
 
 ifeq ($(TAG_LATEST), true)
 	IMAGE_TAGS ?= $(IMAGE):$(VERSION) $(IMAGE):latest
-	GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION) $(GCR_IMAGE):latest
 else
 	IMAGE_TAGS ?= $(IMAGE):$(VERSION)
-	GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION)
 endif
 
 ifeq ($(shell docker buildx inspect 2>/dev/null | awk '/Status/ { print $$2 }'), running)
@@ -107,7 +103,6 @@ endif
 	--output=type=$(BUILDX_OUTPUT_TYPE) \
 	--platform $(BUILDX_PLATFORMS) \
 	$(addprefix -t , $(IMAGE_TAGS)) \
-	$(addprefix -t , $(GCR_IMAGE_TAGS)) \
 	--build-arg=GOPROXY=$(GOPROXY) \
 	--build-arg=PKG=$(PKG) \
 	--build-arg=BIN=$(BIN) \