From c0cabab9656c86d8cbe9209e89dc2e6a1990e314 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Thu, 26 Dec 2024 02:19:14 +0100
Subject: [PATCH] fix: snapshot-controller

---
 .../snapshot-controller/app/helmrelease.yaml  | 21 ++-----------------
 .../rook-ceph/rook-ceph/app/helmrelease.yaml  |  6 ++++++
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/kubernetes/apps/kube-system/snapshot-controller/app/helmrelease.yaml b/kubernetes/apps/kube-system/snapshot-controller/app/helmrelease.yaml
index 679074032..82fb2a1fc 100644
--- a/kubernetes/apps/kube-system/snapshot-controller/app/helmrelease.yaml
+++ b/kubernetes/apps/kube-system/snapshot-controller/app/helmrelease.yaml
@@ -24,6 +24,7 @@ spec:
     cleanupOnFail: true
     crds: CreateReplace
     remediation:
+      strategy: rollback
       retries: 3
   uninstall:
     keepHistory: false
@@ -32,24 +33,6 @@ spec:
       namespace: rook-ceph
   values:
     controller:
-      volumeSnapshotClasses:
-        - name: csi-ceph-blockpool
-          driver: rook-ceph.rbd.csi.ceph.com
-          annotations:
-            snapshot.storage.kubernetes.io/is-default-class: "true"
-          parameters:
-            clusterID: rook-ceph
-            csi.storage.k8s.io/snapshotter-secret-name: rook-csi-rbd-provisioner
-            csi.storage.k8s.io/snapshotter-secret-namespace: rook-ceph
-          deletionPolicy: Delete
-        - name: csi-ceph-filesystem
-          driver: rook-ceph.cephfs.csi.ceph.com
-          annotations:
-            snapshot.storage.kubernetes.io/is-default-class: "false"
-          parameters:
-            clusterID: rook-ceph
-            csi.storage.k8s.io/snapshotter-secret-name: rook-csi-cephfs-provisioner
-            csi.storage.k8s.io/snapshotter-secret-namespace: rook-ceph
-          deletionPolicy: Delete
+      replicaCount: 1
       serviceMonitor:
         create: true
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml
index acf5f73c5..49992fc7c 100644
--- a/kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml
@@ -29,6 +29,12 @@ spec:
   uninstall:
     keepHistory: false
   values:
+    csi:
+      enableVolumeGroupSnapshot: false # TODO: enable this when v1beta1 CRDs are available
+      cephFSKernelMountOptions: ms_mode=prefer-crc
+      enableLiveness: true
+      serviceMonitor:
+        enabled: true
     crds:
       enabled: true
     pspEnable: false