Merge pull request #35 from Elbehery/set-imagePullPolicy-to-ifNotPresent

Bug 1947774: fix imagePullPolicy to ifNotPresent
openshift · Apr 21, 2021 · 9c21c25 · 9c21c25
2 parents 8e1a39c + 7dd5835
commit 9c21c25
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/assets/controller.yaml b/assets/controller.yaml
@@ -29,6 +29,7 @@ spec:
       containers:
         - name: csi-driver
           image: ${DRIVER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - /bin/cinder-csi-plugin
             - "--nodeid=$(NODE_ID)"
@@ -45,7 +46,6 @@ spec:
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/kubernetes/config/cloud.conf
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -63,6 +63,7 @@ spec:
               cpu: 10m
         - name: csi-provisioner
           image: ${PROVISIONER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -73,7 +74,6 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -105,6 +105,7 @@ spec:
             name: metrics-serving-cert
         - name: csi-attacher
           image: ${ATTACHER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
             - "--timeout=3m"
@@ -113,7 +114,6 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -143,14 +143,14 @@ spec:
             name: metrics-serving-cert
         - name: csi-resizer
           image: ${RESIZER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
             - "--http-endpoint=localhost:8204"
             - "--v=${LOG_LEVEL}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -180,14 +180,14 @@ spec:
             name: metrics-serving-cert
         - name: csi-snapshotter
           image: ${SNAPSHOTTER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
             - "--http-endpoint=localhost:8205"
             - "--v=${LOG_LEVEL}"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir

diff --git a/assets/node.yaml b/assets/node.yaml
@@ -33,6 +33,7 @@ spec:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
           image: ${DRIVER_IMAGE}
+          imagePullPolicy: IfNotPresent
           args :
             - /bin/cinder-csi-plugin
             - "--nodeid=$(NODE_ID)"
@@ -48,7 +49,6 @@ spec:
               value: unix://csi/csi.sock
             - name: CLOUD_CONFIG
               value: /etc/kubernetes/config/cloud.conf
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -75,6 +75,7 @@ spec:
               cpu: 10m
         - name: node-driver-registrar
           image: ${NODE_DRIVER_REGISTRAR_IMAGE}
+          imagePullPolicy: IfNotPresent
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -92,7 +93,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          imagePullPolicy: "IfNotPresent"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi

diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go