fix: fixes cluster preprovisioning script download on azurestack. (#2053

)
Azure · Oct 1, 2019 · 53d7498 · 53d7498
1 parent 514c36a
commit 53d7498
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/parts/k8s/cloud-init/masternodecustomdata.yml b/parts/k8s/cloud-init/masternodecustomdata.yml
@@ -563,5 +563,11 @@ coreos:
 runcmd:
 - set -x
 - . /opt/azure/containers/provision_source.sh
+{{if IsAzureStackCloud}}
+- AZURESTACK_ROOT_CERTIFICATE_SOURCE_PATH="/var/lib/waagent/Certificates.pem"
+- AZURESTACK_ROOT_CERTIFICATE__DEST_PATH="/usr/local/share/ca-certificates/azsCertificate.crt"
+- cp $AZURESTACK_ROOT_CERTIFICATE_SOURCE_PATH $AZURESTACK_ROOT_CERTIFICATE__DEST_PATH
+- update-ca-certificates
+{{end}}
 - aptmarkWALinuxAgent hold{{GetKubernetesMasterPreprovisionYaml}}
 {{end}}
diff --git a/parts/k8s/cloud-init/nodecustomdata.yml b/parts/k8s/cloud-init/nodecustomdata.yml
@@ -335,5 +335,11 @@ coreos:
 runcmd:
 - set -x
 - . /opt/azure/containers/provision_source.sh
+{{if IsAzureStackCloud}}
+- AZURESTACK_ROOT_CERTIFICATE_SOURCE_PATH="/var/lib/waagent/Certificates.pem"
+- AZURESTACK_ROOT_CERTIFICATE__DEST_PATH="/usr/local/share/ca-certificates/azsCertificate.crt"
+- cp $AZURESTACK_ROOT_CERTIFICATE_SOURCE_PATH $AZURESTACK_ROOT_CERTIFICATE__DEST_PATH
+- update-ca-certificates
+{{end}}
 - aptmarkWALinuxAgent hold{{GetKubernetesAgentPreprovisionYaml .}}
 {{end}}
diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go