change postgres settings to import only password from secret

charts/kyoo/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kyoo
-version: 0.1.8
+version: 0.1.9
 description: Chart for Kyoo
 keywords:
   - media

charts/kyoo/templates/deployment-back.yaml

@@ -84,30 +84,18 @@ spec:
             - name: PUBLIC_URL
               value: "{{ .Values.config.publicUrl }}"
             - name: POSTGRES_USER
-              valueFrom:
+              value: "{{ .Values.config.postgresql.username }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.usernameKey }}"
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.postgresql.existingSecretName }}"
                   key: "{{ .Values.config.postgresql.passwordKey }}"
             - name: POSTGRES_DB
-              valueFrom:
+              value: "{{ .Values.config.postgresql.database }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.databaseNameKey }}"
             - name: POSTGRES_SERVER
-              valueFrom:
+              value: "{{ .Values.config.postgresql.host }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.hostKey }}"
             - name: POSTGRES_PORT
-              valueFrom:
+              value: "{{ .Values.config.postgresql.port }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.portKey }}"
 
           {{ if .Values.config.oidc.enabled }}
             - name: OIDC_SERVICE_NAME

charts/kyoo/templates/deployment-migrations.yaml

@@ -77,30 +77,18 @@ spec:
             - name: PUBLIC_URL
               value: "{{ .Values.config.publicUrl }}"
             - name: POSTGRES_USER
-              valueFrom:
+              value: "{{ .Values.config.postgresql.username }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.usernameKey }}"
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.postgresql.existingSecretName }}"
                   key: "{{ .Values.config.postgresql.passwordKey }}"
             - name: POSTGRES_DB
-              valueFrom:
+              value: "{{ .Values.config.postgresql.database }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.databaseNameKey }}"
             - name: POSTGRES_SERVER
-              valueFrom:
+              value: "{{ .Values.config.postgresql.host }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.hostKey }}"
             - name: POSTGRES_PORT
-              valueFrom:
+              value: "{{ .Values.config.postgresql.port }}"
-                secretKeyRef:
-                  name: "{{ .Values.config.postgresql.existingSecretName }}"
-                  key: "{{ .Values.config.postgresql.portKey }}"
 
           {{ if .Values.config.oidc.enabled }}
             - name: OIDC_SERVICE_NAME

charts/kyoo/values.yaml

@@ -112,15 +112,16 @@ config:
     secretIDKey: ""
 
   ## Postgresql
-  ## All configuration is expected to be stored in a secret, reference the secret name and each key for the value
   ##
   postgresql:
+    username: ""
+    database: ""
+    host: ""
+    port: ""
+
+    # -- Use a secret to store the pasword
     existingSecretName: ""
-    usernameKey: ""
     passwordKey: ""
-    databaseNameKey: ""
-    hostKey: ""
-    portKey: ""
 
 ## Configure the ingress resource that allows you to access the
 ## kyoo installation. Set up the URL