PIDP-637 - update helm charts, build scripts

.github/workflows/dev-build-frontend.yaml

@@ -52,26 +52,3 @@ jobs:
       - name: "Push image"
         run: |
           docker push image-registry.apps.silver.devops.gov.bc.ca/d8a8f9-tools/pidp-frontend:dev
-
-  # call-helm-install-workflow:    
-  #   uses: ./.github/workflows/dev-deploy_helm_chart.yaml
-  helm-deployment:
-    needs: [build-and-deploy-frontend]
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: actions/checkout@v1 
-
-      - name: Authenticate and set context
-        uses: redhat-actions/oc-login@v1.1
-        with:
-          openshift_server_url: ${{secrets.OPENSHIFT_CLUSTER_URL}}
-          openshift_token: ${{secrets.OPENSHIFT_TOKEN}}
-          namespace: d8a8f9-dev
-
-      - name: Helm Deploy / install command
-        run: |
-          echo current installed helm releases
-          helm list --namespace d8a8f9-dev
-  
-          echo installing helm chart...
-          helm upgrade --install --wait --values ./deploy/dev_values.yaml --namespace d8a8f9-dev dev charts/pidp --debug   

.github/workflows/dev-build-plr-intake.yaml

@@ -40,26 +40,3 @@ jobs:
       - name: "Push image"
         run: |
           docker push image-registry.apps.silver.devops.gov.bc.ca/d8a8f9-tools/pidp-plr-intake:dev
-
-  # call-helm-install-workflow:
-    #   uses: ./.github/workflows/dev-deploy_helm_chart.yaml 
-  helm-deployment:
-    needs: [build-and-deploy-plr-intake]
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: actions/checkout@v1 
-
-      - name: Authenticate and set context
-        uses: redhat-actions/oc-login@v1.1
-        with:
-          openshift_server_url: ${{secrets.OPENSHIFT_CLUSTER_URL}}
-          openshift_token: ${{secrets.OPENSHIFT_TOKEN}}
-          namespace: d8a8f9-dev
-
-      - name: Helm Deploy / install command
-        run: |
-          echo current installed helm releases
-          helm list --namespace d8a8f9-dev
-  
-          echo installing helm chart...
-          helm upgrade --install --wait --values ./deploy/dev_values.yaml --namespace d8a8f9-dev dev charts/pidp --debug 

.github/workflows/dev-build-webapi.yaml

@@ -40,26 +40,6 @@ jobs:
       - name: "Push image"
         run: |
           docker push image-registry.apps.silver.devops.gov.bc.ca/d8a8f9-tools/pidp-webapi:dev
-  
-  # call-helm-install-workflow:
-    #   uses: ./.github/workflows/dev-deploy_helm_chart.yaml
-  helm-deployment:
-    needs: [build-and-deploy-webapi]
-    runs-on: 'ubuntu-latest'
-    steps:
-      - uses: actions/checkout@v1 
-
-      - name: Authenticate and set context
-        uses: redhat-actions/oc-login@v1.1
-        with:
-          openshift_server_url: ${{secrets.OPENSHIFT_CLUSTER_URL}}
-          openshift_token: ${{secrets.OPENSHIFT_TOKEN}}
-          namespace: d8a8f9-dev
-
-      - name: Helm Deploy / install command
-        run: |
-          echo current installed helm releases
-          helm list --namespace d8a8f9-dev
-  
-          echo installing helm chart...
-          helm upgrade --install --wait --values ./deploy/dev_values.yaml --namespace d8a8f9-dev dev charts/pidp --debug 
+
+# TODO: Annotations on deployments to update based on image changes
+# Separate script for changes to helm charts 

.github/workflows/dev-deploy_helm_chart.yaml

@@ -2,16 +2,16 @@ name: Deploy Helm Charts - Dev
 
 on:
   push:
-    branches: [workflows]
+    branches: [develop]
     paths:
-      - "workspace/**"
+      - "charts/**"
   workflow_call:
   workflow_dispatch:
 
 # This will terminate builds that are previously, but continuing to run.  Saves GHA hours.
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
 

charts/frontend/templates/deployment.yaml

@@ -4,6 +4,18 @@ metadata:
   name: {{ include "frontend.fullname" . }}
   labels:
     {{- include "frontend.labels" . | nindent 4 }}
+  annotations:
+    image.openshift.io/triggers: |-
+      [
+        {
+          "from": {
+            "kind": "ImageStreamTag",
+            "name": "pidp-frontend:{{ .Values.global.image.tag }}"
+          },
+          "fieldPath": "spec.template.spec.containers[0].image",
+          "paused": false
+        }
+      ]
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}

charts/plr-intake/templates/deployment.yaml

@@ -10,6 +10,18 @@ metadata:
   name: {{ include "plr-intake.fullname" . }}
   labels:
     {{- include "plr-intake.labels" . | nindent 4 }}
+  annotations:
+    image.openshift.io/triggers: |-
+      [
+        {
+          "from": {
+            "kind": "ImageStreamTag",
+            "name": "pidp-plr-intake:{{ .Values.global.image.tag }}"
+          },
+          "fieldPath": "spec.template.spec.containers[0].image",
+          "paused": false
+        }
+      ]
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}

charts/webapi/templates/deployment.yaml

@@ -12,6 +12,18 @@ metadata:
   name: {{ include "webapi.fullname" . }}
   labels:
     {{- include "webapi.labels" . | nindent 4 }}
+  annotations:
+    image.openshift.io/triggers: |-
+      [
+        {
+          "from": {
+            "kind": "ImageStreamTag",
+            "name": "pidp-webapi:{{ .Values.global.image.tag }}"
+          },
+          "fieldPath": "spec.template.spec.containers[0].image",
+          "paused": false
+        }
+      ]
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}