templates/deployment.yaml aktualisiert

templates/deployment.yaml

@@ -73,7 +73,7 @@ spec:
               {{- end }}
             - name: LB_DB_USER
               {{- if eq .Values.mariadb.enabled true }}
-              value: {{ .Values.mariadb.userDatabase.user.value }}
+              value: {{ .Values.mariadb.auth.username }}
               {{- else }}
                 {{- if .Values.externalDatabase.existingSecretConfig.usernameField }}
               valueFrom:
@@ -85,21 +85,17 @@ spec:
                 {{- end }}
               {{- end }}
             - name: LB_DB_USER_PWD
-              {{- if eq .Values.mariadb.enabled true }}
-              value: {{ .Values.mariadb.userDatabase.password.value }}
-              {{- else }}
-                {{- if .Values.externalDatabase.existingSecretConfig.passwordField }}
               valueFrom:
                 secretKeyRef:
                   name: {{ include "librebooking.databaseSecretName" . }}
+                  {{- if .Values.mariadb.enabled }}
+                  key: mariadb-password
+                  {{- else }}
                   key: {{ .Values.externalDatabase.existingSecretConfig.passwordField }}
-                {{- else}}
-              value: {{ .Values.externalDatabase.password }}
-                {{- end }}
                   {{- end }}
             - name: LB_DB_NAME
               {{- if eq .Values.mariadb.enabled true }}
-              value: {{ .Values.mariadb.userDatabase.name.value }}
+              value: {{ .Values.mariadb.auth.database }}
               {{- else }}
                 {{- if .Values.externalDatabase.existingSecretConfig.databaseField }}
               valueFrom:
@@ -114,6 +110,8 @@ spec:
               value: '{{ .Values.librebooking.installPW }}'
             - name: LB_LOG_LEVEL
               value: '{{ .Values.librebooking.loglevel }}'
+            - name: LB_LOG_SQL
+              value: '{{ .Values.mariadb.loglevel }}'
             - name: TZ
               value: '{{ .Values.librebooking.TZ }}'
       volumes: