Skip to content

Commit 7030453

Browse files
author
Cecile Robert-Michon
committed
🌱 Make AZURE_SSH_PUBLIC_KEY_B64 optional in example templates
1 parent 78d319e commit 7030453

13 files changed

+20
-20
lines changed

‎templates/cluster-template-ephemeral.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
managedDisk:
131131
storageAccountType: Standard_LRS
132132
osType: Linux
133-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
133+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
134134
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
135135
---
136136
apiVersion: cluster.x-k8s.io/v1alpha3
@@ -173,7 +173,7 @@ spec:
173173
managedDisk:
174174
storageAccountType: Standard_LRS
175175
osType: Linux
176-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
176+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
177177
vmSize: ${AZURE_NODE_MACHINE_TYPE}
178178
---
179179
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

‎templates/cluster-template-external-cloud-provider.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ spec:
128128
managedDisk:
129129
storageAccountType: Premium_LRS
130130
osType: Linux
131-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
131+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
132132
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
133133
---
134134
apiVersion: cluster.x-k8s.io/v1alpha3
@@ -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

‎templates/cluster-template-machinepool.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ spec:
128128
managedDisk:
129129
storageAccountType: Premium_LRS
130130
osType: Linux
131-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
131+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
132132
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
133133
---
134134
apiVersion: exp.cluster.x-k8s.io/v1alpha3

‎templates/cluster-template-system-assigned-identity.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ spec:
157157
managedDisk:
158158
storageAccountType: Premium_LRS
159159
osType: Linux
160-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
160+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
161161
vmSize: ${AZURE_NODE_MACHINE_TYPE}
162162
---
163163
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

‎templates/cluster-template-user-assigned-identity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
managedDisk:
130130
storageAccountType: Premium_LRS
131131
osType: Linux
132-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
132+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
133133
userAssignedIdentities:
134134
- providerID: ${USER_ASSIGNED_IDENTITY_PROVIDER_ID}
135135
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
@@ -173,7 +173,7 @@ spec:
173173
managedDisk:
174174
storageAccountType: Premium_LRS
175175
osType: Linux
176-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
176+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
177177
userAssignedIdentities:
178178
- providerID: ${USER_ASSIGNED_IDENTITY_PROVIDER_ID}
179179
vmSize: ${AZURE_NODE_MACHINE_TYPE}

‎templates/cluster-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ spec:
128128
managedDisk:
129129
storageAccountType: Premium_LRS
130130
osType: Linux
131-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
131+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
132132
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
133133
---
134134
apiVersion: cluster.x-k8s.io/v1alpha3
@@ -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

‎templates/flavors/base/cluster-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ spec:
125125
- nameSuffix: etcddisk
126126
diskSizeGB: 256
127127
lun: 0
128-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
128+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}

‎templates/flavors/default/machine-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
diskSizeGB: 128
3737
managedDisk:
3838
storageAccountType: "Premium_LRS"
39-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
39+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
4040
---
4141
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
4242
kind: KubeadmConfigTemplate

‎templates/test/cluster-template-prow-ci-version.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ spec:
214214
managedDisk:
215215
storageAccountType: Premium_LRS
216216
osType: Linux
217-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
217+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
218218
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
219219
---
220220
apiVersion: cluster.x-k8s.io/v1alpha3
@@ -264,7 +264,7 @@ spec:
264264
managedDisk:
265265
storageAccountType: Premium_LRS
266266
osType: Linux
267-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
267+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
268268
vmSize: ${AZURE_NODE_MACHINE_TYPE}
269269
---
270270
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

‎templates/test/cluster-template-prow-clusterresourceset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ spec:
131131
managedDisk:
132132
storageAccountType: Premium_LRS
133133
osType: Linux
134-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
134+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
135135
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}
136136
---
137137
apiVersion: cluster.x-k8s.io/v1alpha3
@@ -172,7 +172,7 @@ spec:
172172
managedDisk:
173173
storageAccountType: Premium_LRS
174174
osType: Linux
175-
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64}
175+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
176176
vmSize: ${AZURE_NODE_MACHINE_TYPE}
177177
---
178178
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3

0 commit comments

Comments
 (0)