Error out when an invalid nodePool is configured

675bd75f · Darren Shepherd · 801f4729 · 675bd75f
Commit 675bd75f authored 4 years ago by Darren Shepherd
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 2 deletions
+4 -2
--- a/pkg/controllers/provisioningv2/rke2/provisioningcluster/template.go
+++ b/pkg/controllers/provisioningv2/rke2/provisioningcluster/template.go
@@ -140,10 +140,12 @@ func machineDeployments(cluster *rancherv1.Cluster, capiCluster *capi.Cluster, d

 	nodePoolNames := map[string]bool{}
 	for _, nodePool := range cluster.Spec.RKEConfig.NodePools {
-		if nodePool.Name == "" || nodePool.NodeConfig == nil || nodePool.NodeConfig.Name == "" || nodePool.NodeConfig.Kind == "" ||
-			(nodePool.Quantity != nil && *nodePool.Quantity == 0) {
+		if nodePool.Quantity != nil && *nodePool.Quantity == 0 {
 			continue
 		}
+		if nodePool.Name == "" || nodePool.NodeConfig == nil || nodePool.NodeConfig.Name == "" || nodePool.NodeConfig.Kind == "" {
+			return nil, fmt.Errorf("invalid nodePool [%s] missing name or valid config", nodePool.Name)
+		}
 		if !nodePool.EtcdRole &&
 			!nodePool.ControlPlaneRole &&
 			!nodePool.WorkerRole {