Merge pull request #433 from andyzhangx/cleanup-yaml

chore: cleanup yaml config

Author: andyzhangx

charts/README.md

@@ -51,10 +51,10 @@ The following table lists the configurable parameters of the latest Azure Blob S
 | `image.csiProvisioner.tag`                            | csi-provisioner docker image tag                      | v2.1.0                                                         |
 | `image.csiProvisioner.pullPolicy`                     | csi-provisioner image pull policy                     | IfNotPresent                                                   |
 | `image.livenessProbe.repository`                      | liveness-probe docker image                           | mcr.microsoft.com/oss/kubernetes-csi/livenessprobe             |
-| `image.livenessProbe.tag`                             | liveness-probe docker image tag                       | v2.2.0                                                         |
+| `image.livenessProbe.tag`                             | liveness-probe docker image tag                       | v2.3.0                                                         |
 | `image.livenessProbe.pullPolicy`                      | liveness-probe image pull policy                      | IfNotPresent                                                   |
 | `image.nodeDriverRegistrar.repository`                | csi-node-driver-registrar docker image                | mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar |
-| `image.nodeDriverRegistrar.tag`                       | csi-node-driver-registrar docker image tag            | v2.0.1                                                         |
+| `image.nodeDriverRegistrar.tag`                       | csi-node-driver-registrar docker image tag            | v2.2.0                                                       |
 | `image.nodeDriverRegistrar.pullPolicy`                | csi-node-driver-registrar image pull policy           | IfNotPresent                                                   |
 | `image.csiResizer.repository`                         | csi-resizer docker image                              | mcr.microsoft.com/oss/kubernetes-csi/csi-resizer               |
 | `image.csiResizer.tag`                                | csi-resizer docker image tag                          | v1.1.0                                                         |

charts/latest/blob-csi-driver-v1.2.0.tgz

@@ -81,85 +81,6 @@ roleRef:
   name: blob-external-resizer-role
   apiGroup: rbac.authorization.k8s.io
 
----
-
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: blob-external-attacher-role
-{{ include "blob.labels" . | indent 2 }}
-rules:
-  - apiGroups: [""]
-    resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["csi.storage.k8s.io"]
-    resources: ["csinodeinfos"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "update", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
-
----
-
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: blob-external-snapshotter-role
-{{ include "blob.labels" . | indent 2 }}
-rules:
-  - apiGroups: [""]
-    resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["persistentvolumeclaims"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["storageclasses"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshotclasses"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshots"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["apiextensions.k8s.io"]
-    resources: ["customresourcedefinitions"]
-    verbs: ["create", "list", "watch", "delete"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
-
----
-
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: blob-csi-snapshotter-binding
-{{ include "blob.labels" . | indent 2 }}
-subjects:
-  - kind: ServiceAccount
-    name: csi-blob-controller-sa
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: ClusterRole
-  name: blob-external-snapshotter-role
-  apiGroup: rbac.authorization.k8s.io
-
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1

charts/latest/blob-csi-driver/templates/rbac-csi-blob-controller.yaml

@@ -9,11 +9,11 @@ image:
     pullPolicy: IfNotPresent
   livenessProbe:
     repository: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe
-    tag: v2.2.0
+    tag: v2.3.0
     pullPolicy: IfNotPresent
   nodeDriverRegistrar:
     repository: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar
-    tag: v2.1.0
+    tag: v2.2.0
     pullPolicy: IfNotPresent
   csiResizer:
     repository: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer

charts/latest/blob-csi-driver/values.yaml

@@ -50,7 +50,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: liveness-probe
-          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.2.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.3.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s

deploy/csi-blob-controller.yaml

@@ -35,7 +35,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.2.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.3.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -49,7 +49,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-          image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.1.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.2.0
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

deploy/csi-blob-node.yaml

@@ -46,84 +46,44 @@ roleRef:
   kind: ClusterRole
   name: blob-external-provisioner-role
   apiGroup: rbac.authorization.k8s.io
-
 ---
 
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blob-external-attacher-role
+  name: blob-external-resizer-role
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: [""]
-    resources: ["nodes"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["csi.storage.k8s.io"]
-    resources: ["csinodeinfos"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["volumeattachments"]
     verbs: ["get", "list", "watch", "update", "patch"]
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "list", "watch", "create", "update", "patch"]
-
----
-
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: blob-external-snapshotter-role
-rules:
-  - apiGroups: [""]
-    resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["storage.k8s.io"]
-    resources: ["storageclasses"]
-    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims/status"]
+    verbs: ["update", "patch"]
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshotclasses"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
-  - apiGroups: ["snapshot.storage.k8s.io"]
-    resources: ["volumesnapshots"]
-    verbs: ["get", "list", "watch", "update"]
-  - apiGroups: ["apiextensions.k8s.io"]
-    resources: ["customresourcedefinitions"]
-    verbs: ["create", "list", "watch", "delete"]
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]
-
 ---
 
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: blob-csi-snapshotter-binding
+  name: blob-csi-resizer-role
 subjects:
   - kind: ServiceAccount
     name: csi-blob-controller-sa
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: blob-external-snapshotter-role
+  name: blob-external-resizer-role
   apiGroup: rbac.authorization.k8s.io
-
 ---
+
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata: