Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip "pull" command if using Kubernetes 1.10, which does not support it. #3832

Merged
merged 4 commits into from
Mar 20, 2019
Merged

Skip "pull" command if using Kubernetes 1.10, which does not support it. #3832

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f968cb7
Don't try to run the images pull command on old versions of kubeadm
tstromberg Mar 8, 2019
0c1b51c
Use --kubeconfig for v1.10.x, instead of skipping the pull
tstromberg Mar 20, 2019
1eca3e0
Merge branch 'master' into k8s-v1.10.0
tstromberg Mar 20, 2019
7eeb0a7
Revert "Use --kubeconfig for v1.10.x, instead of skipping the pull"
tstromberg Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,14 @@ func (k *KubeadmBootstrapper) DeleteCluster(k8s config.KubernetesConfig) error {

// PullImages downloads images that will be used by RestartCluster
func (k *KubeadmBootstrapper) PullImages(k8s config.KubernetesConfig) error {
version, err := ParseKubernetesVersion(k8s.KubernetesVersion)
if err != nil {
return errors.Wrap(err, "parsing kubernetes version")
}
if version.LT(semver.MustParse("1.11.0")) {
return fmt.Errorf("pull command is not supported by kubeadm v%s", version)
}

cmd := fmt.Sprintf("sudo kubeadm config images pull --config %s", constants.KubeadmConfigFile)
if err := k.c.Run(cmd); err != nil {
return errors.Wrapf(err, "running cmd: %s", cmd)
Expand Down