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

Merge pull request #7249 from yifan-gu/generator

Browse Source 
kubelet/container: Introduce RunContainerOptionsGenerator.
This commit is contained in:
David Oppenheimer 2015-04-23 14:59:23 -07:00
commit 8667ebddff
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/container/helpers.go
View File

@ -30,3 +30,10 @@ type HandlerRunner interface {
type Prober interface { type Prober interface {
Probe(pod *api.Pod, status api.PodStatus, container api.Container, containerID string, createdAt int64) (probe.Result, error) Probe(pod *api.Pod, status api.PodStatus, container api.Container, containerID string, createdAt int64) (probe.Result, error)
} }
// 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)
}

6
pkg/kubelet/kubelet.go
View File

@ -692,9 +692,9 @@ func makeBinds(container *api.Container, podVolumes volumeMap) (binds []string)
return return
} }
// generateRunContainerOptions generates the RunContainerOptions, which can be used by // GenerateRunContainerOptions generates the RunContainerOptions, which can be used by
// the container runtime to set parameters for launching a container. // the container runtime to set parameters for launching a container.
func (kl *Kubelet) generateRunContainerOptions(pod *api.Pod, container *api.Container, netMode, ipcMode string) (*kubecontainer.RunContainerOptions, error) { func (kl *Kubelet) GenerateRunContainerOptions(pod *api.Pod, container *api.Container, netMode, ipcMode string) (*kubecontainer.RunContainerOptions, error) {
var err error var err error
opts := &kubecontainer.RunContainerOptions{ opts := &kubecontainer.RunContainerOptions{
NetMode: netMode, NetMode: netMode,
@ -735,7 +735,7 @@ func (kl *Kubelet) runContainer(pod *api.Pod, container *api.Container, netMode,
glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err) glog.Errorf("Couldn't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
} }
opts, err := kl.generateRunContainerOptions(pod, container, netMode, ipcMode) opts, err := kl.GenerateRunContainerOptions(pod, container, netMode, ipcMode)
if err != nil { if err != nil {
return "", err return "", err
} }