Merge pull request #176 from vshn/controller/fix_missing_rbac

Fix controller not having enough RBAC
vshn · Jun 5, 2024 · b883245 · b883245
2 parents b3b9c6b + ad9cfb5
commit b883245
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/apis/minio/v1/bucket_types.go b/apis/minio/v1/bucket_types.go
@@ -48,6 +48,7 @@ type Bucket struct {
 
 type BucketSpec struct {
 	xpv1.ResourceSpec `json:",inline"`
+	ProviderReference *xpv1.Reference  `json:"providerReference,omitempty"`
 	ForProvider       BucketParameters `json:"forProvider,omitempty"`
 }
 

diff --git a/apis/minio/v1/policy_types.go b/apis/minio/v1/policy_types.go
@@ -31,7 +31,9 @@ type Policy struct {
 
 type PolicySpec struct {
 	xpv1.ResourceSpec `json:",inline"`
-	ForProvider       PolicyParameters `json:"forProvider,omitempty"`
+	ProviderReference *xpv1.Reference `json:"providerReference,omitempty"`
+
+	ForProvider PolicyParameters `json:"forProvider,omitempty"`
 }
 
 type PolicyStatus struct {

diff --git a/apis/minio/v1/user_types.go b/apis/minio/v1/user_types.go
@@ -32,7 +32,9 @@ type User struct {
 
 type UserSpec struct {
 	xpv1.ResourceSpec `json:",inline"`
-	ForProvider       UserParameters `json:"forProvider,omitempty"`
+	ProviderReference *xpv1.Reference `json:"providerReference,omitempty"`
+
+	ForProvider UserParameters `json:"forProvider,omitempty"`
 }
 
 type UserStatus struct {

diff --git a/apis/minio/v1/zz_generated.deepcopy.go b/apis/minio/v1/zz_generated.deepcopy.go
diff --git a/config/controller/cluster-role.yaml b/config/controller/cluster-role.yaml
@@ -62,6 +62,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - vshn.appcat.vshn.io
+  resources:
+  - xvshnpostgresqls/finalizers
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - vshn.appcat.vshn.io
   resources:

diff --git a/pkg/controller/postgres/reconciler.go b/pkg/controller/postgres/reconciler.go
@@ -19,6 +19,9 @@ import (
 
 //+kubebuilder:rbac:groups=kubernetes.crossplane.io,resources=objects,verbs=delete
 
+// To run on newer OpenShift version, this RBAC permission is necessary.
+//+kubebuilder:rbac:groups=vshn.appcat.vshn.io,resources=xvshnpostgresqls/finalizers,verbs=get;list;patch;update;watch;create
+
 type XPostgreSQLReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme