Merge pull request #16044 from bparees/imagesource

Automatic merge from submit-queue

add test case for private image source inputs

Author: openshift-merge-robot

pkg/build/controller/strategy/docker.go

@@ -163,6 +163,5 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build) (*v1.Pod, e
 	// location into the working directory.
 	// TODO: consider moving this into the git-clone container and doing the secret copying there instead.
 	setupInputSecrets(pod, &pod.Spec.Containers[0], build.Spec.Source.Secrets)
-
 	return pod, nil
 }

pkg/build/controller/strategy/util.go

@@ -133,15 +133,15 @@ func mountSecretVolume(pod *v1.Pod, container *v1.Container, secretName, mountPa
 func setupDockerSecrets(pod *v1.Pod, container *v1.Container, pushSecret, pullSecret *kapi.LocalObjectReference, imageSources []buildapi.ImageSource) {
 	if pushSecret != nil {
 		mountSecretVolume(pod, container, pushSecret.Name, DockerPushSecretMountPath, "push")
-		pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, []v1.EnvVar{
+		container.Env = append(container.Env, []v1.EnvVar{
 			{Name: dockercfg.PushAuthType, Value: DockerPushSecretMountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker push in %s", DockerPushSecretMountPath, pod.Name)
 	}
 
 	if pullSecret != nil {
 		mountSecretVolume(pod, container, pullSecret.Name, DockerPullSecretMountPath, "pull")
-		pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, []v1.EnvVar{
+		container.Env = append(container.Env, []v1.EnvVar{
 			{Name: dockercfg.PullAuthType, Value: DockerPullSecretMountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker pull in %s", DockerPullSecretMountPath, pod.Name)
@@ -153,7 +153,7 @@ func setupDockerSecrets(pod *v1.Pod, container *v1.Container, pushSecret, pullSe
 		}
 		mountPath := filepath.Join(SourceImagePullSecretMountPath, strconv.Itoa(i))
 		mountSecretVolume(pod, container, imageSource.PullSecret.Name, mountPath, fmt.Sprintf("%s%d", "source-image", i))
-		pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, []v1.EnvVar{
+		container.Env = append(container.Env, []v1.EnvVar{
 			{Name: fmt.Sprintf("%s%d", dockercfg.PullSourceAuthType, i), Value: mountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker pull in %s", mountPath, pod.Name)

test/extended/builds/image_source.go

@@ -36,8 +36,12 @@ var _ = g.Describe("[builds][Slow] build can have Docker image source", func() {
 			err := oc.Run("create").Args("-f", buildFixture).Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
+			g.By("starting building the private input image")
+			br, err := exutil.StartBuildAndWait(oc, "inputimage")
+			br.AssertSuccess()
+
 			g.By("starting the source strategy build")
-			br, err := exutil.StartBuildAndWait(oc, "imagesourcebuild")
+			br, err = exutil.StartBuildAndWait(oc, "imagesourcebuild")
 			br.AssertSuccess()
 
 			g.By("expecting the pod to deploy successfully")
@@ -59,8 +63,12 @@ var _ = g.Describe("[builds][Slow] build can have Docker image source", func() {
 			err := oc.Run("create").Args("-f", buildFixture).Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
+			g.By("starting building the private input image")
+			br, err := exutil.StartBuildAndWait(oc, "inputimage")
+			br.AssertSuccess()
+
 			g.By("starting the docker strategy build")
-			br, err := exutil.StartBuildAndWait(oc, "imagedockerbuild")
+			br, err = exutil.StartBuildAndWait(oc, "imagedockerbuild")
 			br.AssertSuccess()
 
 			g.By("expect the pod to deploy successfully")

test/extended/testdata/bindata.go

@@ -2,6 +2,25 @@ apiVersion: v1
 kind: List
 metadata: {}
 items:
+- apiVersion: v1
+  kind: BuildConfig
+  metadata:
+    labels:
+      build: inputimage
+    name: inputimage
+  spec:
+    output:
+      to:
+        kind: ImageStreamTag
+        name: inputimage:latest
+    source:
+      dockerfile: "FROM foo"
+    strategy:
+      dockerStrategy:
+        from: 
+          kind: ImageStreamTag
+          name: ruby:2.3
+          namespace: openshift
 - apiVersion: v1
   kind: BuildConfig
   metadata:
@@ -19,8 +38,7 @@ items:
       images:
       - from:
           kind: ImageStreamTag
-          name: ruby:2.3
-          namespace: openshift
+          name: inputimage:latest
         paths:
         - destinationDir: injected/dir
           sourcePath: /opt/rh/rh-ruby23/root/usr/bin/ruby
@@ -48,13 +66,19 @@ items:
       images:
       - from:
           kind: ImageStreamTag
-          name: ruby:2.3
-          namespace: openshift
+          name: inputimage:latest
         paths:
         - destinationDir: injected/dir
           sourcePath: /opt/rh/rh-ruby23/root/usr/bin/ruby
     strategy:
-      dockerStrategy: {}
+      dockerStrategy:
+        forcePull: true
+
+- apiVersion: v1
+  kind: ImageStream
+  metadata:
+    name: inputimage
+  spec: {}
 - apiVersion: v1
   kind: ImageStream
   metadata: