Skip to content

Commit 9728679

Browse files
committed
Transfer ~/.minikube/files last
To allow users to overwrite some of the files that we download (kubelet, kubeadm, etc.)
1 parent 998b01b commit 9728679

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,6 @@ func (k *KubeadmBootstrapper) UpdateCluster(cfg bootstrapper.KubernetesConfig) e
261261
assets.NewMemoryAssetTarget([]byte(kubeadmCfg), constants.KubeadmConfigFile, "0640"),
262262
}
263263

264-
if err := addAddons(&files); err != nil {
265-
return errors.Wrap(err, "adding addons to copyable files")
266-
}
267-
268-
for _, f := range files {
269-
if err := k.c.Copy(f); err != nil {
270-
return errors.Wrapf(err, "transferring kubeadm file: %+v", f)
271-
}
272-
}
273264
var g errgroup.Group
274265
for _, bin := range []string{"kubelet", "kubeadm"} {
275266
bin := bin
@@ -292,6 +283,16 @@ func (k *KubeadmBootstrapper) UpdateCluster(cfg bootstrapper.KubernetesConfig) e
292283
return errors.Wrap(err, "downloading binaries")
293284
}
294285

286+
if err := addAddons(&files); err != nil {
287+
return errors.Wrap(err, "adding addons to copyable files")
288+
}
289+
290+
for _, f := range files {
291+
if err := k.c.Copy(f); err != nil {
292+
return errors.Wrapf(err, "transferring kubeadm file: %+v", f)
293+
}
294+
}
295+
295296
err = k.c.Run(`
296297
sudo systemctl daemon-reload &&
297298
sudo systemctl enable kubelet &&

0 commit comments

Comments
 (0)