Merge pull request kubernetes#91199 from aubm/refactor-kubectl-create-deploy-isolate-create-logic

Refactor kubectl create deploy: isolate obj construction logic

Author: k8s-ci-robot

staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment.go

@@ -146,6 +146,30 @@ func (o *DeploymentOpts) Complete(f cmdutil.Factory, cmd *cobra.Command, args []
 
 // Run performs the execution of 'create deployment' sub command
 func (o *DeploymentOpts) Run() error {
+	deploy := o.createDeployment()
+
+	if o.DryRunStrategy != cmdutil.DryRunClient {
+		createOptions := metav1.CreateOptions{}
+		if o.FieldManager != "" {
+			createOptions.FieldManager = o.FieldManager
+		}
+		if o.DryRunStrategy == cmdutil.DryRunServer {
+			if err := o.DryRunVerifier.HasSupport(deploy.GroupVersionKind()); err != nil {
+				return err
+			}
+			createOptions.DryRun = []string{metav1.DryRunAll}
+		}
+		var err error
+		deploy, err = o.Client.Deployments(o.Namespace).Create(context.TODO(), deploy, createOptions)
+		if err != nil {
+			return fmt.Errorf("failed to create deployment: %v", err)
+		}
+	}
+
+	return o.PrintObj(deploy)
+}
+
+func (o *DeploymentOpts) createDeployment() *appsv1.Deployment {
 	one := int32(1)
 	labels := map[string]string{"app": o.Name}
 	selector := metav1.LabelSelector{MatchLabels: labels}
@@ -154,7 +178,7 @@ func (o *DeploymentOpts) Run() error {
 		namespace = o.Namespace
 	}
 
-	deploy := &appsv1.Deployment{
+	return &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{APIVersion: appsv1.SchemeGroupVersion.String(), Kind: "Deployment"},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      o.Name,
@@ -172,26 +196,6 @@ func (o *DeploymentOpts) Run() error {
 			},
 		},
 	}
-
-	if o.DryRunStrategy != cmdutil.DryRunClient {
-		createOptions := metav1.CreateOptions{}
-		if o.FieldManager != "" {
-			createOptions.FieldManager = o.FieldManager
-		}
-		if o.DryRunStrategy == cmdutil.DryRunServer {
-			if err := o.DryRunVerifier.HasSupport(deploy.GroupVersionKind()); err != nil {
-				return err
-			}
-			createOptions.DryRun = []string{metav1.DryRunAll}
-		}
-		var err error
-		deploy, err = o.Client.Deployments(o.Namespace).Create(context.TODO(), deploy, createOptions)
-		if err != nil {
-			return fmt.Errorf("failed to create deployment: %v", err)
-		}
-	}
-
-	return o.PrintObj(deploy)
 }
 
 // buildPodSpec parses the image strings and assemble them into the Containers