fix: autoscaling and secrets

Signed-off-by: OMPRAKASH MISHRA <[email protected]>
bcgov · Mar 6, 2024 · 56c5b50 · 56c5b50
1 parent e28fc5d
commit 56c5b50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -56,7 +56,7 @@ jobs:
       params:
         --set backend.deploymentStrategy=RollingUpdate
         --set frontend.deploymentStrategy=RollingUpdate
-
+        --set global.autoscaling=true
   promote:
     name: Promote Images
     needs: [deploy-prod, vars]

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -41,7 +41,8 @@ jobs:
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
       triggers: ('backend/', 'frontend/', 'migrations/')
-
+      params:
+        --set global.secrets.persist=false
   tests:
     name: Tests
     needs: [deploys]

diff --git a/charts/app/templates/secret.yaml b/charts/app/templates/secret.yaml
@@ -16,8 +16,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}
-  labels: {{- include "selectorLabels" . | nindent 4 }}
+  labels: {{- include "labels" . | nindent 4 }}
+    {{-if .Values.global.secrets.persist }}
     "helm.sh/resource-policy": keep
+    {{- end }}
+
 data:
   databasePassword: {{ $databasePassword | quote }}
   postgres-password: {{ $databasePassword  | quote }}

diff --git a/charts/app/values.yaml b/charts/app/values.yaml
@@ -16,8 +16,7 @@ global:
     databasePassword: ~
     databaseUser: ~
     databaseName: ~
-    annotation:
-      helm.sh/policy: "keep"
+    persist: true
   #-- domain of the application, it is required, apps.silver.devops.gov.bc.ca for silver cluster and apps.devops.gov.bc.ca for gold cluster
   domain: "apps.silver.devops.gov.bc.ca" # it is apps.gold.devops.gov.bc.ca for gold cluster
   #-- the database Alias gives a nice way to switch to different databases, crunchy, patroni ... etc.