OCM-7937 | fix: allow 0 min replicas for classic cluster autoscaling mp

openshift · May 10, 2024 · dc61e69 · dc61e69
1 parent 26ce7d6
commit dc61e69
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/cmd/edit/machinepool/machinepool.go b/cmd/edit/machinepool/machinepool.go
@@ -222,16 +222,20 @@ func editMachinePoolAutoscaling(machinePool *cmv1.MachinePool,
 	asBuilder := cmv1.NewMachinePoolAutoscaling()
 	changed := false
 
-	if machinePool.Autoscaling().MinReplicas() != minReplicas && minReplicas >= 1 {
-		asBuilder = asBuilder.MinReplicas(minReplicas)
+	newMin := machinePool.Autoscaling().MinReplicas()
+	newMax := machinePool.Autoscaling().MaxReplicas()
+
+	if machinePool.Autoscaling().MinReplicas() != minReplicas && minReplicas >= 0 {
+		newMin = minReplicas
 		changed = true
 	}
-	if machinePool.Autoscaling().MaxReplicas() != maxReplicas && maxReplicas >= 1 {
-		asBuilder = asBuilder.MaxReplicas(maxReplicas)
+	if machinePool.Autoscaling().MaxReplicas() != maxReplicas && maxReplicas >= 0 {
+		newMax = maxReplicas
 		changed = true
 	}
 
 	if changed {
+		asBuilder = asBuilder.MinReplicas(newMin).MaxReplicas(newMax)
 		return asBuilder
 	}
 	return nil

diff --git a/cmd/edit/machinepool/machinepool_test.go b/cmd/edit/machinepool/machinepool_test.go
@@ -26,6 +26,26 @@ var _ = Describe("Machinepool", func() {
 			asBuilder := cmv1.NewMachinePoolAutoscaling().MaxReplicas(3).MinReplicas(2)
 			Expect(builder).To(Equal(asBuilder))
 		})
+
+		It("editMachinePoolAutoscaling should allow 0 min replicas", func() {
+			machinePool, err := cmv1.NewMachinePool().
+				Autoscaling(cmv1.NewMachinePoolAutoscaling().MaxReplicas(2).MinReplicas(1)).
+				Build()
+			Expect(err).ToNot(HaveOccurred())
+			builder := editMachinePoolAutoscaling(machinePool, 0, 2)
+			asBuilder := cmv1.NewMachinePoolAutoscaling().MaxReplicas(2).MinReplicas(0)
+			Expect(builder).To(Equal(asBuilder))
+		})
+
+		It("editMachinePoolAutoscaling should allow 0 min and 0 max replicas", func() {
+			machinePool, err := cmv1.NewMachinePool().
+				Autoscaling(cmv1.NewMachinePoolAutoscaling().MaxReplicas(2).MinReplicas(1)).
+				Build()
+			Expect(err).ToNot(HaveOccurred())
+			builder := editMachinePoolAutoscaling(machinePool, 0, 0)
+			asBuilder := cmv1.NewMachinePoolAutoscaling().MaxReplicas(0).MinReplicas(0)
+			Expect(builder).To(Equal(asBuilder))
+		})
 	})
 
 	Context("isMultiAZMachinePool", func() {