Review changes

Author: Bobbins228

pkg/controllers/raycluster_webhook.go

@@ -152,8 +152,9 @@ func (w *rayClusterWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj r
 	// Init Container related errors
 	if ptr.Deref(w.Config.MTLSEnabled, true) {
 		allErrors = append(allErrors, w.validateHeadInitContainer(rayCluster)...)
-		allErrors = append(allErrors, w.validateWorkerInitContainer(rayCluster)...)
-		allErrors = append(allErrors, validateEnvVars(rayCluster)...)
+		allErrors = append(allErrors, validateWorkerInitContainer(rayCluster)...)
+		allErrors = append(allErrors, validateHeadEnvVars(rayCluster)...)
+		allErrors = append(allErrors, validateWorkerEnvVars(rayCluster)...)
 		allErrors = append(allErrors, validateCaVolumes(rayCluster)...)
 	}
 	return warnings, allErrors.ToAggregate()
@@ -376,7 +377,7 @@ func (w *rayClusterWebhook) validateHeadInitContainer(rayCluster *rayv1.RayClust
 	return allErrors
 }
 
-func (w *rayClusterWebhook) validateWorkerInitContainer(rayCluster *rayv1.RayCluster) field.ErrorList {
+func validateWorkerInitContainer(rayCluster *rayv1.RayCluster) field.ErrorList {
 	var allErrors field.ErrorList
 
 	if err := contains(rayCluster.Spec.WorkerGroupSpecs[0].Template.Spec.InitContainers, rayWorkerInitContainer(), byContainerName,
@@ -407,7 +408,7 @@ func validateCaVolumes(rayCluster *rayv1.RayCluster) field.ErrorList {
 	return allErrors
 }
 
-func validateEnvVars(rayCluster *rayv1.RayCluster) field.ErrorList {
+func validateHeadEnvVars(rayCluster *rayv1.RayCluster) field.ErrorList {
 	var allErrors field.ErrorList
 	item := 0
 	for index, container := range rayCluster.Spec.HeadGroupSpec.Template.Spec.Containers {
@@ -420,11 +421,18 @@ func validateEnvVars(rayCluster *rayv1.RayCluster) field.ErrorList {
 	for _, envVar := range envVarList() {
 		if err := contains(rayCluster.Spec.HeadGroupSpec.Template.Spec.Containers[item].Env, envVar, byEnvVarName,
 			field.NewPath("spec", "headGroupSpec", "template", "spec", "containers", strconv.Itoa(item), "env"),
-			"RAY_TLS environment variables are immutable"); err != nil {
+			"RAY_TLS related environment variables are immutable"); err != nil {
 			allErrors = append(allErrors, err)
 		}
 	}
 
+	return allErrors
+}
+
+func validateWorkerEnvVars(rayCluster *rayv1.RayCluster) field.ErrorList {
+	var allErrors field.ErrorList
+	item := 0
+
 	for index, container := range rayCluster.Spec.WorkerGroupSpecs[0].Template.Spec.Containers {
 		if container.Name == "machine-learning" {
 			item = index
@@ -435,7 +443,7 @@ func validateEnvVars(rayCluster *rayv1.RayCluster) field.ErrorList {
 	for _, envVar := range envVarList() {
 		if err := contains(rayCluster.Spec.WorkerGroupSpecs[0].Template.Spec.Containers[item].Env, envVar, byEnvVarName,
 			field.NewPath("spec", "workerGroupSpecs", "0", "template", "spec", "containers", strconv.Itoa(item), "env"),
-			"RAY_TLS environment variables are immutable"); err != nil {
+			"RAY_TLS related environment variables are immutable"); err != nil {
 			allErrors = append(allErrors, err)
 		}
 	}