feat: PLAT-000 Add docker-login support for zendesk-base-images

.github/workflows/cron_deploy-from-branch.yml

@@ -80,6 +80,7 @@ env:
   GAR_ENABLED: ${{ vars.GAR_ENABLED || 'true' }}
   GCR_DEFAULT_REPO: ${{ vars.GCR_DEFAULT_REPO }}
   GAR_DEFAULT_REPO: ${{ vars.GAR_DEFAULT_REPO }}
+  ZENDESK_BASE_IMAGES_REPO: ${{ vars.ZENDESK_BASE_IMAGES_REPO || 'europe-west1-docker.pkg.dev/common-main-cfc4/zendesk-base-images' }}
   REGION: ${{ inputs.region }}
   AVAILABLE_REGIONS_FOR_DEPLOYMENT: ${{ vars.AVAILABLE_REGIONS_FOR_DEPLOYMENT }}
 
@@ -150,13 +151,16 @@ jobs:
             IMAGE_NAME=$GCR_IMAGE_NAME
           fi
 
+          ZENDESK_BASE_IMAGES_DOMAIN=$(echo $ZENDESK_BASE_IMAGES_REPO | cut -d '/' -f 1)
+
           echo "gcr_domain=$GCR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gar_domain=$GAR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gcr_image_repo=$GCR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gar_image_repo=$GAR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gcr_image_name=$GCR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "gar_image_name=$GAR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "zendesk_base_images_domain=$ZENDESK_BASE_IMAGES_DOMAIN" >> $GITHUB_OUTPUT
 
       - name: Get .env file and scheduler for europe region
         if: ${{ env.REGION == 'europe' }}
@@ -215,6 +219,13 @@ jobs:
         if: ${{ env.BUILD_COMMAND }}
         run: $BUILD_COMMAND
 
+      - name: "Authenticating docker for zendesk-base-images dependencies"
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ steps.image_name.outputs.ZENDESK_BASE_IMAGES_DOMAIN }}"
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
       - name: "Authenticating docker to push to gcr"
         if: ${{ env.GCR_ENABLED == 'true' }}
         uses: docker/login-action@v3

.github/workflows/cron_merged-pr.yml

@@ -97,6 +97,7 @@ env:
   GAR_ENABLED: ${{ vars.GAR_ENABLED || 'true' }}
   GCR_DEFAULT_REPO: ${{ vars.GCR_DEFAULT_REPO }}
   GAR_DEFAULT_REPO: ${{ vars.GAR_DEFAULT_REPO }}
+  ZENDESK_BASE_IMAGES_REPO: ${{ vars.ZENDESK_BASE_IMAGES_REPO || 'europe-west1-docker.pkg.dev/common-main-cfc4/zendesk-base-images' }}
   REGION: ${{ inputs.region }}
   AVAILABLE_REGIONS_FOR_DEPLOYMENT: ${{ vars.AVAILABLE_REGIONS_FOR_DEPLOYMENT }}
 
@@ -225,13 +226,17 @@ jobs:
             IMAGE_NAME=$GCR_IMAGE_NAME
           fi
 
+          ZENDESK_BASE_IMAGES_DOMAIN=$(echo $ZENDESK_BASE_IMAGES_REPO | cut -d '/' -f 1)
+
           echo "gcr_domain=$GCR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gar_domain=$GAR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gcr_image_repo=$GCR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gar_image_repo=$GAR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gcr_image_name=$GCR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "gar_image_name=$GAR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "zendesk_base_images_domain=$ZENDESK_BASE_IMAGES_DOMAIN" >> $GITHUB_OUTPUT
+
 
       - name: Get environment.env file and scheduler for updating k8s-manifest repo in europe region scenario
         if: ${{ env.REGION == 'europe' }}
@@ -278,6 +283,13 @@ jobs:
           workload_identity_provider: "${{ secrets.WIF_PROVIDER_NAME }}"
           service_account: ${{ secrets.GSA_GCR_EMAIL }}
 
+      - name: "Authenticating docker for zendesk-base-images dependencies"
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ steps.image_name.outputs.ZENDESK_BASE_IMAGES_DOMAIN }}"
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
       - name: "Authenticating docker to push to gcr"
         if: ${{ env.GCR_ENABLED == 'true' }}
         uses: docker/login-action@v3

.github/workflows/deploy-from-branch.yml

@@ -95,6 +95,7 @@ env:
   GAR_ENABLED: ${{ vars.GAR_ENABLED || 'true' }}
   GCR_DEFAULT_REPO: ${{ vars.GCR_DEFAULT_REPO }}
   GAR_DEFAULT_REPO: ${{ vars.GAR_DEFAULT_REPO }}
+  ZENDESK_BASE_IMAGES_REPO: ${{ vars.ZENDESK_BASE_IMAGES_REPO || 'europe-west1-docker.pkg.dev/common-main-cfc4/zendesk-base-images' }}
   REGION: ${{ inputs.region }}
   AVAILABLE_REGIONS_FOR_DEPLOYMENT: ${{ vars.AVAILABLE_REGIONS_FOR_DEPLOYMENT }}
   CEREBRO_TEAM: ${{ inputs.cerebro_team }}
@@ -164,13 +165,16 @@ jobs:
             IMAGE_NAME=$GCR_IMAGE_NAME
           fi
 
+          ZENDESK_BASE_IMAGES_DOMAIN=$(echo $ZENDESK_BASE_IMAGES_REPO | cut -d '/' -f 1)
+
           echo "gcr_domain=$GCR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gar_domain=$GAR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gcr_image_repo=$GCR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gar_image_repo=$GAR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gcr_image_name=$GCR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "gar_image_name=$GAR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "zendesk_base_images_domain=$ZENDESK_BASE_IMAGES_DOMAIN" >> $GITHUB_OUTPUT
 
       - id: "app_names"
         name: "Get app_names if necessary"
@@ -202,7 +206,7 @@ jobs:
       - name: Export Home
         run: echo "HOME=/root" >> $GITHUB_ENV
 
-      ##  Needs to be added so as to pull common Libs from bitbucket ##
+      ### Needs to be added so as to pull common Libs from bitbucket ##
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:
@@ -218,7 +222,7 @@ jobs:
           key: npm-${{ hashFiles('package-lock.json') }}
           restore-keys: npm-
 
-       ### Authentings with Google Cloud to Push Image to GCR ###
+      ### Authenticate with Google Cloud to Push Image to GCR ###
       - id: "auth"
         name: "Authenticate to Google Cloud"
         uses: "google-github-actions/auth@v2"
@@ -246,15 +250,22 @@ jobs:
         if: ${{ env.BUILD_COMMAND }}
         run: $BUILD_COMMAND
 
-      - name: "Authenticating docker to push to gcr"
+      - name: "Authenticating docker for zendesk-base-images dependencies"
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ steps.image_name.outputs.ZENDESK_BASE_IMAGES_DOMAIN }}"
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
+      - name: "Authenticating docker to push to gcr domain"
         if: ${{ env.GCR_ENABLED == 'true' }}
         uses: docker/login-action@v3
         with:
           registry: "${{ steps.image_name.outputs.GCR_DOMAIN }}"
           username: "oauth2accesstoken"
           password: "${{ steps.auth.outputs.access_token }}"
 
-      - name: "Authenticating docker to push to gar"
+      - name: "Authenticating docker to push to gar domain"
         if: ${{ env.GAR_ENABLED == 'true' }}
         uses: docker/login-action@v3
         with:
@@ -292,7 +303,7 @@ jobs:
           TAGS: ${{ steps.get_image_tag.outputs.image_tag }}
           IMAGE_NAME: ${{ steps.image_name.outputs.gar_image_name }}
 
-      ##Deploy to dev
+      ### Deploy to dev
       - name: "Checkout k8s manifests"
         uses: actions/checkout@v4
         with:

.github/workflows/exceptional_stage_deploy.yml

@@ -95,6 +95,7 @@ env:
   GAR_ENABLED: ${{ vars.GAR_ENABLED || 'true' }}
   GCR_DEFAULT_REPO: ${{ vars.GCR_DEFAULT_REPO }}
   GAR_DEFAULT_REPO: ${{ vars.GAR_DEFAULT_REPO }}
