diff --git a/parts/k8s/cloud-init/jumpboxcustomdata.yml b/parts/k8s/cloud-init/jumpboxcustomdata.yml index 6f478217ca..777d2fb131 100644 --- a/parts/k8s/cloud-init/jumpboxcustomdata.yml +++ b/parts/k8s/cloud-init/jumpboxcustomdata.yml @@ -16,8 +16,8 @@ write_files: {{WrapAsVariable "kubeconfig"}} runcmd: -- . {{GetCSEHelpersScriptFilepath}} -- retrycmd_if_failure 10 5 10 curl -LO https://storage.googleapis.com/kubernetes-release/release/v{{.OrchestratorProfile.OrchestratorVersion}}/bin/linux/amd64/kubectl +- source {{GetCSEHelpersScriptFilepath}} +- retrycmd 10 5 10 curl -LO https://storage.googleapis.com/kubernetes-release/release/v{{.OrchestratorProfile.OrchestratorVersion}}/bin/linux/amd64/kubectl - chmod +x ./kubectl - sudo mv ./kubectl /usr/local/bin/kubectl - chown -R "{{WrapAsParameter "jumpboxUsername"}}" "/home/{{WrapAsParameter "jumpboxUsername"}}" diff --git a/parts/k8s/cloud-init/masternodecustomdata.yml b/parts/k8s/cloud-init/masternodecustomdata.yml index 3df0d6093f..f67e3e7d7a 100644 --- a/parts/k8s/cloud-init/masternodecustomdata.yml +++ b/parts/k8s/cloud-init/masternodecustomdata.yml @@ -553,5 +553,5 @@ mounts: - /var/lib/etcddisk runcmd: - set -x -- . {{GetCSEHelpersScriptFilepath}} +- source {{GetCSEHelpersScriptFilepath}} - aptmarkWALinuxAgent hold{{GetKubernetesMasterPreprovisionYaml}} diff --git a/parts/k8s/cloud-init/nodecustomdata.yml b/parts/k8s/cloud-init/nodecustomdata.yml index 3240167945..a788bff5a2 100644 --- a/parts/k8s/cloud-init/nodecustomdata.yml +++ b/parts/k8s/cloud-init/nodecustomdata.yml @@ -502,6 +502,6 @@ coreos: {{else}} runcmd: - set -x -- . {{GetCSEHelpersScriptFilepath}} +- source {{GetCSEHelpersScriptFilepath}} - aptmarkWALinuxAgent hold{{GetKubernetesAgentPreprovisionYaml .}} {{- end}} diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index 134aa6c3bf..800a3c293b 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -21448,8 +21448,8 @@ write_files: {{WrapAsVariable "kubeconfig"}} runcmd: -- . {{GetCSEHelpersScriptFilepath}} -- retrycmd_if_failure 10 5 10 curl -LO https://storage.googleapis.com/kubernetes-release/release/v{{.OrchestratorProfile.OrchestratorVersion}}/bin/linux/amd64/kubectl +- source {{GetCSEHelpersScriptFilepath}} +- retrycmd 10 5 10 curl -LO https://storage.googleapis.com/kubernetes-release/release/v{{.OrchestratorProfile.OrchestratorVersion}}/bin/linux/amd64/kubectl - chmod +x ./kubectl - sudo mv ./kubectl /usr/local/bin/kubectl - chown -R "{{WrapAsParameter "jumpboxUsername"}}" "/home/{{WrapAsParameter "jumpboxUsername"}}" @@ -22028,7 +22028,7 @@ mounts: - /var/lib/etcddisk runcmd: - set -x -- . {{GetCSEHelpersScriptFilepath}} +- source {{GetCSEHelpersScriptFilepath}} - aptmarkWALinuxAgent hold{{GetKubernetesMasterPreprovisionYaml}} `) @@ -22551,7 +22551,7 @@ coreos: {{else}} runcmd: - set -x -- . {{GetCSEHelpersScriptFilepath}} +- source {{GetCSEHelpersScriptFilepath}} - aptmarkWALinuxAgent hold{{GetKubernetesAgentPreprovisionYaml .}} {{- end}} `)