CSI: update kubernetes sidecar images

update csi sidecar images to fix CVE-2019-11255 more info: kubernetes/kubernetes#85233 kubernetes-csi/external-snapshotter#193 kubernetes-csi/external-provisioner#380 Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
binoue · Apr 10, 2020 · e4d2be2 · e4d2be2
1 parent 81346b8
commit e4d2be2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md
@@ -290,9 +290,9 @@ below, which you should change to match where your images are located.
     - name: ROOK_CSI_REGISTRAR_IMAGE
         value: "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
     - name: ROOK_CSI_PROVISIONER_IMAGE
-        value: "quay.io/k8scsi/csi-provisioner:v1.3.0"
+        value: "quay.io/k8scsi/csi-provisioner:v1.4.0"
     - name: ROOK_CSI_SNAPSHOTTER_IMAGE
-        value: "quay.io/k8scsi/csi-snapshotter:v1.2.0"
+        value: "quay.io/k8scsi/csi-snapshotter:v1.2.2"
     - name: ROOK_CSI_ATTACHER_IMAGE
         value: "quay.io/k8scsi/csi-attacher:v1.2.0"
 ```

diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md
@@ -130,8 +130,8 @@ The following tables lists the configurable parameters of the rook-operator char
 | `csi.kubeletDirPath`            | Kubelet root directory path (if the Kubelet uses a different path for the `--root-dir` flag)            | `/var/lib/kubelet`                                     |
 | `csi.cephcsi.image`             | Ceph CSI image.                                                                                         | `quay.io/cephcsi/cephcsi:v1.2.1`                       |
 | `csi.registrar.image`           | Kubernetes CSI registrar image.                                                                         | `quay.io/k8scsi/csi-node-driver-registrar:v1.1.0`      |
-| `csi.provisioner.image`         | Kubernetes CSI provisioner image.                                                                       | `quay.io/k8scsi/csi-provisioner:v1.3.0`                |
-| `csi.snapshotter.image`         | Kubernetes CSI snapshotter image.                                                                       | `quay.io/k8scsi/csi-snapshotter:v1.2.0`                |
+| `csi.provisioner.image`         | Kubernetes CSI provisioner image.                                                                       | `quay.io/k8scsi/csi-provisioner:v1.4.0`                |
+| `csi.snapshotter.image`         | Kubernetes CSI snapshotter image.                                                                       | `quay.io/k8scsi/csi-snapshotter:v1.2.2`                |
 | `csi.attacher.image`            | Kubernetes CSI Attacher image.                                                                          | `quay.io/k8scsi/csi-attacher:v1.2.0`                   |
 | `agent.flexVolumeDirPath`       | Path where the Rook agent discovers the flex volume plugins (*)                                         | `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/` |
 | `agent.libModulesDirPath`       | Path where the Rook agent should look for kernel modules (*)                                            | `/lib/modules`                                         |

diff --git a/cluster/charts/rook-ceph/values.yaml b/cluster/charts/rook-ceph/values.yaml
@@ -78,9 +78,9 @@ csi:
   #registrar:
     #image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
   #provisioner:
-    #image: quay.io/k8scsi/csi-provisioner:v1.3.0
+    #image: quay.io/k8scsi/csi-provisioner:v1.4.0
   #snapshotter:
-    #image: quay.io/k8scsi/csi-snapshotter:v1.2.0
+    #image: quay.io/k8scsi/csi-snapshotter:v1.2.2
   #attacher:
     #image: quay.io/k8scsi/csi-attacher:v1.2.0
 

diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml
@@ -182,9 +182,9 @@ spec:
         #- name: ROOK_CSI_REGISTRAR_IMAGE
         #  value: "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
         #- name: ROOK_CSI_PROVISIONER_IMAGE
-        #  value: "quay.io/k8scsi/csi-provisioner:v1.3.0"
+        #  value: "quay.io/k8scsi/csi-provisioner:v1.4.0"
         #- name: ROOK_CSI_SNAPSHOTTER_IMAGE
-        #  value: "quay.io/k8scsi/csi-snapshotter:v1.2.0"
+        #  value: "quay.io/k8scsi/csi-snapshotter:v1.2.2"
         #- name: ROOK_CSI_ATTACHER_IMAGE
         #  value: "quay.io/k8scsi/csi-attacher:v1.2.0"
         # kubelet directory path, if kubelet configured to use other than /var/lib/kubelet path.

diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go
@@ -85,9 +85,9 @@ var (
 	// image names
 	DefaultCSIPluginImage   = "quay.io/cephcsi/cephcsi:v1.2.1"
 	DefaultRegistrarImage   = "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
-	DefaultProvisionerImage = "quay.io/k8scsi/csi-provisioner:v1.3.0"
+	DefaultProvisionerImage = "quay.io/k8scsi/csi-provisioner:v1.4.0"
 	DefaultAttacherImage    = "quay.io/k8scsi/csi-attacher:v1.2.0"
-	DefaultSnapshotterImage = "quay.io/k8scsi/csi-snapshotter:v1.2.0"
+	DefaultSnapshotterImage = "quay.io/k8scsi/csi-snapshotter:v1.2.2"
 )
 
 const (