Stop creating rolebinding

Signed-off-by: Anish Asthana <anishasthana1@gmail.com>

Author: anishasthana

controllers/mcad_controller_test.go

@@ -12,7 +12,6 @@ import (
 const (
 	mcadCRCase1         = "./testdata/mcad_test_cases/case_1.yaml"
 	mcadConfigMap1      = "./testdata/mcad_test_results/case_1/configmap.yaml"
-	mcadRolebinding1    = "./testdata/mcad_test_results/case_1/rolebinding.yaml"
 	mcadService1        = "./testdata/mcad_test_results/case_1/service.yaml"
 	mcadServiceAccount1 = "./testdata/mcad_test_results/case_1/serviceaccount.yaml"
 )
@@ -34,7 +33,6 @@ var _ = Describe("The MCAD Controller", func() {
 		It("It should create a configmap", func() {
 			deployMCAD(ctx, mcadCRCase1, opts)
 			compareConfigMaps(mcadConfigMap1, opts)
-			compareRoleBindings(mcadRolebinding1, opts)
 			compareServiceAccounts(mcadServiceAccount1, opts)
 			compareServices(mcadService1, opts)
 		})

controllers/multi_cluster_app_dispatcher.go

@@ -10,7 +10,6 @@ var multiClusterAppDispatcherTemplates = []string{
 	"mcad/configmap.yaml.tmpl",
 	"mcad/service.yaml.tmpl",
 	"mcad/serviceaccount.yaml.tmpl",
-	"mcad/rolebinding_custom-metrics-auth-reader.yaml.tmpl", //Confirm is this rolebinding is actually required by MCAD
 }
 
 func (r *MCADReconciler) ReconcileMCAD(ctx context.Context, mcad *codeflarev1alpha1.MCAD, req ctrl.Request, params *MCADParams) error {

controllers/suite_test.go

@@ -21,7 +21,6 @@ import (
 	"github.com/project-codeflare/codeflare-operator/controllers/util"
 	"go.uber.org/zap/zapcore"
 	corev1 "k8s.io/api/core/v1"
-	k8srbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"path/filepath"
 	"testing"
@@ -173,19 +172,19 @@ func compareConfigMaps(path string, opts mf.Option) {
 	Expect(util.ConfigMapsAreEqual(*expectedConfigMap, *actualConfigMap)).Should(BeTrue())
 }
 
-func compareRoleBindings(path string, opts mf.Option) {
-	expectedRB := &k8srbacv1.RoleBinding{}
-	Expect(convertToStructuredResource(path, expectedRB, opts)).NotTo(HaveOccurred())
-	expectedRB.Subjects[0].Namespace = workingNamespace
-
-	actualRB := &k8srbacv1.RoleBinding{}
-	Eventually(func() error {
-		namespacedNamed := types.NamespacedName{Name: expectedRB.Name, Namespace: workingNamespace}
-		return k8sClient.Get(ctx, namespacedNamed, actualRB)
-	}, timeout, interval).ShouldNot(HaveOccurred())
-
-	Expect(util.RoleBindingsAreEqual(*expectedRB, *actualRB)).Should(BeTrue())
-}
+//func compareRoleBindings(path string, opts mf.Option) {
+//	expectedRB := &k8srbacv1.RoleBinding{}
+//	Expect(convertToStructuredResource(path, expectedRB, opts)).NotTo(HaveOccurred())
+//	expectedRB.Subjects[0].Namespace = workingNamespace
+//
+//	actualRB := &k8srbacv1.RoleBinding{}
+//	Eventually(func() error {
+//		namespacedNamed := types.NamespacedName{Name: expectedRB.Name, Namespace: workingNamespace}
+//		return k8sClient.Get(ctx, namespacedNamed, actualRB)
+//	}, timeout, interval).ShouldNot(HaveOccurred())
+//
+//	Expect(util.RoleBindingsAreEqual(*expectedRB, *actualRB)).Should(BeTrue())
+//}
 
 func compareServiceAccounts(path string, opts mf.Option) {
 	expectedSA := &corev1.ServiceAccount{}

controllers/util/util.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	k8srbacv1 "k8s.io/api/rbac/v1"
 	"reflect"
 )
 
@@ -25,22 +24,22 @@ func ConfigMapsAreEqual(expected corev1.ConfigMap, actual corev1.ConfigMap) bool
 	return true
 }
 
-func RoleBindingsAreEqual(rb1 k8srbacv1.RoleBinding, rb2 k8srbacv1.RoleBinding) bool {
-
-	if !reflect.DeepEqual(rb1.ObjectMeta.Labels, rb2.ObjectMeta.Labels) {
-		notEqualMsg("Rolebinding labels")
-		return false
-	}
-	if !reflect.DeepEqual(rb1.Subjects, rb2.Subjects) {
-		notEqualMsg("Rolebinding subjects")
-		return false
-	}
-	if !reflect.DeepEqual(rb1.RoleRef, rb2.RoleRef) {
-		notEqualMsg("Rolebinding role references")
-		return false
-	}
-	return true
-}
+//func RoleBindingsAreEqual(rb1 k8srbacv1.RoleBinding, rb2 k8srbacv1.RoleBinding) bool {
+//
+//	if !reflect.DeepEqual(rb1.ObjectMeta.Labels, rb2.ObjectMeta.Labels) {
+//		notEqualMsg("Rolebinding labels")
+//		return false
+//	}
+//	if !reflect.DeepEqual(rb1.Subjects, rb2.Subjects) {
+//		notEqualMsg("Rolebinding subjects")
+//		return false
+//	}
+//	if !reflect.DeepEqual(rb1.RoleRef, rb2.RoleRef) {
+//		notEqualMsg("Rolebinding role references")
+//		return false
+//	}
+//	return true
+//}
 
 func ServiceAccountsAreEqual(sa1 corev1.ServiceAccount, sa2 corev1.ServiceAccount) bool {
 	if !reflect.DeepEqual(sa1.ObjectMeta.Labels, sa2.ObjectMeta.Labels) {