From a01c01b01b962e5a529e77c7612e7bac0d91c7e2 Mon Sep 17 00:00:00 2001
From: Zhou Miao <zhoumiao@corp-ci.com>
Date: Thu, 25 Apr 2019 12:03:44 +0800
Subject: [PATCH] fix helm value pullPolicy mismatch bug

---
 deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml    | 4 ++--
 deploy/cephfs/helm/templates/provisioner-statefulset.yaml | 2 +-
 deploy/rbd/helm/templates/nodeplugin-daemonset.yaml       | 4 ++--
 deploy/rbd/helm/templates/provisioner-statefulset.yaml    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
index c56e70bb4..24ffc8420 100644
--- a/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
+++ b/deploy/cephfs/helm/templates/nodeplugin-daemonset.yaml
@@ -49,7 +49,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -82,7 +82,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           volumeMounts:
             - name: mount-cache-dir
               mountPath: /mount-cache-dir
diff --git a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
index fe4fc6428..84c698fbc 100644
--- a/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
+++ b/deploy/cephfs/helm/templates/provisioner-statefulset.yaml
@@ -65,7 +65,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: {{ .Values.socketDir }}
diff --git a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
index 355983b49..6290dd978 100644
--- a/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
+++ b/deploy/rbd/helm/templates/nodeplugin-daemonset.yaml
@@ -49,7 +49,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.nodeplugin.registrar.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.registrar.image.pullPolicy }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -82,7 +82,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           volumeMounts:
             - name: plugin-dir
               mountPath: {{ .Values.socketDir }}
diff --git a/deploy/rbd/helm/templates/provisioner-statefulset.yaml b/deploy/rbd/helm/templates/provisioner-statefulset.yaml
index 269cb0a44..23265d116 100644
--- a/deploy/rbd/helm/templates/provisioner-statefulset.yaml
+++ b/deploy/rbd/helm/templates/provisioner-statefulset.yaml
@@ -43,7 +43,7 @@ spec:
 {{ toYaml .Values.provisioner.resources | indent 12 }}
         - name: csi-snapshotter
           image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }}
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           args:
             - "--csi-address=$(ADDRESS)"
             - "--connection-timeout=15s"
@@ -83,7 +83,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.imagePullPolicy }}
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: {{ .Values.socketDir }}