diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index df7fb96be91..5618aba2298 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -86,7 +86,7 @@ type RuntimeHooks interface { // Determines whether the runtime should pull the specified container's image. ShouldPullImage(pod *api.Pod, container *api.Container, imagePresent bool) bool - // Runs after an image is pulled reporting it's status. Error may be nil + // Runs after an image is pulled reporting its status. Error may be nil // for a successful pull. ReportImagePull(pod *api.Pod, container *api.Container, err error) } diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 6452642fd2c..8ee6083da3f 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -28,13 +28,6 @@ import ( const kubeletSubsystem = "kubelet" var ( - ImagePullLatency = prometheus.NewSummary( - prometheus.SummaryOpts{ - Subsystem: kubeletSubsystem, - Name: "image_pull_latency_microseconds", - Help: "Image pull latency in microseconds.", - }, - ) ContainersPerPodCount = prometheus.NewSummary( prometheus.SummaryOpts{ Subsystem: kubeletSubsystem, @@ -73,7 +66,6 @@ var registerMetrics sync.Once func Register(containerCache kubecontainer.RuntimeCache) { // Register the metrics. registerMetrics.Do(func() { - prometheus.MustRegister(ImagePullLatency) prometheus.MustRegister(SyncPodLatency) prometheus.MustRegister(DockerOperationsLatency) prometheus.MustRegister(SyncPodsLatency) diff --git a/pkg/kubelet/runtime_hooks.go b/pkg/kubelet/runtime_hooks.go index 73575dad964..1b2a70a7a38 100644 --- a/pkg/kubelet/runtime_hooks.go +++ b/pkg/kubelet/runtime_hooks.go @@ -49,15 +49,15 @@ func (kr *kubeletRuntimeHooks) ShouldPullImage(pod *api.Pod, container *api.Cont return false } -func (kr *kubeletRuntimeHooks) ReportImagePull(pod *api.Pod, container *api.Container, err error) { +func (kr *kubeletRuntimeHooks) ReportImagePull(pod *api.Pod, container *api.Container, pullError error) { ref, err := kubecontainer.GenerateContainerRef(pod, container) if err != nil { - glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err) + glog.Errorf("Couldn't make a ref to pod %q, container %q: '%v'", pod.Name, container.Name, err) return } - if err != nil { - kr.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", container.Image, err) + if pullError != nil { + kr.recorder.Eventf(ref, "failed", "Failed to pull image %q: %v", container.Image, pullError) } else { kr.recorder.Eventf(ref, "pulled", "Successfully pulled image %q", container.Image) }