feat: 🎨 use cnpg secret name optional attribute

Author: mathieulaude

charts/dso-console/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cpn-console
 description: A Helm chart to deploy Cloud Pi Native Console
 type: application
-version: 2.1.9
+version: 2.1.10
 appVersion: 9.3.3
 keywords: []
 home: https://cloud-pi-native.fr

charts/dso-console/README.md

@@ -1,6 +1,6 @@
 # cpn-console
 
-![Version: 2.1.9](https://img.shields.io/badge/Version-2.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.3.3](https://img.shields.io/badge/AppVersion-9.3.3-informational?style=flat-square)
+![Version: 2.1.10](https://img.shields.io/badge/Version-2.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 9.3.3](https://img.shields.io/badge/AppVersion-9.3.3-informational?style=flat-square)
 
 A Helm chart to deploy Cloud Pi Native Console
 
@@ -135,6 +135,7 @@ A Helm chart to deploy Cloud Pi Native Console
 | global.keycloak.realm | string | `"cloud-pi-native"` | Name of the keycloak realm used for authentication. |
 | global.keycloak.redirectUri | string | `"https://console.dso.local"` | Keycloak redirect uri used with keycloak. |
 | global.keycloak.sessionSecret | string | `"a-very-strong-secret-with-more-than-32-char"` | Session secret used to store keycloak session for Console CPN client. |
+| global.postgresql.cnpgSecretName | string | `""` | Name of the secret to use to connect to external CNPG-managed DB |
 | global.postgresql.dbUrl | string | `""` | Postgres database connection string used to override computed db url, usefull if external database. # For postgres it should look like this "postgresql://db_user:db_password@db_service:db_port/db_name?schema=public" |
 | global.secrets | object | `{}` | Map of environment variables to inject into backend and frontend containers. |
 | imageCredentials.email | string | `""` | Email to pull images. |

charts/dso-console/templates/_helpers.tpl

@@ -35,6 +35,17 @@ Create image pull secret
 {{- end }}
 {{- end }}
 
+{{/*
+Create postgresql DB url connexion
+*/}}
+{{- define "cpnConsole.dbUrlValue" }}
+{{- if .Values.global.postgresql.dbUrl }}
+{{- .Values.global.postgresql.dbUrl }}
+{{- else }}
+{{- printf "postgresql://%s:%s@%s-%s-hl:%s/%s?schema=public" .Values.postgresql.auth.username .Values.postgresql.auth.password .Release.Name .Values.postgresql.nameOverride (.Values.postgresql.primary.service.ports.postgresql | toString) .Values.postgresql.auth.database }}
+{{- end }}
+{{- end }}
+
 
 {{/*
 Create container environment variables from configmap

charts/dso-console/templates/server/deployment.yaml

@@ -92,12 +92,12 @@ spec:
           {{- toYaml .Values.server.envFrom | nindent 8 }}
         {{- end }}
         {{- if .Values.server.startupProbe.enabled }}
-        {{- if .Values.cnpg.enabled }}
+        {{- if .Values.global.postgresql.cnpgSecretName }}
         env:
         - name: DB_URL
           valueFrom:
             secretKeyRef:
-              name: pg-cluster-console-app
+              name: {{ .Values.global.postgresql.cnpgSecretName }}
               key: uri
         {{- end }}
         startupProbe:

charts/dso-console/templates/server/secret.yaml

@@ -6,7 +6,9 @@ metadata:
 data: 
   SESSION_SECRET: {{ .Values.global.keycloak.sessionSecret | b64enc }}
   KEYCLOAK_CLIENT_SECRET: {{ .Values.global.keycloak.clientSecrets.backend | b64enc }}
-  DB_URL: {{ .Values.global.postgresql.dbUrl | default (printf "postgresql://%s:%s@%s-%s-hl:%s/%s?schema=public" .Values.postgresql.auth.username .Values.postgresql.auth.password .Release.Name .Values.postgresql.nameOverride (.Values.postgresql.primary.service.ports.postgresql | toString) .Values.postgresql.auth.database) | b64enc }}
+  {{- if not .Values.global.postgresql.cnpgSecretName }}
+  DB_URL: {{ include "cpnConsole.dbUrlValue" . | b64enc }}
+  {{- end -}}
   {{- if .Values.global.secrets -}}
   {{- include "cpnConsole.secret" .Values.global | indent 2 }}
   {{- end -}}

charts/dso-console/values.yaml

@@ -74,6 +74,8 @@ global:
     # -- Whether or not to deploy the keycloak dev realm into a configmap named `keycloak-realm-dev`.
     devRealm: false
   postgresql:
+    # -- Name of the secret to use to connect to external CNPG-managed DB
+    cnpgSecretName: ""
     # -- Postgres database connection string used to override computed db url, usefull if external database.
     ## For postgres it should look like this "postgresql://db_user:db_password@db_service:db_port/db_name?schema=public"
     dbUrl: ""