+  ZENDESK_BASE_IMAGES_REPO: ${{ vars.ZENDESK_BASE_IMAGES_REPO || 'europe-west1-docker.pkg.dev/common-main-cfc4/zendesk-base-images' }}
   REGION: ${{ inputs.region }}
   AVAILABLE_REGIONS_FOR_DEPLOYMENT: ${{ vars.AVAILABLE_REGIONS_FOR_DEPLOYMENT }}
   CEREBRO_TEAM: ${{ inputs.cerebro_team }}
@@ -164,13 +165,17 @@ jobs:
             IMAGE_NAME=$GCR_IMAGE_NAME
           fi
 
+          ZENDESK_BASE_IMAGES_DOMAIN=$(echo $ZENDESK_BASE_IMAGES_REPO | cut -d '/' -f 1)
+
           echo "gcr_domain=$GCR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gar_domain=$GAR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gcr_image_repo=$GCR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gar_image_repo=$GAR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gcr_image_name=$GCR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "gar_image_name=$GAR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "zendesk_base_images_domain=$ZENDESK_BASE_IMAGES_DOMAIN" >> $GITHUB_OUTPUT
+
 
       - id: "app_names"
         name: "Get app_names if necessary"
@@ -246,6 +251,13 @@ jobs:
         if: ${{ env.BUILD_COMMAND }}
         run: $BUILD_COMMAND
 
+      - name: "Authenticating docker for zendesk-base-images dependencies"
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ steps.image_name.outputs.ZENDESK_BASE_IMAGES_DOMAIN }}"
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
       - name: "Authenticating docker to push to gcr"
         if: ${{ env.GCR_ENABLED == 'true' }}
         uses: docker/login-action@v3

.github/workflows/merged-pr.yml

@@ -111,6 +111,7 @@ env:
   GAR_ENABLED: ${{ vars.GAR_ENABLED || 'true' }}
   GCR_DEFAULT_REPO: ${{ vars.GCR_DEFAULT_REPO }}
   GAR_DEFAULT_REPO: ${{ vars.GAR_DEFAULT_REPO }}
+  ZENDESK_BASE_IMAGES_REPO: ${{ vars.ZENDESK_BASE_IMAGES_REPO || 'europe-west1-docker.pkg.dev/common-main-cfc4/zendesk-base-images' }}
   AVAILABLE_REGIONS_FOR_DEPLOYMENT: ${{ vars.AVAILABLE_REGIONS_FOR_DEPLOYMENT }}
   REGION: ${{ inputs.region }}
   CEREBRO_TEAM: ${{ inputs.cerebro_team }}
@@ -239,13 +240,16 @@ jobs:
             IMAGE_NAME=$GCR_IMAGE_NAME
           fi
 
+          ZENDESK_BASE_IMAGES_DOMAIN=$(echo $ZENDESK_BASE_IMAGES_REPO | cut -d '/' -f 1)
+
           echo "gcr_domain=$GCR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gar_domain=$GAR_DOMAIN" >> $GITHUB_OUTPUT
           echo "gcr_image_repo=$GCR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gar_image_repo=$GAR_IMAGE_REPO" >> $GITHUB_OUTPUT
           echo "gcr_image_name=$GCR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "gar_image_name=$GAR_IMAGE_NAME" >> $GITHUB_OUTPUT
           echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
+          echo "zendesk_base_images_domain=$ZENDESK_BASE_IMAGES_DOMAIN" >> $GITHUB_OUTPUT
 
       - id: "app_names"
         name: "Get app_names if necessary"
@@ -309,6 +313,13 @@ jobs:
           workload_identity_provider: "${{ secrets.WIF_PROVIDER_NAME }}"
           service_account: ${{ secrets.GSA_GCR_EMAIL }}
 
+      - name: "Authenticating docker for zendesk-base-images dependencies"
+        uses: docker/login-action@v3
+        with:
+          registry: "${{ steps.image_name.outputs.ZENDESK_BASE_IMAGES_DOMAIN }}"
+          username: "oauth2accesstoken"
+          password: "${{ steps.auth.outputs.access_token }}"
+
       - name: "Authenticating docker to push to gcr"
         if: ${{ env.GCR_ENABLED == 'true' }}
         uses: docker/login-action@v3