Fix

Signed-off-by: abarreiro <abarreiro@vmware.com>
adambarreiro · May 17, 2024 · 260f0ac · 260f0ac
1 parent cfedeb9
commit 260f0ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/govcd/cse/4.1/capiyaml_workerpool.tmpl b/govcd/cse/4.1/capiyaml_workerpool.tmpl
@@ -19,13 +19,13 @@ kind: MachineDeployment
 metadata:
   name: "{{.NodePoolName}}"
   namespace: "{{.TargetNamespace}}"
-  {{- if and (gt .AutoscalerMaxSize -1) (gt .AutoscalerMinSize -1) }}
+  {{- if and .AutoscalerMaxSize .AutoscalerMinSize}}
   cluster.x-k8s.io/cluster-api-Autoscaler-node-group-max-size: "{{.AutoscalerMaxSize}}"
   cluster.x-k8s.io/cluster-api-Autoscaler-node-group-min-size: "{{.AutoscalerMinSize}}"
   {{- end}}
 spec:
   clusterName: "{{.ClusterName}}"
-  {{- if and (lt .AutoscalerMaxSize 0) (lt .AutoscalerMinSize 0) }}
+  {{- if .NodePoolMachineCount}}
   replicas: {{.NodePoolMachineCount}}
   {{- end}}
   selector:

diff --git a/govcd/cse/4.2/capiyaml_workerpool.tmpl b/govcd/cse/4.2/capiyaml_workerpool.tmpl
@@ -19,13 +19,13 @@ kind: MachineDeployment
 metadata:
   name: "{{.NodePoolName}}"
   namespace: "{{.TargetNamespace}}"
-  {{- if and (gt .AutoscalerMaxSize -1) (gt .AutoscalerMinSize -1) }}
+  {{- if and .AutoscalerMaxSize .AutoscalerMinSize}}
   cluster.x-k8s.io/cluster-api-Autoscaler-node-group-max-size: "{{.AutoscalerMaxSize}}"
   cluster.x-k8s.io/cluster-api-Autoscaler-node-group-min-size: "{{.AutoscalerMinSize}}"
   {{- end}}
 spec:
   clusterName: "{{.ClusterName}}"
-  {{- if and (lt .AutoscalerMaxSize 0) (lt .AutoscalerMinSize 0) }}
+  {{- if .NodePoolMachineCount}}
   replicas: {{.NodePoolMachineCount}}
   {{- end}}
   selector:

diff --git a/govcd/cse_internal.go b/govcd/cse_internal.go
@@ -193,15 +193,14 @@ func (clusterSettings *cseClusterSettingsInternal) generateWorkerPoolsYaml() (st
 			"NodePoolStorageProfile":  wp.StorageProfileName,
 			"NodePoolDiskSize":        fmt.Sprintf("%dGi", wp.DiskSizeGi),
 			"NodePoolEnableGpu":       strconv.FormatBool(wp.VGpuPolicyName != ""),
-			"NodePoolMachineCount":    strconv.Itoa(wp.MachineCount),
-			"AutoscalerMaxSize":       "-1",
-			"AutoscalerMinSize":       "-1",
 			"KubernetesVersion":       clusterSettings.TkgVersionBundle.KubernetesVersion,
 		}
 
 		if wp.Autoscaler != nil {
 			args["AutoscalerMaxSize"] = strconv.Itoa(wp.Autoscaler.MaxSize)
 			args["AutoscalerMinSize"] = strconv.Itoa(wp.Autoscaler.MinSize)
+		} else {
+			args["NodePoolMachineCount"] = strconv.Itoa(wp.MachineCount)
 		}
 
 		if err := workerPools.Execute(buf, args); err != nil {