updates to files

Author: Fiona-Waters

support/client.go

@@ -26,13 +26,15 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 
 	imagev1 "github.com/openshift/client-go/image/clientset/versioned"
+	machinev1 "github.com/openshift/client-go/machine/clientset/versioned"
 	routev1 "github.com/openshift/client-go/route/clientset/versioned"
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
 )
 
 type Client interface {
 	Core() kubernetes.Interface
+	Machine() machinev1.Interface
 	Route() routev1.Interface
 	Image() imagev1.Interface
 	MCAD() mcadclient.Interface
@@ -42,6 +44,7 @@ type Client interface {
 
 type testClient struct {
 	core    kubernetes.Interface
+	machine machinev1.Interface
 	route   routev1.Interface
 	image   imagev1.Interface
 	mcad    mcadclient.Interface
@@ -55,6 +58,10 @@ func (t *testClient) Core() kubernetes.Interface {
 	return t.core
 }
 
+func (t *testClient) Machine() machinev1.Interface {
+	return t.machine
+}
+
 func (t *testClient) Route() routev1.Interface {
 	return t.route
 }
@@ -88,6 +95,11 @@ func newTestClient() (Client, error) {
 		return nil, err
 	}
 
+	machineClient, err := machinev1.NewForConfig(cfg)
+	if err != nil {
+		return nil, err
+	}
+
 	routeClient, err := routev1.NewForConfig(cfg)
 	if err != nil {
 		return nil, err
@@ -115,6 +127,7 @@ func newTestClient() (Client, error) {
 
 	return &testClient{
 		core:    kubeClient,
+		machine: machineClient,
 		route:   routeClient,
 		image:   imageClient,
 		mcad:    mcadClient,

support/environment.go

@@ -38,6 +38,18 @@ const (
 
 	// Cluster ID for OSD cluster used in tests, used for testing InstaScale
 	OsdClusterID = "CLUSTERID"
+
+	// Type of cluster test is run on
+	ClusterTypeEnvVar = "CLUSTER_TYPE"
+)
+
+type ClusterType string
+
+const (
+	OsdCluster        ClusterType = "OSD"
+	OcpCluster        ClusterType = "OCP"
+	HypershiftCluster ClusterType = "HYPERSHIFT"
+	UndefinedCluster  ClusterType = "UNDEFINED"
 )
 
 func GetCodeFlareSDKVersion() string {
@@ -65,12 +77,23 @@ func GetOsdClusterId() (string, bool) {
 	return os.LookupEnv(OsdClusterID)
 }
 
-func IsOsd() bool {
-	osdClusterId, found := GetOsdClusterId()
-	if found && osdClusterId != "" {
-		return true
+func GetClusterType(t Test) ClusterType {
+	clusterType, ok := os.LookupEnv(ClusterTypeEnvVar)
+	if !ok {
+		t.T().Logf("Expected environment variable %s not found, cluster type is not defined.", ClusterTypeEnvVar)
+		return UndefinedCluster
+	}
+	switch clusterType {
+	case "OSD":
+		return OsdCluster
+	case "OCP":
+		return OcpCluster
+	case "HYPERSHIFT":
+		return HypershiftCluster
+	default:
+		t.T().Logf("Expected environment variable %s contains unexpected value: '%s'", ClusterTypeEnvVar, clusterType)
+		return UndefinedCluster
 	}
-	return false
 }
 
 func lookupEnvOrDefault(key, value string) string {

support/ray.go

@@ -18,28 +18,27 @@ package support
 
 import (
 	"github.com/onsi/gomega"
-	v1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
-	rayv1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
+	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const RayJobDefaultClusterSelectorKey = "ray.io/cluster"
 
-func RayJob(t Test, namespace, name string) func(g gomega.Gomega) *v1.RayJob {
-	return func(g gomega.Gomega) *v1.RayJob {
+func RayJob(t Test, namespace, name string) func(g gomega.Gomega) *rayv1.RayJob {
+	return func(g gomega.Gomega) *rayv1.RayJob {
 		job, err := t.Client().Ray().RayV1().RayJobs(namespace).Get(t.Ctx(), name, metav1.GetOptions{})
 		g.Expect(err).NotTo(gomega.HaveOccurred())
 		return job
 	}
 }
 
-func GetRayJob(t Test, namespace, name string) *v1.RayJob {
+func GetRayJob(t Test, namespace, name string) *rayv1.RayJob {
 	t.T().Helper()
 	return RayJob(t, namespace, name)(t)
 }
 
-func RayJobStatus(job *rayv1alpha1.RayJob) rayv1alpha1.JobStatus {
+func RayJobStatus(job *rayv1.RayJob) rayv1.JobStatus {
 	return job.Status.JobStatus
 }
 
@@ -49,20 +48,20 @@ func GetRayJobId(t Test, namespace, name string) string {
 	return job.Status.JobId
 }
 
-func RayCluster(t Test, namespace, name string) func(g gomega.Gomega) *v1.RayCluster {
-	return func(g gomega.Gomega) *v1.RayCluster {
+func RayCluster(t Test, namespace, name string) func(g gomega.Gomega) *rayv1.RayCluster {
+	return func(g gomega.Gomega) *rayv1.RayCluster {
 		cluster, err := t.Client().Ray().RayV1().RayClusters(namespace).Get(t.Ctx(), name, metav1.GetOptions{})
 		g.Expect(err).NotTo(gomega.HaveOccurred())
 		return cluster
 	}
 }
 
-func GetRayCluster(t Test, namespace, name string) *v1.RayCluster {
+func GetRayCluster(t Test, namespace, name string) *rayv1.RayCluster {
 	t.T().Helper()
 	return RayCluster(t, namespace, name)(t)
 }
 
-func RayClusterState(cluster *rayv1alpha1.RayCluster) rayv1alpha1.ClusterState {
+func RayClusterState(cluster *rayv1.RayCluster) rayv1.ClusterState {
 	return cluster.Status.State
 }