Various fixes: imagePullPolicy, reclaimPolicy, volumeBindingMode

kubernetes-sigs · Apr 7, 2021 · 1b26d47 · 1b26d47
1 parent e993637
commit 1b26d47
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/aws-efs-csi-driver/CHANGELOG.md
@@ -11,4 +11,5 @@
 
 * Set `affinity`, `nodeSelector`, `podAnnotations` and `tolerations` fields independently
 for Controller deployment and Node daemonset
-* Set `resources` field independently for containers
+* Set `resources` and `imagePullPolicy` fields independently for containers
+* Set `reclaimPolicy` and `volumeBindingMode` fields in storage class
diff --git a/charts/aws-efs-csi-driver/aws-efs-csi-driver-1.3.0.tgz b/charts/aws-efs-csi-driver/aws-efs-csi-driver-1.3.0.tgz
diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -48,7 +48,7 @@ spec:
           securityContext:
             privileged: true
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -78,6 +78,7 @@ spec:
           {{- end }}
         - name: csi-provisioner
           image: {{ printf "%s:%s" .Values.sidecars.csiProvisioner.image.repository .Values.sidecars.csiProvisioner.image.tag }}
+          imagePullPolicy: {{ .Values.sidecars.csiProvisioner.image.pullPolicy }}
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
@@ -94,6 +95,7 @@ spec:
           {{- end }}
         - name: liveness-probe
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }}
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9808

diff --git a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
@@ -68,10 +68,11 @@ spec:
           securityContext:
             privileged: true
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
-            - --v={{ .Values.logLevel }}
+            - --v={{ .Values.node.logLevel }}
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
@@ -104,6 +105,7 @@ spec:
           {{- end }}
         - name: csi-driver-registrar
           image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrar.image.repository .Values.sidecars.nodeDriverRegistrar.image.tag }}
+          imagePullPolicy: {{ .Values.sidecars.nodeDriverRegistrar.image.pullPolicy }}
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -127,6 +129,7 @@ spec:
           {{- end }}
         - name: liveness-probe
           image: {{ printf "%s:%s" .Values.sidecars.livenessProbe.image.repository .Values.sidecars.livenessProbe.image.tag }}
+          imagePullPolicy: {{ .Values.sidecars.livenessProbe.image.pullPolicy }}
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9809

diff --git a/charts/aws-efs-csi-driver/templates/storageclass.yaml b/charts/aws-efs-csi-driver/templates/storageclass.yaml
@@ -14,3 +14,9 @@ parameters:
 {{- end }}
 ---
 {{- end }}
+{{- if .reclaimPolicy }}
+reclaimPolicy: {{ .reclaimPolicy  }}
+{{- end }}
+{{- if .volumeBindingMode }}
+volumeBindingMode: {{ .volumeBindingMode }}
+{{- end }}
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -104,3 +104,5 @@ storageClasses: []
 #     gidRangeStart: "1000"
 #     gidRangeEnd: "2000"
 #     basePath: "/dynamic_provisioning"
+#   reclaimPolicy: Delete
+#   volumeBindingMode: Immediate