Skip to content

Commit 2f7873f

Browse files
authored
use default (#73)
1 parent 85584ee commit 2f7873f

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

templates/flavors/base/cluster-template.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
osType: "Linux"
1111
location: "westus"
1212
vmSize: ${AZURESTACKHCI_WORKER_MACHINE_TYPE}
13-
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
13+
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
1414
---
1515
kind: AzureStackHCIMachineTemplate
1616
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
@@ -23,7 +23,7 @@ spec:
2323
osType: "Linux"
2424
location: "westus"
2525
vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
26-
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
26+
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
2727
---
2828
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
2929
kind: KubeadmConfigTemplate
@@ -52,7 +52,7 @@ spec:
5252
osType: "Windows"
5353
location: "westus"
5454
vmSize: ${AZURESTACKHCI_WINDOWS_WORKER_MACHINE_TYPE}
55-
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
55+
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
5656
---
5757
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
5858
kind: KubeadmConfigTemplate
@@ -201,9 +201,11 @@ metadata:
201201
spec:
202202
clusterNetwork:
203203
pods:
204-
cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
204+
cidrBlocks:
205+
- ${AZURESTACKHCI_POD_CIDR:=""}
205206
services:
206-
cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
207+
cidrBlocks:
208+
- ${AZURESTACKHCI_SERVICE_CIDR:=""}
207209
infrastructureRef:
208210
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
209211
kind: AzureStackHCICluster
@@ -222,7 +224,7 @@ spec:
222224
azureStackHCILoadBalancer:
223225
image:
224226
osType: "Linux"
225-
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
227+
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
226228
vmSize: "${AZURESTACKHCI_LOAD_BALANCER_MACHINE_TYPE}"
227229
version: "${KUBERNETES_VERSION}"
228230
---

templates/flavors/default/patches/default.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ metadata:
66
spec:
77
clusterNetwork:
88
pods:
9-
cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
9+
cidrBlocks:
10+
- ${AZURESTACKHCI_POD_CIDR:=""}
1011
services:
11-
cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
12+
cidrBlocks:
13+
- ${AZURESTACKHCI_SERVICE_CIDR:=""}
1214
infrastructureRef:
1315
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
1416
kind: AzureStackHCICluster

templates/flavors/mgmt/mgmt-machine.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Machine
44
metadata:
55
labels:
66
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
7-
cluster.x-k8s.io/control-plane: "true"
7+
cluster.x-k8s.io/control-plane: ""
88
name: ${CLUSTER_NAME}-control-plane-0
99
namespace: default
1010
spec:
@@ -32,7 +32,7 @@ metadata:
3232
spec:
3333
location: westus
3434
providerID: moc://${CLUSTER_NAME}-control-plane-0
35-
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
35+
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
3636
vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
3737
---
3838
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

0 commit comments

Comments
 (0)