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

csi: update cephcsi image to 3.10.2

Browse Source 
Updating the cephcsi image to 3.10.2
which is the latest released one.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit c22597a32c)
This commit is contained in:
Madhu Rajanna authored and Mergify committed 2024-02-09 18:21:53 +00:00
1 parent 1278a78188
commit c6c2cdfa29
9 files changed
+17 -12
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
@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the rook-operator chart
| `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.cephFSPluginUpdateStrategyMaxUnavailable` | A maxUnavailable parameter of CSI cephFS plugin daemonset update strategy. | `1` |
| `csi.cephcsi.image` | Ceph CSI image | `quay.io/cephcsi/cephcsi:v3.10.1` |
| `csi.cephcsi.image` | Ceph CSI image | `quay.io/cephcsi/cephcsi:v3.10.2` |
| `csi.cephfsLivenessMetricsPort` | CSI CephFS driver metrics port | `9081` |
| `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Deployments and DaemonSets Pods | `nil` |
| `csi.clusterName` | Cluster name identifier to set as metadata on the CephFS subvolume and RBD images. This will be useful in cases like for example, when two container orchestrator clusters (Kubernetes/OCP) are using a single ceph cluster | `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.10.1"
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.10.2"
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1"
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.6.3"
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.4.2"
@@ -32,7 +32,7 @@ ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.8.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.10.1"`.
Rook will add internal default version and consume it as `"quay.io/private-repo/cephcsi:v3.10.2"`.
### **Use default images**
deploy/charts/rook-ceph/values.yaml
+1 -1
View File
@@ -469,7 +469,7 @@ csi:
cephcsi:
# -- Ceph CSI image
# @default -- `quay.io/cephcsi/cephcsi:v3.10.1`
# @default -- `quay.io/cephcsi/cephcsi:v3.10.2`
image:
registrar:
deploy/examples/images.txt
+1 -1
View File
@@ -1,7 +1,7 @@
gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995
quay.io/ceph/ceph:v18.2.1
quay.io/ceph/cosi:v0.1.1
quay.io/cephcsi/cephcsi:v3.10.1
quay.io/cephcsi/cephcsi:v3.10.2
quay.io/csiaddons/k8s-sidecar:v0.8.0
registry.k8s.io/sig-storage/csi-attacher:v4.4.2
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
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.10.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.10.2"
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1"
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.9.2"
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.6.3"
deploy/examples/operator.yaml
+1 -1
View File
@@ -112,7 +112,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.10.1"
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.10.2"
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1"
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.9.2"
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v3.6.3"
pkg/operator/ceph/csi/spec.go
+1 -1
View File
@@ -136,7 +136,7 @@ var (
// manually challenging.
var (
// image names
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.10.1"
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.10.2"
DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1"
DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v3.6.3"
DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.4.2"
pkg/operator/ceph/csi/util_test.go
+4 -4
View File
@@ -267,7 +267,7 @@ func Test_getImage(t *testing.T) {
args: args{
data: map[string]string{},
settingName: "ROOK_CSI_CEPH_IMAGE",
defaultImage: "quay.io/cephcsi/cephcsi:v3.10.1",
defaultImage: "quay.io/cephcsi/cephcsi:v3.10.2",
},
want: DefaultCSIPluginImage,
},
@@ -278,7 +278,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.10.1",
defaultImage: "quay.io/cephcsi/cephcsi:v3.10.2",
},
want: "registry.io/private/cephcsi:v8",
},
@@ -289,9 +289,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.10.1",
defaultImage: "quay.io/cephcsi/cephcsi:v3.10.2",
},
want: "registry.io/private/cephcsi:v3.10.1",
want: "registry.io/private/cephcsi:v3.10.2",
},
}
for _, tt := range tests {
pkg/operator/ceph/csi/version_test.go
+5
View File
@@ -30,6 +30,7 @@ var (
testReleaseV391 = CephCSIVersion{3, 9, 1}
testreleasev310 = CephCSIVersion{3, 10, 0}
testReleaseV3101 = CephCSIVersion{3, 10, 1}
testReleaseV3102 = CephCSIVersion{3, 10, 2}
testVersionUnsupported = CephCSIVersion{4, 0, 0}
)
@@ -60,6 +61,10 @@ func TestIsAtLeast(t *testing.T) {
ret = testReleaseV3101.isAtLeast(&testReleaseV3101)
assert.Equal(t, true, ret)
// Test for 3.10.2
ret = testReleaseV3102.isAtLeast(&testReleaseV3102)
assert.Equal(t, true, ret)
}
func TestSupported(t *testing.T) {