From aa7c5896cbf03a9bb5f0087bf1f0390680c019b3 Mon Sep 17 00:00:00 2001 From: Andy Xie Date: Wed, 27 Dec 2017 19:43:42 +0800 Subject: [PATCH] code refactor --- pkg/kubelet/container/runtime.go | 2 -- pkg/kubelet/kubelet_pods.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index 2f5f4e3d188..b0e95b42cb9 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -428,8 +428,6 @@ type RunContainerOptions struct { // this directory will be used to create and mount the log file to // container.TerminationMessagePath PodContainerDir string - // The parent cgroup to pass to Docker - CgroupParent string // The type of container rootfs ReadOnly bool // hostname for pod containers diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 40340934920..041a59445b6 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -436,8 +436,6 @@ func (kl *Kubelet) GenerateRunContainerOptions(pod *v1.Pod, container *v1.Contai return nil, err } - cgroupParent := kl.GetPodCgroupParent(pod) - opts.CgroupParent = cgroupParent hostname, hostDomainName, err := kl.GeneratePodHostNameAndDomain(pod) if err != nil { return nil, err