From 6f4dc24fce4f7507ffc251e06dfcf325d627fc59 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 21 Nov 2024 09:11:56 +0100 Subject: [PATCH 1/2] csi: update groupsnapshot container arg In external-snapshotter the groupsnapshot feature flag is moved to a new container argument and the old enable-volumegroup-snapshot flag is removed, This PR updates the flag to use external-snapshotter latest version, Note:- As the flag is removed with Rook the user cannot test/use the older version of external-snapshotter for groupsnapshot feature, but all other features will be still supported with older releases. Signed-off-by: Madhu Rajanna --- internal/utils/csi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/utils/csi.go b/internal/utils/csi.go index 56ad91ea..59c12cfa 100644 --- a/internal/utils/csi.go +++ b/internal/utils/csi.go @@ -368,7 +368,7 @@ var PreventVolumeModeConversionContainerArg = "--prevent-volume-mode-conversion= var HonorPVReclaimPolicyContainerArg = "--feature-gates=HonorPVReclaimPolicy=true" var ImmediateTopologyContainerArg = "--immediate-topology=false" var RecoverVolumeExpansionFailureContainerArg = "--feature-gates=RecoverVolumeExpansionFailure=true" -var EnableVolumeGroupSnapshotsContainerArg = "--enable-volume-group-snapshots=true" +var EnableVolumeGroupSnapshotsContainerArg = "--feature-gates=CSIVolumeGroupSnapshot=true" var ForceCephKernelClientContainerArg = "--forcecephkernelclient=true" var LogToStdErrContainerArg = "--logtostderr=false" var AlsoLogToStdErrContainerArg = "--alsologtostderr=true" From 810accd482f30f3cbed27c92ce2d116c1bd3a487 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 21 Nov 2024 09:12:28 +0100 Subject: [PATCH 2/2] csi: update external-snapshotter image updating the external-snapshotter image to the latest release. Signed-off-by: Madhu Rajanna --- internal/controller/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/defaults.go b/internal/controller/defaults.go index d1a909c6..ab8ce263 100644 --- a/internal/controller/defaults.go +++ b/internal/controller/defaults.go @@ -31,7 +31,7 @@ var imageDefaults = map[string]string{ "provisioner": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "attacher": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "resizer": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", - "snapshotter": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", + "snapshotter": "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0", "registrar": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1", "plugin": "quay.io/cephcsi/cephcsi:v3.12.2", "addons": "quay.io/csiaddons/k8s-sidecar:v0.10.0",