@@ -15836,6 +15836,14 @@

      "resources": {

       "$ref": "v1.ResourceRequirements",

       "description": "resource requirements to execute the deployment"

+     },

+     "labels": {

+      "type": "any",

+      "description": "labels for deployer and hook pods"

+     },

+     "annotations": {

+      "type": "any",

+      "description": "annotations for deployer and hook pods"

      }

     }

    },

@@ -1510,6 +1510,22 @@ func deepCopy_api_DeploymentStrategy(in deployapi.DeploymentStrategy, out *deplo

 	} else {

 		out.Resources = newVal.(pkgapi.ResourceRequirements)

 	}

+	if in.Labels != nil {

+		out.Labels = make(map[string]string)

+		for key, val := range in.Labels {

+			out.Labels[key] = val

+		}

+	} else {

+		out.Labels = nil

+	}

+	if in.Annotations != nil {

+		out.Annotations = make(map[string]string)

+		for key, val := range in.Annotations {

+			out.Annotations[key] = val

+		}

+	} else {

+		out.Annotations = nil

+	}

 	return nil

 }

@@ -1569,6 +1569,22 @@ func deepCopy_v1_DeploymentStrategy(in deployapiv1.DeploymentStrategy, out *depl

 	} else {

 		out.Resources = newVal.(pkgapiv1.ResourceRequirements)

 	}

+	if in.Labels != nil {

+		out.Labels = make(map[string]string)

+		for key, val := range in.Labels {

+			out.Labels[key] = val

+		}

+	} else {

+		out.Labels = nil

+	}

+	if in.Annotations != nil {

+		out.Annotations = make(map[string]string)

+		for key, val := range in.Annotations {

+			out.Annotations[key] = val

+		}

+	} else {

+		out.Annotations = nil

+	}

 	return nil

 }

@@ -1577,6 +1577,22 @@ func deepCopy_v1beta3_DeploymentStrategy(in deployapiv1beta3.DeploymentStrategy,

 	} else {

 		out.Resources = newVal.(pkgapiv1beta3.ResourceRequirements)

 	}

+	if in.Labels != nil {

+		out.Labels = make(map[string]string)

+		for key, val := range in.Labels {

+			out.Labels[key] = val

+		}

+	} else {

+		out.Labels = nil

+	}

+	if in.Annotations != nil {

+		out.Annotations = make(map[string]string)

+		for key, val := range in.Annotations {

+			out.Annotations[key] = val

+		}

+	} else {

+		out.Annotations = nil

+	}

 	return nil

 }

@@ -36,6 +36,10 @@ type DeploymentStrategy struct {

 	RollingParams *RollingDeploymentStrategyParams

 	// Resources contains resource requirements to execute the deployment

 	Resources kapi.ResourceRequirements

+	// Labels is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Labels map[string]string

+	// Annotations is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Annotations map[string]string

 }

 // DeploymentStrategyType refers to a specific DeploymentStrategy implementation.

@@ -82,6 +82,12 @@ func convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrat

 	if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {

 		return err

 	}

+	if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {

+		return err

+	}

+	if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil {

+		return err

+	}

 	return nil

 }

@@ -101,6 +107,12 @@ func convert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *newer.Deploymen

 	if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {

 		return err

 	}

+	if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {

+		return err

+	}

+	if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil {

+		return err

+	}

 	return nil

 }

@@ -36,6 +36,10 @@ type DeploymentStrategy struct {

 	RollingParams *RollingDeploymentStrategyParams `json:"rollingParams,omitempty" description:"input to the Rolling deployment strategy"`

 	// Resources contains resource requirements to execute the deployment

 	Resources kapi.ResourceRequirements `json:"resources,omitempty" description:"resource requirements to execute the deployment"`

+	// Labels is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Labels map[string]string `json:"labels,omitempty" description:"labels for deployer and hook pods"`

+	// Annotations is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Annotations map[string]string `json:"annotations,omitempty" description:"annotations for deployer and hook pods"`

 }

 // DeploymentStrategyType refers to a specific DeploymentStrategy implementation.

@@ -81,6 +81,12 @@ func convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in *Deployment

 	if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {

 		return err

 	}

+	if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {

+		return err

+	}

+	if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil {

+		return err

+	}

 	return nil

 }

@@ -100,6 +106,12 @@ func convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in *newer.Depl

 	if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {

 		return err

 	}

+	if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {

+		return err

+	}

+	if err := s.Convert(&in.Annotations, &out.Annotations, 0); err != nil {

+		return err

+	}

 	return nil

 }

@@ -36,6 +36,10 @@ type DeploymentStrategy struct {

 	RollingParams *RollingDeploymentStrategyParams `json:"rollingParams,omitempty" description:"input to the Rolling deployment strategy"`

 	// Compute resource requirements to execute the deployment

 	Resources kapi.ResourceRequirements `json:"resources,omitempty" description:"resource requirements to execute the deployment"`

+	// Labels is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Labels map[string]string `json:"labels,omitempty" description:"labels for deployer and hook pods"`

+	// Annotations is a set of key, value pairs added to custom deployer and lifecycle pre/post hook pods.

+	Annotations map[string]string `json:"annotations,omitempty" description:"annotations for deployer and hook pods"`

 }

 // DeploymentStrategyType refers to a specific DeploymentStrategy implementation.

@@ -91,6 +91,13 @@ func validateDeploymentStrategy(strategy *deployapi.DeploymentStrategy) fielderr

 		}

 	}

+	if strategy.Labels != nil {

+		errs = append(errs, validation.ValidateLabels(strategy.Labels, "labels")...)

+	}

+	if strategy.Annotations != nil {

+		errs = append(errs, validation.ValidateAnnotations(strategy.Annotations, "annotations")...)

+	}

+

 	// TODO: validate resource requirements (prereq: https://github.com/kubernetes/kubernetes/pull/7059)

 	return errs

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

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

 )

 // DeploymentController starts a deployment by creating a deployer pod which

@@ -249,6 +250,10 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr

 		},

 	}

+	// MergeInfo will not overwrite values unless the flag OverwriteExistingDstKey is set.

+	util.MergeInto(pod.Labels, deploymentConfig.Template.Strategy.Labels, 0)

+	util.MergeInto(pod.Annotations, deploymentConfig.Template.Strategy.Annotations, 0)

+

 	pod.Spec.Containers[0].ImagePullPolicy = kapi.PullIfNotPresent

 	return pod, nil

@@ -651,6 +651,74 @@ func TestHandle_deployerPodDisappeared(t *testing.T) {

 	}

 }

+func expectMapContains(t *testing.T, exists, expected map[string]string, what string) {

+	if expected == nil {

+		return

+	}

+	for k, v := range expected {

+		value, ok := exists[k]

+		if ok && value != v {

+			t.Errorf("expected %s[%s]=%s, got %s", what, k, v, value)

+		} else if !ok {

+			t.Errorf("expected %s %s: not present", what, k)

+		}

+	}

+}

+

+func TestDeployerCustomLabelsAndAnnotations(t *testing.T) {

+	controller := &DeploymentController{

+		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

+			return deployutil.DecodeDeploymentConfig(deployment, api.Codec)

+		},

+		podClient: &podClientImpl{

+			createPodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

+				return pod, nil

+			},

+		},

+		makeContainer: func(strategy *deployapi.DeploymentStrategy) (*kapi.Container, error) {

+			return okContainer(), nil

+		},

+	}

+

+	testCases := []struct {

+		name         string

+		strategy     deployapi.DeploymentStrategy

+		labels       map[string]string

+		annotations  map[string]string

+		verifyLabels bool

+	}{

+		{name: "labels and annotations", strategy: deploytest.OkStrategy(), labels: map[string]string{"label1": "value1"}, annotations: map[string]string{"annotation1": "value1"}, verifyLabels: true},

+		{name: "custom strategy, no annotations", strategy: deploytest.OkCustomStrategy(), labels: map[string]string{"label2": "value2", "label3": "value3"}, verifyLabels: true},

+		{name: "custom strategy, no labels", strategy: deploytest.OkCustomStrategy(), annotations: map[string]string{"annotation3": "value3"}, verifyLabels: true},

+		{name: "no overrride", strategy: deploytest.OkStrategy(), labels: map[string]string{deployapi.DeployerPodForDeploymentLabel: "ignored"}, verifyLabels: false},

+	}

+

+	for _, test := range testCases {

+		t.Logf("evaluating test case %s", test.name)

+		config := deploytest.OkDeploymentConfig(1)

+		config.Template.Strategy = test.strategy

+		config.Template.Strategy.Labels = test.labels

+		config.Template.Strategy.Annotations = test.annotations

+

+		deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

+		podTemplate, err := controller.makeDeployerPod(deployment)

+		if err != nil {

+			t.Fatal(err)

+		}

+

+		nameLabel, ok := podTemplate.Labels[deployapi.DeployerPodForDeploymentLabel]

+		if ok && nameLabel != deployment.Name {

+			t.Errorf("label %s expected %s, got %s", deployapi.DeployerPodForDeploymentLabel, deployment.Name, nameLabel)

+		} else if !ok {

+			t.Errorf("label %s not present", deployapi.DeployerPodForDeploymentLabel)

+		}

+		if test.verifyLabels {

+			expectMapContains(t, podTemplate.Labels, test.labels, "labels")

+		}

+		expectMapContains(t, podTemplate.Annotations, test.annotations, "annotations")

+	}

+}

+

 func okContainer() *kapi.Container {

 	return &kapi.Container{

 		Image:   "test/image",

@@ -51,7 +51,7 @@ func NewRecreateDeploymentStrategy(client kclient.Interface, codec runtime.Codec

 		},

 		scaler:       scaler,

 		codec:        codec,

-		hookExecutor: stratsupport.NewHookExecutor(client, os.Stdout),

+		hookExecutor: stratsupport.NewHookExecutor(client, os.Stdout, codec),

 		retryTimeout: 120 * time.Second,

 		retryPeriod:  1 * time.Second,

 	}

@@ -87,7 +87,7 @@ func NewRollingDeploymentStrategy(namespace string, client kclient.Interface, co

 			updater := kubectl.NewRollingUpdater(namespace, client)

 			return updater.Update(config)

 		},

-		hookExecutor: stratsupport.NewHookExecutor(client, os.Stdout),

+		hookExecutor: stratsupport.NewHookExecutor(client, os.Stdout, codec),

 		getUpdateAcceptor: func(timeout time.Duration) strat.UpdateAcceptor {

 			return stratsupport.NewAcceptNewlyObservedReadyPods(client, timeout, AcceptorInterval)

 		},

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

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

 	namer "github.com/openshift/origin/pkg/util/namer"

 )

@@ -34,10 +35,12 @@ type HookExecutor struct {

 	podLogDestination io.Writer

 	// podLogStream provides a reader for a pod's logs.

 	podLogStream func(namespace, name string, opts *kapi.PodLogOptions) (io.ReadCloser, error)

+	// Codec is used for encoding/decoding.

+	codec runtime.Codec

 }

 // NewHookExecutor makes a HookExecutor from a client.

