Merge pull request #368 from iPraveenParihar/cephfs/csiaddons-daemonset

cephfs: deploy csi-addons daemonset

Author: Madhu-1

config/csi-rbac/cephfs_nodeplugin_cluster_role.yaml

@@ -26,3 +26,6 @@ rules:
 - apiGroups: [""]
   resources: ["persistentvolumes", "persistentvolumeclaims"]
   verbs: ["get"]
+- apiGroups: ["authentication.k8s.io"]
+  resources: ["tokenreviews"]
+  verbs: ["create"]

deploy/all-in-one/install.yaml

@@ -29768,6 +29768,12 @@ rules:
   - persistentvolumeclaims
   verbs:
   - get
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

deploy/charts/ceph-csi-drivers/templates/cephfs-nodeplugin-cr-rbac.yaml

@@ -56,4 +56,10 @@ rules:
   - persistentvolumeclaims
   verbs:
   - get
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
 {{- end }}

deploy/charts/ceph-csi-operator/templates/cephfs-nodeplugin-cr-rbac.yaml

@@ -54,3 +54,9 @@ rules:
   - persistentvolumeclaims
   verbs:
   - get
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create

deploy/multifile/csi-rbac.yaml

@@ -455,6 +455,12 @@ rules:
   - persistentvolumeclaims
   verbs:
   - get
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

internal/controller/driver_controller.go

@@ -1043,13 +1043,9 @@ func (r *driverReconcile) reconcileNodePluginDaemonSetForCsiAddons() error {
 
 	log := r.log.WithValues("csiAddonsDaemonSetName", daemonSet.Name)
 
-	withCsiAddonsDaemonSet := false
+	withCsiAddonsDaemonSet := ptr.Deref(r.driver.Spec.DeployCsiAddons, false)
 	withCsiAddonsVolumeCondition := false
 
-	if r.isRbdDriver() {
-		withCsiAddonsDaemonSet = ptr.Deref(r.driver.Spec.DeployCsiAddons, false)
-	}
-
 	// check if the driver wants CSI-Addons features
 	if feature := r.driver.GetAnnotations()[driverCSIAddonsFeatureVolumeCondition]; feature != "" {
 		enabled, err := strconv.ParseBool(feature)
@@ -1066,8 +1062,6 @@ func (r *driverReconcile) reconcileNodePluginDaemonSetForCsiAddons() error {
 		}
 
 		withCsiAddonsVolumeCondition = enabled
-		// if the feature is enabled, enable the daemonset too
-		withCsiAddonsDaemonSet = withCsiAddonsDaemonSet || withCsiAddonsVolumeCondition
 	}
 
 	if r.isNfsDriver() {