mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Adding errors to Kubelet events.
This will help while debugging issues that generate events. Also removed unecessary log line.
This commit is contained in:
parent
11b9b309d3
commit
0c664a343c
@ -349,7 +349,6 @@ func (p dockerPuller) Pull(image string) error {
|
|||||||
}
|
}
|
||||||
// Image spec: [<registry>/]<repository>/<image>[:<version] so we count '/'
|
// Image spec: [<registry>/]<repository>/<image>[:<version] so we count '/'
|
||||||
explicitRegistry := (strings.Count(image, "/") == 2)
|
explicitRegistry := (strings.Count(image, "/") == 2)
|
||||||
glog.Errorf("Foo: %s", explicitRegistry)
|
|
||||||
// Hack, look for a private registry, and decorate the error with the lack of
|
// Hack, look for a private registry, and decorate the error with the lack of
|
||||||
// credentials. This is heuristic, and really probably could be done better
|
// credentials. This is heuristic, and really probably could be done better
|
||||||
// by talking to the registry API directly from the kubelet here.
|
// by talking to the registry API directly from the kubelet here.
|
||||||
|
@ -1059,7 +1059,7 @@ func (kl *Kubelet) createPodInfraContainer(pod *api.Pod) (dockertools.DockerID,
|
|||||||
ok, err := kl.dockerPuller.IsImagePresent(container.Image)
|
ok, err := kl.dockerPuller.IsImagePresent(container.Image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if ref != nil {
|
if ref != nil {
|
||||||
kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q", container.Image)
|
kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
|
||||||
}
|
}
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
@ -1099,7 +1099,7 @@ func (kl *Kubelet) pullImage(img string, ref *api.ObjectReference) error {
|
|||||||
|
|
||||||
if err := kl.dockerPuller.Pull(img); err != nil {
|
if err := kl.dockerPuller.Pull(img); err != nil {
|
||||||
if ref != nil {
|
if ref != nil {
|
||||||
kl.recorder.Eventf(ref, "failed", "Failed to pull image %q", img)
|
kl.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", img, err)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -1215,7 +1215,7 @@ func (kl *Kubelet) pullImageAndRunContainer(pod *api.Pod, container *api.Contain
|
|||||||
present, err := kl.dockerPuller.IsImagePresent(container.Image)
|
present, err := kl.dockerPuller.IsImagePresent(container.Image)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if ref != nil {
|
if ref != nil {
|
||||||
kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q", container.Image)
|
kl.recorder.Eventf(ref, "failed", "Failed to inspect image %q: %v", container.Image, err)
|
||||||
}
|
}
|
||||||
glog.Errorf("Failed to inspect image %q: %v; skipping pod %q container %q", container.Image, err, podFullName, container.Name)
|
glog.Errorf("Failed to inspect image %q: %v; skipping pod %q container %q", container.Image, err, podFullName, container.Name)
|
||||||
return "", err
|
return "", err
|
||||||
|
Loading…
Reference in New Issue
Block a user