From ff8ea4d89b36df3da090979c7d860b89b25f689d Mon Sep 17 00:00:00 2001 From: Zach <45979377+zawachte-msft@users.noreply.github.com> Date: Thu, 1 Oct 2020 17:48:31 -0400 Subject: [PATCH] docker script gone (#87) --- templates/flavors/base/cluster-template.yaml | 4 ---- templates/flavors/mgmt/mgmt-machine.yaml | 2 -- 2 files changed, 6 deletions(-) diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml index 30af293..3fc71ef 100644 --- a/templates/flavors/base/cluster-template.yaml +++ b/templates/flavors/base/cluster-template.yaml @@ -32,8 +32,6 @@ metadata: spec: template: spec: - preKubeadmCommands: - - /etc/rc.d/init.d/docker-import-mcr-k8s.sh useExperimentalRetryJoin: true joinConfiguration: nodeRegistration: @@ -271,8 +269,6 @@ spec: apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 name: "${CLUSTER_NAME}-control-plane" kubeadmConfigSpec: - preKubeadmCommands: - - /etc/rc.d/init.d/docker-import-mcr-k8s.sh useExperimentalRetryJoin: true initConfiguration: nodeRegistration: diff --git a/templates/flavors/mgmt/mgmt-machine.yaml b/templates/flavors/mgmt/mgmt-machine.yaml index c41c732..c4b96c8 100644 --- a/templates/flavors/mgmt/mgmt-machine.yaml +++ b/templates/flavors/mgmt/mgmt-machine.yaml @@ -69,7 +69,5 @@ spec: kubeletExtraArgs: cloud-provider: external name: '{{ ds.meta_data["local_hostname"] }}' - preKubeadmCommands: - - /etc/rc.d/init.d/docker-import-mcr-k8s.sh useExperimentalRetryJoin: true --- \ No newline at end of file