Skip to content

Commit 3c82eaf

Browse files
committed
templates: make AZURE_SSH_PUBLIC_KEY_B64 optional
1 parent 723f241 commit 3c82eaf

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed

docs/book/src/topics/ephemeral-os.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ disk SKU limits. Instead they will always be capable of saturating the
77
VM level limits. This can significantly improve performance on the OS
88
disk. Ephemeral storage used for the OS will not persist between
99
maintenance events and VM redeployments. This is ideal for stateless
10-
base OS disks, where any stateful data is kept elsewhere.
10+
base OS disks, where any stateful data is kept elsewhere.
1111

1212
There are a few kinds of local storage devices available on Azure VMs.
1313
Each VM size will have a different combination. For example, some sizes
@@ -56,6 +56,6 @@ spec:
5656
managedDisk:
5757
storageAccountType: Standard_LRS
5858
osType: Linux
59-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
59+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
6060
vmSize: ${AZURE_NODE_MACHINE_TYPE}
6161
````

docs/book/src/topics/managedcluster.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export AZURE_LOCATION="southcentralus"
3333
export AZURE_RESOURCE_GROUP="${CLUSTER_NAME}"
3434
# set AZURE_SUBSCRIPTION_ID to the GUID of your subscription
3535
# this example uses an sdk authentication file and parses the subscriptionId with jq
36-
# this file may be created using
36+
# this file may be created using
3737
#
3838
# `az ad sp create-for-rbac --sdk-auth [roles] > sp.json`
3939
#
@@ -92,7 +92,7 @@ spec:
9292
name: agentpool0
9393
location: southcentralus
9494
resourceGroup: foo-bar
95-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
95+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
9696
subscriptionID: fae7cc14-bfba-4471-9435-f945b42a16dd # fake uuid
9797
version: v1.17.4
9898
networkPolicy: azure # or calico

templates/cluster-template-aks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
name: agentpool0
2828
location: ${AZURE_LOCATION}
2929
resourceGroup: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}}
30-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
30+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
3131
subscriptionID: ${AZURE_SUBSCRIPTION_ID}
3232
version: ${KUBERNETES_VERSION}
3333
---

templates/cluster-template-machinepool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ spec:
166166
managedDisk:
167167
storageAccountType: Premium_LRS
168168
osType: Linux
169-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
169+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
170170
vmSize: ${AZURE_NODE_MACHINE_TYPE}
171171
---
172172
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

templates/flavors/machinepool/machine-pool-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
diskSizeGB: 30
3434
managedDisk:
3535
storageAccountType: "Premium_LRS"
36-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
36+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
3737
---
3838
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
3939
kind: KubeadmConfig

templates/test/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ spec:
258258
managedDisk:
259259
storageAccountType: Premium_LRS
260260
osType: Linux
261-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
261+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
262262
vmSize: ${AZURE_NODE_MACHINE_TYPE}
263263
---
264264
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

templates/test/cluster-template-prow-machine-pool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ spec:
169169
managedDisk:
170170
storageAccountType: Premium_LRS
171171
osType: Linux
172-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
172+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
173173
vmSize: ${AZURE_NODE_MACHINE_TYPE}
174174
---
175175
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

test/e2e/data/infrastructure-azure/cluster-template-kcp-adoption.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ kind: AzureCluster
2929
metadata:
3030
name: ${CLUSTER_NAME}
3131
labels:
32-
initial: ''
32+
initial: ''
3333
spec:
3434
additionalTags:
3535
creationTimestamp: ${TIMESTAMP}
@@ -46,7 +46,7 @@ kind: AzureMachine
4646
metadata:
4747
name: ${CLUSTER_NAME}-control-plane-0
4848
labels:
49-
initial: ''
49+
initial: ''
5050
spec:
5151
dataDisks:
5252
- diskSizeGB: 256
@@ -58,15 +58,15 @@ spec:
5858
managedDisk:
5959
storageAccountType: Premium_LRS
6060
osType: Linux
61-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
61+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
6262
vmSize: Standard_D2s_v3
63-
---
63+
---
6464
apiVersion: cluster.x-k8s.io/v1alpha3
6565
kind: Machine
6666
metadata:
6767
name: ${CLUSTER_NAME}-control-plane-0
6868
labels:
69-
initial: ''
69+
initial: ''
7070
cluster.x-k8s.io/control-plane: "true"
7171
spec:
7272
version: ${KUBERNETES_VERSION}
@@ -79,14 +79,14 @@ spec:
7979
infrastructureRef:
8080
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
8181
kind: AzureMachine
82-
name: ${CLUSTER_NAME}-control-plane-0
82+
name: ${CLUSTER_NAME}-control-plane-0
8383
---
8484
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
8585
kind: KubeadmConfig
8686
metadata:
8787
name: ${CLUSTER_NAME}-control-plane-0
8888
labels:
89-
initial: ''
89+
initial: ''
9090
spec:
9191
useExperimentalRetryJoin: true
9292
initConfiguration:
@@ -144,7 +144,7 @@ spec:
144144
tableType: gpt
145145
mounts:
146146
- - LABEL=etcd_disk
147-
- /var/lib/etcddisk
147+
- /var/lib/etcddisk
148148
files:
149149
- contentFrom:
150150
secret:
@@ -177,14 +177,14 @@ spec:
177177
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
178178
kind: AzureCluster
179179
name: ${CLUSTER_NAME}
180-
---
180+
---
181181
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
182182
kind: KubeadmControlPlane
183183
metadata:
184184
name: ${CLUSTER_NAME}-control-plane
185185
labels:
186186
cluster.x-k8s.io/cluster-name: "${ CLUSTER_NAME }"
187-
kcp: ''
187+
kcp: ''
188188
spec:
189189
infrastructureTemplate:
190190
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
@@ -279,7 +279,7 @@ spec:
279279
managedDisk:
280280
storageAccountType: Premium_LRS
281281
osType: Linux
282-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
282+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
283283
vmSize: Standard_D2s_v3
284284
---
285285
apiVersion: v1

0 commit comments

Comments
 (0)