Merge pull request #172 from wnxn/master

Update aggregation rule
yunify · May 18, 2020 · 8b80908 · 8b80908
2 parents 8366ba6 + 8a4cc3e
commit 8b80908
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@
 .PHONY: all disk
 
 DISK_IMAGE_NAME=csiplugin/csi-qingcloud
-DISK_VERSION=v1.2.0-rc.1
+DISK_VERSION=v1.2.0-rc.2
 ROOT_PATH=$(pwd)
 PACKAGE_LIST=./cmd/... ./pkg/...
 

diff --git a/cmd/disk/main.go b/cmd/disk/main.go
@@ -29,7 +29,7 @@ import (
 )
 
 const (
-	version              = "v1.1.0"
+	version              = "v1.2.0"
 	defaultProvisionName = "disk.csi.qingcloud.com"
 	defaultConfigPath    = "/etc/config/config.yaml"
 )

diff --git a/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.16.yaml b/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.16.yaml
@@ -132,12 +132,9 @@ aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
         app: csi-qingcloud
-    - matchLabels:
-        role: controller
-    - matchLabels:
-        csi: v1.2.0
-    - matchLabels:
         owner: yunify
+        role: controller
+        ver: v1.2.0
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -537,7 +534,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock
-          image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+          image: csiplugin/csi-qingcloud:v1.2.0-rc.2
           imagePullPolicy: Always
           name: csi-qingcloud
           resources:
@@ -628,7 +625,7 @@ spec:
                   fieldPath: spec.nodeName
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock
-          image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+          image: csiplugin/csi-qingcloud:v1.2.0-rc.2
           imagePullPolicy: Always
           name: csi-qingcloud
           resources:

diff --git a/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.17.yaml b/deploy/disk/kubernetes/releases/qingcloud-csi-disk-v1.17.yaml
@@ -151,27 +151,6 @@ rules:
   - update
   - patch
 ---
-aggregationRule:
-  clusterRoleSelectors:
-  - matchLabels:
-      app: csi-qingcloud
-  - matchLabels:
-      role: controller
-  - matchLabels:
-      csi: v1.2.0
-  - matchLabels:
-      owner: yunify
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app: csi-qingcloud
-    owner: yunify
-    role: controller
-    ver: v1.2.0
-  name: csi-qingcloud-controller
-rules: []
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -440,6 +419,24 @@ subjects:
   name: csi-snapshotter
   namespace: kube-system
 ---
+aggregationRule:
+  clusterRoleSelectors:
+    - matchLabels:
+        app: csi-qingcloud
+        owner: yunify
+        role: controller
+        ver: v1.2.0
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app: csi-qingcloud
+    owner: yunify
+    role: controller
+    ver: v1.2.0
+  name: csi-qingcloud-controller
+rules: []
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -648,7 +645,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
-        image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+        image: csiplugin/csi-qingcloud:v1.2.0-rc.2
         imagePullPolicy: Always
         name: csi-qingcloud
         resources:
@@ -739,7 +736,7 @@ spec:
               fieldPath: spec.nodeName
         - name: CSI_ENDPOINT
           value: unix://csi/csi.sock
-        image: csiplugin/csi-qingcloud:v1.2.0-rc.1
+        image: csiplugin/csi-qingcloud:v1.2.0-rc.2
         imagePullPolicy: Always
         name: csi-qingcloud
         resources: