From 22e99504d7fd0f7d5a5dfcba0720e9e36a23c780 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Wed, 7 Jun 2017 16:54:28 +0800 Subject: [PATCH] Update CRI references --- pkg/kubelet/apis/cri/BUILD | 4 ++-- pkg/kubelet/apis/cri/services.go | 2 +- pkg/kubelet/apis/cri/testing/BUILD | 2 +- pkg/kubelet/apis/cri/testing/fake_image_service.go | 2 +- pkg/kubelet/apis/cri/testing/fake_runtime_service.go | 2 +- pkg/kubelet/apis/cri/testing/utils.go | 2 +- pkg/kubelet/container/BUILD | 2 +- pkg/kubelet/container/helpers.go | 2 +- pkg/kubelet/container/runtime.go | 2 +- pkg/kubelet/dockershim/BUILD | 4 ++-- pkg/kubelet/dockershim/convert.go | 2 +- pkg/kubelet/dockershim/convert_test.go | 2 +- pkg/kubelet/dockershim/doc.go | 2 +- pkg/kubelet/dockershim/docker_container.go | 2 +- pkg/kubelet/dockershim/docker_container_test.go | 2 +- pkg/kubelet/dockershim/docker_image.go | 2 +- pkg/kubelet/dockershim/docker_image_test.go | 2 +- pkg/kubelet/dockershim/docker_legacy.go | 2 +- pkg/kubelet/dockershim/docker_sandbox.go | 2 +- pkg/kubelet/dockershim/docker_sandbox_test.go | 2 +- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/dockershim/docker_service_test.go | 2 +- pkg/kubelet/dockershim/docker_stats.go | 2 +- pkg/kubelet/dockershim/docker_streaming.go | 2 +- pkg/kubelet/dockershim/helpers.go | 2 +- pkg/kubelet/dockershim/helpers_linux.go | 2 +- pkg/kubelet/dockershim/helpers_test.go | 2 +- pkg/kubelet/dockershim/helpers_unsupported.go | 2 +- pkg/kubelet/dockershim/helpers_windows.go | 2 +- pkg/kubelet/dockershim/naming.go | 2 +- pkg/kubelet/dockershim/naming_test.go | 2 +- pkg/kubelet/dockershim/remote/BUILD | 2 +- pkg/kubelet/dockershim/remote/docker_server.go | 2 +- pkg/kubelet/dockershim/remote/docker_service.go | 2 +- pkg/kubelet/dockershim/security_context.go | 2 +- pkg/kubelet/dockershim/security_context_test.go | 2 +- pkg/kubelet/kuberuntime/BUILD | 4 ++-- pkg/kubelet/kuberuntime/helpers.go | 2 +- pkg/kubelet/kuberuntime/helpers_test.go | 2 +- pkg/kubelet/kuberuntime/instrumented_services.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_container.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_container_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_gc.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_gc_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_image.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_image_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_logs.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_manager_test.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_sandbox.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go | 2 +- pkg/kubelet/kuberuntime/security_context.go | 2 +- pkg/kubelet/remote/BUILD | 2 +- pkg/kubelet/remote/remote_image.go | 2 +- pkg/kubelet/remote/remote_runtime.go | 2 +- pkg/kubelet/remote/utils.go | 2 +- pkg/kubelet/rktshim/BUILD | 4 ++-- pkg/kubelet/rktshim/app-interface.go | 2 +- pkg/kubelet/rktshim/fake-app-interface.go | 2 +- pkg/kubelet/rktshim/imagestore.go | 2 +- pkg/kubelet/rktshim/imagestore_test.go | 2 +- pkg/kubelet/rktshim/pod-level-interface.go | 2 +- pkg/kubelet/server/streaming/BUILD | 4 ++-- pkg/kubelet/server/streaming/server.go | 2 +- pkg/kubelet/server/streaming/server_test.go | 2 +- test/e2e_node/BUILD | 2 +- test/e2e_node/image_list.go | 2 +- 67 files changed, 72 insertions(+), 72 deletions(-) diff --git a/pkg/kubelet/apis/cri/BUILD b/pkg/kubelet/apis/cri/BUILD index 4e43faa19bd..3eeb7d06941 100644 --- a/pkg/kubelet/apis/cri/BUILD +++ b/pkg/kubelet/apis/cri/BUILD @@ -11,7 +11,7 @@ go_library( name = "go_default_library", srcs = ["services.go"], tags = ["automanaged"], - deps = ["//pkg/kubelet/apis/cri/v1alpha1:go_default_library"], + deps = ["//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library"], ) filegroup( @@ -26,7 +26,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubelet/apis/cri/testing:all-srcs", - "//pkg/kubelet/apis/cri/v1alpha1:all-srcs", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/apis/cri/services.go b/pkg/kubelet/apis/cri/services.go index 11ee088dbf8..36b11e3f9b9 100644 --- a/pkg/kubelet/apis/cri/services.go +++ b/pkg/kubelet/apis/cri/services.go @@ -19,7 +19,7 @@ package cri import ( "time" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // RuntimeVersioner contains methods for runtime name, version and API version. diff --git a/pkg/kubelet/apis/cri/testing/BUILD b/pkg/kubelet/apis/cri/testing/BUILD index 9c0f82c778b..78ea0c54d76 100644 --- a/pkg/kubelet/apis/cri/testing/BUILD +++ b/pkg/kubelet/apis/cri/testing/BUILD @@ -16,7 +16,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ], diff --git a/pkg/kubelet/apis/cri/testing/fake_image_service.go b/pkg/kubelet/apis/cri/testing/fake_image_service.go index 6f18cb5490d..992268d27df 100644 --- a/pkg/kubelet/apis/cri/testing/fake_image_service.go +++ b/pkg/kubelet/apis/cri/testing/fake_image_service.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils" ) diff --git a/pkg/kubelet/apis/cri/testing/fake_runtime_service.go b/pkg/kubelet/apis/cri/testing/fake_runtime_service.go index 37cb26ecb6f..c26d13abcd3 100644 --- a/pkg/kubelet/apis/cri/testing/fake_runtime_service.go +++ b/pkg/kubelet/apis/cri/testing/fake_runtime_service.go @@ -22,7 +22,7 @@ import ( "sync" "time" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) var ( diff --git a/pkg/kubelet/apis/cri/testing/utils.go b/pkg/kubelet/apis/cri/testing/utils.go index 9db9cb70755..2aaee3bfba3 100644 --- a/pkg/kubelet/apis/cri/testing/utils.go +++ b/pkg/kubelet/apis/cri/testing/utils.go @@ -19,7 +19,7 @@ package testing import ( "fmt" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func BuildContainerName(metadata *runtimeapi.ContainerMetadata, sandboxID string) string { diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index 6bf45b81854..55a3bf7a8e2 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -29,7 +29,7 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/ref:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/util/format:go_default_library", "//pkg/kubelet/util/ioutils:go_default_library", diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index acbd8ce1ecd..7930fed552b 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -32,7 +32,7 @@ import ( clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index 779cd89d26a..c3403ad57ad 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index 17ea5650147..864dfcac8fe 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -34,7 +34,7 @@ go_library( "//pkg/apis/componentconfig:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/cm:go_default_library", @@ -94,7 +94,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/dockershim/errors:go_default_library", diff --git a/pkg/kubelet/dockershim/convert.go b/pkg/kubelet/dockershim/convert.go index 2e276a8f75c..0789301839d 100644 --- a/pkg/kubelet/dockershim/convert.go +++ b/pkg/kubelet/dockershim/convert.go @@ -23,7 +23,7 @@ import ( dockertypes "github.com/docker/engine-api/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/convert_test.go b/pkg/kubelet/dockershim/convert_test.go index 115ff760697..a1b4e4cca80 100644 --- a/pkg/kubelet/dockershim/convert_test.go +++ b/pkg/kubelet/dockershim/convert_test.go @@ -22,7 +22,7 @@ import ( dockertypes "github.com/docker/engine-api/types" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func TestConvertDockerStatusToRuntimeAPIState(t *testing.T) { diff --git a/pkg/kubelet/dockershim/doc.go b/pkg/kubelet/dockershim/doc.go index 3ddbc9ccb23..323a941c451 100644 --- a/pkg/kubelet/dockershim/doc.go +++ b/pkg/kubelet/dockershim/doc.go @@ -14,5 +14,5 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Docker integration using pkg/kubelet/apis/cri/v1alpha1/api.pb.go +// Docker integration using pkg/kubelet/apis/cri/v1alpha1/runtime/api.pb.go package dockershim diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index cab84f449ea..a46b37d7645 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -28,7 +28,7 @@ import ( dockerstrslice "github.com/docker/engine-api/types/strslice" "github.com/golang/glog" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_container_test.go b/pkg/kubelet/dockershim/docker_container_test.go index b46b6b3bfca..6a1bb97005e 100644 --- a/pkg/kubelet/dockershim/docker_container_test.go +++ b/pkg/kubelet/dockershim/docker_container_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/dockershim/docker_image.go b/pkg/kubelet/dockershim/docker_image.go index b374c3d7fc7..a2eb8dce158 100644 --- a/pkg/kubelet/dockershim/docker_image.go +++ b/pkg/kubelet/dockershim/docker_image.go @@ -23,7 +23,7 @@ import ( "github.com/docker/docker/pkg/jsonmessage" dockertypes "github.com/docker/engine-api/types" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_image_test.go b/pkg/kubelet/dockershim/docker_image_test.go index 9c1142bbd34..4d6d37f4166 100644 --- a/pkg/kubelet/dockershim/docker_image_test.go +++ b/pkg/kubelet/dockershim/docker_image_test.go @@ -24,7 +24,7 @@ import ( dockertypes "github.com/docker/engine-api/types" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/dockershim/docker_legacy.go b/pkg/kubelet/dockershim/docker_legacy.go index 9aa64729a21..d5d26be47d2 100644 --- a/pkg/kubelet/dockershim/docker_legacy.go +++ b/pkg/kubelet/dockershim/docker_legacy.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/leaky" diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index 4def3b59024..dcaee08cd13 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" utilerrors "k8s.io/apimachinery/pkg/util/errors" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/errors" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go index 64de76f7b3b..4c63b7ce7df 100644 --- a/pkg/kubelet/dockershim/docker_sandbox_test.go +++ b/pkg/kubelet/dockershim/docker_sandbox_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index e7fe8d4c197..d7aadb4f668 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecm "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/cm" diff --git a/pkg/kubelet/dockershim/docker_service_test.go b/pkg/kubelet/dockershim/docker_service_test.go index 9969bffa968..63f3262100e 100644 --- a/pkg/kubelet/dockershim/docker_service_test.go +++ b/pkg/kubelet/dockershim/docker_service_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/clock" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/dockershim/docker_stats.go b/pkg/kubelet/dockershim/docker_stats.go index 997cc8f1673..e25e3579dfe 100644 --- a/pkg/kubelet/dockershim/docker_stats.go +++ b/pkg/kubelet/dockershim/docker_stats.go @@ -19,7 +19,7 @@ package dockershim import ( "fmt" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // DockerService does not implement container stats. diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go index d4af0b58cb5..70f9d105619 100644 --- a/pkg/kubelet/dockershim/docker_streaming.go +++ b/pkg/kubelet/dockershim/docker_streaming.go @@ -30,7 +30,7 @@ import ( "github.com/golang/glog" "k8s.io/client-go/tools/remotecommand" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/server/streaming" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" diff --git a/pkg/kubelet/dockershim/helpers.go b/pkg/kubelet/dockershim/helpers.go index 26e0b4491a3..ce82629bfae 100644 --- a/pkg/kubelet/dockershim/helpers.go +++ b/pkg/kubelet/dockershim/helpers.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/credentialprovider" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/security/apparmor" diff --git a/pkg/kubelet/dockershim/helpers_linux.go b/pkg/kubelet/dockershim/helpers_linux.go index ba1d357e7bc..34a862f153e 100644 --- a/pkg/kubelet/dockershim/helpers_linux.go +++ b/pkg/kubelet/dockershim/helpers_linux.go @@ -24,7 +24,7 @@ import ( "github.com/blang/semver" dockertypes "github.com/docker/engine-api/types" dockercontainer "github.com/docker/engine-api/types/container" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func DefaultMemorySwap() int64 { diff --git a/pkg/kubelet/dockershim/helpers_test.go b/pkg/kubelet/dockershim/helpers_test.go index 8138228e2da..7304abfd966 100644 --- a/pkg/kubelet/dockershim/helpers_test.go +++ b/pkg/kubelet/dockershim/helpers_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" diff --git a/pkg/kubelet/dockershim/helpers_unsupported.go b/pkg/kubelet/dockershim/helpers_unsupported.go index 5c3f14e356c..ab8d380adce 100644 --- a/pkg/kubelet/dockershim/helpers_unsupported.go +++ b/pkg/kubelet/dockershim/helpers_unsupported.go @@ -22,7 +22,7 @@ import ( "github.com/blang/semver" dockertypes "github.com/docker/engine-api/types" "github.com/golang/glog" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func DefaultMemorySwap() int64 { diff --git a/pkg/kubelet/dockershim/helpers_windows.go b/pkg/kubelet/dockershim/helpers_windows.go index 2f2c883aa44..132fabb3c40 100644 --- a/pkg/kubelet/dockershim/helpers_windows.go +++ b/pkg/kubelet/dockershim/helpers_windows.go @@ -27,7 +27,7 @@ import ( dockerfilters "github.com/docker/engine-api/types/filters" "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func DefaultMemorySwap() int64 { diff --git a/pkg/kubelet/dockershim/naming.go b/pkg/kubelet/dockershim/naming.go index 461cc5c6ffc..3a7ef13becc 100644 --- a/pkg/kubelet/dockershim/naming.go +++ b/pkg/kubelet/dockershim/naming.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/leaky" ) diff --git a/pkg/kubelet/dockershim/naming_test.go b/pkg/kubelet/dockershim/naming_test.go index 33a9ef46b25..54358668a03 100644 --- a/pkg/kubelet/dockershim/naming_test.go +++ b/pkg/kubelet/dockershim/naming_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) func TestSandboxNameRoundTrip(t *testing.T) { diff --git a/pkg/kubelet/dockershim/remote/BUILD b/pkg/kubelet/dockershim/remote/BUILD index 9256e2fc699..07a5b4e7595 100644 --- a/pkg/kubelet/dockershim/remote/BUILD +++ b/pkg/kubelet/dockershim/remote/BUILD @@ -16,7 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/dockershim:go_default_library", "//pkg/kubelet/util:go_default_library", "//pkg/util/exec:go_default_library", diff --git a/pkg/kubelet/dockershim/remote/docker_server.go b/pkg/kubelet/dockershim/remote/docker_server.go index c0828fca81b..21865e3e2c1 100644 --- a/pkg/kubelet/dockershim/remote/docker_server.go +++ b/pkg/kubelet/dockershim/remote/docker_server.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "google.golang.org/grpc" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim" "k8s.io/kubernetes/pkg/kubelet/util" "k8s.io/kubernetes/pkg/util/interrupt" diff --git a/pkg/kubelet/dockershim/remote/docker_service.go b/pkg/kubelet/dockershim/remote/docker_service.go index 4fb0fee41c6..e224708eb40 100644 --- a/pkg/kubelet/dockershim/remote/docker_service.go +++ b/pkg/kubelet/dockershim/remote/docker_service.go @@ -23,7 +23,7 @@ import ( "golang.org/x/net/context" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim" utilexec "k8s.io/kubernetes/pkg/util/exec" ) diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index 6c320ab23c6..82aea7027a5 100644 --- a/pkg/kubelet/dockershim/security_context.go +++ b/pkg/kubelet/dockershim/security_context.go @@ -25,7 +25,7 @@ import ( dockercontainer "github.com/docker/engine-api/types/container" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext" knetwork "k8s.io/kubernetes/pkg/kubelet/network" ) diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go index 08bf1f333bf..868beed8af5 100644 --- a/pkg/kubelet/dockershim/security_context_test.go +++ b/pkg/kubelet/dockershim/security_context_test.go @@ -25,7 +25,7 @@ import ( dockercontainer "github.com/docker/engine-api/types/container" "github.com/stretchr/testify/assert" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext" ) diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index 045ca924e35..620d13aa247 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -33,7 +33,7 @@ go_library( "//pkg/api/v1/ref:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/images:go_default_library", @@ -86,7 +86,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/apis/cri/testing:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/metrics:go_default_library", diff --git a/pkg/kubelet/kuberuntime/helpers.go b/pkg/kubelet/kuberuntime/helpers.go index 76c4b000451..7d524a897f2 100644 --- a/pkg/kubelet/kuberuntime/helpers.go +++ b/pkg/kubelet/kuberuntime/helpers.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/helpers_test.go b/pkg/kubelet/kuberuntime/helpers_test.go index f2d198d17bd..8981ad420df 100644 --- a/pkg/kubelet/kuberuntime/helpers_test.go +++ b/pkg/kubelet/kuberuntime/helpers_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" runtimetesting "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/instrumented_services.go b/pkg/kubelet/kuberuntime/instrumented_services.go index 6379576b34d..ecb6cfbdcda 100644 --- a/pkg/kubelet/kuberuntime/instrumented_services.go +++ b/pkg/kubelet/kuberuntime/instrumented_services.go @@ -20,7 +20,7 @@ import ( "time" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 849bbcd5d40..73fbed91099 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -35,7 +35,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/qos" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go index 64e9c4ca5e7..478b778b820 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/pkg/kubelet/kuberuntime/kuberuntime_gc.go index 45796c26a17..fe8f1465945 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/types" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go index ff321d023d0..b32cd942846 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go @@ -25,7 +25,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_image.go b/pkg/kubelet/kuberuntime/kuberuntime_image.go index 39af9041573..635af7c73d3 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_image.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_image.go @@ -21,7 +21,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/credentialprovider" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util/parsers" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go index 5933961c8e2..7818e85475f 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_image_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_image_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/credentialprovider" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_logs.go b/pkg/kubelet/kuberuntime/kuberuntime_logs.go index fb8acba27c7..7a4526c0b10 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_logs.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_logs.go @@ -32,7 +32,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/util/tail" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 2e05ec02ca4..db389dd08a1 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1/ref" "k8s.io/kubernetes/pkg/credentialprovider" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/images" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index 73ac6499f4a..8ad095858f2 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/credentialprovider" apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go index cef10110bde..b9f07420572 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" kubetypes "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go index 58231ae8f79..5eed14a8dbe 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" ) diff --git a/pkg/kubelet/kuberuntime/security_context.go b/pkg/kubelet/kuberuntime/security_context.go index 6c76db9639d..9f9f047fdbc 100644 --- a/pkg/kubelet/kuberuntime/security_context.go +++ b/pkg/kubelet/kuberuntime/security_context.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/kubelet/remote/BUILD b/pkg/kubelet/remote/BUILD index fabc990175c..19da135ed5b 100644 --- a/pkg/kubelet/remote/BUILD +++ b/pkg/kubelet/remote/BUILD @@ -18,7 +18,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/util:go_default_library", "//pkg/util/exec:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/kubelet/remote/remote_image.go b/pkg/kubelet/remote/remote_image.go index 3ad26db52e4..f0f0eb00fa1 100644 --- a/pkg/kubelet/remote/remote_image.go +++ b/pkg/kubelet/remote/remote_image.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util" ) diff --git a/pkg/kubelet/remote/remote_runtime.go b/pkg/kubelet/remote/remote_runtime.go index e7f57bca4e9..096ef32be5a 100644 --- a/pkg/kubelet/remote/remote_runtime.go +++ b/pkg/kubelet/remote/remote_runtime.go @@ -26,7 +26,7 @@ import ( "google.golang.org/grpc" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util" utilexec "k8s.io/kubernetes/pkg/util/exec" ) diff --git a/pkg/kubelet/remote/utils.go b/pkg/kubelet/remote/utils.go index 05362bd3d42..47a37fd09ae 100644 --- a/pkg/kubelet/remote/utils.go +++ b/pkg/kubelet/remote/utils.go @@ -22,7 +22,7 @@ import ( "golang.org/x/net/context" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // getContextWithTimeout returns a context with timeout. diff --git a/pkg/kubelet/rktshim/BUILD b/pkg/kubelet/rktshim/BUILD index 15815ce5a0f..57a301aea63 100644 --- a/pkg/kubelet/rktshim/BUILD +++ b/pkg/kubelet/rktshim/BUILD @@ -20,7 +20,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/util/ioutils:go_default_library", ], ) @@ -30,7 +30,7 @@ go_test( srcs = ["imagestore_test.go"], library = ":go_default_library", tags = ["automanaged"], - deps = ["//pkg/kubelet/apis/cri/v1alpha1:go_default_library"], + deps = ["//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library"], ) filegroup( diff --git a/pkg/kubelet/rktshim/app-interface.go b/pkg/kubelet/rktshim/app-interface.go index 69042138ad6..b7d9ed3b784 100644 --- a/pkg/kubelet/rktshim/app-interface.go +++ b/pkg/kubelet/rktshim/app-interface.go @@ -20,7 +20,7 @@ import ( "time" kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // Runtime provides an API for lifecycle, inspection and introspection diff --git a/pkg/kubelet/rktshim/fake-app-interface.go b/pkg/kubelet/rktshim/fake-app-interface.go index 90ab152228e..ee6a89a6a28 100644 --- a/pkg/kubelet/rktshim/fake-app-interface.go +++ b/pkg/kubelet/rktshim/fake-app-interface.go @@ -24,7 +24,7 @@ import ( "time" kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" ) diff --git a/pkg/kubelet/rktshim/imagestore.go b/pkg/kubelet/rktshim/imagestore.go index 6eefbfe9a3b..0676c4d7f29 100644 --- a/pkg/kubelet/rktshim/imagestore.go +++ b/pkg/kubelet/rktshim/imagestore.go @@ -19,7 +19,7 @@ package rktshim import ( "errors" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // TODO(tmrts): Move these errors to the container API for code re-use. diff --git a/pkg/kubelet/rktshim/imagestore_test.go b/pkg/kubelet/rktshim/imagestore_test.go index e87b9591214..102523dfc0c 100644 --- a/pkg/kubelet/rktshim/imagestore_test.go +++ b/pkg/kubelet/rktshim/imagestore_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) var ( diff --git a/pkg/kubelet/rktshim/pod-level-interface.go b/pkg/kubelet/rktshim/pod-level-interface.go index 4301b0b916d..d6781d040ff 100644 --- a/pkg/kubelet/rktshim/pod-level-interface.go +++ b/pkg/kubelet/rktshim/pod-level-interface.go @@ -18,7 +18,7 @@ package rktshim import ( kubeletapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) // PodSandboxManager provides basic operations to create/delete and examine diff --git a/pkg/kubelet/server/streaming/BUILD b/pkg/kubelet/server/streaming/BUILD index 7af81bf0e7f..5fe94b594c1 100644 --- a/pkg/kubelet/server/streaming/BUILD +++ b/pkg/kubelet/server/streaming/BUILD @@ -17,7 +17,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//vendor/github.com/emicklei/go-restful:go_default_library", @@ -40,7 +40,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/server/portforward:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", diff --git a/pkg/kubelet/server/streaming/server.go b/pkg/kubelet/server/streaming/server.go index 3650fdeebac..875e444621f 100644 --- a/pkg/kubelet/server/streaming/server.go +++ b/pkg/kubelet/server/streaming/server.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" "k8s.io/client-go/tools/remotecommand" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/server/portforward" remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" ) diff --git a/pkg/kubelet/server/streaming/server_test.go b/pkg/kubelet/server/streaming/server_test.go index ca569137c2d..806ba01c986 100644 --- a/pkg/kubelet/server/streaming/server_test.go +++ b/pkg/kubelet/server/streaming/server_test.go @@ -34,7 +34,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" "k8s.io/kubernetes/pkg/api" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" ) diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index bbb9301383b..a0911002d74 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -32,7 +32,7 @@ go_library( "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", - "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", + "//pkg/kubelet/apis/cri/v1alpha1/runtime:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/remote:go_default_library", diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index 7b0db6de91e..a9bb73995ee 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/remote" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework"