@@ -493,6 +493,12 @@ message CommonSpec {

   // be active on a node before the system actively tries to terminate the

   // build; value must be positive integer

   optional int64 completionDeadlineSeconds = 8;

+

+  // nodeSelector is a selector which must be true for the build pod to fit on a node

+  // If nil, it can be overridden by default build nodeselector values for the cluster.

+  // If set to an empty map or a map with any values, default build nodeselector values

+  // are ignored.

+  optional OptionalNodeSelector nodeSelector = 9;

 }

 // CustomBuildStrategy defines input parameters specific to Custom build.

@@ -695,6 +701,15 @@ message JenkinsPipelineBuildStrategy {

   optional string jenkinsfile = 2;

 }

+// OptionalNodeSelector is a map that may also be left nil to distinguish between set and unset.

+// +protobuf.nullable=true

+// +protobuf.options.(gogoproto.goproto_stringer)=false

+message OptionalNodeSelector {

+  // items, if empty, will result in an empty map

+

+  map<string, string> items = 1;

+}

+

 // ProxyConfig defines what proxies to use for an operation

 message ProxyConfig {

   // httpProxy is a proxy used to reach the git repository over http

@@ -21416,7 +21416,8 @@

     "description": "BuildConfigSpec describes when and how builds are created",

     "required": [

      "triggers",

-     "strategy"

+     "strategy",

+     "nodeSelector"

     ],

     "properties": {

      "triggers": {

@@ -21462,6 +21463,10 @@

       "type": "integer",

       "format": "int64",

       "description": "completionDeadlineSeconds is an optional duration in seconds, counted from the time when a build pod gets scheduled in the system, that the build may be active on a node before the system actively tries to terminate the build; value must be positive integer"

+     },

+     "nodeSelector": {

+      "type": "object",

+      "description": "nodeSelector is a selector which must be true for the build pod to fit on a node If nil, it can be overridden by default build nodeselector values for the cluster. If set to an empty map or a map with any values, default build nodeselector values are ignored."

      }

     }

    },

@@ -22477,6 +22482,7 @@

     "description": "BuildSpec has the information to represent a build and also additional information about a build",

     "required": [

      "strategy",

+     "nodeSelector",

      "triggeredBy"

     ],

     "properties": {

@@ -22513,6 +22519,10 @@

       "format": "int64",

       "description": "completionDeadlineSeconds is an optional duration in seconds, counted from the time when a build pod gets scheduled in the system, that the build may be active on a node before the system actively tries to terminate the build; value must be positive integer"

      },

