Merge branch 'master' into playwright_integration

.github/workflows/continuous.yaml

@@ -168,7 +168,7 @@ jobs:
           context: .
           push: true
           build-args: |
-            SRC_IMG=gcr.io/${{ secrets.DEV_PROJECT }}/sefaria-web-${{ steps.branch-name.outputs.current_branch }}:sha-${{ steps.get-sha.outputs.sha_short }}
+            SRC_IMG=us-east1-docker.pkg.dev/${{ secrets.DEV_PROJECT }}/containers/sefaria-web-${{ steps.branch-name.outputs.current_branch }}:sha-${{ steps.get-sha.outputs.sha_short }}
           file: ./build/${{ matrix.app }}/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -384,7 +384,7 @@ jobs:
         env:
           # dependent on GITHUB_RUN_ID, which is implicitly passed in
           DEPLOY_ENV: sandbox-${{ steps.get-sha.outputs.sha_short }}
-          WEB_IMAGE_NAME: gcr.io/${{secrets.DEV_PROJECT}}/sefaria-web-${{ steps.branch-name.outputs.current_branch }}
+          WEB_IMAGE_NAME: us-east1-docker.pkg.dev/${{secrets.DEV_PROJECT}}/containers/sefaria-web-${{ steps.branch-name.outputs.current_branch }}
           WEB_IMAGE_TAG: sha-${{ steps.get-sha.outputs.sha_short }}
       - name: Wait For Job To Finish
         run: ./build/ci/waitForCIJob.bash

.github/workflows/production-deploy.yaml

@@ -12,7 +12,8 @@ on:
       chart_version:
         type: string
         required: true
-        default: 0.20.0
+        default: current
+        description: Set to 'current' to use currently deployed chart version or '0.x.y' to specify chart
 
 jobs:
   # Note - build occurs again here, even though this image has been built in continuous.
@@ -200,21 +201,29 @@ jobs:
           project_id: ${{secrets.PROD_GKE_PROJECT}}
       - name: Set up yq
         uses: frenck/action-setup-yq@v1
+      - name: Determine chart version
+        id: chart_version
+        run: |
+          if [[ "${{ inputs.chart_version }}" == "current" ]]; then
+            echo "chart_version=${{ vars.CHART_VERSION }}" >> $GITHUB_OUTPUT
+          else
+            echo "chart_version=${{ inputs.chart_version }}" >> $GITHUB_OUTPUT
+          fi
       - name: Deploy Production
         run: ./build/ci/production-helm-deploy.sh build/ci/production-values.yaml
         env:
           GIT_COMMIT: "${{ needs.workflow-check.outputs.ref }}"
           PROJECT_ID: "${{ secrets.PROD_GKE_PROJECT }}"
           NAMESPACE: "${{secrets.PROD_GKE_NAMESPACE}}"
           IMAGE_NAME: "${{ secrets.IMAGE_NAME }}"
-          CHART_VERSION: "${{ inputs.chart_version }}"
-#      - name: Update workflow default chart
-#        if: github.ref == 'refs/heads/master'
-#        run: |
-#          yq -i e '.on.workflow_dispatch.inputs.chart_version.default="${{ inputs.chart_version }}"' .github/workflows/release.yml
-#          yq -i e '.on.workflow_call.inputs.chart_version.default="${{ inputs.chart_version }}"' .github/workflows/production-deploy.yaml
-#          git config user.email [email protected]
-#          git config user.name "Sefaria Automated Workflow"
-#          git checkout -b master
-#          git commit -am "ci: update default chart version to ${{ inputs.chart_version }}"
-#          git push
+          CHART_VERSION: "${{ steps.chart_version.outputs.chart_version }}"
+      - name: Update workflow default chart
+        if: github.ref == 'refs/heads/master'
+        run: > 
+          curl -L 
+          -X PATCH 
+          -H "Accept: application/vnd.github+json" 
+          -H "Authorization: Bearer ${{ secrets.WORKFLOW_AUTOMATION_TOKEN }}" 
+          -H "X-GitHub-Api-Version: 2022-11-28"
+          https://api.github.com/repos/Sefaria/Sefaria-Project/actions/variables/CHART_VERSION
+          -d '{"name":"CHART_VERSION","value":"${{ steps.chart_version.outputs.chart_version }}"}'

.github/workflows/release.yml

@@ -5,7 +5,9 @@ on:
       chart_version:
         type: string
         required: true
-        default: 0.20.0
+        default: current
+        description: Set to 'current' to use currently deployed chart version or '0.x.y' to specify chart
+
 jobs:
   semantic-release:
     runs-on: ubuntu-latest

build/ci/sandbox-helm-deploy.sh

@@ -2,9 +2,9 @@
 set -x
 set -e
 
-export WEB_IMAGE="gcr.io/$PROJECT_ID/sefaria-web-$BRANCH"
-export NODE_IMAGE="gcr.io/$PROJECT_ID/sefaria-node-$BRANCH"
-export ASSET_IMAGE="gcr.io/$PROJECT_ID/sefaria-asset-$BRANCH"
+export WEB_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/sefaria-web-$BRANCH"
+export NODE_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/sefaria-node-$BRANCH"
+export ASSET_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/sefaria-asset-$BRANCH"
 export TAG="sha-$GIT_COMMIT"
 export NAME="sandbox-$GIT_COMMIT"
 

build/ci/values.yaml

@@ -4,7 +4,7 @@ deployEnv:
 previousServicesCount: "1"
 web:
   containerImage: 
-    imageRegistry: gcr.io/development-205018/sefaria-web-${BRANCH}
+    imageRegistry: us-east1-docker.pkg.dev/development-205018/containers/sefaria-web-${BRANCH}
     tag: 
   secrets:
     googleClient:
@@ -19,7 +19,7 @@ redis:
     tag: latest
 nodejs:
   containerImage: 
-    imageRegistry: gcr.io/development-205018/sefaria-node-${BRANCH}
+    imageRegistry: us-east1-docker.pkg.dev/development-205018/containers/sefaria-node-${BRANCH}
     tag: 
 varnish:
   secrets:
@@ -36,11 +36,11 @@ ingress:
       ref: cauldron-wildcard-letsencrypt
 nginx:
   containerImage: 
-    imageRegistry: gcr.io/development-205018/sefaria-asset-${BRANCH}
+    imageRegistry: us-east1-docker.pkg.dev/development-205018/containers/sefaria-asset-${BRANCH}
     tag: 
 monitor:
   containerImage: 
-    imageRegistry: gcr.io/development-205018/sefaria-web-${BRANCH}
+    imageRegistry: us-east1-docker.pkg.dev/development-205018/containers/sefaria-web-${BRANCH}
     tag: 
 secrets:
   localSettings: