started and complete events only

Author: bparees

pkg/build/api/types.go

@@ -64,29 +64,21 @@ const (
 	// for a resync.
 	BuildAcceptedAnnotation = "build.openshift.io/accepted"
 
-	// BuildCreatedEvent is the reason associated with the event registered when a build is created.
-	BuildCreatedEventReason = "BuildCreated"
-	// BuildCreatedEventMessage is the message associatd with the event registered when a build is created.
-	BuildCreatedEventMessage = "Build %s/%s has been created"
-	// BuildStartedEvent is the reason associated with the event registered when a build is started (pod is created).
+	// BuildStartedEventReason is the reason associated with the event registered when a build is started (pod is created).
 	BuildStartedEventReason = "BuildStarted"
-	// BuildStartedEvent is the message associated with the event registered when a build is started (pod is created).
-	BuildStartedEventMessage = "Pod has been created to run build %s/%s"
-	// BuildRunningEvent is the reason associated with the event registered when the build pod starts running.
-	BuildRunningEventReason = "BuildRunning"
-	// BuildRunningEvent is the message associated with the event registered when the build pod starts running.
-	BuildRunningEventMessage = "Pod for build %s/%s started running"
-	// BuildCompletedEvent is the reason associated with the event registered when build completes successfully.
+	// BuildStartedEventMessage is the message associated with the event registered when a build is started (pod is created).
+	BuildStartedEventMessage = "Build %s/%s is now running"
+	// BuildCompletedEventReason is the reason associated with the event registered when build completes successfully.
 	BuildCompletedEventReason = "BuildCompleted"
-	// BuildCompletedEvent is the message associated with the event registered when build completes successfully.
+	// BuildCompletedEventMessage is the message associated with the event registered when build completes successfully.
 	BuildCompletedEventMessage = "Build %s/%s completed successfully"
-	// BuildFailedEvent is the reason associated with the event registered when build fails.
+	// BuildFailedEventReason is the reason associated with the event registered when build fails.
 	BuildFailedEventReason = "BuildFailed"
-	// BuildFailedEvent is the message associated with the event registered when build fails.
+	// BuildFailedEventMessage is the message associated with the event registered when build fails.
 	BuildFailedEventMessage = "Build %s/%s failed"
-	// BuildCancelledEvent is the reason associated with the event registered when build is cancelled.
+	// BuildCancelledEventReason is the reason associated with the event registered when build is cancelled.
 	BuildCancelledEventReason = "BuildCancelled"
-	// BuildCancelledEvent is the message associated with the event registered when build is cancelled.
+	// BuildCancelledEventMessage is the message associated with the event registered when build is cancelled.
 	BuildCancelledEventMessage = "Build %s/%s has been cancelled"
 )
 

pkg/build/client/clients.go

@@ -37,11 +37,6 @@ func (c OSClientBuildConfigClient) Update(buildConfig *buildapi.BuildConfig) err
 	return err
 }
 
-// BuildGetter provides methods for getting existing Builds.
-type BuildGetter interface {
-	Get(namespace, name string) (*buildapi.Build, error)
-}
-
 // BuildUpdater provides methods for updating existing Builds.
 type BuildUpdater interface {
 	Update(namespace string, build *buildapi.Build) error
@@ -62,11 +57,6 @@ func NewOSClientBuildClient(client osclient.Interface) *OSClientBuildClient {
 	return &OSClientBuildClient{Client: client}
 }
 
-// Get returns a Build using the OpenShift client.
-func (c OSClientBuildClient) Get(namespace, name string) (*buildapi.Build, error) {
-	return c.Client.Builds(namespace).Get(name)
-}
-
 // Update updates builds using the OpenShift client.
 func (c OSClientBuildClient) Update(namespace string, build *buildapi.Build) error {
 	_, e := c.Client.Builds(namespace).Update(build)

pkg/build/controller/buildpod/controller.go

@@ -204,7 +204,7 @@ func (bc *BuildPodController) HandlePod(pod *kapi.Pod) error {
 		if build.Status.Phase == buildapi.BuildPhaseRunning {
 			now := unversioned.Now()
 			build.Status.StartTimestamp = &now
-			bc.recorder.Eventf(build, kapi.EventTypeNormal, buildapi.BuildRunningEventReason, fmt.Sprintf(buildapi.BuildRunningEventMessage, build.Namespace, build.Name))
+			bc.recorder.Eventf(build, kapi.EventTypeNormal, buildapi.BuildStartedEventReason, fmt.Sprintf(buildapi.BuildStartedEventMessage, build.Namespace, build.Name))
 		}
 	}
 

pkg/build/controller/controller.go

@@ -220,9 +220,8 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {
 		build.Status.Message = buildapi.StatusMessageCannotCreateBuildPod
 		return fmt.Errorf("failed to create build pod: %v", err)
 	}
-	glog.V(4).Infof("Created pod for build: %#v", podSpec)
-	bc.Recorder.Eventf(build, kapi.EventTypeNormal, buildapi.BuildStartedEventReason, fmt.Sprintf(buildapi.BuildStartedEventMessage, build.Namespace, build.Name))
 	common.SetBuildPodNameAnnotation(build, podSpec.Name)
+	glog.V(4).Infof("Created pod for build: %#v", podSpec)
 
 	// Set the build phase, which will be persisted.
 	build.Status.Phase = buildapi.BuildPhasePending

pkg/build/controller/image_change_controller_test.go

@@ -13,7 +13,6 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/api"
 	buildtest "github.com/openshift/origin/pkg/build/controller/test"
 	buildgenerator "github.com/openshift/origin/pkg/build/generator"
-	mocks "github.com/openshift/origin/pkg/build/generator/test"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	imageapi "github.com/openshift/origin/pkg/image/api"
 )
@@ -387,11 +386,7 @@ func mockBuildConfigInstantiator(buildcfg *buildapi.BuildConfig, imageStream *im
 	}
 	instantiator := &buildConfigInstantiator{}
 	instantiator.buildConfigUpdater = &mockBuildConfigUpdater{}
-	recorder := &mocks.MockEventRecorder{}
-	buildGetter := &mocks.MockBuildGetter{}
 	generator := buildgenerator.BuildGenerator{
-		Builds:          buildGetter,
-		Recorder:        recorder,
 		Secrets:         fake.NewSimpleClientset().Core(),
 		ServiceAccounts: fake.NewSimpleClientset(&builderAccount).Core(),
 		Client: buildgenerator.Client{

pkg/build/generator/generator.go

@@ -13,12 +13,10 @@ import (
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
-	"k8s.io/kubernetes/pkg/client/record"
 	"k8s.io/kubernetes/pkg/credentialprovider"
 	kvalidation "k8s.io/kubernetes/pkg/util/validation"
 
 	buildapi "github.com/openshift/origin/pkg/build/api"
-	buildclient "github.com/openshift/origin/pkg/build/client"
 	buildutil "github.com/openshift/origin/pkg/build/util"
 	"github.com/openshift/origin/pkg/cmd/admin/policy"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
@@ -51,8 +49,6 @@ type BuildGenerator struct {
 	DefaultServiceAccountName string
 	ServiceAccounts           kcoreclient.ServiceAccountsGetter
 	Secrets                   kcoreclient.SecretsGetter
-	Recorder                  record.EventRecorder
-	Builds                    buildclient.BuildGetter
 }
 
 // GeneratorClient is the API client used by the generator
@@ -434,12 +430,7 @@ func (g *BuildGenerator) createBuild(ctx kapi.Context, build *buildapi.Build) (*
 	if err != nil {
 		return nil, err
 	}
-	b, err := g.Builds.Get(build.Namespace, build.Name)
-	//b, err := g.Client.GetBuild(ctx, build.Name)
-	if err == nil {
-		g.Recorder.Eventf(b, kapi.EventTypeNormal, buildapi.BuildCreatedEventReason, fmt.Sprintf(buildapi.BuildCreatedEventMessage, build.Namespace, build.Name))
-	}
-	return build, err
+	return g.Client.GetBuild(ctx, build.Name)
 }
 
 // generateBuildFromConfig generates a build definition based on the current imageid