From ec50599e03a4edc9afcc97881fe2874031d20ff5 Mon Sep 17 00:00:00 2001
From: Mikhail Khomenko <mvhoma@gmail.com>
Date: Sun, 2 Feb 2025 13:31:32 +0200
Subject: [PATCH] Migrate to Artifact Registry

---
 .github/workflows/workflow.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index e0d4254..356a3d8 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -12,16 +12,17 @@ on:
 # ${{ secrets }} are taken from GitHub -> Settings -> Secrets
 # ${{ github.sha }} is the commit hash
 env:
-  PROJECT_ID: iris-community-demos
+  PROJECT_ID:          iris-community-demos
   SERVICE_ACCOUNT_KEY: ${{ secrets.SERVICE_ACCOUNT_KEY }}
-  GOOGLE_CREDENTIALS: ${{ secrets.TF_SERVICE_ACCOUNT_KEY }}
-  GITHUB_SHA: ${{ github.sha }}
-  GCR_LOCATION: eu.gcr.io
-  IMAGE_NAME: dc-analytics-image
-  GKE_CLUSTER: dc-analytics-cluster
-  GKE_ZONE: europe-west1-b
-  K8S_NAMESPACE: iris
-  STATEFULSET_NAME: dc-analytics
+  GOOGLE_CREDENTIALS:  ${{ secrets.TF_SERVICE_ACCOUNT_KEY }}
+  GITHUB_SHA:          ${{ github.sha }}
+  GCR_LOCATION:        eu.gcr.io
+  IMAGE_NAME:          dc-analytics-image
+  GKE_CLUSTER:         dc-analytics-cluster
+  GKE_ZONE:            europe-west1-b
+  REGION:              europe-west2
+  K8S_NAMESPACE:       iris
+  STATEFULSET_NAME:    dc-analytics
 
 jobs:
   gcloud-setup-and-build-and-publish-to-GCR:
@@ -42,18 +43,17 @@ jobs:
         version: '496.0.0'
 
     - name: Configure docker to use the gcloud as a credential helper
-      run: |
-        gcloud --quiet auth configure-docker
+      run: gcloud --quiet auth configure-docker ${REGION}-docker.pkg.dev
 
     - name: Build DC-ANALYTICS image
       working-directory: iris
       run: |
-        docker build -t ${GCR_LOCATION}/${PROJECT_ID}/${IMAGE_NAME}:${GITHUB_SHA} .
+        docker build -t ${REGION}-docker.pkg.dev/${PROJECT_ID}/community/${IMAGE_NAME}:${GITHUB_SHA} .
 
     - name: Publish DC-ANALYTICS image to Google Container Registry
       working-directory: iris
       run: |
-        docker push ${GCR_LOCATION}/${PROJECT_ID}/${IMAGE_NAME}:${GITHUB_SHA}
+        docker push ${REGION}-docker.pkg.dev/${PROJECT_ID}/community/${IMAGE_NAME}:${GITHUB_SHA}
 
   # gke-provisioner:
   #   # Inspired by:
@@ -107,7 +107,7 @@ jobs:
       working-directory: ./k8s/
       run: |
         cat statefulset.tpl |\
-        sed "s|DOCKER_REPO_NAME|${GCR_LOCATION}/${PROJECT_ID}/${IMAGE_NAME}|" |\
+        sed "s|DOCKER_REPO_NAME|${REGION}-docker.pkg.dev/${PROJECT_ID}/community/${IMAGE_NAME}|" |\
         sed "s|DOCKER_IMAGE_TAG|${GITHUB_SHA}|" > statefulset.yaml
         cat statefulset.yaml