From 1999581c4590bdf898380192877e96b6e571fd9a Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 17 Jan 2025 10:45:48 +0100 Subject: [PATCH] rebase: update Kubernetes CSI sidecars 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.0 - csi-provisioner:v5.1.0 - csi-attacher:v4.8.0 Signed-off-by: Niels de Vos --- build.env | 6 +++--- charts/ceph-csi-cephfs/README.md | 4 ++-- charts/ceph-csi-cephfs/values.yaml | 4 ++-- charts/ceph-csi-rbd/README.md | 4 ++-- charts/ceph-csi-rbd/values.yaml | 6 +++--- deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml | 2 +- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 2 +- deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml | 2 +- deploy/nfs/kubernetes/csi-nfsplugin.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 4 ++-- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build.env b/build.env index 6291eb4b56e..f25018ad303 100644 --- a/build.env +++ b/build.env @@ -54,11 +54,11 @@ ROOK_VERSION=v1.14.9 ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v19 # CSI sidecar version -CSI_ATTACHER_VERSION=v4.6.1 +CSI_ATTACHER_VERSION=v4.8.0 CSI_SNAPSHOTTER_VERSION=v8.2.0 CSI_RESIZER_VERSION=v1.13.1 -CSI_PROVISIONER_VERSION=v5.0.1 -CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.11.1 +CSI_PROVISIONER_VERSION=v5.1.0 +CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.13.0 # e2e settings # - enable CEPH_CSI_RUN_ALL_TESTS when running tests with if it has root diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 9c779d29867..dfa125c77c1 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -154,7 +154,7 @@ charts and their default values. | `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `nodeplugin.registrar.image.repository` | Node-Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` | -| `nodeplugin.registrar.image.tag` | Image tag | `v2.11.1` | +| `nodeplugin.registrar.image.tag` | Image tag | `v2.13.0` | | `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` | | `nodeplugin.plugin.image.tag` | Image tag | `canary` | @@ -177,7 +177,7 @@ charts and their default values. | `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.0.1` | +| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.1.0` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.provisioner.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.provisioner.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` | diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index be101ba1663..586ba92af19 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -131,7 +131,7 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.11.1 + tag: v2.13.0 pullPolicy: IfNotPresent resources: {} @@ -229,7 +229,7 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v5.0.1 + tag: v5.1.0 pullPolicy: IfNotPresent resources: {} args: diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index ac4428fa006..b01289637ad 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -127,7 +127,7 @@ charts and their default values. | `nodeplugin.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `nodeplugin.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `nodeplugin.registrar.image.repository` | Node Registrar image repository URL | `registry.k8s.io/sig-storage/csi-node-driver-registrar` | -| `nodeplugin.registrar.image.tag` | Image tag | `v2.11.1` | +| `nodeplugin.registrar.image.tag` | Image tag | `v2.13.0` | | `nodeplugin.registrar.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `nodeplugin.plugin.image.repository` | Nodeplugin image repository URL | `quay.io/cephcsi/cephcsi` | | `nodeplugin.plugin.image.tag` | Image tag | `canary` | @@ -154,7 +154,7 @@ charts and their default values. | `provisioner.imagePullSecrets` | Specifies imagePullSecrets for containers | `[]` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.0.1` | +| `provisioner.provisioner.image.tag` | Specifies image tag | `v5.1.0` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.provisioner.args.httpEndpointPort` | Specifies http server port for diagnostics, health checks and metrics | `""` | | `provisioner.provisioner.extraArgs` | Specifies extra arguments for the provisioner sidecar | `[]` | diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index cdeff243a52..991c269d061 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -142,7 +142,7 @@ nodeplugin: registrar: image: repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.11.1 + tag: v2.13.0 pullPolicy: IfNotPresent resources: {} @@ -250,7 +250,7 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v5.0.1 + tag: v5.1.0 pullPolicy: IfNotPresent resources: {} args: @@ -270,7 +270,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-attacher - tag: v4.6.1 + tag: v4.8.0 pullPolicy: IfNotPresent resources: {} args: diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 998fe917cb0..6f56a895178 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -92,7 +92,7 @@ spec: - name: ceph-csi-encryption-kms-config mountPath: /etc/ceph-csi-encryption-kms-config/ - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f609df6a52d..be5e2fec3d7 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -106,7 +106,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 args: - "--v=1" - "--csi-address=/csi/csi.sock" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index 2d13a6bdd60..c06638e266e 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -73,7 +73,7 @@ spec: - name: keys-tmp-dir mountPath: /tmp/csi/keys - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" diff --git a/deploy/nfs/kubernetes/csi-nfsplugin.yaml b/deploy/nfs/kubernetes/csi-nfsplugin.yaml index e6c138eff34..129516faa0b 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin.yaml @@ -80,7 +80,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 args: - "--v=1" - "--csi-address=/csi/csi.sock" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 1953e5b2b66..2fa8e293890 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -104,7 +104,7 @@ spec: mountPath: /run/secrets/tokens readOnly: true - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 args: - "--csi-address=$(ADDRESS)" - "--v=1" @@ -159,7 +159,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 + image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0 args: - "--v=1" - "--csi-address=$(ADDRESS)" diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index 0d3dd57c665..4e096e90acd 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -116,7 +116,7 @@ spec: securityContext: privileged: true allowPrivilegeEscalation: true - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0 args: - "--v=1" - "--csi-address=/csi/csi.sock"