remove WithAutoscalerOptions and WithVersion + check nil only once

Signed-off-by: alimaazamat <alima.azamat2003@gmail.com>

Author: alimaazamat

ray-operator/controllers/ray/utils/validation.go

@@ -581,13 +581,15 @@ func validateLegacyDeletionPolicies(rayJob *rayv1.RayJob) error {
 // validateWorkerGroupIdleTimeout validates the idleTimeoutSeconds field in a worker group spec
 func validateWorkerGroupIdleTimeout(workerGroup rayv1.WorkerGroupSpec, spec *rayv1.RayClusterSpec) error {
 	idleTimeoutSeconds := workerGroup.IdleTimeoutSeconds
-	if idleTimeoutSeconds != nil && *idleTimeoutSeconds < 0 {
-		return fmt.Errorf("idleTimeoutSeconds must be non-negative, got %d", *idleTimeoutSeconds)
-	}
+	if idleTimeoutSeconds != nil {
+		if *idleTimeoutSeconds < 0 {
+			return fmt.Errorf("idleTimeoutSeconds must be non-negative, got %d", *idleTimeoutSeconds)
+		}
 
-	// idleTimeoutSeconds only allowed on autoscaler v2
-	if idleTimeoutSeconds != nil && !IsAutoscalingV2Enabled(spec) {
-		return fmt.Errorf("worker group %s has idleTimeoutSeconds set, but autoscaler version is not v2. Please set .spec.autoscalerOptions.version to v2", workerGroup.GroupName)
+		// idleTimeoutSeconds only allowed on autoscaler v2
+		if !IsAutoscalingV2Enabled(spec) {
+			return fmt.Errorf("worker group %s has idleTimeoutSeconds set, but autoscaler version is not v2. Please set .spec.autoscalerOptions.version to v2", workerGroup.GroupName)
+		}
 	}
 
 	return nil

ray-operator/test/e2eautoscaler/raycluster_autoscaler_part2_test.go

@@ -42,8 +42,6 @@ func TestRayClusterAutoscalerV2IdleTimeout(t *testing.T) {
 		rayClusterSpecAC := rayv1ac.RayClusterSpec().
 			WithEnableInTreeAutoscaling(true).
 			WithRayVersion(GetRayVersion()).
-			WithAutoscalerOptions(rayv1ac.AutoscalerOptions().
-				WithVersion(rayv1.AutoscalerVersionV2)).
 			WithHeadGroupSpec(rayv1ac.HeadGroupSpec().
 				WithRayStartParams(map[string]string{"num-cpus": "0"}).
 				WithTemplate(tc.HeadPodTemplateGetter())).