Skip to content

K
k3s
Unverified Commit b99c8b99 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

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

kubeadm: prepull Etcd image only if required
parents 8307fb2f 328c1825
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/upgrade/apply.go
View file @ b99c8b99
...@@ -195,7 +195,7 @@ func RunApply(flags *applyFlags) error { ...@@ -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 {
......
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