Commit aa7c5896 authored by Andy Xie's avatar Andy Xie

code refactor

parent 18758f50
...@@ -428,8 +428,6 @@ type RunContainerOptions struct { ...@@ -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
......
...@@ -436,8 +436,6 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *v1.Pod, container *v1.Contai ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment