@@ -18263,6 +18263,11 @@

    "v1.RecreateDeploymentStrategyParams": {

     "id": "v1.RecreateDeploymentStrategyParams",

     "properties": {

+     "timeoutSeconds": {

+      "type": "integer",

+      "format": "int64",

+      "description": "the time to wait for updates before giving up"

+     },

      "pre": {

       "$ref": "v1.LifecycleHook",

       "description": "a hook executed before the strategy starts the deployment"

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

 	kvalidation "k8s.io/kubernetes/pkg/api/validation"

 	"k8s.io/kubernetes/pkg/capabilities"

 	"k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/util/yaml"

 	"github.com/openshift/origin/pkg/api/latest"

 	"github.com/openshift/origin/pkg/api/validation"

@@ -51,6 +52,12 @@ func walkJSONFiles(inDir string, fn func(name, path string, data []byte)) error

 		if err != nil {

 			return err

 		}

+		if ext == ".yaml" {

+			data, err = yaml.ToJSON(data)

+			if err != nil {

+				return err

+			}

+		}

 		fn(name, path, data)

 		return nil

 	})

@@ -1729,6 +1729,12 @@ func deepCopy_api_LifecycleHook(in deployapi.LifecycleHook, out *deployapi.Lifec

 }

 func deepCopy_api_RecreateDeploymentStrategyParams(in deployapi.RecreateDeploymentStrategyParams, out *deployapi.RecreateDeploymentStrategyParams, c *conversion.Cloner) error {

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapi.LifecycleHook)

 		if err := deepCopy_api_LifecycleHook(*in.Pre, out.Pre, c); err != nil {

@@ -242,9 +242,18 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 		},

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

 			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))]

 			switch j.Type {

+			case deploy.DeploymentStrategyTypeRecreate:

+				params := &deploy.RecreateDeploymentStrategyParams{}

+				c.Fuzz(params)

+				if params.TimeoutSeconds == nil {

+					s := int64(120)

+					params.TimeoutSeconds = &s

+				}

+				j.RecreateParams = params

 			case deploy.DeploymentStrategyTypeRolling:

 				params := &deploy.RollingDeploymentStrategyParams{}

 				randInt64 := func() *int64 {

@@ -284,8 +293,6 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 					params.MaxUnavailable = intstr.FromString(fmt.Sprintf("%d%%", c.RandUint64()))

 				}

 				j.RollingParams = params

-			default:

-				j.RollingParams = nil

 			}

 		},

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

@@ -3132,6 +3132,12 @@ func autoconvert_api_RecreateDeploymentStrategyParams_To_v1_RecreateDeploymentSt

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*deployapi.RecreateDeploymentStrategyParams))(in)

 	}

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapiv1.LifecycleHook)

 		if err := convert_api_LifecycleHook_To_v1_LifecycleHook(in.Pre, out.Pre, s); err != nil {

@@ -3668,6 +3674,12 @@ func autoconvert_v1_RecreateDeploymentStrategyParams_To_api_RecreateDeploymentSt

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*deployapiv1.RecreateDeploymentStrategyParams))(in)

 	}

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapi.LifecycleHook)

 		if err := convert_v1_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil {

@@ -1756,6 +1756,12 @@ func deepCopy_v1_LifecycleHook(in deployapiv1.LifecycleHook, out *deployapiv1.Li

 }

 func deepCopy_v1_RecreateDeploymentStrategyParams(in deployapiv1.RecreateDeploymentStrategyParams, out *deployapiv1.RecreateDeploymentStrategyParams, c *conversion.Cloner) error {

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapiv1.LifecycleHook)

 		if err := deepCopy_v1_LifecycleHook(*in.Pre, out.Pre, c); err != nil {

@@ -3141,6 +3141,12 @@ func autoconvert_api_RecreateDeploymentStrategyParams_To_v1beta3_RecreateDeploym

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*deployapi.RecreateDeploymentStrategyParams))(in)

 	}

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapiv1beta3.LifecycleHook)

 		if err := convert_api_LifecycleHook_To_v1beta3_LifecycleHook(in.Pre, out.Pre, s); err != nil {

@@ -3677,6 +3683,12 @@ func autoconvert_v1beta3_RecreateDeploymentStrategyParams_To_api_RecreateDeploym

 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {

 		defaulting.(func(*deployapiv1beta3.RecreateDeploymentStrategyParams))(in)

 	}

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapi.LifecycleHook)

 		if err := convert_v1beta3_LifecycleHook_To_api_LifecycleHook(in.Pre, out.Pre, s); err != nil {

@@ -1764,6 +1764,12 @@ func deepCopy_v1beta3_LifecycleHook(in deployapiv1beta3.LifecycleHook, out *depl

 }

 func deepCopy_v1beta3_RecreateDeploymentStrategyParams(in deployapiv1beta3.RecreateDeploymentStrategyParams, out *deployapiv1beta3.RecreateDeploymentStrategyParams, c *conversion.Cloner) error {

+	if in.TimeoutSeconds != nil {

+		out.TimeoutSeconds = new(int64)

+		*out.TimeoutSeconds = *in.TimeoutSeconds

+	} else {

+		out.TimeoutSeconds = nil

+	}

 	if in.Pre != nil {

 		out.Pre = new(deployapiv1beta3.LifecycleHook)

 		if err := deepCopy_v1beta3_LifecycleHook(*in.Pre, out.Pre, c); err != nil {

@@ -11,7 +11,7 @@ import (

 func TestNewClient(t *testing.T) {

 	o := testclient.NewObjects(kapi.Scheme, kapi.Scheme)

-	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.json", o, kapi.Scheme); err != nil {

+	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.yaml", o, kapi.Scheme); err != nil {

 		t.Fatal(err)

 	}

 	oc, _ := NewFixtureClients(o)

@@ -35,6 +35,9 @@ func OkStrategy() deployapi.DeploymentStrategy {

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

 			},

 		},

+		RecreateParams: &deployapi.RecreateDeploymentStrategyParams{

+			TimeoutSeconds: mkintp(20),

+		},

 	}

 }

@@ -64,11 +67,12 @@ func OkCustomParams() *deployapi.CustomDeploymentStrategyParams {

 	}

 }

+func mkintp(i int) *int64 {

+	v := int64(i)

+	return &v

+}

+

 func OkRollingStrategy() deployapi.DeploymentStrategy {

-	mkintp := func(i int) *int64 {

-		v := int64(i)

-		return &v

-	}

 	return deployapi.DeploymentStrategy{

 		Type: deployapi.DeploymentStrategyTypeRolling,

 		RollingParams: &deployapi.RollingDeploymentStrategyParams{

@@ -67,6 +67,9 @@ type CustomDeploymentStrategyParams struct {

 // RecreateDeploymentStrategyParams are the input to the Recreate deployment

 // strategy.

 type RecreateDeploymentStrategyParams struct {

+	// TimeoutSeconds is the time to wait for updates before giving up. If the

+	// value is nil, a default will be used.

+	TimeoutSeconds *int64

 	// Pre is a lifecycle hook which is executed before the strategy manipulates

 	// the deployment. All LifecycleHookFailurePolicy values are supported.

 	Pre *LifecycleHook

@@ -35,6 +35,14 @@ func init() {

 					TimeoutSeconds:      mkintp(deployapi.DefaultRollingTimeoutSeconds),

 				}

 			}

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

+				obj.RecreateParams = &RecreateDeploymentStrategyParams{}

+			}

+		},

+		func(obj *RecreateDeploymentStrategyParams) {

+			if obj.TimeoutSeconds == nil {

+				obj.TimeoutSeconds = mkintp(deployapi.DefaultRollingTimeoutSeconds)

+			}

 		},

 		func(obj *RollingDeploymentStrategyParams) {

 			if obj.IntervalSeconds == nil {

@@ -48,6 +48,9 @@ func TestDefaults(t *testing.T) {

 				Spec: deployv1.DeploymentConfigSpec{

 					Strategy: deployv1.DeploymentStrategy{

 						Type: deployv1.DeploymentStrategyTypeRecreate,

+						RecreateParams: &deployv1.RecreateDeploymentStrategyParams{

+							TimeoutSeconds: newInt64(deployapi.DefaultRollingTimeoutSeconds),

+						},

 						RollingParams: &deployv1.RollingDeploymentStrategyParams{

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

@@ -67,6 +70,9 @@ func TestDefaults(t *testing.T) {

 				Spec: deployv1.DeploymentConfigSpec{

 					Strategy: deployv1.DeploymentStrategy{

 						Type: deployv1.DeploymentStrategyTypeRecreate,

+						RecreateParams: &deployv1.RecreateDeploymentStrategyParams{

+							TimeoutSeconds: newInt64(deployapi.DefaultRollingTimeoutSeconds),

+						},

 						RollingParams: &deployv1.RollingDeploymentStrategyParams{

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

@@ -67,6 +67,9 @@ type CustomDeploymentStrategyParams struct {

 // RecreateDeploymentStrategyParams are the input to the Recreate deployment

 // strategy.

 type RecreateDeploymentStrategyParams struct {

+	// TimeoutSeconds is the time to wait for updates before giving up. If the

+	// value is nil, a default will be used.

+	TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty" description:"the time to wait for updates before giving up"`

 	// Pre is a lifecycle hook which is executed before the strategy manipulates

 	// the deployment. All LifecycleHookFailurePolicy values are supported.

 	Pre *LifecycleHook `json:"pre,omitempty" description:"a hook executed before the strategy starts the deployment"`

@@ -35,6 +35,14 @@ func init() {

 					TimeoutSeconds:      mkintp(deployapi.DefaultRollingTimeoutSeconds),

 				}

 			}

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

+				obj.RecreateParams = &RecreateDeploymentStrategyParams{}

+			}

+		},

+		func(obj *RecreateDeploymentStrategyParams) {

+			if obj.TimeoutSeconds == nil {

+				obj.TimeoutSeconds = mkintp(deployapi.DefaultRollingTimeoutSeconds)

+			}

 		},

 		func(obj *RollingDeploymentStrategyParams) {

 			if obj.IntervalSeconds == nil {

@@ -67,6 +67,9 @@ func TestDefaults(t *testing.T) {

 				Spec: deployv1.DeploymentConfigSpec{

 					Strategy: deployv1.DeploymentStrategy{

 						Type: deployv1.DeploymentStrategyTypeRecreate,

+						RecreateParams: &deployv1.RecreateDeploymentStrategyParams{

+							TimeoutSeconds: newInt64(deployapi.DefaultRollingTimeoutSeconds),

+						},

 						RollingParams: &deployv1.RollingDeploymentStrategyParams{

 							UpdatePeriodSeconds: newInt64(5),

 							IntervalSeconds:     newInt64(6),

@@ -67,6 +67,9 @@ type CustomDeploymentStrategyParams struct {

 // RecreateDeploymentStrategyParams are the input to the Recreate deployment

 // strategy.

 type RecreateDeploymentStrategyParams struct {

+	// TimeoutSeconds is the time to wait for updates before giving up. If the

+	// value is nil, a default will be used.

+	TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty" description:"the time to wait for updates before giving up"`

 	// Pre is a lifecycle hook which is executed before the strategy manipulates

 	// the deployment. All LifecycleHookFailurePolicy values are supported.

 	Pre *LifecycleHook `json:"pre,omitempty" description:"a hook executed before the strategy starts the deployment"`

@@ -28,6 +28,9 @@ import (

 type RecreateDeploymentStrategy struct {

 	// getReplicationController knows how to get a replication controller.

 	getReplicationController func(namespace, name string) (*kapi.ReplicationController, error)

+	// getUpdateAcceptor returns an UpdateAcceptor to verify the first replica

+	// of the deployment.

+	getUpdateAcceptor func(timeout time.Duration) strat.UpdateAcceptor

 	// scaler is used to scale replication controllers.

 	scaler kubectl.Scaler

 	// codec is used to decode DeploymentConfigs contained in deployments.

@@ -41,6 +44,10 @@ type RecreateDeploymentStrategy struct {

 	retryPeriod time.Duration

 }

+// AcceptorInterval is how often the UpdateAcceptor should check for

+// readiness.

+const AcceptorInterval = 1 * time.Second

+

 // NewRecreateDeploymentStrategy makes a RecreateDeploymentStrategy backed by

 // a real HookExecutor and client.

 func NewRecreateDeploymentStrategy(client kclient.Interface, codec runtime.Codec) *RecreateDeploymentStrategy {

@@ -49,6 +56,9 @@ func NewRecreateDeploymentStrategy(client kclient.Interface, codec runtime.Codec

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return client.ReplicationControllers(namespace).Get(name)

 		},

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

+			return stratsupport.NewAcceptNewlyObservedReadyPods(client, timeout, AcceptorInterval)

+		},

 		scaler:       scaler,

 		codec:        codec,

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

@@ -79,6 +89,10 @@ func (s *RecreateDeploymentStrategy) DeployWithAcceptor(from *kapi.ReplicationCo

 	retryParams := kubectl.NewRetryParams(s.retryPeriod, s.retryTimeout)

 	waitParams := kubectl.NewRetryParams(s.retryPeriod, s.retryTimeout)

+	if updateAcceptor == nil {

+		updateAcceptor = s.getUpdateAcceptor(time.Duration(*params.TimeoutSeconds) * time.Second)

+	}

+

 	// Execute any pre-hook.

 	if params != nil && params.Pre != nil {

 		if err := s.hookExecutor.Execute(params.Pre, to, "prehook"); err != nil {

@@ -105,20 +119,19 @@ func (s *RecreateDeploymentStrategy) DeployWithAcceptor(from *kapi.ReplicationCo

 	// Scale up the to deployment.

 	if desiredReplicas > 0 {

-		// If an UpdateAcceptor is provided, scale up to 1 and validate the replica,

+		// Scale up to 1 and validate the replica,

 		// aborting if the replica isn't acceptable.

-		if updateAcceptor != nil {

-			glog.Infof("Scaling %s to 1 before performing acceptance check", deployutil.LabelForDeployment(to))

-			updatedTo, err := s.scaleAndWait(to, 1, retryParams, waitParams)

-			if err != nil {

-				return fmt.Errorf("couldn't scale %s to 1: %v", deployutil.LabelForDeployment(to), err)

-			}

-			glog.Infof("Performing acceptance check of %s", deployutil.LabelForDeployment(to))

-			if err := updateAcceptor.Accept(updatedTo); err != nil {

-				return fmt.Errorf("update acceptor rejected %s: %v", deployutil.LabelForDeployment(to), err)

-			}

-			to = updatedTo

+		glog.Infof("Scaling %s to 1 before performing acceptance check", deployutil.LabelForDeployment(to))

+		updatedTo, err := s.scaleAndWait(to, 1, retryParams, waitParams)

+		if err != nil {

+			return fmt.Errorf("couldn't scale %s to 1: %v", deployutil.LabelForDeployment(to), err)

 		}

+		glog.Infof("Performing acceptance check of %s", deployutil.LabelForDeployment(to))

+		if err := updateAcceptor.Accept(updatedTo); err != nil {

+			return fmt.Errorf("update acceptor rejected %s: %v", deployutil.LabelForDeployment(to), err)

+		}

+		to = updatedTo

+

 		// Complete the scale up.

 		if to.Spec.Replicas != desiredReplicas {

 			glog.Infof("Scaling %s to %d", deployutil.LabelForDeployment(to), desiredReplicas)

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

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

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

 	scalertest "github.com/openshift/origin/pkg/deploy/scaler/test"

+	"github.com/openshift/origin/pkg/deploy/strategy"

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

 )

@@ -25,26 +26,32 @@ func TestRecreate_initialDeployment(t *testing.T) {

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

-		scaler: scaler,

+		getUpdateAcceptor: getUpdateAcceptor,

+		scaler:            scaler,

 	}

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

-	err := strategy.Deploy(nil, deployment, 2)

+	config := deploytest.OkDeploymentConfig(1)

+	config.Spec.Strategy = recreateParams(30, "", "", "")

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

+	err := strategy.Deploy(nil, deployment, 3)

 	if err != nil {

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

 	}

-	if e, a := 1, len(scaler.Events); e != a {

+	if e, a := 2, len(scaler.Events); e != a {

 		t.Fatalf("expected %d scale calls, got %d", e, a)

 	}

-	if e, a := uint(2), scaler.Events[0].Size; e != a {

+	if e, a := uint(1), scaler.Events[0].Size; e != a {

+		t.Errorf("expected scale up to %d, got %d", e, a)

+	}

+	if e, a := uint(3), scaler.Events[1].Size; e != a {

 		t.Errorf("expected scale up to %d, got %d", e, a)

 	}

 }

 func TestRecreate_deploymentPreHookSuccess(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "", "")

+	config.Spec.Strategy = recreateParams(30, deployapi.LifecycleHookFailurePolicyAbort, "", "")

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

 	scaler := &scalertest.FakeScaler{}

@@ -56,6 +63,7 @@ func TestRecreate_deploymentPreHookSuccess(t *testing.T) {

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				hookExecuted = true

@@ -76,7 +84,7 @@ func TestRecreate_deploymentPreHookSuccess(t *testing.T) {

 func TestRecreate_deploymentPreHookFail(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams(deployapi.LifecycleHookFailurePolicyAbort, "", "")

+	config.Spec.Strategy = recreateParams(30, deployapi.LifecycleHookFailurePolicyAbort, "", "")

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

 	scaler := &scalertest.FakeScaler{}

@@ -87,6 +95,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) {

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				return fmt.Errorf("hook execution failure")

@@ -106,7 +115,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) {

 func TestRecreate_deploymentMidHookSuccess(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort, "")

+	config.Spec.Strategy = recreateParams(30, "", deployapi.LifecycleHookFailurePolicyAbort, "")

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

 	scaler := &scalertest.FakeScaler{}

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

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				hookExecuted = true

@@ -138,7 +148,7 @@ func TestRecreate_deploymentMidHookSuccess(t *testing.T) {

 func TestRecreate_deploymentMidHookFail(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams("", deployapi.LifecycleHookFailurePolicyAbort, "")

+	config.Spec.Strategy = recreateParams(30, "", deployapi.LifecycleHookFailurePolicyAbort, "")

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

 	scaler := &scalertest.FakeScaler{}

@@ -149,6 +159,7 @@ func TestRecreate_deploymentMidHookFail(t *testing.T) {

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				return fmt.Errorf("hook execution failure")

@@ -167,7 +178,7 @@ func TestRecreate_deploymentMidHookFail(t *testing.T) {

 }

 func TestRecreate_deploymentPostHookSuccess(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams("", "", deployapi.LifecycleHookFailurePolicyAbort)

+	config.Spec.Strategy = recreateParams(30, "", "", deployapi.LifecycleHookFailurePolicyAbort)

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

 	scaler := &scalertest.FakeScaler{}

@@ -179,6 +190,7 @@ func TestRecreate_deploymentPostHookSuccess(t *testing.T) {

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				hookExecuted = true

@@ -199,7 +211,7 @@ func TestRecreate_deploymentPostHookSuccess(t *testing.T) {

 func TestRecreate_deploymentPostHookFail(t *testing.T) {

 	config := deploytest.OkDeploymentConfig(1)

-	config.Spec.Strategy.RecreateParams = recreateParams("", "", deployapi.LifecycleHookFailurePolicyAbort)

+	config.Spec.Strategy = recreateParams(30, "", "", deployapi.LifecycleHookFailurePolicyAbort)

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

 	scaler := &scalertest.FakeScaler{}

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

 		getReplicationController: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return deployment, nil

 		},

+		getUpdateAcceptor: getUpdateAcceptor,

 		hookExecutor: &hookExecutorImpl{

 			executeFunc: func(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationController, label string) error {

 				hookExecuted = true

@@ -307,9 +320,8 @@ func TestRecreate_acceptorFail(t *testing.T) {

 	}

 }

-func recreateParams(preFailurePolicy, midFailurePolicy, postFailurePolicy deployapi.LifecycleHookFailurePolicy) *deployapi.RecreateDeploymentStrategyParams {

+func recreateParams(timeout int64, preFailurePolicy, midFailurePolicy, postFailurePolicy deployapi.LifecycleHookFailurePolicy) deployapi.DeploymentStrategy {

 	var pre, mid, post *deployapi.LifecycleHook

-

 	if len(preFailurePolicy) > 0 {

 		pre = &deployapi.LifecycleHook{

 			FailurePolicy: preFailurePolicy,

@@ -328,10 +340,15 @@ func recreateParams(preFailurePolicy, midFailurePolicy, postFailurePolicy deploy

 			ExecNewPod:    &deployapi.ExecNewPodHook{},

 		}

 	}

-	return &deployapi.RecreateDeploymentStrategyParams{

-		Pre:  pre,

-		Mid:  mid,

-		Post: post,

+	return deployapi.DeploymentStrategy{

+		Type: deployapi.DeploymentStrategyTypeRecreate,

+		RecreateParams: &deployapi.RecreateDeploymentStrategyParams{

+			TimeoutSeconds: &timeout,

+

+			Pre:  pre,

+			Mid:  mid,

+			Post: post,

+		},

 	}

 }

@@ -348,6 +365,14 @@ func (t *testControllerClient) updateReplicationController(namespace string, ctr

 	return t.updateReplicationControllerFunc(namespace, ctrl)

 }

+func getUpdateAcceptor(timeout time.Duration) strategy.UpdateAcceptor {

+	return &testAcceptor{

+		acceptFn: func(deployment *kapi.ReplicationController) error {

+			return nil

+		},

+	}

+}

+

 type testAcceptor struct {

 	acceptFn func(*kapi.ReplicationController) error

 }

@@ -13,7 +13,7 @@ os::log::install_errexit

 os::cmd::expect_success 'oc get deploymentConfigs'

 os::cmd::expect_success 'oc get dc'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.json'

+os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

 os::cmd::expect_success 'oc describe deploymentConfigs test-deployment-config'

 os::cmd::expect_success_and_text 'oc get dc -o name' 'deploymentconfig/test-deployment-config'

 os::cmd::expect_success_and_text 'oc describe dc test-deployment-config' 'deploymentconfig=test-deployment-config'

@@ -38,7 +38,7 @@ os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -o

 os::cmd::expect_success_and_text 'echo OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'

 os::cmd::expect_success_and_not_text 'echo #OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'

 os::cmd::expect_success 'oc env dc/test-deployment-config TEST=bar OTHER=baz BAR-'

-os::cmd::expect_success_and_not_text 'oc env -f test/integration/fixtures/test-deployment-config.json TEST=VERSION -o yaml' 'v1beta3'

+os::cmd::expect_success_and_not_text 'oc env -f test/integration/fixtures/test-deployment-config.yaml TEST=VERSION -o yaml' 'v1beta3'

 os::cmd::expect_success 'oc env dc/test-deployment-config A=a B=b C=c D=d E=e F=f G=g'

 os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'A=a'

 os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'B=b'

@@ -11,7 +11,7 @@ os::log::install_errexit

 # This test validates the 'volume' command

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.json'

+os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

 os::cmd::expect_success_and_text 'oc volume dc/test-deployment-config --list' 'vol1'

 os::cmd::expect_success 'oc volume dc/test-deployment-config --add --name=vol0 -m /opt5'

@@ -189,13 +189,13 @@ oc logs --previous dc/failing-dc | grep 'test pre hook executed'

 oc delete dc/failing-dc

 # test the mid hook on a recreate deployment and the health check

 oc create -f test/fixtures/failing-dc-mid.yaml

-tryuntil oc get rc/failing-dc-1

-oc logs -f dc/failing-dc

-wait_for_command "oc get rc/failing-dc-1 --template={{.metadata.annotations}} | grep openshift.io/deployment.phase:Failed" $((60*TIME_SEC))

-oc logs dc/failing-dc | grep 'test mid hook executed'

-oc deploy failing-dc --latest

-oc logs --version=1 dc/failing-dc | grep 'test mid hook executed'

-oc logs --previous dc/failing-dc | grep 'test mid hook executed'

+tryuntil oc get rc/failing-dc-mid-1

+oc logs -f dc/failing-dc-mid

+wait_for_command "oc get rc/failing-dc-mid-1 --template={{.metadata.annotations}} | grep openshift.io/deployment.phase:Failed" $((60*TIME_SEC))

+oc logs dc/failing-dc-mid | grep 'test mid hook executed'

+oc deploy failing-dc-mid --latest

+oc logs --version=1 dc/failing-dc-mid | grep 'test mid hook executed'

+oc logs --previous dc/failing-dc-mid | grep 'test mid hook executed'

 echo "[INFO] Run pod diagnostics"

 # Requires a node to run the pod; uses origin-deployer pod, expects registry deployed

@@ -226,7 +226,7 @@ oc logs buildconfig/ruby-sample-build --loglevel=6

 echo "logs: ok"

 echo "[INFO] Starting a deployment to test scaling..."

-oc create -f test/integration/fixtures/test-deployment-config.json

+oc create -f test/integration/fixtures/test-deployment-config.yaml

 # scaling which might conflict with the deployment should work

 oc scale dc/test-deployment-config --replicas=2

 tryuntil '[ "$(oc get rc/test-deployment-config-1 -o yaml | grep Complete)" ]'

@@ -1,14 +1,15 @@

 apiVersion: v1

 kind: DeploymentConfig

 metadata:

-  name: failing-dc

+  name: failing-dc-mid

 spec:

   replicas: 2

   selector:

-    name: failing-dc

+    name: failing-dc-mid

   strategy:

     type: Recreate

     recreateParams:

+      timeoutSeconds: 5

       mid:

         failurePolicy: Abort

         execNewPod:

@@ -19,7 +20,7 @@ spec:

   template:

     metadata:

       labels:

-        name: failing-dc

+        name: failing-dc-mid

     spec:

       containers:

       - image: "docker.io/centos:centos7"

deleted file mode 100644

@@ -1,62 +0,0 @@

-{

-  "kind": "DeploymentConfig",

-  "apiVersion": "v1beta3",

-  "metadata": {

-    "name": "test-deployment-config",

-    "creationTimestamp": null

-  },

-  "spec": {

-    "strategy": {

-      "type": "Recreate",

-      "resources": {}

-    },

-    "replicas": 1,

-    "selector": {

-      "name": "test-deployment"

-    },

-    "template": {

-      "metadata": {

-        "creationTimestamp": null,

-        "labels": {

-          "name": "test-deployment"

-        }

-      },

-      "spec": {

-	"volumes": [

-	  {

-	    "name": "vol1",

-	    "emptyDir": {}

-	  }

-	],

-        "containers": [

-          {

-            "name": "ruby-helloworld",

-            "image": "127.0.0.1:5001/openshift/origin-ruby-sample",

-            "ports": [

-              {

-                "containerPort": 8080,

-                "protocol": "TCP"

-              }

-            ],

-            "resources": {

-              "limits": {

-                "cpu": "100m",

-                "memory": "3Gi"

-              }

-            },

-            "terminationMessagePath": "/dev/termination-log",

-            "imagePullPolicy": "IfNotPresent",

-            "capabilities": {},

-            "securityContext": {

-              "capabilities": {},

-              "privileged": false

-            }

-          }

-        ],

-        "restartPolicy": "Always",

-        "dnsPolicy": "ClusterFirst"

-      }

-    }

-  },

-  "status": {}

-}

new file mode 100644

@@ -0,0 +1,34 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: test-deployment-config

+spec:

+  replicas: 1

+  selector:

+    name: test-deployment

+  strategy:

+    type: Recreate

+    recreateParams:

+      timeoutSeconds: 10

+  template:

+    metadata:

+      labels:

+        name: test-deployment

+    spec:

+      containers:

+      - image: openshift/origin-pod

+        imagePullPolicy: IfNotPresent

+        name: ruby-helloworld

+        ports:

+        - containerPort: 8080

+          protocol: TCP

+        resources:

+          limits:

+            cpu: 100m

+            memory: 3Gi

+      volumes:

+      - emptyDir: {}

+        name: vol1

+  triggers:

+  - type: ConfigChange

+status: {}

\ No newline at end of file