From b258628b05a69ebc8545da92d5ca5d2cc8c0a4b1 Mon Sep 17 00:00:00 2001
From: Humble Chirammal <hchiramm@redhat.com>
Date: Fri, 11 Nov 2022 10:45:25 +0530
Subject: [PATCH] helm: get rid of storage group enablement based on the
 version deploy: remove beta storage group mention from csidriver yaml

the kubernetes version based enablement of storage api group
enablement is no longer requried and its already on v1 for
supported kubernetes versions.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
---
 api/deploy/kubernetes/rbd/csidriver.yaml                      | 2 --
 charts/ceph-csi-cephfs/templates/csidriver-crd.yaml           | 4 ----
 charts/ceph-csi-rbd/templates/csidriver-crd.yaml              | 4 ----
 deploy/cephfs/kubernetes/csidriver.yaml                       | 2 --
 deploy/rbd/kubernetes/csidriver.yaml                          | 2 --
 .../ceph/ceph-csi/api/deploy/kubernetes/nfs/csidriver.yaml    | 1 +
 .../ceph/ceph-csi/api/deploy/kubernetes/rbd/csidriver.yaml    | 3 +--
 7 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/api/deploy/kubernetes/rbd/csidriver.yaml b/api/deploy/kubernetes/rbd/csidriver.yaml
index 4ab105dcc..d948a0ce8 100644
--- a/api/deploy/kubernetes/rbd/csidriver.yaml
+++ b/api/deploy/kubernetes/rbd/csidriver.yaml
@@ -1,6 +1,4 @@
 ---
-# if Kubernetes version is less than 1.18 change
-# apiVersion to storage.k8s.io/v1beta1
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
diff --git a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml
index 3dde576d0..5fc9cb216 100644
--- a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml
+++ b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml
@@ -1,8 +1,4 @@
-{{ if semverCompare ">=1.18.0-beta.1" .Capabilities.KubeVersion.Version }}
 apiVersion: storage.k8s.io/v1
-{{ else }}
-apiVersion: storage.k8s.io/v1beta1
-{{ end }}
 kind: CSIDriver
 metadata:
   name: {{ .Values.driverName }}
diff --git a/charts/ceph-csi-rbd/templates/csidriver-crd.yaml b/charts/ceph-csi-rbd/templates/csidriver-crd.yaml
index f4340a573..e0e026c70 100644
--- a/charts/ceph-csi-rbd/templates/csidriver-crd.yaml
+++ b/charts/ceph-csi-rbd/templates/csidriver-crd.yaml
@@ -1,8 +1,4 @@
-{{ if semverCompare ">=1.18.0-beta.1" .Capabilities.KubeVersion.Version }}
 apiVersion: storage.k8s.io/v1
-{{ else }}
-apiVersion: storage.k8s.io/v1beta1
-{{ end }}
 kind: CSIDriver
 metadata:
   name: {{ .Values.driverName }}
diff --git a/deploy/cephfs/kubernetes/csidriver.yaml b/deploy/cephfs/kubernetes/csidriver.yaml
index fdd17ca7f..dcb2b7745 100644
--- a/deploy/cephfs/kubernetes/csidriver.yaml
+++ b/deploy/cephfs/kubernetes/csidriver.yaml
@@ -1,6 +1,4 @@
 ---
-# if Kubernetes version is less than 1.18 change
-# apiVersion to storage.k8s.io/v1beta1
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
diff --git a/deploy/rbd/kubernetes/csidriver.yaml b/deploy/rbd/kubernetes/csidriver.yaml
index 77dfac197..1d91061c4 100644
--- a/deploy/rbd/kubernetes/csidriver.yaml
+++ b/deploy/rbd/kubernetes/csidriver.yaml
@@ -6,8 +6,6 @@
 # your modifications there.
 #
 ---
-# if Kubernetes version is less than 1.18 change
-# apiVersion to storage.k8s.io/v1beta1
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
diff --git a/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs/csidriver.yaml b/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs/csidriver.yaml
index 97afbc50e..21f2d79f4 100644
--- a/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs/csidriver.yaml
+++ b/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/nfs/csidriver.yaml
@@ -5,5 +5,6 @@ metadata:
   name: "{{ .Name }}"
 spec:
   attachRequired: false
+  fsGroupPolicy: File
   volumeLifecycleModes:
     - Persistent
diff --git a/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd/csidriver.yaml b/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd/csidriver.yaml
index 4ab105dcc..63569181a 100644
--- a/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd/csidriver.yaml
+++ b/vendor/github.com/ceph/ceph-csi/api/deploy/kubernetes/rbd/csidriver.yaml
@@ -1,6 +1,4 @@
 ---
-# if Kubernetes version is less than 1.18 change
-# apiVersion to storage.k8s.io/v1beta1
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
@@ -8,3 +6,4 @@ metadata:
 spec:
   attachRequired: true
   podInfoOnMount: false
+  fsGroupPolicy: File