From 645a6c516ce823fb33d2ccd8f04ca28d0401b4c5 Mon Sep 17 00:00:00 2001 From: jadarsie Date: Wed, 9 Oct 2019 16:06:06 -0700 Subject: [PATCH] fix: revert 'trust Azure Stack's CA cert before pre-provision extensions' --- parts/k8s/cloud-init/masternodecustomdata.yml | 6 ------ parts/k8s/cloud-init/nodecustomdata.yml | 6 ------ pkg/engine/templates_generated.go | 12 ------------ 3 files changed, 24 deletions(-) diff --git a/parts/k8s/cloud-init/masternodecustomdata.yml b/parts/k8s/cloud-init/masternodecustomdata.yml index 028c33ad17..bd52d4d971 100644 --- a/parts/k8s/cloud-init/masternodecustomdata.yml +++ b/parts/k8s/cloud-init/masternodecustomdata.yml @@ -568,11 +568,5 @@ 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 index 43b6cd438a..a55178fc9d 100644 --- a/parts/k8s/cloud-init/nodecustomdata.yml +++ b/parts/k8s/cloud-init/nodecustomdata.yml @@ -346,11 +346,5 @@ 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 index d0c7303f1d..a82669d110 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -17528,12 +17528,6 @@ 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}} `) @@ -17901,12 +17895,6 @@ 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}} `)