From 08997434ac5b9eaa7cac299dab5b429dd9ac9cd6 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 15 Jun 2021 08:09:27 +0530 Subject: [PATCH] ceph: update csi sidecar images to latest release This commit updates all the kubernetes sidecar images to latest available release version. Signed-off-by: Madhu Rajanna --- Documentation/ceph-upgrade.md | 16 ++++++++-------- Documentation/helm-operator.md | 8 ++++---- cluster/charts/rook-ceph/values.yaml | 8 ++++---- .../kubernetes/ceph/operator-openshift.yaml | 8 ++++---- cluster/examples/kubernetes/ceph/operator.yaml | 8 ++++---- pkg/operator/ceph/csi/spec.go | 8 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index cd1e4aa15..d430ebf7d 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -464,10 +464,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.3.1" ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" -ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" -ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.0.2" -ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" -ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0" +ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2" +ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" +ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" +ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1" ``` ### Use default images @@ -485,11 +485,11 @@ kubectl --namespace rook-ceph get pod -o jsonpath='{range .items[*]}{range .spec ``` quay.io/cephcsi/cephcsi:v3.3.1 -k8s.gcr.io/sig-storage/csi-attacher:v3.0.2 +k8s.gcr.io/sig-storage/csi-attacher:v3.2.1 k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 -k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 -k8s.gcr.io/sig-storage/csi-resizer:v1.0.1 -k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0 +k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 +k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 +k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 ``` ## Replace lvm mode OSDs with raw mode (if you use LV-backed PVC) diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index 7791704d4..8f89b918f 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -137,10 +137,10 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.rbdPluginUpdateStrategy` | CSI Rbd plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `OnDelete` | | `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `OnDelete` | | `csi.registrar.image` | Kubernetes CSI registrar image. | `k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1` | -| `csi.resizer.image` | Kubernetes CSI resizer image. | `k8s.gcr.io/sig-storage/csi-resizer:v1.0.0` | -| `csi.provisioner.image` | Kubernetes CSI provisioner image. | `k8s.gcr.io/sig-storage/csi-provisioner:v2.0.0` | -| `csi.snapshotter.image` | Kubernetes CSI snapshotter image. | `k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0` | -| `csi.attacher.image` | Kubernetes CSI Attacher image. | `k8s.gcr.io/sig-storage/csi-attacher:v3.0.0` | +| `csi.resizer.image` | Kubernetes CSI resizer image. | `k8s.gcr.io/sig-storage/csi-resizer:v1.2.0` | +| `csi.provisioner.image` | Kubernetes CSI provisioner image. | `k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2` | +| `csi.snapshotter.image` | Kubernetes CSI snapshotter image. | `k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1` | +| `csi.attacher.image` | Kubernetes CSI Attacher image. | `k8s.gcr.io/sig-storage/csi-attacher:v3.2.1` | | `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Pods. | | | `csi.rbdPodLabels` | Labels to add to the CSI RBD Pods. | | | `csi.volumeReplication.enabled` | Enable Volume Replication. | `false` | diff --git a/cluster/charts/rook-ceph/values.yaml b/cluster/charts/rook-ceph/values.yaml index 56d8de0da..143b60db9 100644 --- a/cluster/charts/rook-ceph/values.yaml +++ b/cluster/charts/rook-ceph/values.yaml @@ -274,13 +274,13 @@ csi: #registrar: #image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 #provisioner: - #image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 + #image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 #snapshotter: - #image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0 + #image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 #attacher: - #image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.2 + #image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.1 #resizer: - #image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1 + #image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 # Labels to add to the CSI CephFS Deployments and DaemonSets Pods. #cephfsPodLabels: "key1=value1,key2=value2" # Labels to add to the CSI RBD Deployments and DaemonSets Pods. diff --git a/cluster/examples/kubernetes/ceph/operator-openshift.yaml b/cluster/examples/kubernetes/ceph/operator-openshift.yaml index 6eae9eedb..ec02beb79 100644 --- a/cluster/examples/kubernetes/ceph/operator-openshift.yaml +++ b/cluster/examples/kubernetes/ceph/operator-openshift.yaml @@ -150,10 +150,10 @@ data: # these images to the desired release of the CSI driver. # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.1" # ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" - # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" - # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" - # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0" - # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.0.2" + # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" + # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2" + # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1" + # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" # (Optional) set user created priorityclassName for csi plugin pods. # CSI_PLUGIN_PRIORITY_CLASSNAME: "system-node-critical" diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml index d7eb17d25..f351107c5 100644 --- a/cluster/examples/kubernetes/ceph/operator.yaml +++ b/cluster/examples/kubernetes/ceph/operator.yaml @@ -74,10 +74,10 @@ data: # these images to the desired release of the CSI driver. # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.1" # ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" - # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" - # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" - # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0" - # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.0.2" + # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" + # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2" + # ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1" + # ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" # (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 ce0b427c2..a1dd3a85b 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -111,10 +111,10 @@ var ( // image names DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.3.1" DefaultRegistrarImage = "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" - DefaultProvisionerImage = "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" - DefaultAttacherImage = "k8s.gcr.io/sig-storage/csi-attacher:v3.0.2" - DefaultSnapshotterImage = "k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0" - DefaultResizerImage = "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" + DefaultProvisionerImage = "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2" + DefaultAttacherImage = "k8s.gcr.io/sig-storage/csi-attacher:v3.2.1" + DefaultSnapshotterImage = "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1" + DefaultResizerImage = "k8s.gcr.io/sig-storage/csi-resizer:v1.2.0" DefaultVolumeReplicationImage = "quay.io/csiaddons/volumereplication-operator:v0.1.0" )