Copy changes to staging and default

ocadotechnology · Jun 26, 2024 · 0c83ac2 · 0c83ac2
1 parent ced8b2a
commit 0c83ac2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/deploy_default.yml b/.github/workflows/deploy_default.yml
@@ -15,6 +15,9 @@ jobs:
       MODULE_NAME: default
       VERSION: ${{ github.run_number }}
       DATABASE_POSTFIX: ${{ secrets.DATABASE_POSTFIX }}
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,18 +28,17 @@ jobs:
           python-version: "3.8.x"
           architecture: "x64"
 
-      - id: gcauth
+      - id: auth
         name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCLOUD_AUTH }}
+          project_id: 'decent-digit-629'
+          workload_identity_provider: 'projects/354656325390/locations/global/workloadIdentityPools/cfl-pool/providers/cfl-provider'
+          service_account: '[email protected]'
 
       - name: Setup gcloud CLI
         uses: google-github-actions/setup-gcloud@v2
 
-      - name: GKE auth
-        uses: simenandre/setup-gke-gcloud-auth-plugin@v1
-
       - name: Deploy to Google Cloud
         uses: ./.github/actions/deploy_gcloud
         with:

diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
@@ -15,6 +15,9 @@ jobs:
       MODULE_NAME: staging
       VERSION: ${{ github.run_number }}
       DATABASE_POSTFIX: ${{ secrets.DATABASE_POSTFIX }}
+    permissions:
+      contents: 'read'
+      id-token: 'write'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,18 +28,17 @@ jobs:
           python-version: "3.8.x"
           architecture: "x64"
 
-      - id: gcauth
+      - id: auth
         name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v2
         with:
-          credentials_json: ${{ secrets.GCLOUD_AUTH }}
+          project_id: 'decent-digit-629'
+          workload_identity_provider: 'projects/354656325390/locations/global/workloadIdentityPools/cfl-pool/providers/cfl-provider'
+          service_account: '[email protected]'
 
       - name: Setup gcloud CLI
         uses: google-github-actions/setup-gcloud@v2
 
-      - name: GKE auth
-        uses: simenandre/setup-gke-gcloud-auth-plugin@v1
-
       - name: Deploy to Google Cloud
         uses: ./.github/actions/deploy_gcloud
         with: