Updated generated deepcopy/conversion

openshift · May 12, 2016 · 57e2e50 · 57e2e50
1 parent 79b9aeb
commit 57e2e50
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/pkg/deploy/api/deep_copy_generated.go b/pkg/deploy/api/deep_copy_generated.go
@@ -270,15 +270,6 @@ func DeepCopy_api_DeploymentLogOptions(in DeploymentLogOptions, out *DeploymentL
 
 func DeepCopy_api_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrategy, c *conversion.Cloner) error {
 	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)
@@ -297,6 +288,15 @@ func DeepCopy_api_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrat
 	} 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 := api.DeepCopy_api_ResourceRequirements(in.Resources, &out.Resources, c); err != nil {
 		return err
 	}

diff --git a/pkg/deploy/api/v1/conversion_generated.go b/pkg/deploy/api/v1/conversion_generated.go
@@ -759,15 +759,6 @@ func autoConvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *deploy_api.
 		defaulting.(func(*deploy_api.DeploymentStrategy))(in)
 	}
 	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)
@@ -786,6 +777,15 @@ func autoConvert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *deploy_api.
 	} 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
+	}
 	// TODO: Inefficient conversion - can we improve it?
 	if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
 		return err