Move Replica check to getDeploymentSpec function

devfile · Jan 25, 2022 · 4a544b1 · 4a544b1
1 parent 145564e
commit 4a544b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/devfile/generator/generators.go b/pkg/devfile/generator/generators.go
@@ -184,11 +184,7 @@ func GetDeployment(devfileObj parser.DevfileObj, deployParams DeploymentParams)
 	deployment := &appsv1.Deployment{
 		TypeMeta:   deployParams.TypeMeta,
 		ObjectMeta: deployParams.ObjectMeta,
-		Spec:       *getDeploymentSpec(deploySpecParams),
-	}
-
-	if deployParams.Replicas != nil {
-		deployment.Spec.Replicas = deployParams.Replicas
+		Spec:       *getDeploymentSpec(deploySpecParams, deployParams),
 	}
 
 	return deployment, nil

diff --git a/pkg/devfile/generator/utils.go b/pkg/devfile/generator/utils.go
@@ -236,7 +236,7 @@ type deploymentSpecParams struct {
 }
 
 // getDeploymentSpec gets a deployment spec
-func getDeploymentSpec(deploySpecParams deploymentSpecParams) *appsv1.DeploymentSpec {
+func getDeploymentSpec(deploySpecParams deploymentSpecParams, deployParams DeploymentParams) *appsv1.DeploymentSpec {
 	deploymentSpec := &appsv1.DeploymentSpec{
 		Strategy: appsv1.DeploymentStrategy{
 			Type: appsv1.RecreateDeploymentStrategyType,
@@ -247,6 +247,10 @@ func getDeploymentSpec(deploySpecParams deploymentSpecParams) *appsv1.Deployment
 		Template: deploySpecParams.PodTemplateSpec,
 	}
 
+	if deployParams.Replicas != nil {
+		deploymentSpec.Replicas = deployParams.Replicas
+	}
+
 	return deploymentSpec
 }