Add 'MissingSecret' reason for pending builds

Author: mfojtik

pkg/build/api/types.go

@@ -259,6 +259,11 @@ const (
 	// StatusReasonExceededRetryTimeout is an error condition when the build has
 	// not completed and retrying the build times out.
 	StatusReasonExceededRetryTimeout = "ExceededRetryTimeout"
+
+	// StatusReasonMissingPushSecret indicates that the build is missing required
+	// secret for pushing the output image.
+	// The build will stay in the pending state until the secret is created, or the build times out.
+	StatusReasonMissingPushSecret = "MissingPushSecret"
 )
 
 // BuildSource is the input used for the build.

pkg/build/controller/controller.go

@@ -10,6 +10,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/client/record"
+	kclient "k8s.io/kubernetes/pkg/client/unversioned"
 
 	buildapi "github.com/openshift/origin/pkg/build/api"
 	buildclient "github.com/openshift/origin/pkg/build/client"
@@ -266,6 +267,7 @@ func (bc *BuildController) resolveOutputDockerImageReference(build *buildapi.Bui
 type BuildPodController struct {
 	BuildStore   cache.Store
 	BuildUpdater buildclient.BuildUpdater
+	SecretClient kclient.SecretsNamespacer
 	PodManager   podManager
 }
 
@@ -284,13 +286,26 @@ func (bc *BuildPodController) HandlePod(pod *kapi.Pod) error {
 	build := obj.(*buildapi.Build)
 
 	nextStatus := build.Status.Phase
+	currentReason := build.Status.Reason
+
 	switch pod.Status.Phase {
 	case kapi.PodRunning:
 		// The pod's still running
+		build.Status.Reason = ""
 		nextStatus = buildapi.BuildPhaseRunning
+	case kapi.PodPending:
+		build.Status.Reason = ""
+		nextStatus = buildapi.BuildPhasePending
+		if secret := build.Spec.Output.PushSecret; secret != nil && currentReason != buildapi.StatusReasonMissingPushSecret {
+			if _, err := bc.SecretClient.Secrets(build.Namespace).Get(secret.Name); err != nil && errors.IsNotFound(err) {
+				build.Status.Reason = buildapi.StatusReasonMissingPushSecret
+				glog.V(4).Infof("Setting reason for pending build to %q due to missing secret %s/%s", build.Status.Reason, build.Namespace, secret.Name)
+			}
+		}
 	case kapi.PodSucceeded:
 		// Check the exit codes of all the containers in the pod
 		nextStatus = buildapi.BuildPhaseComplete
+		build.Status.Reason = ""
 		if len(pod.Status.ContainerStatuses) == 0 {
 			// no containers in the pod means something went badly wrong, so the build
 			// should be failed.
@@ -305,13 +320,19 @@ func (bc *BuildPodController) HandlePod(pod *kapi.Pod) error {
 			}
 		}
 	case kapi.PodFailed:
+		build.Status.Reason = ""
 		nextStatus = buildapi.BuildPhaseFailed
 	}
 
+	// Update the build object when it progress to a next state or the reason for
+	// the current state changed.
 	if build.Status.Phase != nextStatus && !buildutil.IsBuildComplete(build) {
-		glog.V(4).Infof("Updating build %s/%s status %s -> %s", build.Namespace, build.Name, build.Status.Phase, nextStatus)
+		reason := ""
+		if len(build.Status.Reason) > 0 {
+			reason = " (" + string(build.Status.Reason) + ")"
+		}
+		glog.V(4).Infof("Updating build %s/%s status %s -> %s%s", build.Namespace, build.Name, build.Status.Phase, nextStatus, reason)
 		build.Status.Phase = nextStatus
-		build.Status.Reason = ""
 		build.Status.Message = ""
 		if buildutil.IsBuildComplete(build) {
 			now := unversioned.Now()

pkg/build/controller/factory/factory.go

@@ -197,6 +197,7 @@ func (factory *BuildPodControllerFactory) Create() controller.RunnableController
 	buildPodController := &buildcontroller.BuildPodController{
 		BuildStore:   factory.buildStore,
 		BuildUpdater: factory.BuildUpdater,
+		SecretClient: factory.KubeClient,
 		PodManager:   client,
 	}