Merge pull request #4914 from k8s-infra-cherrypick-robot/cherry-pick-4873-to-release-2.4

k8s-ci-robot · web-flow · commit 3ee30c22c44b · 2024-04-08T04:00:28.000-07:00
[release-2.4] 🐛 ROSA: fix auto scale and multi zone compute nodes
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml
@@ -116,7 +116,8 @@ spec:
                 properties:
                   autoscaling:
                     description: Autoscaling specifies auto scaling behaviour for
-                      this MachinePool.
+                      the default MachinePool. Autoscaling min/max value must be equal
+                      or multiple of the availability zones count.
                     properties:
                       maxReplicas:
                         minimum: 1
diff --git a/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go b/controlplane/rosa/api/v1beta2/rosacontrolplane_types.go
@@ -198,7 +198,8 @@ type DefaultMachinePoolSpec struct {
 	// +optional
 	InstanceType string `json:"instanceType,omitempty"`
 
-	// Autoscaling specifies auto scaling behaviour for this MachinePool.
+	// Autoscaling specifies auto scaling behaviour for the default MachinePool. Autoscaling min/max value
+	// must be equal or multiple of the availability zones count.
 	// +optional
 	Autoscaling *expinfrav1.RosaMachinePoolAutoScaling `json:"autoscaling,omitempty"`
 }
diff --git a/controlplane/rosa/controllers/rosacontrolplane_controller.go b/controlplane/rosa/controllers/rosacontrolplane_controller.go
@@ -611,9 +611,13 @@ func buildOCMClusterSpec(controPlaneSpec rosacontrolplanev1.RosaControlPlaneSpec
 	}
 
 	// Set cluster compute autoscaling replicas
+	// In case autoscaling is not defined and multiple zones defined, set the compute nodes equal to the zones count.
 	if computeAutoscaling := controPlaneSpec.DefaultMachinePoolSpec.Autoscaling; computeAutoscaling != nil {
+		ocmClusterSpec.Autoscaling = true
 		ocmClusterSpec.MaxReplicas = computeAutoscaling.MaxReplicas
 		ocmClusterSpec.MinReplicas = computeAutoscaling.MinReplicas
+	} else if computeAutoscaling == nil && len(controPlaneSpec.AvailabilityZones) > 1 {
+		ocmClusterSpec.ComputeNodes = len(controPlaneSpec.AvailabilityZones)
 	}
 
 	if controPlaneSpec.ProvisionShardID != "" {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,8 @@ type DefaultMachinePoolSpec struct {`
`198`	`198`	`// +optional`
`199`	`199`	InstanceType string `json:"instanceType,omitempty"`
`200`	`200`
`201`		`- // Autoscaling specifies auto scaling behaviour for this MachinePool.`
	`201`	`+ // Autoscaling specifies auto scaling behaviour for the default MachinePool. Autoscaling min/max value`
	`202`	`+ // must be equal or multiple of the availability zones count.`
`202`	`203`	`// +optional`
`203`	`204`	Autoscaling *expinfrav1.RosaMachinePoolAutoScaling `json:"autoscaling,omitempty"`
`204`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -611,9 +611,13 @@ func buildOCMClusterSpec(controPlaneSpec rosacontrolplanev1.RosaControlPlaneSpec`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`// Set cluster compute autoscaling replicas`
	`614`	`+ // In case autoscaling is not defined and multiple zones defined, set the compute nodes equal to the zones count.`
`614`	`615`	`if computeAutoscaling := controPlaneSpec.DefaultMachinePoolSpec.Autoscaling; computeAutoscaling != nil {`
	`616`	`+ ocmClusterSpec.Autoscaling = true`
`615`	`617`	`ocmClusterSpec.MaxReplicas = computeAutoscaling.MaxReplicas`
`616`	`618`	`ocmClusterSpec.MinReplicas = computeAutoscaling.MinReplicas`
	`619`	`+ } else if computeAutoscaling == nil && len(controPlaneSpec.AvailabilityZones) > 1 {`
	`620`	`+ ocmClusterSpec.ComputeNodes = len(controPlaneSpec.AvailabilityZones)`
`617`	`621`	`}`
`618`	`622`
`619`	`623`	`if controPlaneSpec.ProvisionShardID != "" {`