Merge "Ldap: add image template function and basic tidy of template"

This commit is contained in:
Zuul 2018-05-19 18:03:32 +00:00 committed by Gerrit Code Review
commit 3dc97675ab

View File

@ -41,8 +41,8 @@ spec:
{{ tuple $envAll "ldap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 6 }}
containers:
- name: ldap
image: {{ .Values.images.tags.ldap }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll "ldap" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env:
- name: LDAP_DOMAIN
value: {{ .Values.openldap.domain }}
@ -50,7 +50,6 @@ spec:
value: {{ .Values.openldap.password }}
ports:
- containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
volumeMounts:
- name: ldap-data
mountPath: /var/lib/ldap