@@ -269,7 +269,9 @@ message DeploymentStrategy {

   // Type is the name of a deployment strategy.

   optional string type = 1;

-  // CustomParams are the input to the Custom deployment strategy.

+  // CustomParams are the input to the Custom deployment strategy, and may also

+  // be specified for the Recreate and Rolling strategies to customize the execution

+  // process that runs the deployment.

   optional CustomDeploymentStrategyParams customParams = 2;

   // RecreateParams are the input to the Recreate deployment strategy.

@@ -278,7 +280,7 @@ message DeploymentStrategy {

   // RollingParams are the input to the Rolling deployment strategy.

   optional RollingDeploymentStrategyParams rollingParams = 4;

-  // Resources contains resource requirements to execute the deployment and any hooks

+  // Resources contains resource requirements to execute the deployment and any hooks.

   optional k8s.io.kubernetes.pkg.api.v1.ResourceRequirements resources = 5;

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

@@ -424,8 +426,8 @@ message RollingDeploymentStrategyParams {

   optional LifecycleHook pre = 7;

   // Post is a lifecycle hook which is executed after the strategy has

-  // finished all deployment logic. The LifecycleHookFailurePolicyAbort policy

-  // is NOT supported.

+  // finished all deployment logic. All LifecycleHookFailurePolicy values

+  // are supported.

   optional LifecycleHook post = 8;

 }

@@ -23218,7 +23218,7 @@

      },

      "customParams": {

       "$ref": "v1.CustomDeploymentStrategyParams",

-      "description": "CustomParams are the input to the Custom deployment strategy."

+      "description": "CustomParams are the input to the Custom deployment strategy, and may also be specified for the Recreate and Rolling strategies to customize the execution process that runs the deployment."

      },

      "recreateParams": {

       "$ref": "v1.RecreateDeploymentStrategyParams",

@@ -23230,7 +23230,7 @@

      },

      "resources": {

       "$ref": "v1.ResourceRequirements",

-      "description": "Resources contains resource requirements to execute the deployment and any hooks"

+      "description": "Resources contains resource requirements to execute the deployment and any hooks."

      },

      "labels": {

       "type": "object",

@@ -23399,7 +23399,7 @@

      },

      "post": {

       "$ref": "v1.LifecycleHook",

-      "description": "Post is a lifecycle hook which is executed after the strategy has finished all deployment logic. The LifecycleHookFailurePolicyAbort policy is NOT supported."

+      "description": "Post is a lifecycle hook which is executed after the strategy has finished all deployment logic. All LifecycleHookFailurePolicy values are supported."

      }

     }

    },

@@ -269,7 +269,9 @@ message DeploymentStrategy {

   // Type is the name of a deployment strategy.

   optional string type = 1;

-  // CustomParams are the input to the Custom deployment strategy.

+  // CustomParams are the input to the Custom deployment strategy, and may also

+  // be specified for the Recreate and Rolling strategies to customize the execution

+  // process that runs the deployment.

   optional CustomDeploymentStrategyParams customParams = 2;

   // RecreateParams are the input to the Recreate deployment strategy.

@@ -278,7 +280,7 @@ message DeploymentStrategy {

   // RollingParams are the input to the Rolling deployment strategy.

   optional RollingDeploymentStrategyParams rollingParams = 4;

-  // Resources contains resource requirements to execute the deployment and any hooks

+  // Resources contains resource requirements to execute the deployment and any hooks.

   optional k8s.io.kubernetes.pkg.api.v1.ResourceRequirements resources = 5;

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

@@ -424,8 +426,8 @@ message RollingDeploymentStrategyParams {

   optional LifecycleHook pre = 7;

   // Post is a lifecycle hook which is executed after the strategy has

-  // finished all deployment logic. The LifecycleHookFailurePolicyAbort policy

-  // is NOT supported.

+  // finished all deployment logic. All LifecycleHookFailurePolicy values

+  // are supported.

   optional LifecycleHook post = 8;

 }

@@ -177,10 +177,10 @@ func (DeploymentRequest) SwaggerDoc() map[string]string {

 var map_DeploymentStrategy = map[string]string{

 	"":               "DeploymentStrategy describes how to perform a deployment.",

 	"type":           "Type is the name of a deployment strategy.",

-	"customParams":   "CustomParams are the input to the Custom deployment strategy.",

+	"customParams":   "CustomParams are the input to the Custom deployment strategy, and may also be specified for the Recreate and Rolling strategies to customize the execution process that runs the deployment.",

 	"recreateParams": "RecreateParams are the input to the Recreate deployment strategy.",

 	"rollingParams":  "RollingParams are the input to the Rolling deployment strategy.",

-	"resources":      "Resources contains resource requirements to execute the deployment and any hooks",

+	"resources":      "Resources contains resource requirements to execute the deployment and any hooks.",

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

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

 }

@@ -254,7 +254,7 @@ var map_RollingDeploymentStrategyParams = map[string]string{

 	"maxUnavailable":      "MaxUnavailable is the maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of total pods at the start of update (ex: 10%). Absolute number is calculated from percentage by rounding up.\n\nThis cannot be 0 if MaxSurge is 0. By default, 25% is used.\n\nExample: when this is set to 30%, the old RC can be scaled down by 30% immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that at least 70% of original number of pods are available at all times during the update.",

 	"maxSurge":            "MaxSurge is the maximum number of pods that can be scheduled above the original number of pods. Value can be an absolute number (ex: 5) or a percentage of total pods at the start of the update (ex: 10%). Absolute number is calculated from percentage by rounding up.\n\nThis cannot be 0 if MaxUnavailable is 0. By default, 25% is used.\n\nExample: when this is set to 30%, the new RC can be scaled up by 30% immediately when the rolling update starts. Once old pods have been killed, new RC can be scaled up further, ensuring that total number of pods running at any time during the update is atmost 130% of original pods.",

 	"pre":                 "Pre is a lifecycle hook which is executed before the deployment process begins. All LifecycleHookFailurePolicy values are supported.",

-	"post":                "Post is a lifecycle hook which is executed after the strategy has finished all deployment logic. The LifecycleHookFailurePolicyAbort policy is NOT supported.",

+	"post":                "Post is a lifecycle hook which is executed after the strategy has finished all deployment logic. All LifecycleHookFailurePolicy values are supported.",

 }

 func (RollingDeploymentStrategyParams) SwaggerDoc() map[string]string {

@@ -671,6 +671,15 @@ func Convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrat

 func autoConvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *api.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {

 	out.Type = DeploymentStrategyType(in.Type)

+	if in.CustomParams != nil {

+		in, out := &in.CustomParams, &out.CustomParams

+		*out = new(CustomDeploymentStrategyParams)

+		if err := Convert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(*in, *out, s); err != nil {

+			return err

+		}

+	} else {

+		out.CustomParams = nil

+	}

 	if in.RecreateParams != nil {

 		in, out := &in.RecreateParams, &out.RecreateParams

 		*out = new(RecreateDeploymentStrategyParams)

@@ -689,15 +698,6 @@ func autoConvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *api.Deploym

 	} else {

 		out.RollingParams = nil

 	}

-	if in.CustomParams != nil {

-		in, out := &in.CustomParams, &out.CustomParams

-		*out = new(CustomDeploymentStrategyParams)

-		if err := Convert_api_CustomDeploymentStrategyParams_To_v1_CustomDeploymentStrategyParams(*in, *out, s); err != nil {

-			return err

-		}

-	} else {

-		out.CustomParams = nil

-	}

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

 		return err

 	}

@@ -365,6 +365,15 @@ func DeepCopy_api_DeploymentStrategy(in interface{}, out interface{}, c *convers

 		in := in.(*DeploymentStrategy)

 		out := out.(*DeploymentStrategy)

 		out.Type = in.Type

+		if in.CustomParams != nil {

+			in, out := &in.CustomParams, &out.CustomParams

+			*out = new(CustomDeploymentStrategyParams)

+			if err := DeepCopy_api_CustomDeploymentStrategyParams(*in, *out, c); err != nil {

+				return err

+			}

+		} else {

+			out.CustomParams = nil

+		}

 		if in.RecreateParams != nil {

 			in, out := &in.RecreateParams, &out.RecreateParams

 			*out = new(RecreateDeploymentStrategyParams)

@@ -383,15 +392,6 @@ func DeepCopy_api_DeploymentStrategy(in interface{}, out interface{}, c *convers

 		} else {

 			out.RollingParams = nil

 		}

-		if in.CustomParams != nil {

-			in, out := &in.CustomParams, &out.CustomParams

-			*out = new(CustomDeploymentStrategyParams)

-			if err := DeepCopy_api_CustomDeploymentStrategyParams(*in, *out, c); err != nil {

-				return err

-			}

-		} else {

-			out.CustomParams = nil

-		}

 		if err := pkg_api.DeepCopy_api_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil {

 			return err

 		}