Skip to content

Commit

Permalink
Fix volume imports
Browse files Browse the repository at this point in the history
  • Loading branch information
yujuhong committed Mar 20, 2015
1 parent 67414e0 commit f3f3c8f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pkg/kubelet/container/fake_runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (f *FakeRuntime) GetPods(all bool) ([]*Pod, error) {
return f.Podlist, f.Err
}

func (f *FakeRuntime) RunPod(pod *api.Pod, volumeMap map[string]volume.Interface) error {
func (f *FakeRuntime) RunPod(pod *api.Pod, volumeMap map[string]volume.VolumePlugin) error {
f.Lock()
defer f.Unlock()

Expand All @@ -152,7 +152,7 @@ func (f *FakeRuntime) KillPod(pod *api.Pod) error {
return f.Err
}

func (f *FakeRuntime) RunContainerInPod(container api.Container, pod *api.Pod, volumeMap map[string]volume.Interface) error {
func (f *FakeRuntime) RunContainerInPod(container api.Container, pod *api.Pod, volumeMap map[string]volume.VolumePlugin) error {
f.Lock()
defer f.Unlock()

Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/container/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ type Runtime interface {
// exited and dead containers (used for garbage collection).
GetPods(all bool) ([]*Pod, error)
// RunPod starts all the containers of a pod within a namespace.
RunPod(*api.Pod, map[string]volume.Interface) error
RunPod(*api.Pod, map[string]volume.VolumePlugin) error
// KillPod kills all the containers of a pod.
KillPod(*api.Pod) error
// RunContainerInPod starts a container within the same namespace of a pod.
RunContainerInPod(api.Container, *api.Pod, map[string]volume.Interface) error
RunContainerInPod(api.Container, *api.Pod, map[string]volume.VolumePlugin) error
// KillContainerInPod kills a container in the pod.
KillContainerInPod(api.Container, *api.Pod) error
// GetPodStatus retrieves the status of the pod, including the information of
Expand Down

0 comments on commit f3f3c8f

Please sign in to comment.