Add RBAC annotations to Barbican controller

This patch adds the missing RBAC annotations to the Barbican controller, and also updates the role.yaml file to use the file generated by make manifests.
openstack-k8s-operators · Nov 9, 2023 · 8caeec2 · 8caeec2
1 parent ae45893
commit 8caeec2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -56,7 +56,7 @@ rules:
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicans
+  - barbicankeystonelisteners
   verbs:
   - create
   - delete
@@ -68,21 +68,21 @@ rules:
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicans/finalizers
+  - barbicankeystonelisteners/finalizers
   verbs:
   - update
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicans/status
+  - barbicankeystonelisteners/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicanworkers
+  - barbicans
   verbs:
   - create
   - delete
@@ -94,21 +94,21 @@ rules:
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicanworkers/finalizers
+  - barbicans/finalizers
   verbs:
   - update
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicanworkers/status
+  - barbicans/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicankeystonelisteners
+  - barbicanworkers
   verbs:
   - create
   - delete
@@ -120,13 +120,13 @@ rules:
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicankeystonelisteners/finalizers
+  - barbicanworkers/finalizers
   verbs:
   - update
 - apiGroups:
   - barbican.openstack.org
   resources:
-  - barbicankeystonelisteners/status
+  - barbicanworkers/status
   verbs:
   - get
   - patch

diff --git a/controllers/barbican_controller.go b/controllers/barbican_controller.go
@@ -65,6 +65,15 @@ type BarbicanReconciler struct {
 //+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicans,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicans/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicans/finalizers,verbs=update
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanapis,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanapis/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanapis/finalizers,verbs=update
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanworkers,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanworkers/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicanworkers/finalizers,verbs=update
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicankeystonelisteners,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicankeystonelisteners/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=barbican.openstack.org,resources=barbicankeystonelisteners/finalizers,verbs=update
 //+kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete;
 //+kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete;
 //+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete;