CLOUDP-147896: Fix the InstanceSize must match issue (#782)

Author: fabritsius

pkg/controller/atlasdeployment/advanced_deployment.go

@@ -86,8 +86,6 @@ func advancedDeploymentIdle(ctx *workflow.Context, project *mdbv1.AtlasProject,
 		}
 	}
 
-	// Prevent changing of instanceSize and diskSizeGB if autoscaling is enabled
-
 	cleanupTheSpec(&specDeployment)
 
 	deploymentAsAtlas, err := specDeployment.ToAtlas()
@@ -103,8 +101,41 @@ func advancedDeploymentIdle(ctx *workflow.Context, project *mdbv1.AtlasProject,
 	return nil, workflow.InProgress(workflow.DeploymentUpdating, "deployment is updating")
 }
 
-func cleanupTheSpec(deployment *mdbv1.AdvancedDeploymentSpec) {
-	deployment.MongoDBVersion = ""
+func cleanupTheSpec(specMerged *mdbv1.AdvancedDeploymentSpec) {
+	specMerged.MongoDBVersion = ""
+
+	globalInstanceSize := ""
+	for i, replicationSpec := range specMerged.ReplicationSpecs {
+		for k := range replicationSpec.RegionConfigs {
+			regionConfig := specMerged.ReplicationSpecs[i].RegionConfigs[k]
+
+			specs := []*mdbv1.Specs{
+				regionConfig.AnalyticsSpecs,
+				regionConfig.ElectableSpecs,
+				regionConfig.ReadOnlySpecs,
+			}
+
+			forEachSpec := func(f func(spec *mdbv1.Specs)) {
+				for _, spec := range specs {
+					if spec != nil {
+						f(spec)
+					}
+				}
+			}
+
+			forEachSpec(func(spec *mdbv1.Specs) {
+				if globalInstanceSize == "" && spec.NodeCount != nil && *spec.NodeCount != 0 {
+					globalInstanceSize = spec.InstanceSize
+				}
+			})
+
+			forEachSpec(func(spec *mdbv1.Specs) {
+				if spec.NodeCount == nil || *spec.NodeCount == 0 {
+					spec.InstanceSize = globalInstanceSize
+				}
+			})
+		}
+	}
 }
 
 // This will prevent from setting diskSizeGB if at least one region config has enabled disk size autoscaling

test/int/deployment_test.go

@@ -850,14 +850,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment"), func() {
 			})
 
 			By(fmt.Sprintf("Updating the InstanceSize of Advanced Deployment %s", kube.ObjectKeyFromObject(createdDeployment)), func() {
-				newInstanceSize := "M20"
-				createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0].AnalyticsSpecs = &mdbv1.Specs{
-					InstanceSize: newInstanceSize,
-				}
-				createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0].ElectableSpecs.InstanceSize = newInstanceSize
-				createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0].ReadOnlySpecs = &mdbv1.Specs{
-					InstanceSize: newInstanceSize,
-				}
+				createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0].ElectableSpecs.InstanceSize = "M20"
 				Expect(k8sClient.Update(context.Background(), createdDeployment)).ToNot(HaveOccurred())
 
 				Eventually(func(g Gomega) bool {
@@ -871,10 +864,12 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment"), func() {
 			})
 
 			By(fmt.Sprintf("Enable AutoScaling for the Advanced Deployment %s", kube.ObjectKeyFromObject(createdDeployment)), func() {
-				createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0].AutoScaling = &mdbv1.AdvancedAutoScalingSpec{
+				regionConfig := createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0]
+				regionConfig.ElectableSpecs.InstanceSize = "M10"
+				regionConfig.AutoScaling = &mdbv1.AdvancedAutoScalingSpec{
 					Compute: &mdbv1.ComputeSpec{
 						Enabled:          toptr.MakePtr(true),
-						MaxInstanceSize:  "M20",
+						MaxInstanceSize:  "M30",
 						MinInstanceSize:  "M10",
 						ScaleDownEnabled: toptr.MakePtr(true),
 					},
@@ -890,6 +885,22 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment"), func() {
 
 				doAdvancedDeploymentStatusChecks()
 				checkAdvancedAtlasState()
+
+				lastGeneration++
+			})
+
+			By(fmt.Sprintf("Update Instance Size Margins with AutoScaling for Deployemnt %s", kube.ObjectKeyFromObject(createdDeployment)), func() {
+				regionConfig := createdDeployment.Spec.AdvancedDeploymentSpec.ReplicationSpecs[0].RegionConfigs[0]
+				regionConfig.AutoScaling.Compute.MinInstanceSize = "M20"
+				regionConfig.ElectableSpecs.InstanceSize = "M20"
+				Expect(k8sClient.Update(context.Background(), createdDeployment)).ToNot(HaveOccurred())
+
+				Eventually(func(g Gomega) bool {
+					return testutil.CheckCondition(k8sClient, createdDeployment, status.TrueCondition(status.ReadyType), validateDeploymentUpdatingFunc(g))
+				}).WithTimeout(30 * time.Minute).WithPolling(interval).Should(BeTrue())
+
+				doAdvancedDeploymentStatusChecks()
+				checkAdvancedAtlasState()
 			})
 		})
 	})