From 4ceef157aeb94f2cf69aba0194df10902dae1901 Mon Sep 17 00:00:00 2001 From: ChristianZaccaria Date: Tue, 14 Nov 2023 09:42:37 +0000 Subject: [PATCH] Add CR and CRBs to TestMCADRay test for CI testing --- tests/integration/mcad_ray_test.go | 74 +++++++++++++++++++++++++- tests/integration/pytorch_mcad_test.go | 2 +- tests/integration/support/rbac.go | 4 +- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/tests/integration/mcad_ray_test.go b/tests/integration/mcad_ray_test.go index 9b48a305..f8bdb747 100644 --- a/tests/integration/mcad_ray_test.go +++ b/tests/integration/mcad_ray_test.go @@ -77,7 +77,19 @@ func TestMCADRay(t *testing.T) { Resources: []string{"routes"}, }, } - token := support.CreateTestRBAC(test, namespace, policyRules) + // Create cluster wide RBAC, required for SDK OpenShift check + // TODO reevaluate once SDK change OpenShift detection logic + clusterPolicyRules := []rbacv1.PolicyRule{ + { + Verbs: []string{"get", "list"}, + APIGroups: []string{"config.openshift.io"}, + Resources: []string{"ingresses"}, + ResourceNames: []string{"cluster"}, + }, + } + token, sa := support.CreateTestRBAC(test, namespace, policyRules) + clusterRole := CreateClusterRole(test, clusterPolicyRules) + CreateClusterRoleBinding(test, sa, clusterRole) // Create Notebook CR support.CreateNotebook(test, namespace, token, config.Name, jupyterNotebookConfigMapFileName) @@ -96,3 +108,63 @@ func TestMCADRay(t *testing.T) { test.Eventually(cfosupport.AppWrappers(test, namespace), cfosupport.TestTimeoutLong). Should(HaveLen(0)) } + +func CreateClusterRoleBinding(t cfosupport.Test, serviceAccount *corev1.ServiceAccount, role *rbacv1.ClusterRole) *rbacv1.ClusterRoleBinding { + t.T().Helper() + + roleBinding := &rbacv1.ClusterRoleBinding{ + TypeMeta: metav1.TypeMeta{ + APIVersion: rbacv1.SchemeGroupVersion.String(), + Kind: "ClusterRoleBinding", + }, + ObjectMeta: metav1.ObjectMeta{ + GenerateName: "crb-", + }, + RoleRef: rbacv1.RoleRef{ + APIGroup: rbacv1.SchemeGroupVersion.Group, + Kind: "ClusterRole", + Name: role.Name, + }, + Subjects: []rbacv1.Subject{ + { + Kind: "ServiceAccount", + APIGroup: corev1.SchemeGroupVersion.Group, + Name: serviceAccount.Name, + Namespace: serviceAccount.Namespace, + }, + }, + } + rb, err := t.Client().Core().RbacV1().ClusterRoleBindings().Create(t.Ctx(), roleBinding, metav1.CreateOptions{}) + t.Expect(err).NotTo(HaveOccurred()) + t.T().Logf("Created ClusterRoleBinding %s/%s successfully", role.Namespace, role.Name) + + t.T().Cleanup(func() { + t.Client().Core().RbacV1().ClusterRoleBindings().Delete(t.Ctx(), rb.Name, metav1.DeleteOptions{}) + }) + + return rb +} + +func CreateClusterRole(t cfosupport.Test, policyRules []rbacv1.PolicyRule) *rbacv1.ClusterRole { + t.T().Helper() + + role := &rbacv1.ClusterRole{ + TypeMeta: metav1.TypeMeta{ + APIVersion: rbacv1.SchemeGroupVersion.String(), + Kind: "ClusterRole", + }, + ObjectMeta: metav1.ObjectMeta{ + GenerateName: "clusterrole-", + }, + Rules: policyRules, + } + role, err := t.Client().Core().RbacV1().ClusterRoles().Create(t.Ctx(), role, metav1.CreateOptions{}) + t.Expect(err).NotTo(HaveOccurred()) + t.T().Logf("Created ClusterRole %s/%s successfully", role.Namespace, role.Name) + + t.T().Cleanup(func() { + t.Client().Core().RbacV1().ClusterRoles().Delete(t.Ctx(), role.Name, metav1.DeleteOptions{}) + }) + + return role +} diff --git a/tests/integration/pytorch_mcad_test.go b/tests/integration/pytorch_mcad_test.go index f4858fb5..65875d9a 100644 --- a/tests/integration/pytorch_mcad_test.go +++ b/tests/integration/pytorch_mcad_test.go @@ -70,7 +70,7 @@ func TestMnistPyTorchMCAD(t *testing.T) { Resources: []string{"pods/log"}, }, } - token := support.CreateTestRBAC(test, namespace, policyRules) + token, _ := support.CreateTestRBAC(test, namespace, policyRules) // Create Notebook CR support.CreateNotebook(test, namespace, token, config.Name, jupyterNotebookConfigMapFileName) diff --git a/tests/integration/support/rbac.go b/tests/integration/support/rbac.go index 8bcabead..aad01eda 100644 --- a/tests/integration/support/rbac.go +++ b/tests/integration/support/rbac.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func CreateTestRBAC(test cfosupport.Test, namespace *corev1.Namespace, policyRules []rbacv1.PolicyRule) (token string) { +func CreateTestRBAC(test cfosupport.Test, namespace *corev1.Namespace, policyRules []rbacv1.PolicyRule) (token string, sa *corev1.ServiceAccount) { test.T().Helper() serviceAccount := &corev1.ServiceAccount{ @@ -88,5 +88,5 @@ func CreateTestRBAC(test cfosupport.Test, namespace *corev1.Namespace, policyRul } treq, err = test.Client().Core().CoreV1().ServiceAccounts(namespace.Name).CreateToken(test.Ctx(), "odh-dw-test-user", treq, metav1.CreateOptions{}) test.Expect(err).NotTo(gomega.HaveOccurred()) - return treq.Status.Token + return treq.Status.Token, serviceAccount }