diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index b6c4ff6624d..5802fb07611 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -516,8 +516,6 @@ type RunContainerOptions struct { PodContainerDir string // The type of container rootfs ReadOnly bool - // hostname for pod containers - Hostname string } // VolumeInfo contains information about the volume. diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 5e56018da1a..b24b9e0e9d7 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -61,7 +61,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/kubelet/status" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/kubelet/util" utilfs "k8s.io/kubernetes/pkg/util/filesystem" utilkernel "k8s.io/kubernetes/pkg/util/kernel" utilpod "k8s.io/kubernetes/pkg/util/pod" @@ -587,13 +586,7 @@ func (kl *Kubelet) GenerateRunContainerOptions(ctx context.Context, pod *v1.Pod, if err != nil { return nil, nil, err } - // nodename will be equal to hostname if SetHostnameAsFQDN is nil or false. If SetHostnameFQDN - // is true and hostDomainName is defined, nodename will be the FQDN (hostname.hostDomainName) - nodename, err := util.GetNodenameForKernel(hostname, hostDomainName, pod.Spec.SetHostnameAsFQDN) - if err != nil { - return nil, nil, err - } - opts.Hostname = nodename + podName := volumeutil.GetUniquePodName(pod) volumes := kl.volumeManager.GetMountedVolumesForPod(podName)