Setup fakeClient to RayCluster_Webhook_Test

Author: ChristianZaccaria

pkg/controllers/raycluster_webhook_test.go

@@ -26,26 +26,43 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	"github.com/project-codeflare/codeflare-operator/pkg/config"
 )
 
 var (
-	namespace      = "test-namespace"
+	mockNamespace = &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-namespace",
+			Labels: map[string]string{
+				"pod-security.kubernetes.io/enforce":         "restricted",
+				"pod-security.kubernetes.io/enforce-version": "v1.24",
+			},
+		},
+	}
 	rayClusterName = "test-raycluster"
 
 	rcWebhook = &rayClusterWebhook{
 		Config: &config.KubeRayConfiguration{},
+		Client: setupFakeClient(),
 	}
 )
 
+func setupFakeClient() client.Client {
+	scheme := runtime.NewScheme()
+	corev1.AddToScheme(scheme)
+	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(mockNamespace).Build()
+}
+
 func TestRayClusterWebhookDefault(t *testing.T) {
 	test := support.NewTest(t)
 
 	validRayCluster := &rayv1.RayCluster{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      rayClusterName,
-			Namespace: namespace,
+			Namespace: mockNamespace.Name,
 		},
 		Spec: rayv1.RayClusterSpec{
 			HeadGroupSpec: rayv1.HeadGroupSpec{
@@ -88,7 +105,7 @@ func TestRayClusterWebhookDefault(t *testing.T) {
 	}
 
 	// Create the RayClusters
-	if _, err := test.Client().Ray().RayV1().RayClusters(namespace).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
+	if _, err := test.Client().Ray().RayV1().RayClusters(mockNamespace.Name).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
 		test.T().Fatalf("Failed to create RayCluster: %v", err)
 	}
 
@@ -234,7 +251,7 @@ func TestValidateCreate(t *testing.T) {
 	validRayCluster := &rayv1.RayCluster{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      rayClusterName,
-			Namespace: namespace,
+			Namespace: mockNamespace.Name,
 		},
 		Spec: rayv1.RayClusterSpec{
 			HeadGroupSpec: rayv1.HeadGroupSpec{
@@ -268,7 +285,7 @@ func TestValidateCreate(t *testing.T) {
 									"--tls-cert=/etc/tls/private/tls.crt",
 									"--tls-key=/etc/tls/private/tls.key",
 									"--cookie-secret=$(COOKIE_SECRET)",
-									"--openshift-delegate-urls={\"/\":{\"resource\":\"pods\",\"namespace\":\"" + namespace + "\",\"verb\":\"get\"}}",
+									"--openshift-delegate-urls={\"/\":{\"resource\":\"pods\",\"namespace\":\"" + mockNamespace.Name + "\",\"verb\":\"get\"}}",
 								},
 								VolumeMounts: []corev1.VolumeMount{
 									{
@@ -298,7 +315,7 @@ func TestValidateCreate(t *testing.T) {
 	}
 
 	// Create the RayClusters
-	if _, err := test.Client().Ray().RayV1().RayClusters(namespace).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
+	if _, err := test.Client().Ray().RayV1().RayClusters(mockNamespace.Name).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
 		test.T().Fatalf("Failed to create RayCluster: %v", err)
 	}
 
@@ -354,7 +371,7 @@ func TestValidateUpdate(t *testing.T) {
 	validRayCluster := &rayv1.RayCluster{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      rayClusterName,
-			Namespace: namespace,
+			Namespace: mockNamespace.Name,
 		},
 		Spec: rayv1.RayClusterSpec{
 			HeadGroupSpec: rayv1.HeadGroupSpec{
@@ -400,7 +417,7 @@ func TestValidateUpdate(t *testing.T) {
 									"--tls-cert=/etc/tls/private/tls.crt",
 									"--tls-key=/etc/tls/private/tls.key",
 									"--cookie-secret=$(COOKIE_SECRET)",
-									"--openshift-delegate-urls={\"/\":{\"resource\":\"pods\",\"namespace\":\"" + namespace + "\",\"verb\":\"get\"}}",
+									"--openshift-delegate-urls={\"/\":{\"resource\":\"pods\",\"namespace\":\"" + mockNamespace.Name + "\",\"verb\":\"get\"}}",
 								},
 								VolumeMounts: []corev1.VolumeMount{
 									{
@@ -418,7 +435,7 @@ func TestValidateUpdate(t *testing.T) {
 								Command: []string{
 									"sh",
 									"-c",
-									`cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${FQ_RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = rayclient-` + rayClusterName + `-` + namespace + `.\nDNS.6 = ` + rayClusterName + `-head-svc.` + namespace + `.svc` + `">./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext`,
+									`cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${FQ_RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = rayclient-` + rayClusterName + `-` + mockNamespace.Name + `.\nDNS.6 = ` + rayClusterName + `-head-svc.` + mockNamespace.Name + `.svc` + `">./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext`,
 								},
 								VolumeMounts: []corev1.VolumeMount{
 									{
@@ -524,7 +541,7 @@ func TestValidateUpdate(t *testing.T) {
 	}
 
 	// Create the RayClusters
-	if _, err := test.Client().Ray().RayV1().RayClusters(namespace).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
+	if _, err := test.Client().Ray().RayV1().RayClusters(mockNamespace.Name).Create(test.Ctx(), validRayCluster, metav1.CreateOptions{}); err != nil {
 		test.T().Fatalf("Failed to create RayCluster: %v", err)
 	}
 

pkg/controllers/support.go

@@ -162,13 +162,14 @@ func withEnvVarName(name string) compare[corev1.EnvVar] {
 }
 
 func namespaceHasSecurityLabels(ctx context.Context, kubeClient client.Client, namespaceName string) (bool, error) {
-	namespace := &corev1.Namespace{}
-	if err := kubeClient.Get(ctx, client.ObjectKey{Name: namespaceName}, namespace); err != nil {
+	obj := &corev1.Namespace{}
+	err := kubeClient.Get(ctx, client.ObjectKey{Name: namespaceName}, obj)
+	if err != nil {
 		return false, err
 	}
 	labelSelector := labels.SelectorFromSet(labels.Set{
 		"pod-security.kubernetes.io/enforce":         "restricted",
 		"pod-security.kubernetes.io/enforce-version": "v1.24",
 	})
-	return labelSelector.Matches(labels.Set(namespace.Labels)), nil
+	return labelSelector.Matches(labels.Set(obj.Labels)), nil
 }