Addressing review comments

Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>

Author: visheshtanksale

api/apps/v1alpha1/nimservice_types.go

@@ -309,95 +309,95 @@ func (n *NIMService) GetLWSLeaderEnv() []corev1.EnvVar {
 		mpiTimeout = n.Spec.MultiNode.MPI.MPIStartTimeout
 	}
 
-	env = append(env,
-		corev1.EnvVar{
+	env = utils.MergeEnvVars([]corev1.EnvVar{
+		{
 			Name:  "NIM_LEADER_ROLE",
 			Value: "1",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "NIM_MPI_ALLOW_RUN_AS_ROOT",
 			Value: "0",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "OMPI_MCA_orte_keep_fqdn_hostnames",
 			Value: "true",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "OMPI_MCA_plm_rsh_args",
 			Value: "-o ConnectionAttempts=20",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "NIM_NUM_COMPUTE_NODES",
 			Value: fmt.Sprintf("%d", n.Spec.MultiNode.Size),
 		},
-		corev1.EnvVar{
+		{
 			Name:  "GPUS_PER_NODE",
 			Value: fmt.Sprintf("%d", n.Spec.MultiNode.GPUSPerPod),
 		},
-		corev1.EnvVar{
+		{
 			Name:  "CLUSTER_START_TIMEOUT",
 			Value: fmt.Sprintf("%d", mpiTimeout),
 		},
-		corev1.EnvVar{
+		{
 			Name: "CLUSTER_SIZE",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.annotations['leaderworkerset.sigs.k8s.io/size']",
 				},
 			},
 		},
-		corev1.EnvVar{
+		{
 			Name: "GROUP_INDEX",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.labels['leaderworkerset.sigs.k8s.io/group-index']",
 				},
 			},
 		},
-	)
+	}, env)
 	return env
 }
 
 func (n *NIMService) GetLWSWorkerEnv() []corev1.EnvVar {
 	env := n.GetEnv()
-	env = append(env,
-		corev1.EnvVar{
+	env = utils.MergeEnvVars([]corev1.EnvVar{
+		{
 			Name:  "NIM_LEADER_ROLE",
 			Value: "0",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "NIM_MPI_ALLOW_RUN_AS_ROOT",
 			Value: "0",
 		},
-		corev1.EnvVar{
+		{
 			Name:  "NIM_NUM_COMPUTE_NODES",
 			Value: fmt.Sprintf("%d", n.Spec.MultiNode.Size),
 		},
-		corev1.EnvVar{
+		{
 			Name: "LEADER_NAME",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.annotations['leaderworkerset.sigs.k8s.io/leader-name']",
 				},
 			},
 		},
-		corev1.EnvVar{
+		{
 			Name: "NAMESPACE",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.namespace",
 				},
 			},
 		},
-		corev1.EnvVar{
+		{
 			Name: "LWS_NAME",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.labels['leaderworkerset.sigs.k8s.io/name']",
 				},
 			},
 		},
-	)
+	}, env)
 	return env
 }