Merge pull request #18253 from bparees/resolve_secret2

Automatic merge from submit-queue.

wait for default service account secrets before running build

fixes https://bugzilla.redhat.com/show_bug.cgi?id=1333030

Author: openshift-merge-robot

pkg/build/apis/build/types.go

@@ -544,7 +544,7 @@ const (
 	StatusMessageFailedContainer                 = "The pod for this build has at least one container with a non-zero exit status."
 	StatusMessageGenericBuildFailed              = "Generic Build failure - check logs for details."
 	StatusMessageUnresolvableEnvironmentVariable = "Unable to resolve build environment variable reference."
-	StatusMessageCannotRetrieveServiceAccount    = "Unable to look up the service account associated with this build."
+	StatusMessageCannotRetrieveServiceAccount    = "Unable to look up the service account secrets for this build."
 )
 
 // BuildStatusOutput contains the status of the built image.

pkg/build/controller/build/build_controller.go

@@ -500,11 +500,23 @@ func (bc *BuildController) resolveImageSecretAsReference(build *buildapi.Build,
 	if err != nil {
 		return nil, fmt.Errorf("Error getting push/pull secrets for service account %s/%s: %v", build.Namespace, serviceAccount, err)
 	}
-	pushSecret := buildutil.FindDockerSecretAsReference(builderSecrets, imagename)
-	if pushSecret == nil {
+	secret := buildutil.FindDockerSecretAsReference(builderSecrets, imagename)
+	if secret == nil {
+		dockerSecretExists := false
+		for _, builderSecret := range builderSecrets {
+			if builderSecret.Type == kapi.SecretTypeDockercfg || builderSecret.Type == kapi.SecretTypeDockerConfigJson {
+				dockerSecretExists = true
+				break
+			}
+		}
+		// If there are no docker secrets associated w/ the service account, return an error so the build
+		// will be retried.  The secrets will be created shortly.
+		if !dockerSecretExists {
+			return nil, fmt.Errorf("No docker secrets associated with build service account %s", serviceAccount)
+		}
 		glog.V(4).Infof("No secrets found for pushing or pulling image named %s for build %s/%s", imagename, build.Namespace, build.Name)
 	}
-	return pushSecret, nil
+	return secret, nil
 }
 
 // resourceName creates a string that can be used to uniquely key the provided resource.

pkg/build/controller/build/build_controller_test.go

@@ -456,7 +456,7 @@ func TestCreateBuildPodWithImageStreamOutput(t *testing.T) {
 	imageStreamRef := &kapi.ObjectReference{Name: "isname:latest", Namespace: "isnamespace", Kind: "ImageStreamTag"}
 	bc := newFakeBuildController(nil, imageClient, nil, nil)
 	defer bc.stop()
-	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef}))
+	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef, PushSecret: &kapi.LocalObjectReference{}}))
 	podName := buildapi.GetBuildPodName(build)
 
 	update, err := bc.createBuildPod(build)
@@ -479,7 +479,7 @@ func TestCreateBuildPodWithOutputImageStreamMissing(t *testing.T) {
 	imageStreamRef := &kapi.ObjectReference{Name: "isname:latest", Namespace: "isnamespace", Kind: "ImageStreamTag"}
 	bc := newFakeBuildController(nil, nil, nil, nil)
 	defer bc.stop()
-	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef}))
+	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef, PushSecret: &kapi.LocalObjectReference{}}))
 
 	update, err := bc.createBuildPod(build)
 
@@ -499,7 +499,7 @@ func TestCreateBuildPodWithImageStreamMissing(t *testing.T) {
 	imageStreamRef := &kapi.ObjectReference{Name: "isname:latest", Kind: "DockerImage"}
 	bc := newFakeBuildController(nil, nil, nil, nil)
 	defer bc.stop()
-	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef}))
+	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef, PushSecret: &kapi.LocalObjectReference{}}))
 	build.Spec.Strategy.DockerStrategy.From = &kapi.ObjectReference{Kind: "ImageStreamTag", Name: "isname:latest"}
 
 	update, err := bc.createBuildPod(build)
@@ -524,7 +524,7 @@ func TestCreateBuildPodWithImageStreamUnresolved(t *testing.T) {
 	imageStreamRef := &kapi.ObjectReference{Name: "isname:latest", Namespace: "isnamespace", Kind: "ImageStreamTag"}
 	bc := newFakeBuildController(nil, imageClient, nil, nil)
 	defer bc.stop()
-	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef}))
+	build := dockerStrategy(mockBuild(buildapi.BuildPhaseNew, buildapi.BuildOutput{To: imageStreamRef, PushSecret: &kapi.LocalObjectReference{}}))
 
 	update, err := bc.createBuildPod(build)