rebase

Signed-off-by: You-Cheng Lin (Owen) <[email protected]>

Author: owenowenisme

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

@@ -319,7 +319,8 @@ func ConvertRayJobToReq(rayJob *rayv1.RayJob) (*utiltypes.RayJobRequest, error)
 		Metadata:     rayJob.Spec.Metadata,
 	}
 	if len(rayJob.Spec.RuntimeEnvYAML) != 0 {
-		runtimeEnv, err := UnmarshalRuntimeEnvYAML(rayJob.Spec.RuntimeEnvYAML)
+		runtimeEnv := utiltypes.RuntimeEnvType{}
+		err := yaml.Unmarshal([]byte(rayJob.Spec.RuntimeEnvYAML), &runtimeEnv)
 		if err != nil {
 			return nil, err
 		}
@@ -334,11 +335,3 @@ func ConvertRayJobToReq(rayJob *rayv1.RayJob) (*utiltypes.RayJobRequest, error)
 	}
 	return req, nil
 }
-
-func UnmarshalRuntimeEnvYAML(runtimeEnvYAML string) (utiltypes.RuntimeEnvType, error) {
-	var runtimeEnv utiltypes.RuntimeEnvType
-	if err := yaml.Unmarshal([]byte(runtimeEnvYAML), &runtimeEnv); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal RuntimeEnvYAML: %v: %w", runtimeEnvYAML, err)
-	}
-	return runtimeEnv, nil
-}

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

@@ -794,44 +794,6 @@ func TestCalculateDesiredReplicas(t *testing.T) {
 	}
 }
 
-func TestUnmarshalRuntimeEnv(t *testing.T) {
-	tests := []struct {
-		name           string
-		runtimeEnvYAML string
-		isErrorNil     bool
-	}{
-		{
-			name:           "Empty runtimeEnvYAML",
-			runtimeEnvYAML: "",
-			isErrorNil:     true,
-		},
-		{
-			name: "Valid runtimeEnvYAML",
-			runtimeEnvYAML: `
-env_vars:
-  counter_name: test_counter
-`,
-			isErrorNil: true,
-		},
-		{
-			name:           "Invalid runtimeEnvYAML",
-			runtimeEnvYAML: `invalid_yaml_str`,
-			isErrorNil:     false,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			_, err := UnmarshalRuntimeEnvYAML(tc.runtimeEnvYAML)
-			if tc.isErrorNil {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-			}
-		})
-	}
-}
-
 func TestFindHeadPodReadyCondition(t *testing.T) {
 	tests := []struct {
 		name     string

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

@@ -8,8 +8,10 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation"
+	"sigs.k8s.io/yaml"
 
 	rayv1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1"
+	utiltypes "github.com/ray-project/kuberay/ray-operator/controllers/ray/utils/types"
 	"github.com/ray-project/kuberay/ray-operator/pkg/features"
 )
 
@@ -204,7 +206,7 @@ func ValidateRayJobSpec(rayJob *rayv1.RayJob) error {
 
 	// Validate whether RuntimeEnvYAML is a valid YAML string. Note that this only checks its validity
 	// as a YAML string, not its adherence to the runtime environment schema.
-	if _, err := UnmarshalRuntimeEnvYAML(rayJob.Spec.RuntimeEnvYAML); err != nil {
+	if err := yaml.Unmarshal([]byte(rayJob.Spec.RuntimeEnvYAML), &utiltypes.RuntimeEnvType{}); err != nil {
 		return err
 	}
 	if rayJob.Spec.ActiveDeadlineSeconds != nil && *rayJob.Spec.ActiveDeadlineSeconds <= 0 {