Merge pull request #14 from DataUSA/develop

change prod deployment helm logic
DataUSA · Apr 23, 2024 · b8fe258 · b8fe258
2 parents 6aee378 + b9baeb3
commit b8fe258
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/google-gke-prod.yaml b/.github/workflows/google-gke-prod.yaml
@@ -65,6 +65,10 @@ on:
         description: 'Production Release Name'
         required: true
         type: string
+      date:
+        description: 'Production Release Date'
+        required: true
+        type: string
       update_release:
           description: 'Check if you are updating the production release name of the latest image'
           required: true
@@ -111,7 +115,7 @@ jobs:
           gcloud beta artifacts docker tags add \
             --quiet \
             ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ env.GKE_APP_NAMESPACE }} \
-            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ inputs.release }}
+            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ inputs.release }}-${{ inputs.date }}
       
       # Transform GitHub secrets to base64 encoded
       - name: Set encoded secret values
@@ -128,8 +132,8 @@ jobs:
               --set app.environment=${{ env.GKE_APP_NAMESPACE }} \
               --set app.release=${{ env.GKE_APP_NAMESPACE }} \
               --set image.repository=${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }} \
-              --set image.tag=${{ inputs.release }} \
-              --set nameOverride=${{ env.GKE_APP_NAME }} \
-              --set fullnameOverride=${{ env.GKE_APP_NAME }} \
+              --set image.tag=${{ inputs.release }}-${{ inputs.date }}  \
+              --set nameOverride=${{ env.GKE_APP_NAME }}-${{ inputs.release }} \
+              --set fullnameOverride=${{ env.GKE_APP_NAME }}-${{ inputs.release }} \
               --set secrets.TESSERACT_BACKEND=$ENCODED_TESSERACT_BACKEND \
-              ${{ env.GKE_APP_NAME }} --values=./helm/staging.yaml ./helm
+              ${{ env.GKE_APP_NAME }}-${{ inputs.release }} --values=./helm/${{ inputs.release }}.yaml ./helm
diff --git a/helm/staging.yaml → helm/arkansas.yaml b/helm/staging.yaml → helm/arkansas.yaml
@@ -77,15 +77,15 @@ ingress:
     nginx.org/location-snippets: |
       add_header Access-Control-Allow-Origin *;
   customHosts:
-    - host: api-staging.datausa.io
+    - host: api-ts-arkansas.datausa.io
       paths:
         - path: /
-          service: cache-api-service
+          service: tesseract-api-arkansas-cache
           port: 80
         - path: /signaller
-          service: cache-api-service
+          service: tesseract-api-arkansas-cache
           port: 8090
   tls:
     - secretName: tesseract-api-varnish-ingress-tls
       hosts: 
-        - api-staging.datausa.io
+        - api-ts-arkansas.datausa.io