Add missing certTrusted condition for ldap-ca volume (#828)

* Add missing certTrusted condition for ldap-ca volume * fix whitespace in ldap-ca condition on groups service that differed from graph and users service --------- Co-authored-by: Willy Kloucek <[email protected]>
owncloud · Dec 6, 2024 · d244e33 · d244e33
1 parent b05a650
commit d244e33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/charts/ocis/templates/graph/deployment.yaml b/charts/ocis/templates/graph/deployment.yaml
@@ -251,7 +251,7 @@ spec:
           emptyDir: {}
           {{ end }}
         - name: ldap-ca
-          {{ if not .Values.features.externalUserManagement.enabled }}
+          {{ if or (not .Values.features.externalUserManagement.enabled) (not .Values.features.externalUserManagement.ldap.certTrusted) }}
           secret:
             secretName: {{ include "secrets.ldapCASecret" . }}
           {{ else }}

diff --git a/charts/ocis/templates/groups/deployment.yaml b/charts/ocis/templates/groups/deployment.yaml
@@ -112,7 +112,7 @@ spec:
               value: {{ .Values.features.externalUserManagement.ldap.uri | quote }}
             {{ end }}
             - name: GROUPS_LDAP_CACERT
-              {{ if or (not .Values.features.externalUserManagement.enabled) ( not .Values.features.externalUserManagement.ldap.certTrusted) }}
+              {{ if or (not .Values.features.externalUserManagement.enabled) (not .Values.features.externalUserManagement.ldap.certTrusted) }}
               value: /etc/ocis/ldap-ca/ldap-ca.crt
               {{ else }}
               value: "" # no cert needed
@@ -167,7 +167,7 @@ spec:
         - name: tmp-volume
           emptyDir: {}
         - name: ldap-ca
-          {{ if or (not .Values.features.externalUserManagement.enabled) ( not .Values.features.externalUserManagement.ldap.certTrusted) }}
+          {{ if or (not .Values.features.externalUserManagement.enabled) (not .Values.features.externalUserManagement.ldap.certTrusted) }}
           secret:
             secretName: {{ include "secrets.ldapCASecret" . }}
           {{ else }}