disable clusterrole

Hyperfoil · Sep 9, 2023 · df6557e · df6557e
1 parent 70b892e
commit df6557e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -94,6 +94,7 @@ rules:
 - apiGroups:
   - security.openshift.io
   resourceNames:
+  - anyuid
   - nonroot
   resources:
   - securitycontextconstraints

diff --git a/controllers/app.go b/controllers/app.go
@@ -4,7 +4,7 @@ import (
 	hyperfoilv1alpha1 "github.com/Hyperfoil/horreum-operator/api/v1alpha1"
 	routev1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
+	// rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -266,29 +266,29 @@ func appServiceAccount(cr *hyperfoilv1alpha1.Horreum) *corev1.ServiceAccount {
 	}
 }
 
-func appClusterRole(cr *hyperfoilv1alpha1.Horreum) *rbacv1.ClusterRole {
-	return &rbacv1.ClusterRole{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "horreum-init-cluster-role",
-		},
-		Rules: []rbacv1.PolicyRule{
-			{
-				APIGroups: []string{
-					"security.openshift.io",
-				},
-				ResourceNames: []string{
-					"anyuid",
-				},
-				Resources: []string{
-					"securitycontextconstraints",
-				},
-				Verbs: []string{
-					"use",
-				},
-			},
-		},
-	}
-}
+// func appClusterRole(cr *hyperfoilv1alpha1.Horreum) *rbacv1.ClusterRole {
+// 	return &rbacv1.ClusterRole{
+// 		ObjectMeta: metav1.ObjectMeta{
+// 			Name:      "horreum-init-cluster-role",
+// 		},
+// 		Rules: []rbacv1.PolicyRule{
+// 			{
+// 				APIGroups: []string{
+// 					"security.openshift.io",
+// 				},
+// 				ResourceNames: []string{
+// 					"anyuid",
+// 				},
+// 				Resources: []string{
+// 					"securitycontextconstraints",
+// 				},
+// 				Verbs: []string{
+// 					"use",
+// 				},
+// 			},
+// 		},
+// 	}
+// }
 
 // func appClusterRoleBinding(cr *hyperfoilv1alpha1.Horreum) *rbacv1.ClusterRoleBinding {
 // 	return &rbacv1.ClusterRoleBinding{

diff --git a/controllers/horreum_controller.go b/controllers/horreum_controller.go
@@ -34,7 +34,7 @@ import (
 
 	routev1 "github.com/openshift/api/route/v1"
 	corev1 "k8s.io/api/core/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
+	// rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -298,10 +298,10 @@ func (r *HorreumReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 	if err := ensureSame(r, cr, logger, appServiceAccount, &corev1.ServiceAccount{}, nocompare, nocheck); err != nil {
 		return reconcile.Result{}, err
 	}
-	appClusterRole := appClusterRole(cr)
-	if err := ensureSame(r, cr, logger, appClusterRole, &rbacv1.ClusterRole{}, nocompare, nocheck); err != nil {
-		return reconcile.Result{}, err
-	}
+	// appClusterRole := appClusterRole(cr)
+	// if err := ensureSame(r, cr, logger, appClusterRole, &rbacv1.ClusterRole{}, nocompare, nocheck); err != nil {
+	// 	return reconcile.Result{}, err
+	// }
 	// appClusterRoleBinding := appClusterRoleBinding(cr)
 	// if err := ensureSame(r, cr, logger, appClusterRoleBinding, &rbacv1.ClusterRoleBinding{}, nocompare, nocheck); err != nil {
 	// 	return reconcile.Result{}, err