Merge pull request #140 from kangshung/feature/sidecarImagePullPolicy

Add imagePullPolicy support for NiFi sidecars
cetic · May 28, 2021 · c6f21da · c6f21da
2 parents d4e13df + f5384e5
commit c6f21da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.7.4
+version: 0.7.5
 appVersion: 1.12.1
 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
 keywords:

diff --git a/README.md b/README.md
@@ -186,6 +186,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | **SideCar**                                                                 |
 | `sidecar.image`                                                             | Separate image for tailing each log separately and checking zookeeper connectivity                                 | `busybox`                       |
 | `sidecar.tag`                                                               | Image tag                                                                                                          | `1.32.0`                        |
+| `sidecar.imagePullPolicy`                                                   | Image imagePullPolicy                                                                                              | `IfNotPresent`                  |
 | **Resources**                                                               |
 | `resources`                                                                 | Pod resource requests and limits for logs                                                                          | `{}`                            |
 | **logResources**                                                            |

diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
@@ -87,6 +87,7 @@ spec:
       initContainers:
 {{- if .Values.properties.isNode }}
       - name: zookeeper
+        imagePullPolicy: {{ .Values.sidecar.imagePullPolicy | default "Always" | quote }}
         image: "{{ .Values.sidecar.image }}:{{ .Values.sidecar.tag }}"
         command:
         - sh
@@ -458,6 +459,7 @@ spec:
 {{ toYaml .Values.extraVolumeMounts | indent 10 }}
           {{- end }}
       - name: app-log
+        imagePullPolicy: {{ .Values.sidecar.imagePullPolicy | default "Always" | quote }}
         image: "{{ .Values.sidecar.image }}:{{ .Values.sidecar.tag }}"
         args: [tail, -n+1, -F, /var/log/nifi-app.log]
         resources:
@@ -466,6 +468,7 @@ spec:
         - name: logs
           mountPath: /var/log
       - name: bootstrap-log
+        imagePullPolicy: {{ .Values.sidecar.imagePullPolicy | default "Always" | quote }}
         image: "{{ .Values.sidecar.image }}:{{ .Values.sidecar.tag }}"
         args: [tail, -n+1, -F, /var/log/nifi-bootstrap.log]
         resources:
@@ -474,6 +477,7 @@ spec:
         - name: logs
           mountPath: /var/log
       - name: user-log
+        imagePullPolicy: {{ .Values.sidecar.imagePullPolicy | default "Always" | quote }}
         image: "{{ .Values.sidecar.image }}:{{ .Values.sidecar.tag }}"
         args: [tail, -n+1, -F, /var/log/nifi-user.log]
         resources:

diff --git a/values.yaml b/values.yaml
@@ -182,6 +182,7 @@ jvmMemory: 2g
 sidecar:
   image: busybox
   tag: "1.32.0"
+  imagePullPolicy: "IfNotPresent"
 
 ## Enable persistence using Persistent Volume Claims
 ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/