Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 069d9e4

Browse files
author
CecileRobertMichon
committed
Add fix to upgrade backwards compatibility
1 parent 030e5dc commit 069d9e4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

parts/k8s/kubernetesmastercustomdata.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ runcmd:
366366
- sudo /bin/chown etcd:etcd {{WrapAsVariable "etcdServerKeyFilepath"}}
367367
- sudo /bin/chown etcd:etcd {{WrapAsVerbatim "variables('etcdPeerKeyFilepath')[copyIndex(variables('masterOffset'))]"}}
368368
- systemctl restart etcd
369+
- MEMBER="$(sudo etcdctl member list | grep -E {{WrapAsVerbatim "variables('masterVMNames')[copyIndex(variables('masterOffset'))]"}} | cut -d{{WrapAsVariable "singleQuote"}}:{{WrapAsVariable "singleQuote"}} -f 1)"
370+
- sudo etcdctl member update ${MEMBER} {{WrapAsVerbatim "variables('masterEtcdPeerURLs')[copyIndex(variables('masterOffset'))]"}}
369371
- for i in $(seq 1 20); do curl --cacert /etc/kubernetes/certs/ca.crt --cert /etc/kubernetes/certs/etcdclient.crt --key /etc/kubernetes/certs/etcdclient.key --max-time 60 "{{WrapAsVerbatim "variables('masterEtcdClientURLs')[copyIndex(variables('masterOffset'))]"}}"/v2/machines; [ $? -eq 0 ] && break || sleep 5; done
370372
- retrycmd_if_failure apt-get update
371373
- retrycmd_if_failure apt-get install -y apt-transport-https ca-certificates

parts/k8s/kubernetesmastervars.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@
297297
"scope": "[resourceGroup().id]",
298298
"tenantId": "[subscription().tenantId]",
299299
"targetEnvironment": "[parameters('targetEnvironment')]",
300+
"singleQuote": "'",
300301
"dockerEngineDownloadRepo": "[parameters('dockerEngineDownloadRepo')]",
301302
"dockerEngineVersion": "[parameters('dockerEngineVersion')]"
302303
{{if .LinuxProfile.HasSecrets}}
@@ -330,6 +331,5 @@
330331
"agentWindowsOffer": "WindowsServerSemiAnnual",
331332
"agentWindowsSku": "Datacenter-Core-1709-with-Containers-smalldisk",
332333
"agentWindowsVersion": "[parameters('agentWindowsVersion')]",
333-
"singleQuote": "'",
334334
"windowsCustomScriptSuffix": " $inputFile = '%SYSTEMDRIVE%\\AzureData\\CustomData.bin' ; $outputFile = '%SYSTEMDRIVE%\\AzureData\\CustomDataSetupScript.ps1' ; Copy-Item $inputFile $outputFile ; Invoke-Expression('{0} {1}' -f $outputFile, $arguments) ; "
335335
{{end}}

0 commit comments

Comments
 (0)