Merge pull request #18778 from jim-minter/issue18772

Automatic merge from submit-queue (batch tested with PRs 18778, 18709, 18876, 18897, 18652).

apply build defaults to init containers

fixes #18772

Author: openshift-merge-robot

pkg/build/controller/build/defaults/defaults.go

@@ -80,26 +80,33 @@ func (b BuildDefaults) applyPodDefaults(pod *v1.Pod) {
 
 	// Apply default resources
 	defaultResources := b.config.Resources
+	allContainers := make([]*v1.Container, 0, len(pod.Spec.Containers)+len(pod.Spec.InitContainers))
 	for i := range pod.Spec.Containers {
-		podEnv := &pod.Spec.Containers[i].Env
-		util.MergeTrustedEnvWithoutDuplicates(util.CopyApiEnvVarToV1EnvVar(b.config.Env), podEnv, false)
+		allContainers = append(allContainers, &pod.Spec.Containers[i])
+	}
+	for i := range pod.Spec.InitContainers {
+		allContainers = append(allContainers, &pod.Spec.InitContainers[i])
+	}
+
+	for _, c := range allContainers {
+		util.MergeTrustedEnvWithoutDuplicates(util.CopyApiEnvVarToV1EnvVar(b.config.Env), &c.Env, false)
 
-		if pod.Spec.Containers[i].Resources.Limits == nil {
-			pod.Spec.Containers[i].Resources.Limits = v1.ResourceList{}
+		if c.Resources.Limits == nil {
+			c.Resources.Limits = v1.ResourceList{}
 		}
 		for name, value := range defaultResources.Limits {
-			if _, ok := pod.Spec.Containers[i].Resources.Limits[v1.ResourceName(name)]; !ok {
+			if _, ok := c.Resources.Limits[v1.ResourceName(name)]; !ok {
 				glog.V(5).Infof("Setting default resource limit %s for pod %s/%s to %v", name, pod.Namespace, pod.Name, value)
-				pod.Spec.Containers[i].Resources.Limits[v1.ResourceName(name)] = value
+				c.Resources.Limits[v1.ResourceName(name)] = value
 			}
 		}
-		if pod.Spec.Containers[i].Resources.Requests == nil {
-			pod.Spec.Containers[i].Resources.Requests = v1.ResourceList{}
+		if c.Resources.Requests == nil {
+			c.Resources.Requests = v1.ResourceList{}
 		}
 		for name, value := range defaultResources.Requests {
-			if _, ok := pod.Spec.Containers[i].Resources.Requests[v1.ResourceName(name)]; !ok {
+			if _, ok := c.Resources.Requests[v1.ResourceName(name)]; !ok {
 				glog.V(5).Infof("Setting default resource request %s for pod %s/%s to %v", name, pod.Namespace, pod.Name, value)
-				pod.Spec.Containers[i].Resources.Requests[v1.ResourceName(name)] = value
+				c.Resources.Requests[v1.ResourceName(name)] = value
 			}
 		}
 	}

pkg/build/controller/build/defaults/defaults_test.go

@@ -571,6 +571,9 @@ func TestResourceDefaults(t *testing.T) {
 		// normally the buildconfig resources would be applied to the pod
 		// when it was created, but this pod didn't get created by the normal
 		// pod creation flow, so fake this out.
+		for i := range pod.Spec.InitContainers {
+			pod.Spec.InitContainers[i].Resources = buildutil.CopyApiResourcesToV1Resources(&test.BuildResource)
+		}
 		for i := range pod.Spec.Containers {
 			pod.Spec.Containers[i].Resources = buildutil.CopyApiResourcesToV1Resources(&test.BuildResource)
 		}
@@ -585,9 +588,12 @@ func TestResourceDefaults(t *testing.T) {
 		if !kapihelper.Semantic.DeepEqual(test.ExpectedResource, build.Spec.Resources) {
 			t.Fatalf("%v:Build resource expected expected=actual, %#v != %#v", name, test.ExpectedResource, build.Spec.Resources)
 		}
-		for i := range pod.Spec.Containers {
-			if !kapihelper.Semantic.DeepEqual(buildutil.CopyApiResourcesToV1Resources(&test.ExpectedResource), pod.Spec.Containers[i].Resources) {
-				t.Fatalf("%v:Pod container %d resource expected expected=actual, got expected:\n%#v\nactual:\n%#v", name, i, test.ExpectedResource, pod.Spec.Containers[i].Resources)
+
+		allContainers := append([]v1.Container{}, pod.Spec.Containers...)
+		allContainers = append(allContainers, pod.Spec.InitContainers...)
+		for i, c := range allContainers {
+			if !kapihelper.Semantic.DeepEqual(buildutil.CopyApiResourcesToV1Resources(&test.ExpectedResource), c.Resources) {
+				t.Fatalf("%v: Pod container %d resource expected expected=actual, got expected:\n%#v\nactual:\n%#v", name, i, test.ExpectedResource, c.Resources)
 			}
 		}
 	}