Skip to content

Commit 0dbf1d3

Browse files
committed
remove kubelet unused run container options
1 parent 157f4b9 commit 0dbf1d3

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

pkg/kubelet/container/runtime.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,6 @@ type RunContainerOptions struct {
516516
PodContainerDir string
517517
// The type of container rootfs
518518
ReadOnly bool
519-
// hostname for pod containers
520-
Hostname string
521519
}
522520

523521
// VolumeInfo contains information about the volume.

pkg/kubelet/kubelet_pods.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import (
6161
"k8s.io/kubernetes/pkg/kubelet/metrics"
6262
"k8s.io/kubernetes/pkg/kubelet/status"
6363
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
64-
"k8s.io/kubernetes/pkg/kubelet/util"
6564
utilfs "k8s.io/kubernetes/pkg/util/filesystem"
6665
utilkernel "k8s.io/kubernetes/pkg/util/kernel"
6766
utilpod "k8s.io/kubernetes/pkg/util/pod"
@@ -587,13 +586,7 @@ func (kl *Kubelet) GenerateRunContainerOptions(ctx context.Context, pod *v1.Pod,
587586
if err != nil {
588587
return nil, nil, err
589588
}
590-
// nodename will be equal to hostname if SetHostnameAsFQDN is nil or false. If SetHostnameFQDN
591-
// is true and hostDomainName is defined, nodename will be the FQDN (hostname.hostDomainName)
592-
nodename, err := util.GetNodenameForKernel(hostname, hostDomainName, pod.Spec.SetHostnameAsFQDN)
593-
if err != nil {
594-
return nil, nil, err
595-
}
596-
opts.Hostname = nodename
589+
597590
podName := volumeutil.GetUniquePodName(pod)
598591
volumes := kl.volumeManager.GetMountedVolumesForPod(podName)
599592

0 commit comments

Comments
 (0)