Merge pull request kubernetes-sigs#4660 from nawazkh/set_defaults_to_…

…templates Set nonzero default control plane node count in templates
willie-yao · Mar 26, 2024 · 8be2ad2 · 8be2ad2
2 parents 7f385fd + b8f15c3
commit 8be2ad2
Show file tree

Hide file tree

Showing 49 changed files with 89 additions and 89 deletions.
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
diff --git a/templates/cluster-template-aks.yaml b/templates/cluster-template-aks.yaml
diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml
diff --git a/templates/cluster-template-azure-cni-v1.yaml b/templates/cluster-template-azure-cni-v1.yaml
diff --git a/templates/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml
diff --git a/templates/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml
diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
diff --git a/templates/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml
diff --git a/templates/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml
diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
diff --git a/templates/cluster-template-private.yaml b/templates/cluster-template-private.yaml
diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -106,7 +106,7 @@ spec:
       apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
       kind: AzureMachineTemplate
       name: ${CLUSTER_NAME}-control-plane
-  replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+  replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1}
   version: ${KUBERNETES_VERSION}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -134,7 +134,7 @@ metadata:
   namespace: default
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels: null
   template:

diff --git a/templates/flavors/aad/machine-deployment.yaml b/templates/flavors/aad/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels:
   template:

diff --git a/templates/flavors/aks/cluster-template.yaml b/templates/flavors/aks/cluster-template.yaml
@@ -53,7 +53,7 @@ metadata:
   name: "${CLUSTER_NAME}-pool0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   template:
     metadata: {}
     spec:
@@ -84,7 +84,7 @@ metadata:
   name: "${CLUSTER_NAME}-pool1"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   template:
     metadata: {}
     spec:

diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
@@ -38,7 +38,7 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 metadata:
   name: "${CLUSTER_NAME}-control-plane"
 spec:
-  replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+  replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1}
   machineTemplate:
     infrastructureRef:
       kind: AzureMachineTemplate

diff --git a/templates/flavors/default/machine-deployment.yaml b/templates/flavors/default/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels:
   template:

diff --git a/templates/flavors/dual-stack/machine-deployment.yaml b/templates/flavors/dual-stack/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels:
   template:

diff --git a/templates/flavors/flatcar/machine-deployment.yaml b/templates/flavors/flatcar/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: ${CLUSTER_NAME}-md-0
 spec:
   clusterName: ${CLUSTER_NAME}
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels: null
   template:

diff --git a/templates/flavors/ipv6/machine-deployment.yaml b/templates/flavors/ipv6/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels:
   template:

diff --git a/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml b/templates/flavors/machinepool-windows/machine-pool-deployment-windows.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-mp-win"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   template:
     spec:
       clusterName: "${CLUSTER_NAME}"

diff --git a/templates/flavors/machinepool/machine-pool-deployment.yaml b/templates/flavors/machinepool/machine-pool-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-mp-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   template:
     spec:
       clusterName: "${CLUSTER_NAME}"

diff --git a/templates/flavors/nvidia-gpu/machine-deployment.yaml b/templates/flavors/nvidia-gpu/machine-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${WORKER_MACHINE_COUNT:=2}
   selector:
     matchLabels:
   template: