From c847e6b98d6d1718dc9b969c8dadd32d887cb604 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 29 Sep 2022 18:04:47 +0530 Subject: [PATCH] csi: update sidecars to latest in CSI deployment Signed-off-by: Humble Chirammal --- Documentation/Helm-Charts/operator-chart.md | 8 ++++---- .../Storage-Configuration/Ceph-CSI/custom-images.md | 8 ++++---- deploy/charts/rook-ceph/values.yaml | 8 ++++---- deploy/examples/images.txt | 8 ++++---- deploy/examples/operator-openshift.yaml | 8 ++++---- pkg/operator/ceph/csi/spec.go | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Documentation/Helm-Charts/operator-chart.md b/Documentation/Helm-Charts/operator-chart.md index 1caf18ac9..11262c0ef 100644 --- a/Documentation/Helm-Charts/operator-chart.md +++ b/Documentation/Helm-Charts/operator-chart.md @@ -119,10 +119,10 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `RollingUpdate` | | `csi.nfsPluginUpdateStrategy` | CSI NFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `RollingUpdate` | | `csi.registrar.image` | Kubernetes CSI registrar image. | `registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1` | -| `csi.resizer.image` | Kubernetes CSI resizer image. | `registry.k8s.io/sig-storage/csi-resizer:v1.4.0` | -| `csi.provisioner.image` | Kubernetes CSI provisioner image. | `registry.k8s.io/sig-storage/csi-provisioner:v3.1.0` | -| `csi.snapshotter.image` | Kubernetes CSI snapshotter image. | `registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1` | -| `csi.attacher.image` | Kubernetes CSI Attacher image. | `registry.k8s.io/sig-storage/csi-attacher:v3.4.0` | +| `csi.resizer.image` | Kubernetes CSI resizer image. | `registry.k8s.io/sig-storage/csi-resizer:v1.6.0` | +| `csi.provisioner.image` | Kubernetes CSI provisioner image. | `registry.k8s.io/sig-storage/csi-provisioner:v3.3.0` | +| `csi.snapshotter.image` | Kubernetes CSI snapshotter image. | `registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0` | +| `csi.attacher.image` | Kubernetes CSI Attacher image. | `registry.k8s.io/sig-storage/csi-attacher:v4.0.0` | | `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Pods. | `` | | `csi.rbdPodLabels` | Labels to add to the CSI RBD Pods. | `` | | `csi.csiAddons.enabled` | Enable CSIAddons | `false` | diff --git a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md index 66e3c15a7..e8be5fd80 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md @@ -20,10 +20,10 @@ The default upstream images are included below, which you can change to your des ```yaml ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.7.0" ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.1" -ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1" -ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.5.0" -ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.5.0" -ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.1" +ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.3.0" +ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v4.0.0" +ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.6.0" +ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v6.1.0" ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.5.0" ``` diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 107980ea1..a028f189e 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -397,13 +397,13 @@ csi: #registrar: # image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1 #provisioner: - # image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 + # image: registry.k8s.io/sig-storage/csi-provisioner:v3.3.0 #snapshotter: - # image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 + # image: registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0 #attacher: - # image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0 + # image: registry.k8s.io/sig-storage/csi-attacher:v4.0.0 #resizer: - # image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0 + # image: registry.k8s.io/sig-storage/csi-resizer:v1.6.0 #imagePullPolicy: IfNotPresent # Labels to add to the CSI CephFS Deployments and DaemonSets Pods. #cephfsPodLabels: "key1=value1,key2=value2" diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 9ed4e531f..8347bfb04 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,9 +1,9 @@ quay.io/ceph/ceph:v17.2.3 quay.io/cephcsi/cephcsi:v3.7.0 quay.io/csiaddons/k8s-sidecar:v0.5.0 - registry.k8s.io/sig-storage/csi-attacher:v3.5.0 + registry.k8s.io/sig-storage/csi-attacher:v4.0.0 registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1 - registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 - registry.k8s.io/sig-storage/csi-resizer:v1.5.0 - registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1 + registry.k8s.io/sig-storage/csi-provisioner:v3.3.0 + registry.k8s.io/sig-storage/csi-resizer:v1.6.0 + registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0 rook/ceph:master diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index d939d19b0..8cfbe6c15 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -189,10 +189,10 @@ data: # these images to the desired release of the CSI driver. # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.7.0" # ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1" - # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.5.0" - # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.2.1" - # ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1" - # ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v3.5.0" + # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.6.0" + # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0" + # ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0" + # ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.0.0" # (Optional) set user created priorityclassName for csi plugin pods. CSI_PLUGIN_PRIORITY_CLASSNAME: "system-node-critical" diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 2293fe0c1..97f0278bf 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -132,10 +132,10 @@ var ( // image names DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.7.0" DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.1" - DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v3.2.1" - DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v3.5.0" - DefaultSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1" - DefaultResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.5.0" + DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v3.3.0" + DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.0.0" + DefaultSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0" + DefaultResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.6.0" DefaultCSIAddonsImage = "quay.io/csiaddons/k8s-sidecar:v0.5.0" // image pull policy