Skip to content

Commit a9b7bb7

Browse files
committed
csi: update Kubernetes CSI sidecar images to current versions
The Kubernetes CSI sidecars have had several releases that were not included in deployments by Rook yet, update them to the versions that are available today: - csi-node-driver-registrar:v2.13.1 - csi-provisioner:v5.1.1 - csi-attacher:v4.8.1 - csi-resizer:v1.13.2 - csi-snapshotter:v8.2.1 This change is important, because Ceph-CSI will implement the new Controller.GetSnapshot CSI procedure. A bug in csi-lib-utils causes a panic when a ControllerCapability is provided, but not (yet) known to the CSI sidecars. The updated sidecars consume a version of csi-lib-utils with a fix for that panic. See-also: kubernetes-csi/csi-lib-utils#188 Signed-off-by: Niels de Vos <[email protected]>
1 parent e5b808e commit a9b7bb7

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

Documentation/Helm-Charts/operator-chart.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The following table lists the configurable parameters of the rook-operator chart
5050
| `containerSecurityContext` | Set the container security context for the operator | `{"capabilities":{"drop":["ALL"]},"runAsGroup":2016,"runAsNonRoot":true,"runAsUser":2016}` |
5151
| `crds.enabled` | Whether the helm chart should create and update the CRDs. If false, the CRDs must be managed independently with deploy/examples/crds.yaml. **WARNING** Only set during first deployment. If later disabled the cluster may be DESTROYED. If the CRDs are deleted in this case, see [the disaster recovery guide](https://rook.io/docs/rook/latest/Troubleshooting/disaster-recovery/#restoring-crds-after-deletion) to restore them. | `true` |
5252
| `csi.attacher.repository` | Kubernetes CSI Attacher image repository | `"registry.k8s.io/sig-storage/csi-attacher"` |
53-
| `csi.attacher.tag` | Attacher image tag | `"v4.8.0"` |
53+
| `csi.attacher.tag` | Attacher image tag | `"v4.8.1"` |
5454
| `csi.cephFSAttachRequired` | Whether to skip any attach operation altogether for CephFS PVCs. See more details [here](https://kubernetes-csi.github.io/docs/skip-attach.html#skip-attach-with-csi-driver-object). If cephFSAttachRequired is set to false it skips the volume attachments and makes the creation of pods using the CephFS PVC fast. **WARNING** It's highly discouraged to use this for CephFS RWO volumes. Refer to this [issue](https://github.com/kubernetes/kubernetes/issues/103305) for more details. | `true` |
5555
| `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"` |
5656
| `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` |
@@ -110,7 +110,7 @@ The following table lists the configurable parameters of the rook-operator chart
110110
| `csi.pluginPriorityClassName` | PriorityClassName to be set on csi driver plugin pods | `"system-node-critical"` |
111111
| `csi.pluginTolerations` | Array of tolerations in YAML format which will be added to CephCSI plugin DaemonSet | `nil` |
112112
| `csi.provisioner.repository` | Kubernetes CSI provisioner image repository | `"registry.k8s.io/sig-storage/csi-provisioner"` |
113-
| `csi.provisioner.tag` | Provisioner image tag | `"v5.1.0"` |
113+
| `csi.provisioner.tag` | Provisioner image tag | `"v5.1.1"` |
114114
| `csi.provisionerNodeAffinity` | The node labels for affinity of the CSI provisioner deployment [^1] | `nil` |
115115
| `csi.provisionerPriorityClassName` | PriorityClassName to be set on csi driver provisioner pods | `"system-cluster-critical"` |
116116
| `csi.provisionerReplicas` | Set replicas for csi provisioner deployment | `2` |
@@ -122,16 +122,16 @@ The following table lists the configurable parameters of the rook-operator chart
122122
| `csi.rbdPluginUpdateStrategyMaxUnavailable` | A maxUnavailable parameter of CSI RBD plugin daemonset update strategy. | `1` |
123123
| `csi.rbdPodLabels` | Labels to add to the CSI RBD Deployments and DaemonSets Pods | `nil` |
124124
| `csi.registrar.repository` | Kubernetes CSI registrar image repository | `"registry.k8s.io/sig-storage/csi-node-driver-registrar"` |
125-
| `csi.registrar.tag` | Registrar image tag | `"v2.13.0"` |
125+
| `csi.registrar.tag` | Registrar image tag | `"v2.13.1"` |
126126
| `csi.resizer.repository` | Kubernetes CSI resizer image repository | `"registry.k8s.io/sig-storage/csi-resizer"` |
127-
| `csi.resizer.tag` | Resizer image tag | `"v1.13.1"` |
127+
| `csi.resizer.tag` | Resizer image tag | `"v1.13.2"` |
128128
| `csi.serviceMonitor.enabled` | Enable ServiceMonitor for Ceph CSI drivers | `false` |
129129
| `csi.serviceMonitor.interval` | Service monitor scrape interval | `"10s"` |
130130
| `csi.serviceMonitor.labels` | ServiceMonitor additional labels | `{}` |
131131
| `csi.serviceMonitor.namespace` | Use a different namespace for the ServiceMonitor | `nil` |
132132
| `csi.sidecarLogLevel` | Set logging level for Kubernetes-csi sidecar containers. Supported values from 0 to 5. 0 for general useful logs (the default), 5 for trace level verbosity. | `0` |
133133
| `csi.snapshotter.repository` | Kubernetes CSI snapshotter image repository | `"registry.k8s.io/sig-storage/csi-snapshotter"` |
134-
| `csi.snapshotter.tag` | Snapshotter image tag | `"v8.2.0"` |
134+
| `csi.snapshotter.tag` | Snapshotter image tag | `"v8.2.1"` |
135135
| `csi.topology.domainLabels` | domainLabels define which node labels to use as domains for CSI nodeplugins to advertise their domains | `nil` |
136136
| `csi.topology.enabled` | Enable topology based provisioning | `false` |
137137
| `currentNamespaceOnly` | Whether the operator should watch cluster CRD in its own namespace or not | `false` |

Documentation/Storage-Configuration/Ceph-CSI/custom-images.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ The default upstream images are included below, which you can change to your des
1919

2020
```yaml
2121
ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.14.0"
22-
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
23-
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
24-
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
25-
ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
26-
ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
22+
ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.1"
23+
ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.1"
24+
ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
25+
ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
26+
ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
2727
ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.12.0"
2828
```
2929

deploy/charts/rook-ceph/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,31 +495,31 @@ csi:
495495
# -- Kubernetes CSI registrar image repository
496496
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
497497
# -- Registrar image tag
498-
tag: v2.13.0
498+
tag: v2.13.1
499499

500500
provisioner:
501501
# -- Kubernetes CSI provisioner image repository
502502
repository: registry.k8s.io/sig-storage/csi-provisioner
503503
# -- Provisioner image tag
504-
tag: v5.1.0
504+
tag: v5.1.1
505505

506506
snapshotter:
507507
# -- Kubernetes CSI snapshotter image repository
508508
repository: registry.k8s.io/sig-storage/csi-snapshotter
509509
# -- Snapshotter image tag
510-
tag: v8.2.0
510+
tag: v8.2.1
511511

512512
attacher:
513513
# -- Kubernetes CSI Attacher image repository
514514
repository: registry.k8s.io/sig-storage/csi-attacher
515515
# -- Attacher image tag
516-
tag: v4.8.0
516+
tag: v4.8.1
517517

518518
resizer:
519519
# -- Kubernetes CSI resizer image repository
520520
repository: registry.k8s.io/sig-storage/csi-resizer
521521
# -- Resizer image tag
522-
tag: v1.13.1
522+
tag: v1.13.2
523523

524524
# -- Image pull policy
525525
imagePullPolicy: IfNotPresent

deploy/examples/images.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
quay.io/ceph/cosi:v0.1.2
55
quay.io/cephcsi/cephcsi:v3.14.0
66
quay.io/csiaddons/k8s-sidecar:v0.12.0
7-
registry.k8s.io/sig-storage/csi-attacher:v4.8.0
8-
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
9-
registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
10-
registry.k8s.io/sig-storage/csi-resizer:v1.13.1
11-
registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
7+
registry.k8s.io/sig-storage/csi-attacher:v4.8.1
8+
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.1
9+
registry.k8s.io/sig-storage/csi-provisioner:v5.1.1
10+
registry.k8s.io/sig-storage/csi-resizer:v1.13.2
11+
registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1

deploy/examples/operator-openshift.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,11 @@ data:
190190
# of the CSI driver to something other than what is officially supported, change
191191
# these images to the desired release of the CSI driver.
192192
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.14.0"
193-
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
194-
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
195-
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
196-
# ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
197-
# ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
193+
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.1"
194+
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
195+
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.1"
196+
# ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
197+
# ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
198198

199199
# (Optional) set user created priorityclassName for csi plugin pods.
200200
CSI_PLUGIN_PRIORITY_CLASSNAME: "system-node-critical"

deploy/examples/operator.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ data:
120120
# of the CSI driver to something other than what is officially supported, change
121121
# these images to the desired release of the CSI driver.
122122
# ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.14.0"
123-
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
124-
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
125-
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
126-
# ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
127-
# ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
123+
# ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.1"
124+
# ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
125+
# ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v5.1.1"
126+
# ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
127+
# ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
128128

129129
# To indicate the image pull policy to be applied to all the containers in the csi driver pods.
130130
# ROOK_CSI_IMAGE_PULL_POLICY: "IfNotPresent"

pkg/operator/ceph/csi/spec.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ var (
133133
var (
134134
// image names
135135
DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.14.0"
136-
DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
137-
DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.1.0"
138-
DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.0"
139-
DefaultSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
140-
DefaultResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.1"
136+
DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.1"
137+
DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v5.1.1"
138+
DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.8.1"
139+
DefaultSnapshotterImage = "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.1"
140+
DefaultResizerImage = "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
141141
DefaultCSIAddonsImage = "quay.io/csiaddons/k8s-sidecar:v0.12.0"
142142

143143
// image pull policy

tests/framework/utils/snapshot.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
const (
2828
// snapshotterVersion from which the snapshotcontroller and CRD will be
2929
// installed
30-
snapshotterVersion = "v8.2.0"
30+
snapshotterVersion = "v8.2.1"
3131
repoURL = "https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter"
3232
rbacPath = "deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml"
3333
controllerPath = "deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml"

0 commit comments

Comments
 (0)