From 401ce4697a3072baa49f0660038df54d3d9b6289 Mon Sep 17 00:00:00 2001 From: Riya Singhal Date: Tue, 21 Nov 2023 17:51:13 +0530 Subject: [PATCH] csi: add csi-addons sidecar to cephfs deployment this commit adds csi-addon sidecar to cephfsplugin provisioner deployment Signed-off-by: Riya Singhal --- .../csi-cephfsplugin-provisioner-dep.yaml | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) 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 index 14374971a3bf..7b05a2c3ff34 100644 --- a/pkg/operator/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml +++ b/pkg/operator/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml @@ -119,6 +119,9 @@ spec: {{ if .CSIClusterName }} - "--clustername={{ .CSIClusterName }}" {{ end }} + {{ if .EnableCSIAddonsSideCar }} + - "--csi-addons-endpoint=$(CSIADDONS_ENDPOINT)" + {{ end }} env: - name: POD_IP valueFrom: @@ -134,6 +137,10 @@ spec: fieldPath: metadata.namespace - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock + {{ if .EnableCSIAddonsSideCar }} + - name: CSIADDONS_ENDPOINT + value: unix:///csi/csi-addons.sock + {{ end }} imagePullPolicy: {{ .ImagePullPolicy }} volumeMounts: - name: socket-dir @@ -154,6 +161,44 @@ spec: mountPath: /etc/ceph/ceph.conf subPath: ceph.conf {{ end }} + {{ if .EnableCSIAddonsSideCar }} + - name: csi-addons + image: {{ .CSIAddonsImage }} + args : + - "--node-id=$(NODE_ID)" + - "--v={{ .LogLevel }}" + - "--csi-addons-address=$(CSIADDONS_ENDPOINT)" + - "--controller-port={{ .CSIAddonsPort }}" + - "--pod=$(POD_NAME)" + - "--namespace=$(POD_NAMESPACE)" + - "--pod-uid=$(POD_UID)" + - "--stagingpath={{ .KubeletDirPath }}/plugins/kubernetes.io/csi/" + ports: + - containerPort: {{ .CSIAddonsPort }} + env: + - name: NODE_ID + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_UID + valueFrom: + fieldRef: + fieldPath: metadata.uid + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: CSIADDONS_ENDPOINT + value: unix:///csi/csi-addons.sock + imagePullPolicy: {{ .ImagePullPolicy }} + volumeMounts: + - name: socket-dir + mountPath: /csi + {{ end }} {{ if .EnableLiveness }} - name: liveness-prometheus image: {{ .CSIPluginImage }}