@@ -329,10 +329,15 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 			}

 		},

 		func(j *deploy.DeploymentStrategy, c fuzz.Continue) {

+			randInt64 := func() *int64 {

+				p := int64(c.RandUint64())

+				return &p

+			}

 			c.FuzzNoCustom(j)

 			j.RecreateParams, j.RollingParams, j.CustomParams = nil, nil, nil

 			strategyTypes := []deploy.DeploymentStrategyType{deploy.DeploymentStrategyTypeRecreate, deploy.DeploymentStrategyTypeRolling, deploy.DeploymentStrategyTypeCustom}

 			j.Type = strategyTypes[c.Rand.Intn(len(strategyTypes))]

+			j.ActiveDeadlineSeconds = randInt64()

 			switch j.Type {

 			case deploy.DeploymentStrategyTypeRecreate:

 				params := &deploy.RecreateDeploymentStrategyParams{}

@@ -344,10 +349,6 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 				j.RecreateParams = params

 			case deploy.DeploymentStrategyTypeRolling:

 				params := &deploy.RollingDeploymentStrategyParams{}

-				randInt64 := func() *int64 {

-					p := int64(c.RandUint64())

-					return &p

-				}

 				params.TimeoutSeconds = randInt64()

 				params.IntervalSeconds = randInt64()

 				params.UpdatePeriodSeconds = randInt64()

@@ -80,6 +80,7 @@ func OkStrategy() deployapi.DeploymentStrategy {

 		RecreateParams: &deployapi.RecreateDeploymentStrategyParams{

 			TimeoutSeconds: mkintp(20),

 		},

+		ActiveDeadlineSeconds: mkintp(int(deployapi.MaxDeploymentDurationSeconds)),

 	}

 }

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

 	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

+

+	// ActiveDeadlineSeconds is the duration in seconds that the deployer pods for this deployment

+	// config may be active on a node before the system actively tries to terminate them.

+	ActiveDeadlineSeconds *int64

 }

 // DeploymentStrategyType refers to a specific DeploymentStrategy implementation.

@@ -64,6 +64,10 @@ func SetDefaults_DeploymentStrategy(obj *DeploymentStrategy) {

 	if obj.Type == DeploymentStrategyTypeRecreate && obj.RecreateParams == nil {

 		obj.RecreateParams = &RecreateDeploymentStrategyParams{}

 	}

+

+	if obj.ActiveDeadlineSeconds == nil {

+		obj.ActiveDeadlineSeconds = mkintp(deployapi.MaxDeploymentDurationSeconds)

+	}

 }

 func SetDefaults_RecreateDeploymentStrategyParams(obj *RecreateDeploymentStrategyParams) {

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

 							MaxSurge:            &defaultIntOrString,

 							MaxUnavailable:      &defaultIntOrString,

 						},

+						ActiveDeadlineSeconds: newInt64(deployapi.MaxDeploymentDurationSeconds),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{

@@ -127,6 +128,7 @@ func TestDefaults(t *testing.T) {

 							MaxSurge:            &differentIntOrString,

 							MaxUnavailable:      &differentIntOrString,

 						},

+						ActiveDeadlineSeconds: newInt64(deployapi.MaxDeploymentDurationSeconds),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{

@@ -165,6 +167,7 @@ func TestDefaults(t *testing.T) {

 							TimeoutSeconds:      newInt64(7),

 							MaxSurge:            newIntOrString(intstr.FromString("50%")),

 						},

+						ActiveDeadlineSeconds: newInt64(3600),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{

@@ -184,6 +187,7 @@ func TestDefaults(t *testing.T) {

 							MaxSurge:            newIntOrString(intstr.FromString("50%")),

 							MaxUnavailable:      newIntOrString(intstr.FromInt(0)),

 						},

+						ActiveDeadlineSeconds: newInt64(3600),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{

@@ -223,6 +227,7 @@ func TestDefaults(t *testing.T) {

 							MaxSurge:            newIntOrString(intstr.FromInt(0)),

 							MaxUnavailable:      newIntOrString(intstr.FromString("25%")),

 						},

+						ActiveDeadlineSeconds: newInt64(deployapi.MaxDeploymentDurationSeconds),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{

@@ -260,6 +265,7 @@ func TestDefaults(t *testing.T) {

 							MaxUnavailable:      newIntOrString(intstr.FromString("25%")),

 							MaxSurge:            newIntOrString(intstr.FromInt(0)),

 						},

+						ActiveDeadlineSeconds: newInt64(deployapi.MaxDeploymentDurationSeconds),

 					},

 					Triggers: []deployv1.DeploymentTriggerPolicy{

 						{},

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

 	Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,6,rep,name=labels"`

 	// 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" protobuf:"bytes,7,rep,name=annotations"`

+

+	// ActiveDeadlineSeconds is the duration in seconds that the deployer pods for this deployment

+	// config may be active on a node before the system actively tries to terminate them.

+	ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"`

 }

 // DeploymentStrategyType refers to a specific DeploymentStrategy implementation.

@@ -44,9 +44,17 @@ func ValidateDeploymentConfigSpec(spec deployapi.DeploymentConfigSpec) field.Err

 		allErrs = append(allErrs, kapivalidation.ValidateNonnegativeField(int64(*spec.RevisionHistoryLimit), specPath.Child("revisionHistoryLimit"))...)

 	}

 	allErrs = append(allErrs, kapivalidation.ValidateNonnegativeField(int64(spec.MinReadySeconds), specPath.Child("minReadySeconds"))...)

-	if int64(spec.MinReadySeconds) >= deployapi.DefaultRollingTimeoutSeconds {

-		allErrs = append(allErrs, field.Invalid(specPath.Child("minReadySeconds"), spec.MinReadySeconds,

-			fmt.Sprintf("must be less than the deployment timeout (%ds)", deployapi.DefaultRollingTimeoutSeconds)))

+	timeoutSeconds := deployapi.DefaultRollingTimeoutSeconds

+	if spec.Strategy.RollingParams != nil && spec.Strategy.RollingParams.TimeoutSeconds != nil {

+		timeoutSeconds = *(spec.Strategy.RollingParams.TimeoutSeconds)

+	} else if spec.Strategy.RecreateParams != nil && spec.Strategy.RecreateParams.TimeoutSeconds != nil {

+		timeoutSeconds = *(spec.Strategy.RecreateParams.TimeoutSeconds)

+	}

+	if timeoutSeconds > 0 && int64(spec.MinReadySeconds) >= timeoutSeconds {

+		allErrs = append(allErrs, field.Invalid(specPath.Child("minReadySeconds"), spec.MinReadySeconds, fmt.Sprintf("must be less than the deployment timeout (%ds)", timeoutSeconds)))

+	}

+	if spec.Strategy.ActiveDeadlineSeconds != nil && int64(spec.MinReadySeconds) >= *(spec.Strategy.ActiveDeadlineSeconds) {

+		allErrs = append(allErrs, field.Invalid(specPath.Child("minReadySeconds"), spec.MinReadySeconds, fmt.Sprintf("must be less than activeDeadlineSeconds (%ds - used by the deployer pod)", *(spec.Strategy.ActiveDeadlineSeconds))))

 	}

 	if spec.Template == nil {

 		allErrs = append(allErrs, field.Required(specPath.Child("template"), ""))

@@ -239,6 +247,19 @@ func validateDeploymentStrategy(strategy *deployapi.DeploymentStrategy, pod *kap

 	errs = append(errs, validation.ValidateResourceRequirements(&strategy.Resources, fldPath.Child("resources"))...)

+	if strategy.ActiveDeadlineSeconds != nil {

+		errs = append(errs, kapivalidation.ValidateNonnegativeField(*strategy.ActiveDeadlineSeconds, fldPath.Child("activeDeadlineSeconds"))...)

+		var timeoutSeconds *int64

+		if strategy.RollingParams != nil {

+			timeoutSeconds = strategy.RollingParams.TimeoutSeconds

+		} else if strategy.RecreateParams != nil {

+			timeoutSeconds = strategy.RecreateParams.TimeoutSeconds

+		}

+		if timeoutSeconds != nil && *strategy.ActiveDeadlineSeconds <= *timeoutSeconds {

+			errs = append(errs, field.Invalid(fldPath.Child("activeDeadlineSeconds"), *strategy.ActiveDeadlineSeconds, "activeDeadlineSeconds must be greater than timeoutSeconds"))

+		}

+	}

+

 	return errs

 }

@@ -34,6 +34,7 @@ func rollingConfig(interval, updatePeriod, timeout int) api.DeploymentConfig {

 					TimeoutSeconds:      mkint64p(timeout),

 					MaxSurge:            intstr.FromInt(1),

 				},

+				ActiveDeadlineSeconds: mkint64p(3600),

 			},

 			Template: test.OkPodTemplate(),

 			Selector: test.OkSelector(),

@@ -55,6 +56,7 @@ func rollingConfigMax(maxSurge, maxUnavailable intstr.IntOrString) api.Deploymen

 					MaxSurge:            maxSurge,

 					MaxUnavailable:      maxUnavailable,

 				},

+				ActiveDeadlineSeconds: mkint64p(3600),

 			},

 			Template: test.OkPodTemplate(),

 			Selector: test.OkSelector(),

@@ -254,7 +256,8 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 					Triggers: manualTrigger(),

 					Selector: test.OkSelector(),

 					Strategy: api.DeploymentStrategy{

-						CustomParams: test.OkCustomParams(),

+						CustomParams:          test.OkCustomParams(),

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 				},

@@ -271,6 +274,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 					Selector: test.OkSelector(),

 					Strategy: api.DeploymentStrategy{

 						Type: api.DeploymentStrategyTypeCustom,

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 				},

@@ -292,6 +296,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								{Name: "A=B"},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 				},

@@ -314,6 +319,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -334,6 +340,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								FailurePolicy: api.LifecycleHookFailurePolicyRetry,

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -357,6 +364,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -380,6 +388,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -405,6 +414,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -425,6 +435,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								FailurePolicy: api.LifecycleHookFailurePolicyRetry,

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -445,6 +456,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								FailurePolicy: api.LifecycleHookFailurePolicyRetry,

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -471,6 +483,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -497,6 +510,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -523,6 +537,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -545,6 +560,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								TagImages:     []api.TagImageHook{{}},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -587,6 +603,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 								},

 							},

 						},

+						ActiveDeadlineSeconds: mkint64p(3600),

 					},

 					Template: test.OkPodTemplate(),

 					Selector: test.OkSelector(),

@@ -638,6 +655,7 @@ func TestValidateDeploymentConfigMissingFields(t *testing.T) {

 	}

 	for testName, v := range errorCases {

+		t.Logf("running scenario %q", testName)

 		errs := ValidateDeploymentConfig(&v.DeploymentConfig)

 		if len(v.ErrorType) == 0 {

 			if len(errs) > 0 {

@@ -287,6 +287,9 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr

 	// Assigning to a variable since its address is required

 	maxDeploymentDurationSeconds := deployapi.MaxDeploymentDurationSeconds

+	if deploymentConfig.Spec.Strategy.ActiveDeadlineSeconds != nil {

+		maxDeploymentDurationSeconds = *(deploymentConfig.Spec.Strategy.ActiveDeadlineSeconds)

+	}

 	gracePeriod := int64(10)

@@ -332,7 +332,11 @@ func makeHookPod(hook *deployapi.LifecycleHook, rc *kapi.ReplicationController,

 	}

 	// Assigning to a variable since its address is required

-	maxDeploymentDurationSeconds := deployapi.MaxDeploymentDurationSeconds - int64(time.Since(deployerPod.Status.StartTime.Time).Seconds())

+	defaultActiveDeadline := deployapi.MaxDeploymentDurationSeconds

+	if strategy.ActiveDeadlineSeconds != nil {

+		defaultActiveDeadline = *(strategy.ActiveDeadlineSeconds)

+	}

+	maxDeploymentDurationSeconds := defaultActiveDeadline - int64(time.Since(deployerPod.Status.StartTime.Time).Seconds())

 	// Let the kubelet manage retries if requested

 	restartPolicy := kapi.RestartPolicyNever

@@ -363,9 +363,9 @@ os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-post

 # test the pre hook on a rolling deployment

 os::cmd::expect_success 'oc create -f test/testdata/failing-dc.yaml'

 os::cmd::try_until_success 'oc get rc/failing-dc-1'

-os::cmd::expect_success 'oc logs -f dc/failing-dc'

 os::cmd::expect_failure 'oc rollout status dc/failing-dc'

 os::cmd::expect_success_and_text 'oc logs dc/failing-dc' 'test pre hook executed'

+os::cmd::expect_success_and_text 'oc get po failing-dc-1-deploy -o jsonpath={.spec.activeDeadlineSeconds}' '3600'

 os::cmd::try_until_text 'oc rollout latest failing-dc --again -o revision' '2'

 os::cmd::expect_success_and_text 'oc logs --version=1 dc/failing-dc' 'test pre hook executed'

 os::cmd::expect_success_and_text 'oc logs --previous dc/failing-dc'  'test pre hook executed'

@@ -10,6 +10,7 @@ spec:

   strategy:

     type: Rolling

     resources: {}

+    activeDeadlineSeconds: 3600

     rollingParams:

       intervalSeconds: 1

       maxSurge: 25%