[stable/openldap] add image pull policy and pod annotations (#14909)

* [stable/openldap] Add custom annotations

Signed-off-by: Jacek Ciwiś <jacek.ciwis@thesoftwarehouse.pl>

* [stable/openldap] Add imagePullPolicy to initContainers

Signed-off-by: Jacek Ciwiś <jacek.ciwis@thesoftwarehouse.pl>

* [stable/openldap] Update default image tag to 1.2.4 (appVersion: 2.4.47)

Signed-off-by: Jacek Ciwiś <jacek.ciwis@thesoftwarehouse.pl>
This commit is contained in:
Jacek Ciwiś
2019-06-27 20:53:20 -07:00
committed by Kubernetes Prow Robot
parent 4f10582e69
commit 8547a7bcba
4 changed files with 11 additions and 4 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
apiVersion: v1
name: openldap
home: https://www.openldap.org
version: 1.0.0
appVersion: 2.4.44
version: 1.1.0
appVersion: 2.4.47
description: Community developed LDAP software
icon: http://www.openldap.org/images/headers/LDAPworm.gif
keywords:
+1
View File
@@ -31,6 +31,7 @@ The following table lists the configurable parameters of the openldap chart and
| `image.tag` | Container image tag | `1.1.10` |
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
| `extraLabels` | Labels to add to the Resources | `{}` |
| `podAnnotations` | Annotations to add to the pod | `{}` |
| `existingSecret` | Use an existing secret for admin and config user passwords | `""` |
| `service.annotations` | Annotations to add to the service | `{}` |
| `service.clusterIP` | IP address to assign to the service | `""` |
@@ -26,6 +26,9 @@ spec:
checksum/configmap-env: {{ include (print $.Template.BasePath "/configmap-env.yaml") . | sha256sum }}
{{- if .Values.customLdifFiles}}
checksum/configmap-customldif: {{ include (print $.Template.BasePath "/configmap-customldif.yaml") . | sha256sum }}
{{- end }}
{{- if .Values.podAnnotations}}
{{ toYaml .Values.podAnnotations | indent 8}}
{{- end }}
labels:
app: {{ template "openldap.name" . }}
@@ -38,6 +41,7 @@ spec:
- name: {{ .Chart.Name }}-init-ldif
image: busybox
command: ['sh', '-c', 'cp /customldif/* /ldifworkingdir']
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: customldif
mountPath: /customldif
@@ -48,6 +52,7 @@ spec:
- name: {{ .Chart.Name }}-init-tls
image: busybox
command: ['sh', '-c', 'cp /tls/* /certs']
imagePullPolicy: {{ .Values.image.pullPolicy }}
volumeMounts:
- name: tls
mountPath: /tls
+3 -2
View File
@@ -19,7 +19,7 @@ strategy: {}
image:
# From repository https://github.com/osixia/docker-openldap
repository: osixia/openldap
tag: 1.2.1
tag: 1.2.4
pullPolicy: IfNotPresent
# Spcifies an existing secret to be used for admin and config user passwords
@@ -34,7 +34,8 @@ tls:
secret: "" # The name of a generic secret to use for custom CA certificate (ca.crt)
## Add additional labels to all resources
extraLabels: {}
## Add additional annotations to pods
podAnnotations: {}
service:
annotations: {}
clusterIP: ""