refactor ovn clusterrole

Signed-off-by: 马洪贞 <hzma@alauda.io>
kubeovn · Feb 22, 2024 · bb622eb · bb622eb
1 parent d631f9d
commit bb622eb
Show file tree

Hide file tree

Showing 3 changed files with 165 additions and 54 deletions.
diff --git a/charts/kube-ovn/templates/ovn-CR.yaml b/charts/kube-ovn/templates/ovn-CR.yaml
@@ -54,60 +54,99 @@ rules:
       - ""
     resources:
       - pods
-      - pods/exec
       - namespaces
-      - nodes
-      - configmaps
     verbs:
-      - create
       - get
       - list
+      - patch
       - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
       - patch
       - update
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - pods/exec
+    verbs:
+      - create
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:
       - network-attachment-definitions
     verbs:
       - get
   - apiGroups:
-      - ""
       - networking.k8s.io
-      - apps
     resources:
       - networkpolicies
-      - daemonsets
     verbs:
       - get
       - list
       - watch
   - apiGroups:
-      - ""
       - apps
     resources:
+      - daemonsets
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
       - services/status
     verbs:
+      - get
+      - list
       - update
+      - create
+      - delete
+      - watch
   - apiGroups:
       - ""
-      - networking.k8s.io
-      - apps
-      - extensions
     resources:
-      - services
       - endpoints
+    verbs:
+      - create
+      - update
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
       - statefulsets
-      - deployments
-      - deployments/scale
     verbs:
+      - get
+      - list
       - create
       - delete
       - update
-      - patch
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
+      - deployments/scale
+    verbs:
       - get
       - list
-      - watch
+      - create
+      - delete
+      - update
   - apiGroups:
       - ""
     resources:
@@ -222,8 +261,6 @@ rules:
       - get
       - list
   - apiGroups:
-      - ""
-      - networking.k8s.io
       - apps
     resources:
       - daemonsets

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2937,60 +2937,99 @@ rules:
       - ""
     resources:
       - pods
-      - pods/exec
       - namespaces
-      - nodes
-      - configmaps
     verbs:
-      - create
       - get
       - list
+      - patch
       - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
       - patch
       - update
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - pods/exec
+    verbs:
+      - create
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:
       - network-attachment-definitions
     verbs:
       - get
   - apiGroups:
-      - ""
       - networking.k8s.io
-      - apps
     resources:
       - networkpolicies
-      - daemonsets
     verbs:
       - get
       - list
       - watch
   - apiGroups:
-      - ""
       - apps
     resources:
+      - daemonsets
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
       - services/status
     verbs:
+      - get
+      - list
       - update
+      - create
+      - delete
+      - watch
   - apiGroups:
       - ""
-      - networking.k8s.io
-      - apps
-      - extensions
     resources:
-      - services
       - endpoints
+    verbs:
+      - create
+      - update
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
       - statefulsets
-      - deployments
-      - deployments/scale
     verbs:
+      - get
+      - list
       - create
       - delete
       - update
-      - patch
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
+      - deployments/scale
+    verbs:
       - get
       - list
-      - watch
+      - create
+      - delete
+      - update
   - apiGroups:
       - ""
     resources:
@@ -3115,8 +3154,6 @@ rules:
       - get
       - list
   - apiGroups:
-      - ""
-      - networking.k8s.io
       - apps
     resources:
       - daemonsets

diff --git a/yamls/sa.yaml b/yamls/sa.yaml
@@ -110,60 +110,99 @@ rules:
       - ""
     resources:
       - pods
-      - pods/exec
       - namespaces
-      - nodes
-      - configmaps
     verbs:
-      - create
       - get
       - list
+      - patch
       - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
       - patch
       - update
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+      - pods/exec
+    verbs:
+      - create
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:
       - network-attachment-definitions
     verbs:
       - get
   - apiGroups:
-      - ""
       - networking.k8s.io
-      - apps
     resources:
       - networkpolicies
-      - daemonsets
     verbs:
       - get
       - list
       - watch
   - apiGroups:
-      - ""
       - apps
     resources:
+      - daemonsets
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
       - services/status
     verbs:
+      - get
+      - list
       - update
+      - create
+      - delete
+      - watch
   - apiGroups:
       - ""
-      - networking.k8s.io
-      - apps
-      - extensions
     resources:
-      - services
       - endpoints
+    verbs:
+      - create
+      - update
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
       - statefulsets
-      - deployments
-      - deployments/scale
     verbs:
+      - get
+      - list
       - create
       - delete
       - update
-      - patch
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
+      - deployments/scale
+    verbs:
       - get
       - list
-      - watch
+      - create
+      - delete
+      - update
   - apiGroups:
       - ""
     resources:
@@ -284,8 +323,6 @@ rules:
       - get
       - list
   - apiGroups:
-      - ""
-      - networking.k8s.io
       - apps
     resources:
       - daemonsets