Merge branch 'next' into mail-config

owncloud · Oct 19, 2023 · 8b0630d · 8b0630d
2 parents 76e8728 + a99b6b0
commit 8b0630d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml
@@ -26,6 +26,9 @@ spec:
           {{- include "ocis.containerSecurityContext" . | nindent 10 }}
           env:
             {{- include "ocis.serviceRegistry" . | nindent 12 }}
+
+            - name: OCIS_DEFAULT_LANGUAGE
+              value: {{ default "en" .Values.features.language.default | quote }}
 
             - name: NOTIFICATIONS_LOG_COLOR
               value: {{ .Values.logging.color | quote }}
@@ -97,12 +100,6 @@ spec:
               {{- end }}
             {{- end }}
 
-            - name: NOTIFICATIONS_MACHINE_AUTH_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "secrets.machineAuthAPIKeySecret" . }}
-                  key: machine-auth-api-key
-
             - name: NOTIFICATIONS_SERVICE_ACCOUNT_ID
               valueFrom:
                 configMapKeyRef:

diff --git a/charts/ocis/templates/settings/deployment.yaml b/charts/ocis/templates/settings/deployment.yaml
@@ -26,6 +26,9 @@ spec:
           env:
             {{- include "ocis.serviceRegistry" . | nindent 12 }}
 
+            - name: OCIS_DEFAULT_LANGUAGE
+              value: {{ default "en" .Values.features.language.default | quote }}
+
             - name: SETTINGS_LOG_COLOR
               value: {{ .Values.logging.color | quote }}
             - name: SETTINGS_LOG_LEVEL
@@ -45,9 +48,6 @@ spec:
             - name: SETTINGS_DEBUG_PPROF
               value: {{ .Values.debug.profiling | quote }}
 
-            - name: OCIS_DEFAULT_LANGUAGE
-              value: {{ default "en" .Values.features.language.default | quote }}
-
             # cache
             - name: SETTINGS_CACHE_STORE
               value: {{ default "memory" .Values.cache.type | quote }}

diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml
@@ -218,8 +218,7 @@ features:
       # the minimum amount of digits the password needs to have
       minDigits: 0
       # list of banned passwords
-      bannedPasswords:
-        []
+      bannedPasswords: []
         # - foo
         # - bar
   # Apps integration