[Bug] Enable ResourceQuota by adding Resources for the health-check i…

…nit container (ray-project#1043)

Enable ResourceQuota by adding Resources for the health-check init container

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

@@ -191,6 +191,8 @@ func DefaultWorkerPodTemplate(instance rayiov1alpha1.RayCluster, workerSpec rayi
 
 	// The Ray worker should only start once the GCS server is ready.
 	rayContainerIndex := getRayContainerIndex(podTemplate.Spec)
+	// Do not modify `deepCopyRayContainer` anywhere.
+	deepCopyRayContainer := podTemplate.Spec.Containers[rayContainerIndex].DeepCopy()
 	initContainer := v1.Container{
 		Name:            "wait-gcs-ready",
 		Image:           podTemplate.Spec.Containers[rayContainerIndex].Image,
@@ -203,8 +205,10 @@ func DefaultWorkerPodTemplate(instance rayiov1alpha1.RayCluster, workerSpec rayi
 		// This init container requires certain environment variables to establish a secure connection with the Ray head using TLS authentication.
 		// Additionally, some of these environment variables may reference files stored in volumes, so we need to include both the `Env` and `VolumeMounts` fields here.
 		// For more details, please refer to: https://docs.ray.io/en/latest/ray-core/configure.html#tls-authentication.
-		Env:          podTemplate.Spec.Containers[rayContainerIndex].DeepCopy().Env,
-		VolumeMounts: podTemplate.Spec.Containers[rayContainerIndex].DeepCopy().VolumeMounts,
+		Env:          deepCopyRayContainer.Env,
+		VolumeMounts: deepCopyRayContainer.VolumeMounts,
+		// If users specify ResourceQuota for the namespace, the init container need to specify resource explicitly.
+		Resources: deepCopyRayContainer.Resources,
 	}
 	podTemplate.Spec.InitContainers = append(podTemplate.Spec.InitContainers, initContainer)
 

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

@@ -827,6 +827,8 @@ func TestDefaultInitContainer(t *testing.T) {
 	// Ray container to the init container. This may be changed in the future.
 	healthCheckContainer := podTemplateSpec.Spec.InitContainers[numInitContainers-1]
 	rayContainer := worker.Template.Spec.Containers[getRayContainerIndex(worker.Template.Spec)]
+
+	assert.NotEqual(t, len(rayContainer.Env), 0, "The test only makes sense if the Ray container has environment variables.")
 	assert.Equal(t, len(rayContainer.Env), len(healthCheckContainer.Env))
 	for _, env := range rayContainer.Env {
 		// env.ValueFrom is the source for the environment variable's value. Cannot be used if value is not empty.
@@ -836,4 +838,8 @@ func TestDefaultInitContainer(t *testing.T) {
 			checkContainerEnv(t, healthCheckContainer, env.Name, env.ValueFrom.FieldRef.FieldPath)
 		}
 	}
+
+	// The values of `Resources` should be the same in both Ray container and health-check container.
+	assert.NotEmpty(t, rayContainer.Resources, "The test only makes sense if the Ray container has resource limit/request.")
+	assert.Equal(t, rayContainer.Resources, healthCheckContainer.Resources)
 }