kubelet/container: Remove ipcMode and netMode from RunContainerOptions.

Since createPodInfraContainer() is moved into dockertools. There is no
need to pass the ipcMode or netMode via RunContainerOptions.

pkg/kubelet/container/helpers.go

@@ -30,9 +30,8 @@ type HandlerRunner interface {
 
 // RunContainerOptionsGenerator generates the options that necessary for
 // container runtime to run a container.
-// TODO(yifan): Remove netMode, ipcMode.
 type RunContainerOptionsGenerator interface {
-	GenerateRunContainerOptions(pod *api.Pod, container *api.Container, netMode, ipcMode string) (*RunContainerOptions, error)
+	GenerateRunContainerOptions(pod *api.Pod, container *api.Container) (*RunContainerOptions, error)
 }
 
 // Trims runtime prefix from ID or image name (e.g.: docker://busybox -> busybox).

pkg/kubelet/container/runtime.go

@@ -201,13 +201,6 @@ type RunContainerOptions struct {
 	DNS []string
 	// The list of DNS search domains.
 	DNSSearch []string
-	// Docker namespace identifiers(currently we have 'NetMode' and 'IpcMode'.
-	// These are for docker to attach a container in a pod to the pod infra
-	// container's namespace.
-	// TODO(yifan): Remove these after we pushed the pod infra container logic
-	// into docker's container runtime.
-	NetMode string
-	IpcMode string
 	// The parent cgroup to pass to Docker
 	CgroupParent string
 }