github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5743 from yujuhong/fix_volume

Browse Source 
Fix volume imports
This commit is contained in:
Brian Grant 2015-03-20 16:33:35 -07:00
commit cc17181521
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/container/fake_runtime.go
View File

@ -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()
@ -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()

4
pkg/kubelet/container/runtime.go
View File

@ -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