From 8547a7bcba3404a94cf4bfc04c60afa9b22a2fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20Ciwi=C5=9B?= <jacek.ciwis@thesoftwarehouse.pl>
Date: Fri, 28 Jun 2019 05:53:20 +0200
Subject: [PATCH] [stable/openldap] add image pull policy and pod annotations
 (#14909)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [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>
---
 stable/openldap/Chart.yaml                | 4 ++--
 stable/openldap/README.md                 | 1 +
 stable/openldap/templates/deployment.yaml | 5 +++++
 stable/openldap/values.yaml               | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/stable/openldap/Chart.yaml b/stable/openldap/Chart.yaml
index 0deccc661a..109786b123 100644
--- a/stable/openldap/Chart.yaml
+++ b/stable/openldap/Chart.yaml
@@ -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:
diff --git a/stable/openldap/README.md b/stable/openldap/README.md
index 4c7c3cb722..4ac372b0fd 100644
--- a/stable/openldap/README.md
+++ b/stable/openldap/README.md
@@ -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                                                                                                       | `""`                |
diff --git a/stable/openldap/templates/deployment.yaml b/stable/openldap/templates/deployment.yaml
index 46af3c113a..4683f131d0 100644
--- a/stable/openldap/templates/deployment.yaml
+++ b/stable/openldap/templates/deployment.yaml
@@ -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
diff --git a/stable/openldap/values.yaml b/stable/openldap/values.yaml
index 6de299658c..96c39b7ed3 100644
--- a/stable/openldap/values.yaml
+++ b/stable/openldap/values.yaml
@@ -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: ""