github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
Andy Xie 2017-12-27 19:43:42 +08:00
parent 18758f502c
commit aa7c5896cb
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/container/runtime.go
View File

@ -428,8 +428,6 @@ type RunContainerOptions struct {
// this directory will be used to create and mount the log file to // this directory will be used to create and mount the log file to
// container.TerminationMessagePath // container.TerminationMessagePath
PodContainerDir string PodContainerDir string
// The parent cgroup to pass to Docker
CgroupParent string
// The type of container rootfs // The type of container rootfs
ReadOnly bool ReadOnly bool
// hostname for pod containers // hostname for pod containers

2
pkg/kubelet/kubelet_pods.go
View File

@ -436,8 +436,6 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *v1.Pod, container *v1.Contai
return nil, err return nil, err
} }
cgroupParent := kl.GetPodCgroupParent(pod)
opts.CgroupParent = cgroupParent
hostname, hostDomainName, err := kl.GeneratePodHostNameAndDomain(pod) hostname, hostDomainName, err := kl.GeneratePodHostNameAndDomain(pod)
if err != nil { if err != nil {
return nil, err return nil, err