resolve conflict

cybozu-go · Sep 11, 2024 · 0ae375e · 0ae375e
1 parent 652434e
commit 0ae375e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 120 deletions.
diff --git a/charts/moco/templates/generated/generated.yaml b/charts/moco/templates/generated/generated.yaml
@@ -128,6 +128,7 @@ rules:
       - ""
     resources:
       - configmaps/status
+      - pods/status
       - secrets/status
       - serviceaccounts/status
       - services/status
@@ -152,66 +153,6 @@ rules:
       - patch
       - update
       - watch
-  - apiGroups:
-      - ""
-    resources:
-      - pods/status
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - secrets/status
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - serviceaccounts
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - serviceaccounts/status
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - services/status
-    verbs:
-      - get
   - apiGroups:
       - apps
     resources:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -23,6 +23,7 @@ rules:
   - ""
   resources:
   - configmaps/status
+  - pods/status
   - secrets/status
   - serviceaccounts/status
   - services/status
@@ -47,66 +48,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods/status
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - secrets/status
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts/status
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - services/status
-  verbs:
-  - get
 - apiGroups:
   - apps
   resources:

diff --git a/controllers/mysqlcluster_controller_test.go b/controllers/mysqlcluster_controller_test.go
@@ -117,6 +117,7 @@ var _ = Describe("MySQLCluster reconciler", func() {
 			},
 		})
 		Expect(err).ToNot(HaveOccurred())
+
 		mockMgr = &mockManager{
 			clusters: make(map[string]struct{}),
 		}