Consolidate slice append (#20)

microsoft · Jul 17, 2019 · a4b9eeb · a4b9eeb
1 parent 1fb9e25
commit a4b9eeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/apis/frameworkcontroller/v1/funcs.go b/pkg/apis/frameworkcontroller/v1/funcs.go
@@ -359,13 +359,15 @@ func (f *Framework) NewPod(cm *core.ConfigMap, taskRoleName string, taskIndex in
 	// is failed and the termination message file specified by the terminationMessagePath
 	// is not found or empty.
 	for i := range pod.Spec.Containers {
-		pod.Spec.Containers[i].Env = append(predefinedEnvs, pod.Spec.Containers[i].Env...)
+		pod.Spec.Containers[i].Env = append(append([]core.EnvVar{},
+			predefinedEnvs...), pod.Spec.Containers[i].Env...)
 		if len(pod.Spec.Containers[i].TerminationMessagePolicy) == 0 {
 			pod.Spec.Containers[i].TerminationMessagePolicy = core.TerminationMessageFallbackToLogsOnError
 		}
 	}
 	for i := range pod.Spec.InitContainers {
-		pod.Spec.InitContainers[i].Env = append(predefinedEnvs, pod.Spec.InitContainers[i].Env...)
+		pod.Spec.InitContainers[i].Env = append(append([]core.EnvVar{},
+			predefinedEnvs...), pod.Spec.InitContainers[i].Env...)
 		if len(pod.Spec.InitContainers[i].TerminationMessagePolicy) == 0 {
 			pod.Spec.InitContainers[i].TerminationMessagePolicy = core.TerminationMessageFallbackToLogsOnError
 		}

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -1130,8 +1130,8 @@ func (c *FrameworkController) syncTaskState(
 			} else if pod.Status.Phase == core.PodFailed {
 				// All Container names in a Pod must be different, so we can still identify
 				// a Container even after the InitContainers is merged with the AppContainers.
-				allContainerStatuses := append(
-					pod.Status.InitContainerStatuses,
+				allContainerStatuses := append(append([]core.ContainerStatus{},
+					pod.Status.InitContainerStatuses...),
 					pod.Status.ContainerStatuses...)
 
 				lastContainerExitCode := common.NilInt32()