Fix empty namespace and name

Author: phantom5125

ray-operator/controllers/ray/metrics/ray_cluster_metrics_test.go

@@ -19,6 +19,8 @@ import (
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 )
 
+var defaultRayClusterMetricTTL = 10
+
 func TestRayClusterInfo(t *testing.T) {
 	tests := []struct {
 		name            string
@@ -62,7 +64,7 @@ func TestRayClusterInfo(t *testing.T) {
 				objs[i] = &tc.clusters[i]
 			}
 			client := fake.NewClientBuilder().WithScheme(k8sScheme).WithObjects(objs...).Build()
-			manager := NewRayClusterMetricsManager(context.Background(), client)
+			manager := NewRayClusterMetricsManager(context.Background(), client, defaultRayClusterMetricTTL)
 			reg := prometheus.NewRegistry()
 			reg.MustRegister(manager)
 
@@ -104,7 +106,7 @@ func TestScheduleRayClusterMetricForCleanup(t *testing.T) {
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayClusterMetricsManager(ctx, client)
+	manager := NewRayClusterMetricsManager(ctx, client, defaultRayClusterMetricTTL)
 
 	// Schedule a metric for cleanup
 	manager.ScheduleRayClusterMetricForCleanup("test-cluster", "test-namespace")
@@ -123,7 +125,7 @@ func TestCleanupExpiredRayClusterMetrics(t *testing.T) {
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayClusterMetricsManager(ctx, client)
+	manager := NewRayClusterMetricsManager(ctx, client, defaultRayClusterMetricTTL)
 
 	// Set up a metric
 	manager.ObserveRayClusterProvisionedDuration("expired-cluster", "test-namespace", 123.45)
@@ -166,7 +168,7 @@ func TestRayClusterCleanupLoop(t *testing.T) {
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayClusterMetricsManager(ctx, client)
+	manager := NewRayClusterMetricsManager(ctx, client, defaultRayClusterMetricTTL)
 
 	// Set up a metric
 	manager.ObserveRayClusterProvisionedDuration("test-cluster", "test-namespace", 123.45)
@@ -252,7 +254,7 @@ func TestRayClusterConditionProvisioned(t *testing.T) {
 				objs[i] = &tc.clusters[i]
 			}
 			client := fake.NewClientBuilder().WithScheme(k8sScheme).WithObjects(objs...).Build()
-			manager := NewRayClusterMetricsManager(context.Background(), client)
+			manager := NewRayClusterMetricsManager(context.Background(), client, defaultRayClusterMetricTTL)
 			reg := prometheus.NewRegistry()
 			reg.MustRegister(manager)
 

ray-operator/controllers/ray/metrics/ray_job_metrics_test.go

@@ -20,6 +20,8 @@ import (
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
 )
 
+var defaultRayJobMetricTTL = 10
+
 func TestMetricRayJobInfo(t *testing.T) {
 	tests := []struct {
 		name            string
@@ -59,7 +61,7 @@ func TestMetricRayJobInfo(t *testing.T) {
 				objs[i] = &tc.rayJobs[i]
 			}
 			client := fake.NewClientBuilder().WithScheme(k8sScheme).WithObjects(objs...).Build()
-			manager := NewRayJobMetricsManager(context.Background(), client)
+			manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 			reg := prometheus.NewRegistry()
 			reg.MustRegister(manager)
 
@@ -139,7 +141,7 @@ func TestMetricRayJobDeploymentStatus(t *testing.T) {
 				objs[i] = &tc.rayJobs[i]
 			}
 			client := fake.NewClientBuilder().WithScheme(k8sScheme).WithObjects(objs...).Build()
-			manager := NewRayJobMetricsManager(context.Background(), client)
+			manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 			reg := prometheus.NewRegistry()
 			reg.MustRegister(manager)
 
@@ -196,7 +198,7 @@ func TestScheduleRayJobMetricForCleanup(t *testing.T) {
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
 	// Create a metrics manager
-	manager := NewRayJobMetricsManager(context.Background(), client)
+	manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 
 	// Schedule a cleanup for a job
 	manager.ScheduleRayJobMetricForCleanup("test-job", "default")
@@ -218,7 +220,7 @@ func TestCleanupExpiredRayJobMetrics(t *testing.T) {
 	k8sScheme := runtime.NewScheme()
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayJobMetricsManager(context.Background(), client)
+	manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 
 	// Register the manager with the registry
 	registry.MustRegister(manager)
@@ -258,7 +260,7 @@ func TestRayJobCleanupLoop(t *testing.T) {
 	k8sScheme := runtime.NewScheme()
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayJobMetricsManager(context.Background(), client)
+	manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 
 	// Start the cleanup loop
 	ctx, cancel := context.WithCancel(context.Background())
@@ -292,7 +294,7 @@ func TestRayJobConditionProvisioned(t *testing.T) {
 	k8sScheme := runtime.NewScheme()
 	require.NoError(t, rayv1.AddToScheme(k8sScheme))
 	client := fake.NewClientBuilder().WithScheme(k8sScheme).Build()
-	manager := NewRayJobMetricsManager(context.Background(), client)
+	manager := NewRayJobMetricsManager(context.Background(), client, defaultRayJobMetricTTL)
 	registry.MustRegister(manager)
 
 	// Simulate a job becoming provisioned

ray-operator/controllers/ray/raycluster_controller.go

@@ -136,7 +136,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 		// Clear all related expectations
 		r.rayClusterScaleExpectation.Delete(instance.Name, instance.Namespace)
 		if r.options.RayClusterMetricsManager != nil {
-			r.options.RayClusterMetricsManager.ScheduleRayClusterMetricForCleanup(instance.Name, instance.Namespace)
+			r.options.RayClusterMetricsManager.ScheduleRayClusterMetricForCleanup(request.Name, request.Namespace)
 		}
 	} else {
 		logger.Error(err, "Read request instance error!")

ray-operator/controllers/ray/rayjob_controller.go

@@ -94,7 +94,7 @@ func (r *RayJobReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 			logger.Info("RayJob resource not found. Ignoring since object must be deleted")
 			// Schedule metrics cleanup when job reaches terminal status
 			if r.options.RayJobMetricsManager != nil {
-				r.options.RayJobMetricsManager.ScheduleRayJobMetricForCleanup(rayJobInstance.Name, rayJobInstance.Namespace)
+				r.options.RayJobMetricsManager.ScheduleRayJobMetricForCleanup(request.Name, request.Namespace)
 			}
 			return ctrl.Result{}, nil
 		}