Ldap: add image template function and basic tidy of template
This PS adds the image template function, and also performs basic tiding of the template. Change-Id: If8f149e9e73a2e8e761c471af0a203c2dae27ff8 Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
parent
aa40400a53
commit
c2558ba9ab
@ -40,30 +40,29 @@ spec:
|
|||||||
initContainers:
|
initContainers:
|
||||||
{{ tuple $envAll "ldap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 6 }}
|
{{ tuple $envAll "ldap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 6 }}
|
||||||
containers:
|
containers:
|
||||||
- name: ldap
|
- name: ldap
|
||||||
image: {{ .Values.images.tags.ldap }}
|
{{ tuple $envAll "ldap" | include "helm-toolkit.snippets.image" | indent 10 }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
||||||
env:
|
|
||||||
- name: LDAP_DOMAIN
|
|
||||||
value: {{ .Values.openldap.domain }}
|
|
||||||
- name: LDAP_ADMIN_PASSWORD
|
|
||||||
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 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
volumeMounts:
|
env:
|
||||||
- name: ldap-data
|
- name: LDAP_DOMAIN
|
||||||
mountPath: /var/lib/ldap
|
value: {{ .Values.openldap.domain }}
|
||||||
- name: ldap-config
|
- name: LDAP_ADMIN_PASSWORD
|
||||||
mountPath: /etc/ldap/slapd.d
|
value: {{ .Values.openldap.password }}
|
||||||
|
ports:
|
||||||
|
- containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||||
|
volumeMounts:
|
||||||
|
- name: ldap-data
|
||||||
|
mountPath: /var/lib/ldap
|
||||||
|
- name: ldap-config
|
||||||
|
mountPath: /etc/ldap/slapd.d
|
||||||
{{- if not .Values.storage.pvc.enabled }}
|
{{- if not .Values.storage.pvc.enabled }}
|
||||||
volumes:
|
volumes:
|
||||||
- name: ldap-data
|
- name: ldap-data
|
||||||
hostPath:
|
hostPath:
|
||||||
path: {{ .Values.storage.host.data_path }}
|
path: {{ .Values.storage.host.data_path }}
|
||||||
- name: ldap-config
|
- name: ldap-config
|
||||||
hostPath:
|
hostPath:
|
||||||
path: {{ .Values.storage.host.config_path }}
|
path: {{ .Values.storage.host.config_path }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
volumeClaimTemplates:
|
volumeClaimTemplates:
|
||||||
- metadata:
|
- metadata:
|
||||||
|
Loading…
Reference in New Issue
Block a user