ceph: update csi image to v3.3.0

as we are having v3.3.0 cephcsi latest release
updating the cephcsi image to the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna committed 2021-04-15 19:36:31 +05:30
1 parent b6eea0cb33
commit fd28e48664
9 files changed
+15 -8

No files matched your search

+2 -2
View File
@@ -448,7 +448,7 @@ kubectl -n $ROOK_OPERATOR_NAMESPACE edit configmap rook-ceph-operator-config
The default upstream images are included below, which you can change to your desired images.
```yaml
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.2.1"
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0"
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_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2"
@@ -470,7 +470,7 @@ kubectl --namespace rook-ceph get pod -o jsonpath='{range .items[*]}{range .spec
```
```
quay.io/cephcsi/cephcsi:v3.2.1
quay.io/cephcsi/cephcsi:v3.3.0
k8s.gcr.io/sig-storage/csi-attacher:v3.0.2
k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
+1 -1
View File
@@ -124,7 +124,7 @@ The following tables lists the configurable parameters of the rook-operator char
| `csi.rbdLivenessMetricsPort` | Ceph CSI RBD driver metrics port. | `8080` |
| `csi.forceCephFSKernelClient` | Enable Ceph Kernel clients on kernel < 4.17 which support quotas for Cephfs. | `true` |
| `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:v3.2.0` |
| `csi.cephcsi.image` | Ceph CSI image. | `quay.io/cephcsi/cephcsi:v3.3.0` |
| `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` |
+1
View File
@@ -33,5 +33,6 @@ v1.6...
* for Pacific (16.2.x), Rook is able to update multiple OSD Deployments at the same time to speed
up updates and upgrades for larger Ceph clusters
* Disable CSI GRPC metrics by default
* Update CephCSI to v3.3.0
* Monitors failover can be [disabled](Documentation/ceph-mon-health.md#failing-over-a-monitor), this is useful for monitor going under planned maintenance where automatic failover is not desired
* RGW: Rook has started using deployment's replicatset functionality instead of deploying multiple deployments for each rgw
+1 -1
View File
@@ -264,7 +264,7 @@ csi:
#rbdLivenessMetricsPort: 9080
#kubeletDirPath: /var/lib/kubelet
#cephcsi:
#image: quay.io/cephcsi/cephcsi:v3.2.1
#image: quay.io/cephcsi/cephcsi:v3.3.0
#registrar:
#image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
#provisioner:
@@ -140,7 +140,7 @@ data:
# The default version of CSI supported by Rook will be started. To change the version
# of the CSI driver to something other than what is officially supported, change
# these images to the desired release of the CSI driver.
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.2.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0"
# 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"
@@ -64,7 +64,7 @@ data:
# The default version of CSI supported by Rook will be started. To change the version
# of the CSI driver to something other than what is officially supported, change
# these images to the desired release of the CSI driver.
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.2.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0"
# 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"
+1 -1
View File
@@ -105,7 +105,7 @@ var (
// manually challenging.
var (
// image names
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.2.1"
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.3.0"
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"
+2 -1
View File
@@ -32,7 +32,8 @@ var (
releasev300 = CephCSIVersion{3, 0, 0}
releasev310 = CephCSIVersion{3, 1, 0}
releasev320 = CephCSIVersion{3, 2, 0}
supportedCSIVersions = []CephCSIVersion{minimum, releaseV210, releasev300, releasev310, releasev320}
releasev330 = CephCSIVersion{3, 3, 0}
supportedCSIVersions = []CephCSIVersion{minimum, releaseV210, releasev300, releasev310, releasev320, releasev330}
// omap generator is supported in v3.2.0+
omapSupportedVersions = releasev320
// for parsing the output of `cephcsi`
+5
View File
@@ -77,6 +77,11 @@ func TestIsAtLeast(t *testing.T) {
ret = testReleaseV300.isAtLeast(&testReleaseV300)
assert.Equal(t, true, ret)
// Test for 3.3.0
// Test version which is lesser
ret = testReleaseV330.isAtLeast(&testReleaseV300)
assert.Equal(t, true, ret)
// Test version which is greater (minor)
version = CephCSIVersion{3, 1, 1}
ret = testReleaseV300.isAtLeast(&version)