csi: remove attacher sidecar from CephFS rook deployment

CephFS CSI driver dont have/advertise controller publish/unpublish capabilities, thus dont need attacher sidecar for its operations. The presence of external-attacher adds on overhead and issues wrt attachment in various scenarios. One of them would be the lack of performance on syncing volumeattachment from api server..etc. More or less we don't have controller publish and unpublish capabilities, so we should not make use of this sidecar and cause unnecessary addon here thus other issues. similar changes have been added to CSI ceph/ceph-csi#3149 Signed-off-by: yati1998 <ypadia@redhat.com>
yati1998 · Aug 2, 2022 · 6323322 · 6323322
1 parent e78714c
commit 6323322
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 58 deletions.
diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md
@@ -100,8 +100,8 @@ If you did not modify the `cluster.yaml` above, it is expected that one OSD will
 ```console
 $ kubectl -n rook-ceph get pod
 NAME                                                 READY   STATUS      RESTARTS   AGE
-csi-cephfsplugin-provisioner-d77bb49c6-n5tgs         5/5     Running     0          140s
-csi-cephfsplugin-provisioner-d77bb49c6-v9rvn         5/5     Running     0          140s
+csi-cephfsplugin-provisioner-d77bb49c6-n5tgs         4/4     Running     0          140s
+csi-cephfsplugin-provisioner-d77bb49c6-v9rvn         4/4     Running     0          140s
 csi-cephfsplugin-rthrp                               3/3     Running     0          140s
 csi-rbdplugin-hbsm7                                  3/3     Running     0          140s
 csi-rbdplugin-provisioner-5b5cd64fd-nvk6c            6/6     Running     0          140s

diff --git a/Documentation/Troubleshooting/ceph-csi-common-issues.md b/Documentation/Troubleshooting/ceph-csi-common-issues.md
@@ -292,7 +292,7 @@ Restarting the `csi-xxxxplugin-xxx` pod on the node may help.
 
 ## Volume Attachment
 
-Each provisioner pod also has a sidecar container called `csi-attacher`.
+Each RBD provisioner pod also has a sidecar container called `csi-attacher`.
 
 ### csi-attacher
 

diff --git a/deploy/charts/rook-ceph/templates/clusterrole.yaml b/deploy/charts/rook-ceph/templates/clusterrole.yaml
@@ -454,12 +454,6 @@ rules:
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "patch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments/status"]
-    verbs: ["patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims/status"]
     verbs: ["patch"]

diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml
@@ -224,14 +224,6 @@ csi:
         limits:
           memory: 256Mi
           cpu: 200m
-    - name : csi-attacher
-      resource:
-        requests:
-          memory: 128Mi
-          cpu: 100m
-        limits:
-          memory: 256Mi
-          cpu: 200m
     - name : csi-snapshotter
       resource:
         requests:

diff --git a/deploy/examples/common.yaml b/deploy/examples/common.yaml
@@ -42,12 +42,6 @@ rules:
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "patch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments/status"]
-    verbs: ["patch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims/status"]
     verbs: ["patch"]

diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml
@@ -389,14 +389,6 @@ data:
   #      limits:
   #        memory: 256Mi
   #        cpu: 200m
-  #  - name : csi-attacher
-  #    resource:
-  #      requests:
-  #        memory: 128Mi
-  #        cpu: 100m
-  #      limits:
-  #        memory: 256Mi
-  #        cpu: 200m
   #  - name : csi-snapshotter
   #    resource:
   #      requests:

diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml
@@ -312,14 +312,6 @@ data:
   #      limits:
   #        memory: 256Mi
   #        cpu: 200m
-  #  - name : csi-attacher
-  #    resource:
-  #      requests:
-  #        memory: 128Mi
-  #        cpu: 100m
-  #      limits:
-  #        memory: 256Mi
-  #        cpu: 200m
   #  - name : csi-snapshotter
   #    resource:
   #      requests:

diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go
@@ -608,7 +608,7 @@ func (r *ReconcileCSI) startDrivers(ver *version.Info, ownerInfo *k8sutil.OwnerI
 		}
 	}
 	if EnableCephFS {
-		err = csiDriverobj.createCSIDriverInfo(r.opManagerContext, r.context.Clientset, CephFSDriverName, k8sutil.GetValue(r.opConfig.Parameters, "CSI_CEPHFS_FSGROUPPOLICY", string(k8scsi.ReadWriteOnceWithFSTypeFSGroupPolicy)), true)
+		err = csiDriverobj.createCSIDriverInfo(r.opManagerContext, r.context.Clientset, CephFSDriverName, k8sutil.GetValue(r.opConfig.Parameters, "CSI_CEPHFS_FSGROUPPOLICY", string(k8scsi.ReadWriteOnceWithFSTypeFSGroupPolicy)), false)
 		if err != nil {
 			return errors.Wrapf(err, "failed to create CSI driver object for %q", CephFSDriverName)
 		}

diff --git a/pkg/operator/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml b/pkg/operator/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml
@@ -22,24 +22,6 @@ spec:
       priorityClassName: {{ .ProvisionerPriorityClassName }}
       {{ end }}
       containers:
-        - name: csi-attacher
-          image: {{ .AttacherImage }}
-          args:
-            - "--v={{ .LogLevel }}"
-            - "--csi-address=$(ADDRESS)"
-            - "--leader-election=true"
-            - "--timeout={{ .GRPCTimeout }}"
-            - "--leader-election-namespace={{ .Namespace }}"
-            - "--leader-election-lease-duration=137s"
-            - "--leader-election-renew-deadline=107s"
-            - "--leader-election-retry-period=26s"
-          env:
-            - name: ADDRESS
-              value: /csi/csi-provisioner.sock
-          imagePullPolicy: "IfNotPresent"
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /csi
         {{ if .EnableCephFSSnapshotter }}
         - name: csi-snapshotter
           image:  {{ .SnapshotterImage }}