Commit 328c1825 authored by Ed Bartosh's avatar Ed Bartosh

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
parent 465d578d
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment