add envFrom

reschandreas · Sep 20, 2024 · e223d03 · e223d03
1 parent 3eda7de
commit e223d03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/helm/ravatar/Chart.yaml b/helm/ravatar/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: ravatar
 description: Ravatar is an implementation of the Libavatar service, which make it easy to host your own avatar service.
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "v0.1.1"
diff --git a/helm/ravatar/templates/deployment.yaml b/helm/ravatar/templates/deployment.yaml
@@ -64,8 +64,6 @@ spec:
               value: {{ .Values.ravatar.ldap.url | quote }}
             - name: LDAP_BIND_USERNAME
               value: {{ .Values.ravatar.ldap.bindUsername | quote }}
-            - name: LDAP_BIND_PASSWORD
-              value: {{ .Values.ravatar.ldap.bindPassword | quote }}
             - name: LDAP_BASE_DN
               value: {{ .Values.ravatar.ldap.baseDN | quote }}
             - name: LDAP_SEARCH_FILTER
@@ -75,6 +73,17 @@ spec:
             - name: LDAP_TARGET_ATTRIBUTES
               value: {{ .Values.ravatar.ldap.targetAttributes | quote }}
             {{ end }}
+          {{- if or .Values.ravatar.ldap.enabled .Values.envFrom }}
+          envFrom:
+            {{- if and .Values.ravatar.ldap.enabled }}
+            - secretRef:
+                #key should be LDAP_BIND_PASSWORD
+                name: {{ include "ravatar.fullname" . }}-ldap-password
+            {{- end }}
+            {{- if .Values.envFrom }}
+            {{- toYaml .Values.envFrom | nindent 12 }}
+            {{- end }}
+          {{- end }}
           readinessProbe:
             httpGet:
               path: /healthz