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

Merge pull request #11739 from rook/mergify/bp/release-1.11/pr-11738

Browse Source 
csi: update cephcsi to v3.8.0 (backport #11738)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2023-02-22 09:38:13 -07:00
2 parents abc45c43a4 3d65f951d8
commit fa4d97ea68
12 files changed
+43 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Documentation/Helm-Charts/operator-chart.md
+1 -1
View File
@@ -57,7 +57,7 @@ The following table lists the configurable parameters of the rook-operator chart
| `csi.cephFSFSGroupPolicy` | Policy for modifying a volume's ownership or permissions when the CephFS PVC is being mounted. supported values are documented at https://kubernetes-csi.github.io/docs/support-fsgroup.html | `"File"` |
| `csi.cephFSKernelMountOptions` | Set CephFS Kernel mount options to use https://docs.ceph.com/en/latest/man/8/mount.ceph/#options. Set to "ms_mode=secure" when connections.encrypted is enabled in CephCluster CR | `nil` |
| `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate | `RollingUpdate` |
| `csi.cephcsi.image` | Ceph CSI image | `quay.io/cephcsi/cephcsi:v3.7.2` |
| `csi.cephcsi.image` | Ceph CSI image | `quay.io/cephcsi/cephcsi:v3.8.0` |
| `csi.cephfsGrpcMetricsPort` | CSI CephFS driver GRPC metrics port | `9091` |
| `csi.cephfsLivenessMetricsPort` | CSI CephFS driver metrics port | `9081` |
| `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Deployments and DaemonSets Pods | `nil` |
Documentation/Storage-Configuration/Ceph-CSI/custom-images.md
+2 -2
View File
@@ -18,7 +18,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.7.2"
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.8.0"
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0"
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0"
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.1.0"
@@ -32,7 +32,7 @@ ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.5.0"
If image version is not passed along with the image name in any of the variables above,
Rook will add the corresponding default version to that image.
Example: if `ROOK_CSI_CEPH_IMAGE: "quay.io/private-repo/cephcsi"` is passed,
Rook will add internal default version and consume it as `"quay.io/private-repo/cephcsi:v3.7.2"`.
Rook will add internal default version and consume it as `"quay.io/private-repo/cephcsi:v3.8.0"`.
### **Use default images**
Documentation/Storage-Configuration/NFS/nfs-csi-driver.md
+2 -2
View File
@@ -6,12 +6,11 @@ title: CSI provisioner and driver
This feature is experimental and will not support upgrades to future versions.
In version 1.9.1, Rook is able to deploy the experimental NFS Ceph CSI driver. This requires Ceph
CSI version 3.6.0 or above. We recommend Ceph v16.2.7 or above.
CSI version 3.7.0 or above. We recommend Ceph v16.2.7 or above.
For this section, we will refer to Rook's deployment examples in the
[deploy/examples](https://github.com/rook/rook/tree/master/deploy/examples) directory.
## Enabling the CSI drivers
The Ceph CSI NFS provisioner and driver require additional RBAC to operate. Apply the
@@ -95,6 +94,7 @@ See `deploy/examples/csi/nfs/pod.yaml` for an example of how a PVC can be connec
application pod.
### Connecting to an export directly
After a PVC is created successfully, the `share` parameter set on the resulting PV contains the
`share` path which can be used as the export path when
[mounting the export manually](nfs.md#mounting-exports). In the example below
Documentation/Upgrade/rook-upgrade.md
+1 -1
View File
@@ -188,7 +188,7 @@ kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-cep
If have not customized the CSI image versions, this is automatically updated.
!!! important
The minimum supported version of Ceph-CSI is v3.6.0.
The minimum supported version of Ceph-CSI is v3.7.0.
If you have specified custom CSI images, we recommended you update to the latest Ceph-CSI drivers.
See the [CSI Custom Images](../Storage-Configuration/Ceph-CSI/custom-images.md) documentation.
deploy/charts/rook-ceph/values.yaml
+1 -1
View File
@@ -456,7 +456,7 @@ csi:
cephcsi:
# -- Ceph CSI image
# @default -- `quay.io/cephcsi/cephcsi:v3.7.2`
# @default -- `quay.io/cephcsi/cephcsi:v3.8.0`
image:
registrar:
deploy/examples/images.txt
+1 -1
View File
@@ -1,5 +1,5 @@
quay.io/ceph/ceph:v17.2.5
quay.io/cephcsi/cephcsi:v3.7.2
quay.io/cephcsi/cephcsi:v3.8.0
quay.io/csiaddons/k8s-sidecar:v0.5.0
registry.k8s.io/sig-storage/csi-attacher:v4.1.0
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
deploy/examples/operator-openshift.yaml
+1 -1
View File
@@ -190,7 +190,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.7.2"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.8.0"
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0"
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.7.0"
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0"
deploy/examples/operator.yaml
+1 -1
View File
@@ -107,7 +107,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.7.2"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.8.0"
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0"
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.7.0"
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0"
pkg/operator/ceph/csi/spec.go
+1 -1
View File
@@ -134,7 +134,7 @@ var (
// manually challenging.
var (
// image names
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.7.2"
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.8.0"
DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0"
DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v3.4.0"
DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.1.0"
pkg/operator/ceph/csi/util_test.go
+4 -4
View File
@@ -268,7 +268,7 @@ func Test_getImage(t *testing.T) {
args: args{
data: map[string]string{},
settingName: "ROOK_CSI_CEPH_IMAGE",
defaultImage: "quay.io/cephcsi/cephcsi:v3.7.2",
defaultImage: "quay.io/cephcsi/cephcsi:v3.8.0",
},
want: DefaultCSIPluginImage,
},
@@ -279,7 +279,7 @@ func Test_getImage(t *testing.T) {
"ROOK_CSI_CEPH_IMAGE": "registry.io/private/cephcsi:v8",
},
settingName: "ROOK_CSI_CEPH_IMAGE",
defaultImage: "quay.io/cephcsi/cephcsi:v3.7.2",
defaultImage: "quay.io/cephcsi/cephcsi:v3.8.0",
},
want: "registry.io/private/cephcsi:v8",
},
@@ -290,9 +290,9 @@ func Test_getImage(t *testing.T) {
"ROOK_CSI_CEPH_IMAGE": "registry.io/private/cephcsi",
},
settingName: "ROOK_CSI_CEPH_IMAGE",
defaultImage: "quay.io/cephcsi/cephcsi:v3.7.2",
defaultImage: "quay.io/cephcsi/cephcsi:v3.8.0",
},
want: "registry.io/private/cephcsi:v3.7.2",
want: "registry.io/private/cephcsi:v3.8.0",
},
}
for _, tt := range tests {
pkg/operator/ceph/csi/version.go
+3 -3
View File
@@ -26,13 +26,13 @@ import (
var (
//minimum supported version is 3.7.0
minimum = CephCSIVersion{3, 6, 0}
minimum = CephCSIVersion{3, 7, 0}
//supportedCSIVersions are versions that rook supports
releasev370 = CephCSIVersion{3, 7, 0}
releasev380 = CephCSIVersion{3, 8, 0}
supportedCSIVersions = []CephCSIVersion{
minimum,
releasev370,
releasev380,
}
// custom ceph.conf is supported in v3.5.0+
pkg/operator/ceph/csi/version_test.go
+25 -7
View File
@@ -23,12 +23,15 @@ import (
)
var (
testMinVersion = CephCSIVersion{3, 6, 0}
testReleaseV350 = CephCSIVersion{3, 5, 0}
testReleaseV360 = CephCSIVersion{3, 6, 0}
testReleaseV361 = CephCSIVersion{3, 6, 1}
testReleaseV370 = CephCSIVersion{3, 7, 0}
testReleaseV371 = CephCSIVersion{3, 7, 1}
testMinVersion = CephCSIVersion{3, 7, 0}
testReleaseV350 = CephCSIVersion{3, 5, 0}
testReleaseV360 = CephCSIVersion{3, 6, 0}
testReleaseV361 = CephCSIVersion{3, 6, 1}
testReleaseV370 = CephCSIVersion{3, 7, 0}
testReleaseV371 = CephCSIVersion{3, 7, 1}
testReleaseV380 = CephCSIVersion{3, 8, 0}
testReleaseV381 = CephCSIVersion{3, 8, 1}
testVersionUnsupported = CephCSIVersion{4, 0, 0}
)
@@ -53,6 +56,14 @@ func TestIsAtLeast(t *testing.T) {
// Test for 3.7.1
ret = testReleaseV371.isAtLeast(&testReleaseV360)
assert.Equal(t, true, ret)
// Test for 3.8.0
ret = testReleaseV380.isAtLeast(&testReleaseV370)
assert.Equal(t, true, ret)
// Test for 3.8.1
ret = testReleaseV381.isAtLeast(&testReleaseV371)
assert.Equal(t, true, ret)
}
func TestSupported(t *testing.T) {
@@ -63,14 +74,21 @@ func TestSupported(t *testing.T) {
ret = testVersionUnsupported.Supported()
assert.Equal(t, false, ret)
// 3.6 is not supported after 3.8.0 release
ret = testReleaseV360.Supported()
assert.Equal(t, true, ret)
assert.Equal(t, false, ret)
ret = testReleaseV370.Supported()
assert.Equal(t, true, ret)
ret = testReleaseV371.Supported()
assert.Equal(t, true, ret)
ret = testReleaseV380.Supported()
assert.Equal(t, true, ret)
ret = testReleaseV381.Supported()
assert.Equal(t, true, ret)
}
func Test_extractCephCSIVersion(t *testing.T) {