github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Reorganize kubelet tree so apis can be independently versioned

Browse Source
This commit is contained in:
Michael Taufen
2017-02-22 16:05:05 -08:00
parent b4b5bfdb46
commit cbad320205
94 changed files with 522 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/image_list.go
View File

@@ -26,8 +26,8 @@ import (
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/kubelet/api"
"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/remote"
commontest "k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/framework"
@@ -82,7 +82,7 @@ func (dp *dockerPuller) Pull(image string) ([]byte, error) {
}
type remotePuller struct {
imageService api.ImageManagerService
imageService internalapi.ImageManagerService
}
func (rp *remotePuller) Name() string {
@@ -91,7 +91,7 @@ func (rp *remotePuller) Name() string {
func (rp *remotePuller) Pull(image string) ([]byte, error) {
// TODO(runcom): should we check if the image is already pulled with ImageStatus?
_, err := rp.imageService.PullImage(&runtime.ImageSpec{Image: image}, nil)
_, err := rp.imageService.PullImage(&runtimeapi.ImageSpec{Image: image}, nil)
return nil, err
}