github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: fix ImagePullCheck output

Browse Source 
ImagePullCheck outputs "pulling <image>" line even if image
already exists and is not pulled.

Fixed the output to reflect the reality. ImagePullCheck now outputs
either "pulling <image>" or "image <image> exists".
This commit is contained in:
Ed Bartosh 2018-07-31 14:07:22 +03:00
parent 23111ad414
commit 84300e781c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/preflight/checks.go
View File

@ -829,14 +829,15 @@ 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 (ipc ImagePullCheck) Check() (warnings, errors []error) { func (ipc ImagePullCheck) Check() (warnings, errors []error) {
for _, image := range ipc.imageList { for _, image := range ipc.imageList {
glog.V(1).Infoln("pulling ", image)
ret, err := ipc.runtime.ImageExists(image) ret, err := ipc.runtime.ImageExists(image)
if ret && err == nil { if ret && err == nil {
glog.V(1).Infof("image exists: %s", image)
continue continue
} }
if err != nil { if err != nil {
errors = append(errors, fmt.Errorf("failed to check if image %s exists: %v", image, err)) errors = append(errors, fmt.Errorf("failed to check if image %s exists: %v", image, err))
} }
glog.V(1).Infof("pulling %s", image)
if err := ipc.runtime.PullImage(image); err != nil { if err := ipc.runtime.PullImage(image); err != nil {
errors = append(errors, fmt.Errorf("failed to pull image %s: %v", image, err)) errors = append(errors, fmt.Errorf("failed to pull image %s: %v", image, err))
} }