From 328c1825d4a805bb3304107e017698c99db5bb45 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 7 Nov 2018 14:55:07 +0200 Subject: [PATCH] kubeadm: prepull Etcd image only if required Prepull Etcd image only if external Etcd is not used and --etcd-upgrade=false is not specified. Fixes: kubernetes/kubeadm#1214 --- cmd/kubeadm/app/cmd/upgrade/apply.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index af03ad615a..ed43667670 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -195,7 +195,7 @@ func RunApply(flags *applyFlags) error { glog.V(1).Infof("[upgrade/apply] creating prepuller") prepuller := upgrade.NewDaemonSetPrepuller(upgradeVars.client, upgradeVars.waiter, &upgradeVars.cfg.ClusterConfiguration) componentsToPrepull := constants.MasterComponents - if upgradeVars.cfg.Etcd.External != nil { + if upgradeVars.cfg.Etcd.External == nil && flags.etcdUpgrade { componentsToPrepull = append(componentsToPrepull, constants.Etcd) } if err := upgrade.PrepullImagesInParallel(prepuller, flags.imagePullTimeout, componentsToPrepull); err != nil {