github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70743 from bart0sh/PR0039-kubeadm-dont-prepull-etcd-if-not-required

Browse Source 
kubeadm: prepull Etcd image only if required
This commit is contained in:
k8s-ci-robot 2018-11-11 19:07:00 -08:00 committed by GitHub
commit b99c8b994f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/upgrade/apply.go
View File

@ -195,7 +195,7 @@ func RunApply(flags *applyFlags) error {
klog.V(1).Infof("[upgrade/apply] creating prepuller") klog.V(1).Infof("[upgrade/apply] creating prepuller")
prepuller := upgrade.NewDaemonSetPrepuller(upgradeVars.client, upgradeVars.waiter, &upgradeVars.cfg.ClusterConfiguration) prepuller := upgrade.NewDaemonSetPrepuller(upgradeVars.client, upgradeVars.waiter, &upgradeVars.cfg.ClusterConfiguration)
componentsToPrepull := constants.MasterComponents componentsToPrepull := constants.MasterComponents
if upgradeVars.cfg.Etcd.External != nil { if upgradeVars.cfg.Etcd.External == nil && flags.etcdUpgrade {
componentsToPrepull = append(componentsToPrepull, constants.Etcd) componentsToPrepull = append(componentsToPrepull, constants.Etcd)
} }
if err := upgrade.PrepullImagesInParallel(prepuller, flags.imagePullTimeout, componentsToPrepull); err != nil { if err := upgrade.PrepullImagesInParallel(prepuller, flags.imagePullTimeout, componentsToPrepull); err != nil {