Resloved conflicts

Signed-off-by: win5923 <[email protected]>

ray-operator/controllers/ray/common/pod.go

@@ -148,6 +148,9 @@ func configureGCSFaultTolerance(podTemplate *corev1.PodTemplateSpec, instance ra
 					})
 				}
 			} else {
+				// If users directly set the `redis-username` in `rayStartParams` instead of referring
+				// to a K8s secret, we need to set the `REDIS_USERNAME` env var so that the Redis cleanup
+				// job can connect to Redis using the username.
 				if !utils.EnvVarExists(utils.REDIS_USERNAME, container.Env) {
 					// setting the REDIS_USERNAME env var from the params
 					redisUsernameEnv := corev1.EnvVar{Name: utils.REDIS_USERNAME}

ray-operator/controllers/ray/common/pod_test.go

@@ -365,7 +365,6 @@ func TestConfigureGCSFaultToleranceWithAnnotations(t *testing.T) {
 			isHeadPod:                   false,
 		},
 		{
-			// The most common case.
 			name:                        "GCS FT enabled with redis username and password env and ray start params referring to env",
 			gcsFTEnabled:                true,
 			redisUsernameEnv:            "test-username",
@@ -389,6 +388,9 @@ func TestConfigureGCSFaultToleranceWithAnnotations(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			// Validate the test input
+			if test.redisUsernameEnv != "" && test.redisUsernameRayStartParams != "" {
+				assert.True(t, test.redisUsernameRayStartParams == "$REDIS_USERNAME")
+			}
 			if test.redisPasswordEnv != "" && test.redisPasswordRayStartParams != "" {
 				assert.True(t, test.redisPasswordRayStartParams == "$REDIS_PASSWORD")
 			}
@@ -475,6 +477,10 @@ func TestConfigureGCSFaultToleranceWithAnnotations(t *testing.T) {
 					assert.Equal(t, podTemplate.Annotations[utils.RayExternalStorageNSAnnotationKey], test.storageNS)
 					assert.True(t, utils.EnvVarExists(utils.RAY_EXTERNAL_STORAGE_NS, container.Env))
 				}
+				if test.redisUsernameEnv != "" {
+					env := getEnvVar(container, utils.REDIS_USERNAME)
+					assert.Equal(t, env.Value, test.redisUsernameEnv)
+				}
 				if test.redisPasswordEnv != "" {
 					env := getEnvVar(container, utils.REDIS_PASSWORD)
 					assert.Equal(t, env.Value, test.redisPasswordEnv)