Merge pull request kubernetes-sigs#1616 from huww98/bmcpfs-manifest

deploy: align bmcpfs sidecar with others

Author: k8s-ci-robot

deploy/charts/alibaba-cloud-csi-driver/templates/controller.yaml

@@ -255,6 +255,7 @@ spec:
             - --kube-api-qps=100
             - --kube-api-burst=200
             - --v=5
+            - --logging-format={{ .Values.logging.format }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
@@ -305,6 +306,7 @@ spec:
             - --kube-api-qps=100
             - --kube-api-burst=200
             - --v=5
+            - --logging-format={{ .Values.logging.format }}
           image: {{ include "imageSpec" (list .Values "externalProvisioner") }}
           resources:
             limits:
@@ -364,7 +366,7 @@ spec:
           image: {{ include "imageSpec" (list .Values "externalProvisioner") }}
           args:
             - --csi-address=/csi/csi.sock
-            - --http-endpoint=:8100
+            - --http-endpoint=:8120
             - --volume-name-prefix=bmcpfs
             - --default-fstype=bmcpfs
             - --timeout=150s
@@ -373,13 +375,25 @@ spec:
             - --kube-api-qps=100
             - --kube-api-burst=200
             - --v=5
+            - --logging-format={{ .Values.logging.format }}
           resources: 
             requests:
               cpu: 10m
               memory: 16Mi
             limits:
               cpu: 500m
               memory: 1024Mi
+          ports:
+            - containerPort: 8120
+              name: bmcpfs-p-http
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz/leader-election
+              port: bmcpfs-p-http
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
           volumeMounts:
             - name: bmcpfs-provisioner-dir
               mountPath: /csi
@@ -396,11 +410,23 @@ spec:
             - --v=5
             - --logging-format={{ .Values.logging.format }}
             - --csi-address=/csi/csi.sock
+            - --http-endpoint=:8121
             - --leader-election=true
             - --kube-api-qps=50
             - --kube-api-burst=100
             - --worker-threads=32
             - --timeout=30s
+          ports:
+            - containerPort: 8121
+              name: bmcpfs-a-http
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz/leader-election
+              port: bmcpfs-a-http
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
           volumeMounts:
             - name: bmcpfs-provisioner-dir
               mountPath: /csi
@@ -421,6 +447,7 @@ spec:
             - --kube-api-qps=100
             - --kube-api-burst=200
             - --v=5
+            - --logging-format={{ .Values.logging.format }}
           resources:
             requests:
               cpu: 10m

deploy/charts/alibaba-cloud-csi-driver/templates/monitor.yaml

@@ -38,6 +38,10 @@ spec:
 {{- if and .Values.csi.local.enabled .Values.csi.local.controller.enabled }}
   - port: local-p-http
   - port: local-r-http
+{{- end }}
+{{- if and .Values.csi.bmcpfs.enabled .Values.csi.bmcpfs.controller.enabled }}
+  - port: bmcpfs-p-http
+  - port: bmcpfs-a-http
 {{- end }}
   selector:
     matchLabels: