Merge pull request #1100 from kahun/fix/gke_node_pools_per_region

Fix GKE MachinePool replicas per region
kubernetes-sigs · Dec 15, 2023 · 818b985 · 818b985
2 parents cadb9b9 + 29b28ef
commit 818b985
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/cloud/scope/managedmachinepool.go b/cloud/scope/managedmachinepool.go
@@ -170,7 +170,11 @@ func NodePoolResourceLabels(additionalLabels infrav1.Labels, clusterName string)
 func ConvertToSdkNodePool(nodePool infrav1exp.GCPManagedMachinePool, machinePool clusterv1exp.MachinePool, regional bool, clusterName string) *containerpb.NodePool {
 	replicas := *machinePool.Spec.Replicas
 	if regional {
-		replicas /= cloud.DefaultNumRegionsPerZone
+		if len(nodePool.Spec.NodeLocations) != 0 {
+			replicas /= int32(len(nodePool.Spec.NodeLocations))
+		} else {
+			replicas /= cloud.DefaultNumRegionsPerZone
+		}
 	}
 	nodePoolName := nodePool.Spec.NodePoolName
 	if len(nodePoolName) == 0 {

diff --git a/cloud/services/container/nodepools/reconcile.go b/cloud/services/container/nodepools/reconcile.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/cluster-api-provider-gcp/cloud"
 	"sigs.k8s.io/cluster-api-provider-gcp/util/resourceurl"
 
 	"google.golang.org/api/iterator"
@@ -433,7 +432,7 @@ func (s *Service) checkDiffAndPrepareUpdateSize(existingNodePool *containerpb.No
 
 	replicas := *s.scope.MachinePool.Spec.Replicas
 	if shared.IsRegional(s.scope.Region()) {
-		replicas /= cloud.DefaultNumRegionsPerZone
+		replicas /= int32(len(existingNodePool.Locations))
 	}
 
 	if replicas != existingNodePool.InitialNodeCount {

diff --git a/cloud/services/shared/machinepool.go b/cloud/services/shared/machinepool.go
@@ -34,8 +34,14 @@ func ManagedMachinePoolPreflightCheck(managedPool *infrav1exp.GCPManagedMachineP
 	}
 
 	if IsRegional(location) {
-		if *machinePool.Spec.Replicas%cloud.DefaultNumRegionsPerZone != 0 {
-			return fmt.Errorf("a machine pool (%s) in a regional cluster must have replicas with a multiple of %d", machinePool.Name, cloud.DefaultNumRegionsPerZone)
+		var numRegionsPerZone int32
+		if len(managedPool.Spec.NodeLocations) != 0 {
+			numRegionsPerZone = int32(len(managedPool.Spec.NodeLocations))
+		} else {
+			numRegionsPerZone = cloud.DefaultNumRegionsPerZone
+		}
+		if *machinePool.Spec.Replicas%numRegionsPerZone != 0 {
+			return fmt.Errorf("a machine pool (%s) in a regional cluster with %d regions, must have replicas with a multiple of %d", machinePool.Name, numRegionsPerZone, numRegionsPerZone)
 		}
 	}