diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml index 54c36b40823..b9b1c547e7d 100644 --- a/templates/cluster-template-aad.yaml +++ b/templates/cluster-template-aad.yaml @@ -111,7 +111,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 @@ -139,7 +139,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/cluster-template-aks.yaml b/templates/cluster-template-aks.yaml index b99c2379068..eeb1db28de4 100644 --- a/templates/cluster-template-aks.yaml +++ b/templates/cluster-template-aks.yaml @@ -48,7 +48,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: metadata: {} spec: @@ -78,7 +78,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: metadata: {} spec: diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml index 31cbcea51f5..cc8f704a88b 100644 --- a/templates/cluster-template-azure-bastion.yaml +++ b/templates/cluster-template-azure-bastion.yaml @@ -108,7 +108,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 @@ -136,7 +136,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/cluster-template-azure-cni-v1.yaml b/templates/cluster-template-azure-cni-v1.yaml index fab81472882..f69b4a3b4ad 100644 --- a/templates/cluster-template-azure-cni-v1.yaml +++ b/templates/cluster-template-azure-cni-v1.yaml @@ -108,7 +108,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 @@ -139,7 +139,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/cluster-template-dual-stack.yaml b/templates/cluster-template-dual-stack.yaml index 070cd67a33e..751175e1e3c 100644 --- a/templates/cluster-template-dual-stack.yaml +++ b/templates/cluster-template-dual-stack.yaml @@ -129,7 +129,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 @@ -174,7 +174,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/cluster-template-edgezone.yaml b/templates/cluster-template-edgezone.yaml index 81e7a725957..9c4887ce03d 100644 --- a/templates/cluster-template-edgezone.yaml +++ b/templates/cluster-template-edgezone.yaml @@ -109,7 +109,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 @@ -137,7 +137,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/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml index 105a0d9a28f..d41e2d71734 100644 --- a/templates/cluster-template-ephemeral.yaml +++ b/templates/cluster-template-ephemeral.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 @@ -137,7 +137,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/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml index 201774a2681..a8a7c52e5ff 100644 --- a/templates/cluster-template-flatcar.yaml +++ b/templates/cluster-template-flatcar.yaml @@ -121,7 +121,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 @@ -154,7 +154,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/cluster-template-ipv6.yaml b/templates/cluster-template-ipv6.yaml index 884f77d5949..fe452e3b09d 100644 --- a/templates/cluster-template-ipv6.yaml +++ b/templates/cluster-template-ipv6.yaml @@ -134,7 +134,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 @@ -179,7 +179,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/cluster-template-machinepool-windows.yaml b/templates/cluster-template-machinepool-windows.yaml index 0861baa2daa..eee2497565c 100644 --- a/templates/cluster-template-machinepool-windows.yaml +++ b/templates/cluster-template-machinepool-windows.yaml @@ -110,7 +110,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 @@ -138,7 +138,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: @@ -218,7 +218,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml index b337dc5a64c..da062b05a64 100644 --- a/templates/cluster-template-machinepool.yaml +++ b/templates/cluster-template-machinepool.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} template: spec: bootstrap: diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml index 4ced5e04900..f864b19e543 100644 --- a/templates/cluster-template-nvidia-gpu.yaml +++ b/templates/cluster-template-nvidia-gpu.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 @@ -150,7 +150,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/cluster-template-private.yaml b/templates/cluster-template-private.yaml index 031b6c98da2..6b3f4769e9b 100644 --- a/templates/cluster-template-private.yaml +++ b/templates/cluster-template-private.yaml @@ -120,7 +120,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 @@ -148,7 +148,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/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml index 28ad70f5a82..768a04dd9c8 100644 --- a/templates/cluster-template-topology.yaml +++ b/templates/cluster-template-topology.yaml @@ -14,10 +14,10 @@ spec: topology: class: ${CLUSTER_CLASS_NAME} controlPlane: - replicas: ${CONTROL_PLANE_MACHINE_COUNT} + replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1} version: ${KUBERNETES_VERSION} workers: machineDeployments: - class: ${CLUSTER_NAME}-worker name: md-0 - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} diff --git a/templates/cluster-template-windows.yaml b/templates/cluster-template-windows.yaml index f7104d26886..0cdd73c2784 100644 --- a/templates/cluster-template-windows.yaml +++ b/templates/cluster-template-windows.yaml @@ -110,7 +110,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 @@ -138,7 +138,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: matchLabels: null template: @@ -215,7 +215,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/cluster-template.yaml b/templates/cluster-template.yaml index 185ecdb9a0e..760dc0ad373 100644 --- 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 index dd1dc088f83..f5661046455 100644 --- 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 index a2e3e7b451d..b63a701b270 100644 --- 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 index 24e894a8ecf..d8e1a4effbc 100644 --- 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 index 00d60f6eb19..9aaf668473f 100644 --- 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 index 421ce5df7ee..fcdb296fc87 100644 --- 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 index f69e0224e20..8b83fabf945 100644 --- 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 index 9ffc9309104..cbadd6df9f1 100644 --- 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 index 93403124dbb..2b31e45a2b7 100644 --- 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 index 78bd60462f6..cf78483289e 100644 --- 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 index 4c8dec327fd..c64125c3605 100644 --- 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: diff --git a/templates/flavors/topology/cluster.yaml b/templates/flavors/topology/cluster.yaml index 753f1462df8..e8b76a882c3 100644 --- a/templates/flavors/topology/cluster.yaml +++ b/templates/flavors/topology/cluster.yaml @@ -15,9 +15,9 @@ spec: class: ${CLUSTER_CLASS_NAME} version: ${KUBERNETES_VERSION} controlPlane: - replicas: ${CONTROL_PLANE_MACHINE_COUNT} + replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1} workers: machineDeployments: - class: ${CLUSTER_NAME}-worker name: md-0 - replicas: ${WORKER_MACHINE_COUNT} \ No newline at end of file + replicas: ${WORKER_MACHINE_COUNT:=2} diff --git a/templates/flavors/windows/machine-deployment-windows.yaml b/templates/flavors/windows/machine-deployment-windows.yaml index e69f4ada293..89aabeb4723 100644 --- a/templates/flavors/windows/machine-deployment-windows.yaml +++ b/templates/flavors/windows/machine-deployment-windows.yaml @@ -5,7 +5,7 @@ metadata: name: "${CLUSTER_NAME}-md-win" spec: clusterName: "${CLUSTER_NAME}" - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: matchLabels: template: diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index 24586dca43a..282376a8942 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -55,7 +55,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: metadata: {} spec: @@ -93,7 +93,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: metadata: {} spec: diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml index 4867d8c057e..d058c6d7879 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -115,7 +115,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 @@ -146,7 +146,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/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index 802e2fbca15..68faaa6e823 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -230,7 +230,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 @@ -265,7 +265,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index 28b3e10caa4..c2fa9011fca 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -237,7 +237,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 @@ -272,7 +272,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 1c25deae291..e95f20ee60b 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -209,7 +209,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 @@ -243,7 +243,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index 888fbcf3252..a9f684d57da 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -121,7 +121,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 @@ -152,7 +152,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index 31d1c72e5bd..24ed10e79a9 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -135,7 +135,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 @@ -183,7 +183,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/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index b13db764d76..0784e48b6a6 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -118,7 +118,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: v1.25.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -153,7 +153,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: spec: diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 9bbc72a98de..e5cb3a798c7 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -129,7 +129,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 @@ -162,7 +162,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/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index e15821a4049..552fad886f2 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -142,7 +142,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 @@ -187,7 +187,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/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index 455770a8116..b3735f3466f 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -207,7 +207,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 @@ -241,7 +241,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index 292bca47838..5ce2848ac67 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -118,7 +118,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 @@ -146,7 +146,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index ed0d682693a..ba457a8ec86 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -118,7 +118,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 @@ -146,7 +146,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index 23ef7283998..928763970a3 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -114,7 +114,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 @@ -158,7 +158,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/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index aa93ae55da6..869021aec01 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -150,7 +150,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 @@ -181,7 +181,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/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml index a0d0b92dc48..bc7c946b08f 100644 --- a/templates/test/ci/cluster-template-prow-spot.yaml +++ b/templates/test/ci/cluster-template-prow-spot.yaml @@ -114,7 +114,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 @@ -145,7 +145,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index dcfbfe35626..c6b5beb8baf 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -17,7 +17,7 @@ spec: topology: class: ${CLUSTER_CLASS_NAME} controlPlane: - replicas: ${CONTROL_PLANE_MACHINE_COUNT} + replicas: ${CONTROL_PLANE_MACHINE_COUNT:=1} variables: - name: subscriptionID value: ${AZURE_SUBSCRIPTION_ID} diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index f91367e97cc..d51df2ce7f6 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -115,7 +115,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 @@ -146,7 +146,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/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 5bccde1375e..d6b4872fd54 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -118,7 +118,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 @@ -146,7 +146,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index 58f962d47b4..db8f02988d2 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -198,7 +198,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 @@ -232,7 +232,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} template: spec: bootstrap: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 5b1ebde43ea..2d01d6703c5 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -201,7 +201,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 @@ -238,7 +238,7 @@ metadata: namespace: default spec: clusterName: ${CLUSTER_NAME} - replicas: ${WORKER_MACHINE_COUNT} + replicas: ${WORKER_MACHINE_COUNT:=2} selector: {} template: metadata: