feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

csi: update cephcsi to v3.6.0 release

Browse Source 
Removed v3.4.0 as its deprecated in cephcsi
and updated the templates to point to latest
v3.6.0 release.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna committed 2022-04-06 09:51:46 +05:30
1 parent 5b393bb884
commit a1ded0f27f
9 files changed
+28 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Documentation/ceph-upgrade.md
+2 -2
View File
@@ -547,7 +547,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.5.1"
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.6.0"
ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
ROOK_CSI_ATTACHER_IMAGE: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0"
@@ -578,7 +578,7 @@ k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
quay.io/cephcsi/cephcsi:v3.5.1
quay.io/cephcsi/cephcsi:v3.6.0
quay.io/csiaddons/volumereplication-operator:v0.3.0
quay.io/csiaddons/k8s-sidecar:v0.2.1
```
Documentation/helm-operator.md
+1 -1
View File
@@ -134,7 +134,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.5.1` |
| `csi.cephcsi.image` | Ceph CSI image. | `quay.io/cephcsi/cephcsi:v3.6.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.5.0` |
deploy/charts/rook-ceph/values.yaml
+1 -1
View File
@@ -278,7 +278,7 @@ csi:
#rbdLivenessMetricsPort: 9080
#kubeletDirPath: /var/lib/kubelet
#cephcsi:
#image: quay.io/cephcsi/cephcsi:v3.5.1
#image: quay.io/cephcsi/cephcsi:v3.6.0
#registrar:
#image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
#provisioner:
deploy/examples/images.txt
+1 -1
View File
@@ -4,7 +4,7 @@
k8s.gcr.io/sig-storage/csi-resizer:v1.4.0
k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
quay.io/ceph/ceph:v16.2.7
quay.io/cephcsi/cephcsi:v3.5.1
quay.io/cephcsi/cephcsi:v3.6.0
quay.io/csiaddons/k8s-sidecar:v0.2.1
quay.io/csiaddons/volumereplication-operator:v0.3.0
rook/ceph:master
deploy/examples/operator-openshift.yaml
+1 -1
View File
@@ -162,7 +162,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.5.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.6.0"
# ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
# ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0"
# ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
deploy/examples/operator.yaml
+1 -1
View File
@@ -79,7 +79,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.5.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.6.0"
# ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
# ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0"
# ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
pkg/operator/ceph/csi/spec.go
+1 -1
View File
@@ -104,7 +104,7 @@ var (
// manually challenging.
var (
// image names
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.5.1"
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.6.0"
DefaultRegistrarImage = "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
DefaultProvisionerImage = "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
DefaultAttacherImage = "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0"
pkg/operator/ceph/csi/version.go
+6 -5
View File
@@ -25,15 +25,16 @@ import (
)
var (
//minimum supported version is 3.4.0
minimum = CephCSIVersion{3, 4, 0}
//minimum supported version is 3.5.0
minimum = CephCSIVersion{3, 5, 0}
//supportedCSIVersions are versions that rook supports
releasev340 = CephCSIVersion{3, 4, 0}
releasev350 = CephCSIVersion{3, 5, 0}
releasev350 = CephCSIVersion{3, 5, 0}
releasev360 = CephCSIVersion{3, 6, 0}
supportedCSIVersions = []CephCSIVersion{
minimum,
releasev340,
releasev350,
releasev360,
}
// custom ceph.conf is supported in v3.5.0+
pkg/operator/ceph/csi/version_test.go
+14 -7
View File
@@ -23,9 +23,10 @@ import (
)
var (
testMinVersion = CephCSIVersion{3, 4, 0}
testMinVersion = CephCSIVersion{3, 5, 0}
testReleaseV340 = CephCSIVersion{3, 4, 0}
testReleaseV350 = CephCSIVersion{3, 5, 0}
testReleaseV360 = CephCSIVersion{3, 6, 0}
testVersionUnsupported = CephCSIVersion{4, 0, 0}
)
@@ -39,15 +40,15 @@ func TestIsAtLeast(t *testing.T) {
ret = testMinVersion.isAtLeast(&testMinVersion)
assert.Equal(t, true, ret)
// Test version which is equal
ret = testReleaseV340.isAtLeast(&testReleaseV340)
assert.Equal(t, true, ret)
// Test for 3.5.0
// Test version which is lesser
ret = testReleaseV350.isAtLeast(&testReleaseV340)
assert.Equal(t, true, ret)
// Test for 3.6.0
ret = testReleaseV360.isAtLeast(&testReleaseV360)
assert.Equal(t, true, ret)
}
func TestSupported(t *testing.T) {
@@ -59,10 +60,13 @@ func TestSupported(t *testing.T) {
assert.Equal(t, false, ret)
ret = testReleaseV340.Supported()
assert.Equal(t, true, ret)
assert.Equal(t, false, ret)
ret = testReleaseV350.Supported()
assert.Equal(t, true, ret)
ret = testReleaseV360.Supported()
assert.Equal(t, true, ret)
}
func Test_extractCephCSIVersion(t *testing.T) {
@@ -97,11 +101,14 @@ func TestSupportsCustomCephConf(t *testing.T) {
AllowUnsupported = false
ret = testMinVersion.SupportsCustomCephConf()
assert.False(t, ret)
assert.True(t, ret)
ret = testReleaseV340.SupportsCustomCephConf()
assert.False(t, ret)
ret = testReleaseV350.SupportsCustomCephConf()
assert.True(t, ret)
ret = testReleaseV360.SupportsCustomCephConf()
assert.True(t, ret)
}