CARRY: Use env variable 'NAMESPACE' for e2e tests

Author: ChristianZaccaria

test/util/e2e.go

@@ -23,6 +23,22 @@ import (
 	visibilityv1alpha1 "sigs.k8s.io/kueue/client-go/clientset/versioned/typed/visibility/v1alpha1"
 )
 
+const (
+	// The environment variable for namespace where Kueue is installed
+	namespaceEnvVar = "NAMESPACE"
+
+	// The namespace where kueue is installed in opendatahub
+	odhNamespace = "opendatahub"
+
+	// The namespace where kueue is installed in rhoai
+	rhoaiNamespace = "redhat-ods-applications"
+
+	// The default namespace where kueue is installed
+	kueueNamespace = "kueue-system"
+
+	undefinedNamespace = "undefined"
+)
+
 func CreateClientUsingCluster(kContext string) (client.WithWatch, *rest.Config) {
 	cfg, err := config.GetConfigWithContext(kContext)
 	if err != nil {
@@ -74,7 +90,7 @@ func waitForOperatorAvailability(ctx context.Context, k8sClient client.Client, k
 	pods := &corev1.PodList{}
 	gomega.EventuallyWithOffset(2, func(g gomega.Gomega) error {
 		g.Expect(k8sClient.Get(ctx, key, deployment)).To(gomega.Succeed())
-		g.Expect(k8sClient.List(ctx, pods, client.InNamespace(key.Namespace), client.MatchingLabels(deployment.Spec.Selector.MatchLabels))).To(gomega.Succeed())
+		g.Expect(k8sClient.List(ctx, pods, client.InNamespace(GetNamespace()), client.MatchingLabels(deployment.Spec.Selector.MatchLabels))).To(gomega.Succeed())
 		for _, pod := range pods.Items {
 			for _, cs := range pod.Status.ContainerStatuses {
 				// To make sure that we don't have restarts of controller-manager.
@@ -95,11 +111,31 @@ func waitForOperatorAvailability(ctx context.Context, k8sClient client.Client, k
 }
 
 func WaitForKueueAvailability(ctx context.Context, k8sClient client.Client) {
-	kcmKey := types.NamespacedName{Namespace: "kueue-system", Name: "kueue-controller-manager"}
+	kcmKey := types.NamespacedName{Namespace: GetNamespace(), Name: "kueue-controller-manager"}
 	waitForOperatorAvailability(ctx, k8sClient, kcmKey)
 }
 
 func WaitForJobSetAvailability(ctx context.Context, k8sClient client.Client) {
 	kcmKey := types.NamespacedName{Namespace: "jobset-system", Name: "jobset-controller-manager"}
 	waitForOperatorAvailability(ctx, k8sClient, kcmKey)
 }
+
+func GetNamespace() string {
+	namespace, ok := os.LookupEnv(namespaceEnvVar)
+	if !ok {
+		fmt.Printf("Expected environment variable %s is unset, please use this environment variable to specify in which namespace Kueue is installed", namespaceEnvVar)
+		os.Exit(1)
+	}
+	switch namespace {
+	case "opendatahub":
+		return odhNamespace
+	case "redhat-ods-applications":
+		return rhoaiNamespace
+	case "kueue-system":
+		return kueueNamespace
+	default:
+		fmt.Printf("Expected environment variable %s contains an incorrect value", namespaceEnvVar)
+		os.Exit(1)
+		return undefinedNamespace
+	}
+}