+     "nodeSelector": {

+      "type": "object",

+      "description": "nodeSelector is a selector which must be true for the build pod to fit on a node If nil, it can be overridden by default build nodeselector values for the cluster. If set to an empty map or a map with any values, default build nodeselector values are ignored."

+     },

      "triggeredBy": {

       "type": "array",

       "items": {

@@ -44686,7 +44686,8 @@

     "description": "BuildConfigSpec describes when and how builds are created",

     "required": [

      "triggers",

-     "strategy"

+     "strategy",

+     "nodeSelector"

     ],

     "properties": {

      "completionDeadlineSeconds": {

@@ -44694,6 +44695,10 @@

       "type": "integer",

       "format": "int64"

      },

+     "nodeSelector": {

+      "description": "nodeSelector is a selector which must be true for the build pod to fit on a node If nil, it can be overridden by default build nodeselector values for the cluster. If set to an empty map or a map with any values, default build nodeselector values are ignored.",

+      "type": "object"

+     },

      "output": {

       "$ref": "#/definitions/v1.BuildOutput"

      },

@@ -44919,6 +44924,7 @@

     "description": "BuildSpec has the information to represent a build and also additional information about a build",

     "required": [

      "strategy",

+     "nodeSelector",

      "triggeredBy"

     ],

     "properties": {

@@ -44927,6 +44933,10 @@

       "type": "integer",

       "format": "int64"

      },

+     "nodeSelector": {

+      "description": "nodeSelector is a selector which must be true for the build pod to fit on a node If nil, it can be overridden by default build nodeselector values for the cluster. If set to an empty map or a map with any values, default build nodeselector values are ignored.",

+      "type": "object"

+     },

      "output": {

       "$ref": "#/definitions/v1.BuildOutput"

      },

@@ -26,7 +26,7 @@ This command launches an instance of the Kubernetes apiserver (kube\-apiserver).

 .PP

 \fB\-\-admission\-control\fP="AlwaysAdmit"

-    Ordered list of plug\-ins to do admission control of resources into cluster. Comma\-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, BuildByStrategy, BuildDefaults, BuildOverrides, ClusterResourceOverride, DefaultStorageClass, DenyEscalatingExec, DenyExecOnPrivileged, ExternalIPRanger, ImagePolicyWebhook, InitialResources, LimitPodHardAntiAffinityTopology, LimitRanger, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, OriginNamespaceLifecycle, OriginPodNodeEnvironment, OwnerReferencesPermissionEnforcement, PersistentVolumeLabel, PodNodeConstraints, PodSecurityPolicy, ProjectRequestLimit, ResourceQuota, RunOnceDuration, SCCExecRestrictions, SecurityContextConstraint, SecurityContextDeny, ServiceAccount, openshift.io/ClusterResourceQuota, openshift.io/ImageLimitRange, openshift.io/ImagePolicy, openshift.io/JenkinsBootstrapper, openshift.io/OriginResourceQuota, openshift.io/RestrictedEndpointsAdmission.

+    Ordered list of plug\-ins to do admission control of resources into cluster. Comma\-delimited list of: AlwaysAdmit, AlwaysDeny, AlwaysPullImages, BuildByStrategy, ClusterResourceOverride, DefaultStorageClass, DenyEscalatingExec, DenyExecOnPrivileged, ExternalIPRanger, ImagePolicyWebhook, InitialResources, LimitPodHardAntiAffinityTopology, LimitRanger, NamespaceAutoProvision, NamespaceExists, NamespaceLifecycle, OriginNamespaceLifecycle, OriginPodNodeEnvironment, OwnerReferencesPermissionEnforcement, PersistentVolumeLabel, PodNodeConstraints, PodSecurityPolicy, ProjectRequestLimit, ResourceQuota, RunOnceDuration, SCCExecRestrictions, SecurityContextConstraint, SecurityContextDeny, ServiceAccount, openshift.io/ClusterResourceQuota, openshift.io/ImageLimitRange, openshift.io/ImagePolicy, openshift.io/JenkinsBootstrapper, openshift.io/OriginResourceQuota, openshift.io/RestrictedEndpointsAdmission.

 .PP

 \fB\-\-admission\-control\-config\-file\fP=""

@@ -4,7 +4,6 @@ import (

 	"errors"

 	"fmt"

-	"k8s.io/kubernetes/pkg/admission"

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/unversioned"

 	"k8s.io/kubernetes/pkg/runtime"

@@ -12,70 +11,44 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 )

-// IsBuildPod returns true if a pod is a pod generated for a Build

-func IsBuildPod(a admission.Attributes) bool {

-	if a.GetResource().GroupResource() != kapi.Resource("pods") {

-		return false

-	}

-	if len(a.GetSubresource()) != 0 {

-		return false

-	}

-	pod, err := GetPod(a)

-	if err != nil {

-		return false

-	}

-	return hasBuildAnnotation(pod) && hasBuildEnvVar(pod)

-}

-

-// GetBuild returns a build object encoded in a pod's BUILD environment variable along with

+// GetBuildFromPod returns a build object encoded in a pod's BUILD environment variable along with

 // its encoding version

-func GetBuild(a admission.Attributes) (*buildapi.Build, unversioned.GroupVersion, error) {

-	pod, err := GetPod(a)

+func GetBuildFromPod(pod *kapi.Pod) (*buildapi.Build, unversioned.GroupVersion, error) {

+	envVar, err := buildEnvVar(pod)

 	if err != nil {

-		return nil, unversioned.GroupVersion{}, err

+		return nil, unversioned.GroupVersion{}, fmt.Errorf("unable to get build from pod: %v", err)

 	}

-	build, version, err := getBuildFromPod(pod)

+	obj, groupVersionKind, err := kapi.Codecs.UniversalDecoder().Decode([]byte(envVar.Value), nil, nil)

 	if err != nil {

-		return nil, unversioned.GroupVersion{}, admission.NewForbidden(a, fmt.Errorf("unable to get build from pod: %v", err))

+		return nil, unversioned.GroupVersion{}, fmt.Errorf("unable to get build from pod: %v", err)

 	}

-	return build, version, nil

-}

-

-// GetPod returns a pod from an admission attributes object

-func GetPod(a admission.Attributes) (*kapi.Pod, error) {

-	pod, isPod := a.GetObject().(*kapi.Pod)

-	if !isPod {

-		return nil, admission.NewForbidden(a, fmt.Errorf("unrecognized request object: %#v", a.GetObject()))

+	build, ok := obj.(*buildapi.Build)

+	if !ok {

+		return nil, unversioned.GroupVersion{}, fmt.Errorf("unable to get build from pod: %v", errors.New("decoded object is not of type Build"))

 	}

-	return pod, nil

+	return build, groupVersionKind.GroupVersion(), nil

 }

-// SetBuild encodes a build object and sets it in a pod's BUILD environment variable

-func SetBuild(a admission.Attributes, build *buildapi.Build, groupVersion unversioned.GroupVersion) error {

-	pod, err := GetPod(a)

+// SetBuildInPod encodes a build object and sets it in a pod's BUILD environment variable

+func SetBuildInPod(pod *kapi.Pod, build *buildapi.Build, groupVersion unversioned.GroupVersion) error {

+	envVar, err := buildEnvVar(pod)

 	if err != nil {

-		return err

+		return fmt.Errorf("unable to set build in pod: %v", err)

 	}

-

-	err = setBuildInPod(build, pod, groupVersion)

+	encodedBuild, err := runtime.Encode(kapi.Codecs.LegacyCodec(groupVersion), build)

 	if err != nil {

-		return admission.NewForbidden(a, fmt.Errorf("unable to set build in pod: %v", err))

+		return fmt.Errorf("unable to set build in pod: %v", err)

 	}

-

+	envVar.Value = string(encodedBuild)

 	return nil

 }

-// SetBuildLogLevel extracts BUILD_LOGLEVEL from the Build environment

+// SetPodLogLevelFromBuild extracts BUILD_LOGLEVEL from the Build environment

 // and feeds it as an argument to the Pod's entrypoint. The BUILD_LOGLEVEL

 // environment variable may have been set in multiple ways: a default value,

 // by a BuildConfig, or by the BuildDefaults admission plugin. In this method

 // we finally act on the value by injecting it into the Pod.

-func SetBuildLogLevel(attributes admission.Attributes, build *buildapi.Build) error {

-	pod, err := GetPod(attributes)

-	if err != nil {

-		return err

-	}

-

+func SetPodLogLevelFromBuild(pod *kapi.Pod, build *buildapi.Build) error {

 	var envs []kapi.EnvVar

 	// Check whether the build strategy supports --loglevel parameter.

@@ -102,39 +75,6 @@ func SetBuildLogLevel(attributes admission.Attributes, build *buildapi.Build) er

 	return nil

 }

-// getBuildFromPod detects the encoding of a Build in a pod and returns the Build

-// object along with its detected version.

-func getBuildFromPod(pod *kapi.Pod) (*buildapi.Build, unversioned.GroupVersion, error) {

-	envVar, err := buildEnvVar(pod)

-	if err != nil {

-		return nil, unversioned.GroupVersion{}, err

-	}

-	obj, groupVersionKind, err := kapi.Codecs.UniversalDecoder().Decode([]byte(envVar.Value), nil, nil)

-	if err != nil {

-		return nil, unversioned.GroupVersion{}, err

-	}

-	build, ok := obj.(*buildapi.Build)

-	if !ok {

-		return nil, unversioned.GroupVersion{}, errors.New("decoded object is not of type Build")

-	}

-	return build, groupVersionKind.GroupVersion(), nil

-}

-

-// setBuildInPod encodes a build with the given version and sets it in the BUILD environment variable

-// of the pod.

-func setBuildInPod(build *buildapi.Build, pod *kapi.Pod, groupVersion unversioned.GroupVersion) error {

-	envVar, err := buildEnvVar(pod)

-	if err != nil {

-		return err

-	}

-	encodedBuild, err := runtime.Encode(kapi.Codecs.LegacyCodec(groupVersion), build)

-	if err != nil {

-		return err

-	}

-	envVar.Value = string(encodedBuild)

-	return nil

-}

-

 func buildEnvVar(pod *kapi.Pod) (*kapi.EnvVar, error) {

 	if len(pod.Spec.Containers) == 0 {

 		return nil, errors.New("pod has no containers")

@@ -8,47 +8,13 @@ import (

 	"k8s.io/kubernetes/pkg/api/unversioned"

 	u "github.com/openshift/origin/pkg/build/admission/testutil"

-	buildapi "github.com/openshift/origin/pkg/build/api"

 )

-func TestIsBuildPod(t *testing.T) {

-	tests := []struct {

-		pod      *u.TestPod

-		expected bool

-	}{

-		{

-			pod:      u.Pod().WithAnnotation("foo", "bar"),

-			expected: false,

-		},

-		{

-			pod:      u.Pod().WithEnvVar("BUILD", "blah"),

-			expected: false,

-		},

-		{

-			pod:      u.Pod().WithAnnotation(buildapi.BuildAnnotation, "build"),

-			expected: false,

-		},

-		{

-			pod: u.Pod().

-				WithAnnotation(buildapi.BuildAnnotation, "build").

-				WithEnvVar("BUILD", "true"),

-			expected: true,

-		},

-	}

-

-	for _, tc := range tests {

-		actual := IsBuildPod(tc.pod.ToAttributes())

-		if actual != tc.expected {

-			t.Errorf("unexpected result (%v) for pod %#v", actual, tc.pod)

-		}

-	}

-}

-

 func TestGetBuild(t *testing.T) {

 	build := u.Build().WithDockerStrategy()

 	for _, version := range []string{"v1"} {

 		pod := u.Pod().WithBuild(t, build.AsBuild(), version)

-		resultBuild, resultVersion, err := GetBuild(pod.ToAttributes())

+		resultBuild, resultVersion, err := GetBuildFromPod((*kapi.Pod)(pod))

 		if err != nil {

 			t.Fatalf("unexpected error: %v", err)

 		}

@@ -69,7 +35,7 @@ func TestSetBuild(t *testing.T) {

 		if err != nil {

 			t.Fatalf("unexpected error: %v", err)

 		}

-		err = SetBuild(pod.ToAttributes(), build.AsBuild(), groupVersion)

+		err = SetBuildInPod((*kapi.Pod)(pod), build.AsBuild(), groupVersion)

 		if err != nil {

 			t.Fatalf("unexpected error: %v", err)

 		}

@@ -83,7 +49,7 @@ func TestSetBuild(t *testing.T) {

 func TestSetBuildLogLevel(t *testing.T) {

 	build := u.Build().WithSourceStrategy()

 	pod := u.Pod().WithEnvVar("BUILD", "foo")

-	SetBuildLogLevel(pod.ToAttributes(), build.AsBuild())

+	SetPodLogLevelFromBuild((*kapi.Pod)(pod), build.AsBuild())

 	if len(pod.Spec.Containers[0].Args) == 0 {

 		t.Errorf("Builds pod loglevel was not set")

@@ -96,7 +62,7 @@ func TestSetBuildLogLevel(t *testing.T) {

 	build = u.Build().WithSourceStrategy()

 	pod = u.Pod().WithEnvVar("BUILD", "foo")

 	build.Spec.Strategy.SourceStrategy.Env = []kapi.EnvVar{{Name: "BUILD_LOGLEVEL", Value: "7", ValueFrom: nil}}

-	SetBuildLogLevel(pod.ToAttributes(), build.AsBuild())

+	SetPodLogLevelFromBuild((*kapi.Pod)(pod), build.AsBuild())

 	if pod.Spec.Containers[0].Args[0] != "--loglevel=7" {

 		t.Errorf("Build pod loglevel was not transferred from BUILD_LOGLEVEL environment variable: %#v", pod)

@@ -1,27 +1,26 @@

 package admission

 import (

-	"io"

-	"io/ioutil"

-	"reflect"

+	"github.com/golang/glog"

 	"k8s.io/kubernetes/pkg/runtime"

+	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 	configlatest "github.com/openshift/origin/pkg/cmd/server/api/latest"

+	"github.com/openshift/origin/pkg/cmd/util/pluginconfig"

 )

 // ReadPluginConfig will read a plugin configuration object from a reader stream

-func ReadPluginConfig(reader io.Reader, config runtime.Object) error {

-	if reader == nil || reflect.ValueOf(reader).IsNil() {

+func ReadPluginConfig(pluginConfig map[string]configapi.AdmissionPluginConfig, name string, config runtime.Object) error {

+

+	configFilePath, err := pluginconfig.GetPluginConfigFile(pluginConfig, name, "")

+	if configFilePath == "" {

 		return nil

 	}

-	configBytes, err := ioutil.ReadAll(reader)

-	if err != nil {

-		return err

-	}

-	err = configlatest.ReadYAMLInto(configBytes, config)

+	err = configlatest.ReadYAMLFileInto(configFilePath, config)

 	if err != nil {

+		glog.Errorf("couldn't open plugin configuration %s: %#v", configFilePath, err)

 		return err

 	}

 	return nil

@@ -1,7 +1,6 @@

 package admission

 import (

-	"bytes"

 	"reflect"

 	"testing"

@@ -48,22 +47,15 @@ func TestReadPluginConfig(t *testing.T) {

 	configapi.Scheme.AddKnownTypes(configapi.SchemeGroupVersion, &OtherTestConfig2{})

 	configapi.Scheme.AddKnownTypeWithName(configapiv1.SchemeGroupVersion.WithKind("OtherTestConfig2"), &OtherTestConfig2V2{})

-	configString := `apiVersion: v1

-kind: TestConfig

-item1: hello

-item2:

-- foo

-- bar

-`

-

 	config := &TestConfig{}

 	expected := &TestConfig{

 		Item1: "hello",

 		Item2: []string{"foo", "bar"},

 	}

+	pluginCfg := map[string]configapi.AdmissionPluginConfig{"testconfig": {"", expected}}

 	// The config should match the expected config object

-	err := ReadPluginConfig(bytes.NewBufferString(configString), config)

+	err := ReadPluginConfig(pluginCfg, "testconfig", config)

 	if err != nil {

 		t.Fatalf("unexpected: %v", err)

 	}

@@ -71,16 +63,17 @@ item2:

 		t.Errorf("config does not equal expected: %#v", config)

 	}

-	// Passing a nil reader, should not get an error

-	var nilBuffer *bytes.Buffer

-	err = ReadPluginConfig(nilBuffer, &TestConfig{})

+	// Passing a nil cfg, should not get an error

+	pluginCfg = map[string]configapi.AdmissionPluginConfig{}

+	err = ReadPluginConfig(pluginCfg, "testconfig", &TestConfig{})

 	if err != nil {

 		t.Fatalf("unexpected: %v", err)

 	}

 	// Passing the wrong type of destination object should result in an error

 	config2 := &OtherTestConfig2{}

-	err = ReadPluginConfig(bytes.NewBufferString(configString), config2)

+	pluginCfg = map[string]configapi.AdmissionPluginConfig{"testconfig": {"", expected}}

+	err = ReadPluginConfig(pluginCfg, "testconfig", config2)

 	if err == nil {

 		t.Fatalf("expected error")

 	}

@@ -1,100 +1,93 @@

 package defaults

 import (

-	"io"

-

 	"github.com/golang/glog"

-	"k8s.io/kubernetes/pkg/admission"

 	kapi "k8s.io/kubernetes/pkg/api"

-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

 	buildadmission "github.com/openshift/origin/pkg/build/admission"

 	defaultsapi "github.com/openshift/origin/pkg/build/admission/defaults/api"

 	"github.com/openshift/origin/pkg/build/admission/defaults/api/validation"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 )

-func init() {

-	admission.RegisterPlugin("BuildDefaults", func(c clientset.Interface, config io.Reader) (admission.Interface, error) {

-

-		defaultsConfig, err := getConfig(config)

-		if err != nil {

-			return nil, err

-		}

-

-		glog.V(5).Infof("Initializing BuildDefaults plugin with config: %#v", defaultsConfig)

-		return NewBuildDefaults(defaultsConfig), nil

-	})

+type BuildDefaults struct {

+	config *defaultsapi.BuildDefaultsConfig

 }

-func getConfig(in io.Reader) (*defaultsapi.BuildDefaultsConfig, error) {

-	defaultsConfig := &defaultsapi.BuildDefaultsConfig{}

-	err := buildadmission.ReadPluginConfig(in, defaultsConfig)

+// NewBuildDefaults creates a new BuildDefaults that will apply the defaults specified in the plugin config

+func NewBuildDefaults(pluginConfig map[string]configapi.AdmissionPluginConfig) (BuildDefaults, error) {

+	config := &defaultsapi.BuildDefaultsConfig{}

+	err := buildadmission.ReadPluginConfig(pluginConfig, defaultsapi.BuildDefaultsPlugin, config)

 	if err != nil {

-		return nil, err

+		return BuildDefaults{}, err

 	}

-	errs := validation.ValidateBuildDefaultsConfig(defaultsConfig)

+	errs := validation.ValidateBuildDefaultsConfig(config)

 	if len(errs) > 0 {

-		return nil, errs.ToAggregate()

+		return BuildDefaults{}, errs.ToAggregate()

 	}

-	return defaultsConfig, nil

+	glog.V(4).Infof("Initialized build defaults plugin with config: %#v", *config)

+	return BuildDefaults{config: config}, nil

 }

-type buildDefaults struct {

-	*admission.Handler

-	defaultsConfig *defaultsapi.BuildDefaultsConfig

-}

-

-// NewBuildDefaults returns an admission control for builds that sets build defaults

-// based on the plugin configuration

-func NewBuildDefaults(defaultsConfig *defaultsapi.BuildDefaultsConfig) admission.Interface {

-	return &buildDefaults{

-		Handler:        admission.NewHandler(admission.Create),

-		defaultsConfig: defaultsConfig,

-	}

-}

-

-// Admit applies configured build defaults to a pod that is identified

-// as a build pod.

-func (a *buildDefaults) Admit(attributes admission.Attributes) error {

-	if a.defaultsConfig == nil {

-		return nil

-	}

-	if !buildadmission.IsBuildPod(attributes) {

+// ApplyDefaults applies configured build defaults to a build pod

+func (b BuildDefaults) ApplyDefaults(pod *kapi.Pod) error {

+	if b.config == nil {

 		return nil

 	}

-	build, version, err := buildadmission.GetBuild(attributes)

+

+	build, version, err := buildadmission.GetBuildFromPod(pod)

 	if err != nil {

 		return nil

 	}

-	glog.V(4).Infof("Handling build %s/%s", build.Namespace, build.Name)

+	glog.V(4).Infof("Applying defaults to build %s/%s", build.Namespace, build.Name)

+

+	b.applyBuildDefaults(build)

-	a.applyBuildDefaults(build)

+	b.applyPodDefaults(pod)

-	err = buildadmission.SetBuildLogLevel(attributes, build)

+	err = buildadmission.SetPodLogLevelFromBuild(pod, build)

 	if err != nil {

 		return err

 	}

-	return buildadmission.SetBuild(attributes, build, version)

+	return buildadmission.SetBuildInPod(pod, build, version)

 }

-func (a *buildDefaults) applyBuildDefaults(build *buildapi.Build) {

+func (b BuildDefaults) applyPodDefaults(pod *kapi.Pod) {

+	if len(b.config.NodeSelector) != 0 && pod.Spec.NodeSelector == nil {

+		// only apply nodeselector defaults if the pod has no nodeselector labels

+		// already.

+		pod.Spec.NodeSelector = map[string]string{}

+		for k, v := range b.config.NodeSelector {

+			addDefaultNodeSelector(k, v, pod.Spec.NodeSelector)

+		}

+	}

+

+	if len(b.config.Annotations) != 0 && pod.Annotations == nil {

+		pod.Annotations = map[string]string{}

+	}

+	for k, v := range b.config.Annotations {

+		addDefaultAnnotations(k, v, pod.Annotations)

+	}

+}

+

+func (b BuildDefaults) applyBuildDefaults(build *buildapi.Build) {

 	// Apply default env

 	buildEnv := getBuildEnv(build)

-	for _, envVar := range a.defaultsConfig.Env {

+	for _, envVar := range b.config.Env {

 		glog.V(5).Infof("Adding default environment variable %s=%s to build %s/%s", envVar.Name, envVar.Value, build.Namespace, build.Name)

 		addDefaultEnvVar(envVar, buildEnv)

 	}

 	// Apply default labels

-	for _, lbl := range a.defaultsConfig.ImageLabels {

+	for _, lbl := range b.config.ImageLabels {

 		glog.V(5).Infof("Adding default image label %s=%s to build %s/%s", lbl.Name, lbl.Value, build.Namespace, build.Name)

 		addDefaultLabel(lbl, &build.Spec.Output.ImageLabels)

 	}

-	sourceDefaults := a.defaultsConfig.SourceStrategyDefaults

+	sourceDefaults := b.config.SourceStrategyDefaults

 	sourceStrategy := build.Spec.Strategy.SourceStrategy

 	if sourceDefaults != nil && sourceDefaults.Incremental != nil && *sourceDefaults.Incremental &&

 		sourceStrategy != nil && sourceStrategy.Incremental == nil {

@@ -107,25 +100,25 @@ func (a *buildDefaults) applyBuildDefaults(build *buildapi.Build) {

 	if build.Spec.Source.Git == nil {

 		return

 	}

-	if len(a.defaultsConfig.GitHTTPProxy) != 0 {

+	if len(b.config.GitHTTPProxy) != 0 {

 		if build.Spec.Source.Git.HTTPProxy == nil {

-			t := a.defaultsConfig.GitHTTPProxy

+			t := b.config.GitHTTPProxy

 			glog.V(5).Infof("Setting default Git HTTP proxy of build %s/%s to %s", build.Namespace, build.Name, t)

 			build.Spec.Source.Git.HTTPProxy = &t

 		}

 	}

-	if len(a.defaultsConfig.GitHTTPSProxy) != 0 {

+	if len(b.config.GitHTTPSProxy) != 0 {

 		if build.Spec.Source.Git.HTTPSProxy == nil {

-			t := a.defaultsConfig.GitHTTPSProxy

+			t := b.config.GitHTTPSProxy

 			glog.V(5).Infof("Setting default Git HTTPS proxy of build %s/%s to %s", build.Namespace, build.Name, t)

 			build.Spec.Source.Git.HTTPSProxy = &t

 		}

 	}

-	if len(a.defaultsConfig.GitNoProxy) != 0 {

+	if len(b.config.GitNoProxy) != 0 {

 		if build.Spec.Source.Git.NoProxy == nil {

-			t := a.defaultsConfig.GitNoProxy

+			t := b.config.GitNoProxy

 			glog.V(5).Infof("Setting default Git no proxy of build %s/%s to %s", build.Namespace, build.Name, t)

 			build.Spec.Source.Git.NoProxy = &t

 		}

@@ -168,3 +161,19 @@ func addDefaultLabel(defaultLabel buildapi.ImageLabel, buildLabels *[]buildapi.I

 		*buildLabels = append(*buildLabels, defaultLabel)

 	}

 }

+

+func addDefaultNodeSelector(k, v string, selectors map[string]string) bool {

+	if _, ok := selectors[k]; !ok {

+		selectors[k] = v

+		return true

+	}

+	return false

+}

+

+func addDefaultAnnotations(k, v string, annotations map[string]string) bool {

+	if _, ok := annotations[k]; !ok {

+		annotations[k] = v

+		return true

+	}

+	return false

+}

@@ -21,13 +21,13 @@ func TestProxyDefaults(t *testing.T) {

 		GitNoProxy:    "no",

 	}

-	admitter := NewBuildDefaults(defaultsConfig)

+	admitter := BuildDefaults{defaultsConfig}

 	pod := u.Pod().WithBuild(t, u.Build().WithDockerStrategy().AsBuild(), "v1")

-	err := admitter.Admit(pod.ToAttributes())

+	err := admitter.ApplyDefaults((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	build, _, err := buildadmission.GetBuild(pod.ToAttributes())

+	build, _, err := buildadmission.GetBuildFromPod((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -57,13 +57,13 @@ func TestEnvDefaults(t *testing.T) {

 		},

 	}

-	admitter := NewBuildDefaults(defaultsConfig)

+	admitter := BuildDefaults{defaultsConfig}

 	pod := u.Pod().WithBuild(t, u.Build().WithSourceStrategy().AsBuild(), "v1")

-	err := admitter.Admit(pod.ToAttributes())

+	err := admitter.ApplyDefaults((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	build, _, err := buildadmission.GetBuild(pod.ToAttributes())

+	build, _, err := buildadmission.GetBuildFromPod((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -100,14 +100,14 @@ func TestIncrementalDefaults(t *testing.T) {

 		},

 	}

-	admitter := NewBuildDefaults(defaultsConfig)

+	admitter := BuildDefaults{defaultsConfig}

 	pod := u.Pod().WithBuild(t, u.Build().WithSourceStrategy().AsBuild(), "v1")

-	err := admitter.Admit(pod.ToAttributes())

+	err := admitter.ApplyDefaults((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	build, _, err := buildadmission.GetBuild(pod.ToAttributes())

+	build, _, err := buildadmission.GetBuildFromPod((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -119,11 +119,11 @@ func TestIncrementalDefaults(t *testing.T) {

 	bool_f := false

 	build.Spec.Strategy.SourceStrategy.Incremental = &bool_f

 	pod = u.Pod().WithBuild(t, build, "v1")

-	err = admitter.Admit(pod.ToAttributes())

+	err = admitter.ApplyDefaults((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	build, _, err = buildadmission.GetBuild(pod.ToAttributes())

+	build, _, err = buildadmission.GetBuildFromPod((*kapi.Pod)(pod))

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -249,9 +249,9 @@ func TestLabelDefaults(t *testing.T) {

 			ImageLabels: test.defaultLabels,

 		}

-		admitter := NewBuildDefaults(defaultsConfig)

+		admitter := BuildDefaults{defaultsConfig}

 		pod := u.Pod().WithBuild(t, u.Build().WithImageLabels(test.buildLabels).AsBuild(), "v1")

-		err := admitter.Admit(pod.ToAttributes())

+		err := admitter.ApplyDefaults((*kapi.Pod)(pod))

 		if err != nil {

 			t.Fatalf("unexpected error: %v", err)

 		}

@@ -266,3 +266,101 @@ func TestLabelDefaults(t *testing.T) {

 		}

 	}

 }

+

+func TestBuildDefaultsNodeSelector(t *testing.T) {

+	tests := []struct {

+		name     string

+		build    *buildapi.Build

+		defaults map[string]string

+		expected map[string]string

+	}{

+		{

+			name:     "build - full add",

+			build:    u.Build().AsBuild(),

+			defaults: map[string]string{"key1": "default1", "key2": "default2"},

+			expected: map[string]string{"key1": "default1", "key2": "default2"},

+		},

+		{

+			name:     "build - ignored",

+			build:    u.Build().WithNodeSelector(map[string]string{"key1": "value1"}).AsBuild(),

+			defaults: map[string]string{"key1": "default1", "key2": "default2"},

+			expected: map[string]string{"key1": "value1"},

+		},

+		{

+			name:     "build - empty(non-nil) nodeselector",

+			build:    u.Build().WithNodeSelector(map[string]string{}).AsBuild(),

+			defaults: map[string]string{"key1": "default1"},

+			expected: map[string]string{},

+		},

+	}

+

+	for _, test := range tests {

+		defaults := BuildDefaults{config: &defaultsapi.BuildDefaultsConfig{NodeSelector: test.defaults}}

+		pod := u.Pod().WithBuild(t, test.build, "v1")

+		// normally the pod will have the nodeselectors from the build, due to the pod creation logic

+		// in the build controller flow. fake it out here.

+		pod.Spec.NodeSelector = test.build.Spec.NodeSelector

+		err := defaults.ApplyDefaults((*kapi.Pod)(pod))

+		if err != nil {

+			t.Errorf("%s: unexpected error: %v", test.name, err)

+		}

+		if len(pod.Spec.NodeSelector) != len(test.expected) {

+			t.Errorf("%s: incorrect number of selectors, expected %v, got %v", test.name, test.expected, pod.Spec.NodeSelector)

+		}

+		for k, v := range pod.Spec.NodeSelector {

+			if ev, ok := test.expected[k]; !ok || ev != v {

+				t.Errorf("%s: incorrect selector value for key %s, expected %s, got %s", test.name, k, ev, v)

+			}

+		}

+	}

+}

+

+func TestBuildDefaultsAnnotations(t *testing.T) {

+	tests := []struct {

+		name        string

+		build       *buildapi.Build

+		annotations map[string]string

+		defaults    map[string]string

+		expected    map[string]string

+	}{

+		{

+			name:        "build - nil annotations",

+			build:       u.Build().AsBuild(),

+			annotations: nil,

+			defaults:    map[string]string{"key1": "default1", "key2": "default2"},

+			expected:    map[string]string{"key1": "default1", "key2": "default2"},

+		},

+		{

+			name:        "build - full add",

+			build:       u.Build().AsBuild(),

+			annotations: map[string]string{"key3": "value3"},

+			defaults:    map[string]string{"key1": "default1", "key2": "default2"},

+			expected:    map[string]string{"key1": "default1", "key2": "default2", "key3": "value3"},

+		},

+		{

+			name:        "build - partial add",

+			build:       u.Build().AsBuild(),

+			annotations: map[string]string{"key1": "value1"},

+			defaults:    map[string]string{"key1": "default1", "key2": "default2"},

+			expected:    map[string]string{"key1": "value1", "key2": "default2"},

+		},

+	}

+

+	for _, test := range tests {

+		defaults := BuildDefaults{config: &defaultsapi.BuildDefaultsConfig{Annotations: test.defaults}}

+		pod := u.Pod().WithBuild(t, test.build, "v1")

+		pod.Annotations = test.annotations

+		err := defaults.ApplyDefaults((*kapi.Pod)(pod))

+		if err != nil {

+			t.Errorf("%s: unexpected error: %v", test.name, err)

+		}

+		if len(pod.Annotations) != len(test.expected) {

+			t.Errorf("%s: incorrect number of annotations, expected %v, got %v", test.name, test.expected, pod.Annotations)

+		}

+		for k, v := range pod.Annotations {

+			if ev, ok := test.expected[k]; !ok || ev != v {

+				t.Errorf("%s: incorrect annotation value for key %s, expected %s, got %s", test.name, k, ev, v)

+			}

+		}

+	}

+}

@@ -7,31 +7,39 @@ import (

 	buildapi "github.com/openshift/origin/pkg/build/api"

 )

+const BuildDefaultsPlugin = "BuildDefaults"

+

 // BuildDefaultsConfig controls the default information for Builds

 type BuildDefaultsConfig struct {

 	unversioned.TypeMeta

-	// GitHTTPProxy is the location of the HTTPProxy for Git source

+	// gitHTTPProxy is the location of the HTTPProxy for Git source

 	GitHTTPProxy string

-	// GitHTTPSProxy is the location of the HTTPSProxy for Git source

+	// gitHTTPSProxy is the location of the HTTPSProxy for Git source

 	GitHTTPSProxy string

-	// GitNoProxy is the list of domains for which the proxy should not be used

+	// gitNoProxy is the list of domains for which the proxy should not be used

 	GitNoProxy string

-	// Env is a set of default environment variables that will be applied to the

+	// env is a set of default environment variables that will be applied to the

 	// build if the specified variables do not exist on the build

 	Env []kapi.EnvVar

-	// SourceStrategyDefaults are default values that apply to builds using the

+	// sourceStrategyDefaults are default values that apply to builds using the

 	// source strategy.

 	SourceStrategyDefaults *SourceStrategyDefaultsConfig

-	// ImageLabels is a list of docker labels that are applied to the resulting image.

+	// imageLabels is a list of docker labels that are applied to the resulting image.

 	// User can override a default label by providing a label with the same name in their

 	// Build/BuildConfig.

 	ImageLabels []buildapi.ImageLabel

+

+	// nodeSelector is a selector which must be true for the build pod to fit on a node

+	NodeSelector map[string]string

+

+	// annotations are annotations that will be added to the build pod

+	Annotations map[string]string

 }

 // SourceStrategyDefaultsConfig contains values that apply to builds using the

@@ -7,12 +7,14 @@ package v1

 var map_BuildDefaultsConfig = map[string]string{

 	"":              "BuildDefaultsConfig controls the default information for Builds",

-	"gitHTTPProxy":  "GitHTTPProxy is the location of the HTTPProxy for Git source",

-	"gitHTTPSProxy": "GitHTTPSProxy is the location of the HTTPSProxy for Git source",

-	"gitNoProxy":    "GitNoProxy is the list of domains for which the proxy should not be used",

-	"env":           "Env is a set of default environment variables that will be applied to the build if the specified variables do not exist on the build",

-	"sourceStrategyDefaults": "SourceStrategyDefaults are default values that apply to builds using the source strategy.",

-	"imageLabels":            "ImageLabels is a list of docker labels that are applied to the resulting image. User can override a default label by providing a label with the same name in their Build/BuildConfig.",

+	"gitHTTPProxy":  "gitHTTPProxy is the location of the HTTPProxy for Git source",