Skip to content

K
k3s
Unverified Commit d1a047cf authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #64945 from fabriziopandini/fix-kubeadm-pull-log

Automatic merge from submit-queue (batch tested with PRs 64945, 64977). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix kubeadm init does not inform the users it is pulling images **What this PR does / why we need it**: Kubeadm should print a message informing the user that it is pre-pulling images before starting the init sequence, making users aware of the action in progress, which can take some time in environments with poor internet connection. **Which issue(s) this PR fixes**: fixes https://github.com/kubernetes/kubeadm/issues/908 **Release note**: ```release-note NONE ```
parents e6f64d0a d9506299
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
cmd/kubeadm/app/cmd/init.go
View file @ d1a047cf
...@@ -259,6 +259,10 @@ func NewInit(cfgPath string, externalcfg *kubeadmapiv1alpha2.MasterConfiguration ...@@ -259,6 +259,10 @@ func NewInit(cfgPath string, externalcfg *kubeadmapiv1alpha2.MasterConfiguration
if err := preflight.RunInitMasterChecks(utilsexec.New(), cfg, ignorePreflightErrors); err != nil { if err := preflight.RunInitMasterChecks(utilsexec.New(), cfg, ignorePreflightErrors); err != nil {
return nil, err return nil, err
} }
fmt.Println("[preflight/images] Pulling images required for setting up a Kubernetes cluster")
fmt.Println("[preflight/images] This might take a minute or two, depending on the speed of your internet connection")
fmt.Println("[preflight/images] You can also perform this action in beforehand using 'kubeadm config images pull'")
if err := preflight.RunPullImagesCheck(utilsexec.New(), cfg, ignorePreflightErrors); err != nil { if err := preflight.RunPullImagesCheck(utilsexec.New(), cfg, ignorePreflightErrors); err != nil {
return nil, err return nil, err
} }
......
cmd/kubeadm/app/preflight/checks.go
View file @ d1a047cf
...@@ -843,6 +843,7 @@ func (ImagePullCheck) Name() string { ...@@ -843,6 +843,7 @@ func (ImagePullCheck) Name() string {
// Check pulls images required by kubeadm. This is a mutating check // Check pulls images required by kubeadm. This is a mutating check
func (i ImagePullCheck) Check() (warnings, errors []error) { func (i ImagePullCheck) Check() (warnings, errors []error) {
for _, image := range i.ImageList { for _, image := range i.ImageList {
glog.V(1).Infoln("pulling ", image)
if err := i.Images.Exists(image); err == nil { if err := i.Images.Exists(image); err == nil {
continue continue
} }
......
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