diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index afe0e49d2ce1..beea93d48680 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -1869,7 +1869,7 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, _ kubecontainer.Pod, _ api.PodSta err := dm.verifyNonRoot(container) dm.updateReasonCache(pod, container, "VerifyNonRootError", err) if err != nil { - glog.Errorf("Error running pod %q container %q: %v", kubecontainer.GetPodFullName(pod), container.Name, err) + glog.Errorf("Error running pod %q container %q: %v", format.Pod(pod), container.Name, err) continue } } @@ -1890,7 +1890,7 @@ func (dm *DockerManager) SyncPod(pod *api.Pod, _ kubecontainer.Pod, _ api.PodSta dm.updateReasonCache(pod, container, kubecontainer.ErrRunContainer.Error(), err) if err != nil { // TODO(bburns) : Perhaps blacklist a container after N failures? - glog.Errorf("Error running pod %q container %q: %v", kubecontainer.GetPodFullName(pod), container.Name, err) + glog.Errorf("Error running pod %q container %q: %v", format.Pod(pod), container.Name, err) continue } containersStarted++ @@ -1979,7 +1979,7 @@ func (dm *DockerManager) doBackOff(pod *api.Pod, container *api.Container, podSt if ref, err := kubecontainer.GenerateContainerRef(pod, container); err == nil { dm.recorder.Eventf(ref, api.EventTypeWarning, kubecontainer.BackOffStartContainer, "Back-off restarting failed docker container") } - err := fmt.Errorf("Back-off %s restarting failed container=%s pod=%s", backOff.Get(stableName), container.Name, kubecontainer.GetPodFullName(pod)) + err := fmt.Errorf("Back-off %s restarting failed container=%s pod=%s", backOff.Get(stableName), container.Name, format.Pod(pod)) dm.updateReasonCache(pod, container, kubecontainer.ErrCrashLoopBackOff.Error(), err) glog.Infof("%s", err.Error()) return true diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go index 0ebff534848f..470817687f62 100644 --- a/pkg/kubelet/prober/prober.go +++ b/pkg/kubelet/prober/prober.go @@ -28,6 +28,7 @@ import ( "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/prober/results" + "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/probe" execprobe "k8s.io/kubernetes/pkg/probe/exec" httprobe "k8s.io/kubernetes/pkg/probe/http" @@ -80,7 +81,7 @@ func (pb *prober) probe(probeType probeType, pod *api.Pod, status api.PodStatus, return results.Failure, fmt.Errorf("Unknown probe type: %q", probeType) } - ctrName := fmt.Sprintf("%s:%s", kubecontainer.GetPodFullName(pod), container.Name) + ctrName := fmt.Sprintf("%s:%s", format.Pod(pod), container.Name) if probeSpec == nil { glog.Warningf("%s probe for %s is nil", probeType, ctrName) return results.Success, nil @@ -155,7 +156,7 @@ func (pb *prober) runProbe(p *api.Probe, pod *api.Pod, status api.PodStatus, con return pb.tcp.Probe(status.PodIP, port, timeout) } glog.Warningf("Failed to find probe builder for container: %v", container) - return probe.Unknown, "", fmt.Errorf("Missing probe handler for %s:%s", kubecontainer.GetPodFullName(pod), container.Name) + return probe.Unknown, "", fmt.Errorf("Missing probe handler for %s:%s", format.Pod(pod), container.Name) } func extractPort(param intstr.IntOrString, container api.Container) (int, error) { diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index 6b2eaef0a437..4aeda9376c6a 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -24,7 +24,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/kubelet/container" - kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" ) @@ -148,7 +147,7 @@ func (kl *Kubelet) isPodRunning(pod *api.Pod, runningPod container.Pod) (bool, e // TODO (random-liu) Change this to new pod status status, err := kl.containerRuntime.GetAPIPodStatus(pod) if err != nil { - glog.Infof("Failed to get the status of pod %q: %v", kubecontainer.GetPodFullName(pod), err) + glog.Infof("Failed to get the status of pod %q: %v", format.Pod(pod), err) return false, err } for _, st := range status.ContainerStatuses {