-func NewHookExecutor(client kclient.Interface, podLogDestination io.Writer) *HookExecutor {

+func NewHookExecutor(client kclient.Interface, podLogDestination io.Writer, codec runtime.Codec) *HookExecutor {

 	return &HookExecutor{

 		podClient: &HookExecutorPodClientImpl{

 			CreatePodFunc: func(namespace string, pod *kapi.Pod) (*kapi.Pod, error) {

@@ -55,6 +58,7 @@ func NewHookExecutor(client kclient.Interface, podLogDestination io.Writer) *Hoo

 			return req.Stream()

 		},

 		podLogDestination: podLogDestination,

+		codec:             codec,

 	}

 }

@@ -93,8 +97,13 @@ func (e *HookExecutor) Execute(hook *deployapi.LifecycleHook, deployment *kapi.R

 //   * Working directory

 //   * Resources

 func (e *HookExecutor) executeExecNewPod(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

+	config, err := deployutil.DecodeDeploymentConfig(deployment, e.codec)

+	if err != nil {

+		return err

+	}

+

 	// Build a pod spec from the hook config and deployment

-	podSpec, err := makeHookPod(hook, deployment, label)

+	podSpec, err := makeHookPod(hook, deployment, &config.Template.Strategy, label)

 	if err != nil {

 		return err

 	}

@@ -164,7 +173,7 @@ func (e *HookExecutor) readPodLogs(pod *kapi.Pod, wg *sync.WaitGroup) {

 }

 // makeHookPod makes a pod spec from a hook and deployment.

-func makeHookPod(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) (*kapi.Pod, error) {

+func makeHookPod(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, strategy *deployapi.DeploymentStrategy, label string) (*kapi.Pod, error) {

 	exec := hook.ExecNewPod

 	var baseContainer *kapi.Container

 	for _, container := range deployment.Spec.Template.Spec.Containers {

@@ -269,6 +278,9 @@ func makeHookPod(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationCont

 		},

 	}

+	util.MergeInto(pod.Labels, strategy.Labels, 0)

+	util.MergeInto(pod.Annotations, strategy.Annotations, 0)

+

 	return pod, nil

 }

@@ -42,6 +42,7 @@ func TestHookExecutor_executeExecNewCreatePodFailure(t *testing.T) {

 				return func() *kapi.Pod { return nil }

 			},

 		},

+		codec: kapi.Codec,

 	}

 	err := executor.executeExecNewPod(hook, deployment, "hook")

@@ -81,6 +82,7 @@ func TestHookExecutor_executeExecNewPodSucceeded(t *testing.T) {

 		podLogStream: func(namespace, name string, opts *kapi.PodLogOptions) (io.ReadCloser, error) {

 			return ioutil.NopCloser(strings.NewReader("test")), nil

 		},

+		codec: kapi.Codec,

 	}

 	err := executor.executeExecNewPod(hook, deployment, "hook")

@@ -132,6 +134,7 @@ func TestHookExecutor_executeExecNewPodFailed(t *testing.T) {

 		podLogStream: func(namespace, name string, opts *kapi.PodLogOptions) (io.ReadCloser, error) {

 			return nil, fmt.Errorf("can't access logs")

 		},

+		codec: kapi.Codec,

 	}

 	err := executor.executeExecNewPod(hook, deployment, "hook")

@@ -150,9 +153,10 @@ func TestHookExecutor_makeHookPodInvalidContainerRef(t *testing.T) {

 		},

 	}

-	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codec)

+	config := deploytest.OkDeploymentConfig(1)

+	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

-	_, err := makeHookPod(hook, deployment, "hook")

+	_, err := makeHookPod(hook, deployment, &config.Template.Strategy, "hook")

 	if err == nil {

 		t.Fatalf("expected an error")

@@ -166,9 +170,11 @@ func TestHookExecutor_makeHookPod(t *testing.T) {

 	maxDeploymentDurationSeconds := deployapi.MaxDeploymentDurationSeconds

 	tests := []struct {

-		name     string

-		hook     *deployapi.LifecycleHook

-		expected *kapi.Pod

+		name                string

+		hook                *deployapi.LifecycleHook

+		expected            *kapi.Pod

+		strategyLabels      map[string]string

+		strategyAnnotations map[string]string

 	}{

 		{

 			name: "overrides",

@@ -309,11 +315,74 @@ func TestHookExecutor_makeHookPod(t *testing.T) {

 				},

 			},

 		},

+		{

+			name: "labels and annotations",

+			hook: &deployapi.LifecycleHook{

+				FailurePolicy: deployapi.LifecycleHookFailurePolicyAbort,

+				ExecNewPod: &deployapi.ExecNewPodHook{

+					ContainerName: "container1",

+				},

+			},

+			expected: &kapi.Pod{

+				ObjectMeta: kapi.ObjectMeta{

+					Name: namer.GetPodName(deploymentName, "hook"),

+					Labels: map[string]string{

+						deployapi.DeployerPodForDeploymentLabel: deploymentName,

+						"label1": "value1",

+					},

+					Annotations: map[string]string{

+						deployapi.DeploymentAnnotation: deploymentName,

+						"annotation2":                  "value2",

+					},

+				},

+				Spec: kapi.PodSpec{

+					RestartPolicy:         kapi.RestartPolicyNever,

+					ActiveDeadlineSeconds: &maxDeploymentDurationSeconds,

+					Containers: []kapi.Container{

+						{

+							Name:  "lifecycle",

+							Image: "registry:8080/repo1:ref1",

+							Env: []kapi.EnvVar{

+								{

+									Name:  "ENV1",

+									Value: "VAL1",

+								},

+								{

+									Name:  "OPENSHIFT_DEPLOYMENT_NAME",

+									Value: deploymentName,

+								},

+								{

+									Name:  "OPENSHIFT_DEPLOYMENT_NAMESPACE",

+									Value: deploymentNamespace,

+								},

+							},

+							Resources: kapi.ResourceRequirements{

+								Limits: kapi.ResourceList{

+									kapi.ResourceCPU:    resource.MustParse("10"),

+									kapi.ResourceMemory: resource.MustParse("10M"),

+								},

+							},

+						},

+					},

+					ImagePullSecrets: []kapi.LocalObjectReference{

+						{

+							Name: "secret-1",

+						},

+					},

+				},

+			},

+			strategyLabels: map[string]string{

+				deployapi.DeployerPodForDeploymentLabel: "ignoredValue",

+				"label1": "value1",

+			},

+			strategyAnnotations: map[string]string{"annotation2": "value2"},

+		},

 	}

 	for _, test := range tests {

 		t.Logf("evaluating test: %s", test.name)

-		pod, err := makeHookPod(test.hook, deployment("deployment", "test"), "hook")

+		config, deployment := deployment("deployment", "test", test.strategyLabels, test.strategyAnnotations)

+		pod, err := makeHookPod(test.hook, deployment, &config.Template.Strategy, "hook")

 		if err != nil {

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

 		}

@@ -337,9 +406,10 @@ func TestHookExecutor_makeHookPodRestart(t *testing.T) {

 		},

 	}

-	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codec)

+	config := deploytest.OkDeploymentConfig(1)

+	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

-	pod, err := makeHookPod(hook, deployment, "hook")

+	pod, err := makeHookPod(hook, deployment, &config.Template.Strategy, "hook")

 	if err != nil {

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

 	}

@@ -456,7 +526,7 @@ func TestAcceptNewlyObservedReadyPods_scenarios(t *testing.T) {

 	}

 }

-func deployment(name, namespace string) *kapi.ReplicationController {

+func deployment(name, namespace string, strategyLabels, strategyAnnotations map[string]string) (*deployapi.DeploymentConfig, *kapi.ReplicationController) {

 	config := &deployapi.DeploymentConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name:      name,

@@ -472,6 +542,8 @@ func deployment(name, namespace string) *kapi.ReplicationController {

 						kapi.ResourceName(kapi.ResourceMemory): resource.MustParse("10G"),

 					},

 				},

+				Labels:      strategyLabels,

+				Annotations: strategyAnnotations,

 			},

 			ControllerTemplate: kapi.ReplicationControllerSpec{

 				Replicas: 1,

@@ -534,7 +606,7 @@ func deployment(name, namespace string) *kapi.ReplicationController {

 	}

 	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

 	deployment.Namespace = namespace

-	return deployment

+	return config, deployment

 }

 type envByNameAsc []kapi.EnvVar