diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index a972f867fee..a9be02a32d6 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -277,14 +277,6 @@ func SandboxToContainerState(state runtimeapi.PodSandboxState) State { return ContainerStateUnknown } -// FormatPod returns a string representing a pod in a human readable format, -// with pod UID as part of the string. -func FormatPod(pod *Pod) string { - // Use underscore as the delimiter because it is not allowed in pod name - // (DNS subdomain format), while allowed in the container name format. - return fmt.Sprintf("%s_%s(%s)", pod.Name, pod.Namespace, pod.ID) -} - // GetContainerSpec gets the container spec by containerName. func GetContainerSpec(pod *v1.Pod, containerName string) *v1.Container { var containerSpec *v1.Container @@ -325,7 +317,7 @@ func HasWindowsHostProcessContainer(pod *v1.Pod) bool { return hasHostProcess } -// AllContainersAreWindowsHostProcess returns true if all containres in a pod are HostProcess containers. +// AllContainersAreWindowsHostProcess returns true if all containers in a pod are HostProcess containers. func AllContainersAreWindowsHostProcess(pod *v1.Pod) bool { allHostProcess := true podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool { @@ -362,7 +354,7 @@ func MakePortMappings(container *v1.Container) (ports []PortMapping) { } } - var name string = p.Name + var name = p.Name if name == "" { name = fmt.Sprintf("%s-%s-%s:%d:%d", family, p.Protocol, p.HostIP, p.ContainerPort, p.HostPort) }