Skip to content

Use defaults for SSH and cidrs #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Use defaults for SSH and cidrs #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions templates/flavors/base/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
osType: "Linux"
location: "westus"
vmSize: ${AZURESTACKHCI_WORKER_MACHINE_TYPE}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
---
kind: AzureStackHCIMachineTemplate
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
Expand All @@ -23,7 +23,7 @@ spec:
osType: "Linux"
location: "westus"
vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
kind: KubeadmConfigTemplate
Expand Down Expand Up @@ -52,7 +52,7 @@ spec:
osType: "Windows"
location: "westus"
vmSize: ${AZURESTACKHCI_WINDOWS_WORKER_MACHINE_TYPE}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
kind: KubeadmConfigTemplate
Expand Down Expand Up @@ -201,9 +201,11 @@ metadata:
spec:
clusterNetwork:
pods:
cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
cidrBlocks:
- ${AZURESTACKHCI_POD_CIDR:=""}
services:
cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
cidrBlocks:
- ${AZURESTACKHCI_SERVICE_CIDR:=""}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureStackHCICluster
Expand All @@ -222,7 +224,7 @@ spec:
azureStackHCILoadBalancer:
image:
osType: "Linux"
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
vmSize: "${AZURESTACKHCI_LOAD_BALANCER_MACHINE_TYPE}"
version: "${KUBERNETES_VERSION}"
---
Expand Down
6 changes: 4 additions & 2 deletions templates/flavors/default/patches/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ metadata:
spec:
clusterNetwork:
pods:
cidrBlocks: ["${AZURESTACKHCI_POD_CIDR}"]
cidrBlocks:
- ${AZURESTACKHCI_POD_CIDR:=""}
services:
cidrBlocks: ["${AZURESTACKHCI_SERVICE_CIDR}"]
cidrBlocks:
- ${AZURESTACKHCI_SERVICE_CIDR:=""}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: AzureStackHCICluster
Expand Down
4 changes: 2 additions & 2 deletions templates/flavors/mgmt/mgmt-machine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: Machine
metadata:
labels:
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
cluster.x-k8s.io/control-plane: "true"
cluster.x-k8s.io/control-plane: ""
name: ${CLUSTER_NAME}-control-plane-0
namespace: default
spec:
Expand Down Expand Up @@ -32,7 +32,7 @@ metadata:
spec:
location: westus
providerID: moc://${CLUSTER_NAME}-control-plane-0
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY}
sshPublicKey: ${AZURESTACKHCI_SSH_PUBLIC_KEY:=""}
vmSize: ${AZURESTACKHCI_CONTROL_PLANE_MACHINE_TYPE}
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
Expand Down