send errors to utilruntime

Victor · Victor · commit 20dccbb97486 · 2016-11-23T14:08:03.000+01:00
diff --git a/pkg/build/builder/docker.go b/pkg/build/builder/docker.go
@@ -14,6 +14,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	utilruntime "k8s.io/kubernetes/pkg/util/runtime"
 
 	s2iapi "github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/tar"
@@ -73,7 +74,7 @@ func (d *DockerBuilder) Build() error {
 		d.build.Status.Reason = api.StatusReasonFetchSourceFailed
 		d.build.Status.Message = api.StatusMessageFetchSourceFailed
 		if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return err
 	}
@@ -82,7 +83,7 @@ func (d *DockerBuilder) Build() error {
 		glog.V(4).Infof("Setting build revision with details %#v", sourceInfo)
 		revision := updateBuildRevision(d.build, sourceInfo)
 		if updateErr := retryBuildStatusUpdate(d.build, d.client, revision); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 	}
 	if err = d.addBuildParameters(buildDir); err != nil {
@@ -126,7 +127,7 @@ func (d *DockerBuilder) Build() error {
 			glog.V(0).Infof("\nPulling image %s ...", imageName)
 			if err = pullImage(d.dockerClient, imageName, pullAuthConfig); err != nil {
 				if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {
-					glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+					utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 				}
 				return fmt.Errorf("failed to pull image: %v", err)
 			}
@@ -140,7 +141,7 @@ func (d *DockerBuilder) Build() error {
 	cname := containerName("docker", d.build.Name, d.build.Namespace, "post-commit")
 	if err := execPostCommitHook(d.dockerClient, d.build.Spec.PostCommit, buildTag, cname); err != nil {
 		if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return err
 	}
@@ -167,7 +168,7 @@ func (d *DockerBuilder) Build() error {
 		glog.V(0).Infof("\nPushing image %s ...", pushTag)
 		if err := pushImage(d.dockerClient, pushTag, pushAuthConfig); err != nil {
 			if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {
-				glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+				utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 			}
 			return reportPushFailure(err, authPresent, pushAuthConfig)
 		}
diff --git a/pkg/build/builder/sti.go b/pkg/build/builder/sti.go
@@ -12,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	utilruntime "k8s.io/kubernetes/pkg/util/runtime"
+
 	s2iapi "github.com/openshift/source-to-image/pkg/api"
 	"github.com/openshift/source-to-image/pkg/api/describe"
 	"github.com/openshift/source-to-image/pkg/api/validation"
@@ -251,7 +253,7 @@ func (s *S2IBuilder) Build() error {
 	if err != nil {
 		s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(buildInfo.FailureReason.Reason, buildInfo.FailureReason.Message)
 		if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return err
 	}
@@ -262,7 +264,7 @@ func (s *S2IBuilder) Build() error {
 		s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(result.BuildInfo.FailureReason.Reason, result.BuildInfo.FailureReason.Message)
 
 		if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return err
 	}
@@ -272,7 +274,7 @@ func (s *S2IBuilder) Build() error {
 		s.build.Status.Reason = api.StatusReasonPostCommitHookFailed
 		s.build.Status.Message = api.StatusMessagePostCommitHookFailed
 		if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return err
 	}
@@ -303,7 +305,7 @@ func (s *S2IBuilder) Build() error {
 			s.build.Status.Reason = api.StatusReasonPushImageToRegistryFailed
 			s.build.Status.Message = api.StatusMessagePushImageToRegistryFailed
 			if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {
-				glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+				utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 			}
 			return reportPushFailure(err, authPresent, pushAuthConfig)
 		}
@@ -336,14 +338,14 @@ func (d *downloader) Download(config *s2iapi.Config) (*s2iapi.SourceInfo, error)
 		d.s.build.Status.Reason = api.StatusReasonFetchSourceFailed
 		d.s.build.Status.Message = api.StatusMessageFetchSourceFailed
 		if updateErr := retryBuildStatusUpdate(d.s.build, d.s.client, nil); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 		return nil, err
 	}
 	if sourceInfo != nil {
 		revision := updateBuildRevision(d.s.build, sourceInfo)
 		if updateErr := retryBuildStatusUpdate(d.s.build, d.s.client, revision); updateErr != nil {
-			glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)
+			utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))
 		}
 	}
 	if sourceInfo != nil {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`	`docker "github.com/fsouza/go-dockerclient"`
`15`	`15`
`16`	`16`	`kapi "k8s.io/kubernetes/pkg/api"`
	`17`	`+ utilruntime "k8s.io/kubernetes/pkg/util/runtime"`
`17`	`18`
`18`	`19`	`s2iapi "github.com/openshift/source-to-image/pkg/api"`
`19`	`20`	`"github.com/openshift/source-to-image/pkg/tar"`
`@@ -73,7 +74,7 @@ func (d *DockerBuilder) Build() error {`
`73`	`74`	`d.build.Status.Reason = api.StatusReasonFetchSourceFailed`
`74`	`75`	`d.build.Status.Message = api.StatusMessageFetchSourceFailed`
`75`	`76`	`if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {`
`76`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`77`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`77`	`78`	`}`
`78`	`79`	`return err`
`79`	`80`	`}`
`@@ -82,7 +83,7 @@ func (d *DockerBuilder) Build() error {`
`82`	`83`	`glog.V(4).Infof("Setting build revision with details %#v", sourceInfo)`
`83`	`84`	`revision := updateBuildRevision(d.build, sourceInfo)`
`84`	`85`	`if updateErr := retryBuildStatusUpdate(d.build, d.client, revision); updateErr != nil {`
`85`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`86`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`if err = d.addBuildParameters(buildDir); err != nil {`
`@@ -126,7 +127,7 @@ func (d *DockerBuilder) Build() error {`
`126`	`127`	`glog.V(0).Infof("\nPulling image %s ...", imageName)`
`127`	`128`	`if err = pullImage(d.dockerClient, imageName, pullAuthConfig); err != nil {`
`128`	`129`	`if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {`
`129`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`130`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`130`	`131`	`}`
`131`	`132`	`return fmt.Errorf("failed to pull image: %v", err)`
`132`	`133`	`}`
`@@ -140,7 +141,7 @@ func (d *DockerBuilder) Build() error {`
`140`	`141`	`cname := containerName("docker", d.build.Name, d.build.Namespace, "post-commit")`
`141`	`142`	`if err := execPostCommitHook(d.dockerClient, d.build.Spec.PostCommit, buildTag, cname); err != nil {`
`142`	`143`	`if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {`
`143`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`144`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`144`	`145`	`}`
`145`	`146`	`return err`
`146`	`147`	`}`
`@@ -167,7 +168,7 @@ func (d *DockerBuilder) Build() error {`
`167`	`168`	`glog.V(0).Infof("\nPushing image %s ...", pushTag)`
`168`	`169`	`if err := pushImage(d.dockerClient, pushTag, pushAuthConfig); err != nil {`
`169`	`170`	`if updateErr := retryBuildStatusUpdate(d.build, d.client, nil); updateErr != nil {`
`170`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`171`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`171`	`172`	`}`
`172`	`173`	`return reportPushFailure(err, authPresent, pushAuthConfig)`
`173`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ import (`
`12`	`12`	`"strings"`
`13`	`13`	`"time"`
`14`	`14`
	`15`	`+ utilruntime "k8s.io/kubernetes/pkg/util/runtime"`
	`16`	`+`
`15`	`17`	`s2iapi "github.com/openshift/source-to-image/pkg/api"`
`16`	`18`	`"github.com/openshift/source-to-image/pkg/api/describe"`
`17`	`19`	`"github.com/openshift/source-to-image/pkg/api/validation"`
`@@ -251,7 +253,7 @@ func (s *S2IBuilder) Build() error {`
`251`	`253`	`if err != nil {`
`252`	`254`	`s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(buildInfo.FailureReason.Reason, buildInfo.FailureReason.Message)`
`253`	`255`	`if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {`
`254`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`256`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`255`	`257`	`}`
`256`	`258`	`return err`
`257`	`259`	`}`
`@@ -262,7 +264,7 @@ func (s *S2IBuilder) Build() error {`
`262`	`264`	`s.build.Status.Reason, s.build.Status.Message = convertS2IFailureType(result.BuildInfo.FailureReason.Reason, result.BuildInfo.FailureReason.Message)`
`263`	`265`
`264`	`266`	`if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {`
`265`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`267`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`266`	`268`	`}`
`267`	`269`	`return err`
`268`	`270`	`}`
`@@ -272,7 +274,7 @@ func (s *S2IBuilder) Build() error {`
`272`	`274`	`s.build.Status.Reason = api.StatusReasonPostCommitHookFailed`
`273`	`275`	`s.build.Status.Message = api.StatusMessagePostCommitHookFailed`
`274`	`276`	`if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {`
`275`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`277`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`276`	`278`	`}`
`277`	`279`	`return err`
`278`	`280`	`}`
`@@ -303,7 +305,7 @@ func (s *S2IBuilder) Build() error {`
`303`	`305`	`s.build.Status.Reason = api.StatusReasonPushImageToRegistryFailed`
`304`	`306`	`s.build.Status.Message = api.StatusMessagePushImageToRegistryFailed`
`305`	`307`	`if updateErr := retryBuildStatusUpdate(s.build, s.client, nil); updateErr != nil {`
`306`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`308`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`307`	`309`	`}`
`308`	`310`	`return reportPushFailure(err, authPresent, pushAuthConfig)`
`309`	`311`	`}`
`@@ -336,14 +338,14 @@ func (d downloader) Download(config s2iapi.Config) (*s2iapi.SourceInfo, error)`
`336`	`338`	`d.s.build.Status.Reason = api.StatusReasonFetchSourceFailed`
`337`	`339`	`d.s.build.Status.Message = api.StatusMessageFetchSourceFailed`
`338`	`340`	`if updateErr := retryBuildStatusUpdate(d.s.build, d.s.client, nil); updateErr != nil {`
`339`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`341`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`340`	`342`	`}`
`341`	`343`	`return nil, err`
`342`	`344`	`}`
`343`	`345`	`if sourceInfo != nil {`
`344`	`346`	`revision := updateBuildRevision(d.s.build, sourceInfo)`
`345`	`347`	`if updateErr := retryBuildStatusUpdate(d.s.build, d.s.client, revision); updateErr != nil {`
`346`		`- glog.V(0).Infof("error: An error occured while updating the build status: %v", updateErr)`
	`348`	`+ utilruntime.HandleError(fmt.Errorf("error: An error occured while updating the build status: %v", updateErr))`
`347`	`349`	`}`
`348`	`350`	`}`
`349`	`351`	`if sourceInfo != nil {`