Merge pull request #155 from bcgov/bug/helm-secret

Add random default for object storage secret
bcgov · Sep 9, 2024 · 9c92165 · 9c92165
2 parents 6708aee + 0a957ab
commit 9c92165
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/charts/pcns/Chart.yaml b/charts/pcns/Chart.yaml
@@ -3,7 +3,7 @@ name: nr-permitconnect-navigator-service
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.13
+version: 0.0.14
 kubeVersion: ">= 1.13.0"
 description: PermitConnect Navigator Service
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/charts/pcns/README.md b/charts/pcns/README.md
@@ -1,6 +1,6 @@
 # nr-permitconnect-navigator-service
 
-![Version: 0.0.13](https://img.shields.io/badge/Version-0.0.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
+![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square)
 
 PermitConnect Navigator Service
 

diff --git a/charts/pcns/templates/secret.yaml b/charts/pcns/templates/secret.yaml
@@ -8,6 +8,8 @@
 {{- $chesUsername := (randAlphaNum 32) }}
 {{- $oPassword := (randAlphaNum 32) }}
 {{- $oUsername := (randAlphaNum 32) }}
+{{- $osPassword := (randAlphaNum 32) }}
+{{- $osUsername := (randAlphaNum 32) }}
 {{- $ssoPassword := (randAlphaNum 32) }}
 {{- $ssoUsername := (randAlphaNum 32) }}
 
@@ -105,8 +107,8 @@ metadata:
   labels: {{ include "pcns.labels" . | nindent 4 }}
 type: kubernetes.io/basic-auth
 data:
-  password: {{ .Values.objectStorageSecretOverride.password | b64enc | quote }}
-  username: {{ .Values.objectStorageSecretOverride.username | b64enc | quote }}
+  password: {{ .Values.objectStorageSecretOverride.password | default $osPassword | b64enc | quote }}
+  username: {{ .Values.objectStorageSecretOverride.username | default $osUsername | b64enc | quote }}
 {{- end }}
 {{- if not $oSecret }}
 ---