Merge pull request #144 from chasinandrew/develop

Develop

Author: chasinandrew

.github/workflows/_deployment.yaml

@@ -108,7 +108,7 @@ jobs:
           docker push "${{ vars.region }}-docker.pkg.dev/${{ vars.artifact_registry_project }}/${{ vars.artifact_registry_repo }}/${{ vars.service_name }}:latest"
 
   deploy: 
-    if: contains(fromJSON('["develop", "main"]'), github.ref_name)
+    if: contains(fromJSON('["develop", "main"]'), github.ref_name) && github.event == 'push' 
     name: "Cloud Run Deployment"
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
@@ -129,7 +129,6 @@ jobs:
           service_account: '${{ secrets.WIF_SERVICE_ACCOUNT }}'     # e.g. - my-service-account@my-project.iam.gserviceaccount.com
 
       - name: Create Service ${{ inputs.environment }} Declaration   
-        if: inputs.environment == 'dev' || inputs.environment == 'qa'
         run: |-
           export CONTAINER_IMAGE="${{ vars.region }}-docker.pkg.dev/${{ vars.artifact_registry_project }}/${{ vars.artifact_registry_repo }}/${{ vars.service_name }}:${{ github.sha }}"
           export SERVICE_NAME="${{ vars.service_name }}"
@@ -148,7 +147,6 @@ jobs:
 
       - name: Deploy to ${{ inputs.environment }} Cloud Run
         id: deploy-dev-qa
-        if: github.event == 'push' 
         uses: google-github-actions/deploy-cloudrun@v0
         with:
           project_id: ${{ vars.gcp_project_id }}

.github/workflows/deployment-prod-canary.yaml

@@ -27,8 +27,7 @@ on:
         required: true
         default: '90'
         description: Old Cloud Run revision traffic percentage
-        options:
-          - 0 
+        options: 
           - 10
           - 25
           - 50
@@ -87,4 +86,5 @@ jobs:
           project_id: ${{ vars.gcp_project_id }}
           service: ${{ vars.service_name }}
           region: ${{ vars.region }}
-          metadata: container-canary.yaml
+          metadata: container-canary.yaml
+        #TODO: add revision tag url, do same thing on data tier (blue-green), test in parallel 

.github/workflows/deployment-prod-release.yaml

@@ -34,7 +34,6 @@ jobs:
     name: "Cloud Run Deployment"
     runs-on: ubuntu-latest
     environment: prod
-    needs: [image-build-push]
     permissions:
       id-token: write
       contents: read