Merge pull request #157 from jabdoa2/rbac_and_kubebuilder_annotations

fix kubebuilder annotations and regenerate RBACs
wave-k8s · May 2, 2024 · f5ef0e1 · f5ef0e1
2 parents 9cd6cbb + e17d4d9
commit f5ef0e1
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 169 deletions.
diff --git a/config/rbac/manager_role.yaml b/config/rbac/manager_role.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -0,0 +1,58 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: manager-role
+rules:
+- resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- resources:
+  - events
+  verbs:
+  - create
+  - patch
+  - update
+- resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
diff --git a/pkg/controller/daemonset/daemonset_controller.go b/pkg/controller/daemonset/daemonset_controller.go
@@ -31,6 +31,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
+// +kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
+
 // Add creates a new DaemonSet Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
@@ -84,10 +89,6 @@ type ReconcileDaemonSet struct {
 
 // Reconcile reads that state of the cluster for a DaemonSet object and
 // updates its PodSpec based on mounted configuration
-// +kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
 func (r *ReconcileDaemonSet) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 	// Fetch the DaemonSet instance
 	instance := &appsv1.DaemonSet{}

diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go
@@ -31,6 +31,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
+// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
+
 // Add creates a new Deployment Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
@@ -85,10 +90,6 @@ type ReconcileDeployment struct {
 
 // Reconcile reads that state of the cluster for a Deployment object and
 // updates its PodSpec based on mounted configuration
-// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
 func (r *ReconcileDeployment) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 	// Fetch the Deployment instance
 	instance := &appsv1.Deployment{}

diff --git a/pkg/controller/statefulset/statefulset_controller.go b/pkg/controller/statefulset/statefulset_controller.go
@@ -31,6 +31,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
+// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
+// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
+
 // Add creates a new StatefulSet Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
@@ -85,10 +90,6 @@ type ReconcileStatefulSet struct {
 
 // Reconcile reads that state of the cluster for a StatefulSet object and
 // updates its PodSpec based on mounted configuration
-// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=configmaps,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=secrets,verbs=get;list;watch;update;patch
-// +kubebuilder:rbac:groups=,resources=events,verbs=create;update;patch
 func (r *ReconcileStatefulSet) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 	// Fetch the StatefulSet instance
 	instance := &appsv1.StatefulSet{}