fix: rm Containers[RayContainerIndex].Env check which is not necessar…

…y and change confusing message
ray-project · Jan 14, 2025 · ce2c194 · ce2c194
1 parent 4d71412
commit ce2c194
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/ray-operator/apis/ray/v1/raycluster_webhook.go b/ray-operator/apis/ray/v1/raycluster_webhook.go
@@ -98,13 +98,10 @@ func (r *RayCluster) ValidateRayClusterSpec() *field.Error {
 		return field.Invalid(
 			field.NewPath("spec").Child("gcsFaultToleranceOptions"),
 			r.Spec.GcsFaultToleranceOptions,
-			fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s is disabled", RayFTEnabledAnnotationKey),
+			fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s annotation is set to false", RayFTEnabledAnnotationKey),
 		)
 	}
-	if r.Annotations[RayFTEnabledAnnotationKey] != "true" &&
-		len(r.Spec.HeadGroupSpec.Template.Spec.Containers) > 0 &&
-		r.Spec.HeadGroupSpec.Template.Spec.Containers[RayContainerIndex].Env != nil {
-
+	if r.Annotations[RayFTEnabledAnnotationKey] != "true" && len(r.Spec.HeadGroupSpec.Template.Spec.Containers) > 0 {
 		if EnvVarExists(RAY_REDIS_ADDRESS, r.Spec.HeadGroupSpec.Template.Spec.Containers[RayContainerIndex].Env) {
 			return field.Invalid(
 				field.NewPath("spec").Child("headGroupSpec").Child("template").Child("spec").Child("containers").Index(0).Child("env"),

diff --git a/ray-operator/apis/ray/v1/raycluster_webhook_test.go b/ray-operator/apis/ray/v1/raycluster_webhook_test.go
@@ -27,7 +27,7 @@ func TestValidateRayClusterSpec(t *testing.T) {
 			},
 			gcsFaultToleranceOptions: &GcsFaultToleranceOptions{},
 			expectError:              true,
-			errorMessage:             fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s is disabled", RayFTEnabledAnnotationKey),
+			errorMessage:             fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s annotation is set to false", RayFTEnabledAnnotationKey),
 		},
 		{
 			name: "FT disabled with RAY_REDIS_ADDRESS set",
@@ -197,7 +197,7 @@ func TestValidateRayCluster(t *testing.T) {
 			},
 			GcsFaultToleranceOptions: &GcsFaultToleranceOptions{},
 			expectError:              true,
-			errorMessage:             fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s is disabled", RayFTEnabledAnnotationKey),
+			errorMessage:             fmt.Sprintf("GcsFaultToleranceOptions should be nil when %s annotation is set to false", RayFTEnabledAnnotationKey),
 		},
 		{
 			name: "Valid RayCluster",