change postgres settings to import only password from secret

charts/kyoo/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kyoo
-version: 0.1.2
+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-matcher.yaml

@@ -62,16 +62,23 @@ spec:
 
             - name: KYOO_URL
               value: http://{{ template "kyoo.fullname" . }}-back.{{ .Release.Namespace }}:{{ .Values.back.service.port }}
+
+          {{- if .Values.config.secretAPIKey.existingKyooSecretKey }}
             - name: KYOO_APIKEYS
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.secretAPIKey.existingSecretName }}"
                   key: "{{ .Values.config.secretAPIKey.existingKyooSecretKey }}"
+          {{- end }}
+
+          {{- if .Values.config.secretAPIKey.existingTMDBSecretKey }}
             - name: THEMOVIEDB_APIKEY
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.secretAPIKey.existingSecretName }}"
                   key: "{{ .Values.config.secretAPIKey.existingTMDBSecretKey }}"
+          {{- end }}
+
             - name: LIBRARY_LANGUAGES
               value: "{{ .Values.config.libraryLanguages }}"
             - name: RABBITMQ_HOST

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/templates/deployment-scanner.yaml

@@ -65,16 +65,23 @@ spec:
 
             - name: KYOO_URL
               value: http://{{ template "kyoo.fullname" . }}-back.{{ .Release.Namespace }}:{{ .Values.back.service.port }}
+
+          {{- if .Values.config.secretAPIKey.existingKyooSecretKey }}
             - name: KYOO_APIKEYS
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.secretAPIKey.existingSecretName }}"
                   key: "{{ .Values.config.secretAPIKey.existingKyooSecretKey }}"
+          {{- end }}
+
+          {{- if .Values.config.secretAPIKey.existingTMDBSecretKey }}
             - name: THEMOVIEDB_APIKEY
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.config.secretAPIKey.existingSecretName }}"
                   key: "{{ .Values.config.secretAPIKey.existingTMDBSecretKey }}"
+          {{- end }}
+
             - name: LIBRARY_LANGUAGES
               value: "{{ .Values.config.libraryLanguages }}"
             - name: LIBRARY_IGNORE_PATTERN

charts/kyoo/values.yaml

@@ -68,7 +68,7 @@ config:
   # UNLOGGED_PERMISSIONS=overall.read,overall.play
   # You can specify this to allow guests users to see your collection without behing able to play videos for example:
   # UNLOGGED_PERMISSIONS=overall.read
-  unloggedPermissions: ""
+  unloggedPermissions: overall.read
 
   # Specify permissions of new accounts.
   defaultPermissions: overall.read,overall.play
@@ -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
@@ -633,7 +634,7 @@ scanner:
   ## ref: https://hub.docker.com/r/zoriya/zoriya/kyoo_scanner/tags
   ##
   image:
-    repository: zoriya/zoriya/kyoo_scanner
+    repository: zoriya/kyoo_scanner
     tag: "4.4.0"
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -817,7 +818,7 @@ rabbitmq:
   ## Do not use simultaneously with `extraConfigurationExistingSecret`
   ##
   extraConfiguration: |-
-    default_vhost = none
+    default_vhost = '/'
     default_permissions.configure = .*
     default_permissions.read = .*
     default_permissions.write = .*