From bb828a9f841cc6d1a8630101f2dcfb3f624eac80 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:00:08 -0400 Subject: [PATCH] Make copy of pkg/kubelet/cri/remote Signed-off-by: Davanum Srinivas --- integration/main_test.go | 2 +- .../kubernetes/pkg/kubelet/cri => integration}/remote/doc.go | 0 .../pkg/kubelet/cri => integration}/remote/remote_image.go | 3 ++- .../pkg/kubelet/cri => integration}/remote/remote_runtime.go | 3 ++- .../pkg/kubelet/cri => integration}/remote/util/util_unix.go | 0 .../cri => integration}/remote/util/util_unsupported.go | 0 .../kubelet/cri => integration}/remote/util/util_windows.go | 0 .../kubernetes/pkg/kubelet/cri => integration}/remote/utils.go | 0 8 files changed, 5 insertions(+), 3 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/doc.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/remote_image.go (98%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/remote_runtime.go (99%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_unix.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/util/util_windows.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet/cri => integration}/remote/utils.go (100%) diff --git a/integration/main_test.go b/integration/main_test.go index d31583a12..a03fe99c1 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -36,9 +36,9 @@ import ( "google.golang.org/grpc" "k8s.io/cri-api/pkg/apis" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote" kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" + "github.com/containerd/cri/integration/remote" criconfig "github.com/containerd/cri/pkg/config" "github.com/containerd/cri/pkg/constants" "github.com/containerd/cri/pkg/server" diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/doc.go b/integration/remote/doc.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/doc.go rename to integration/remote/doc.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go b/integration/remote/remote_image.go similarity index 98% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go rename to integration/remote/remote_image.go index e8089f666..7e68b0fbb 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go +++ b/integration/remote/remote_image.go @@ -27,7 +27,8 @@ import ( internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote/util" + + "github.com/containerd/cri/integration/remote/util" ) // RemoteImageService is a gRPC implementation of internalapi.ImageManagerService. diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go b/integration/remote/remote_runtime.go similarity index 99% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go rename to integration/remote/remote_runtime.go index 24b6012b9..b8a2c28a4 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go +++ b/integration/remote/remote_runtime.go @@ -29,8 +29,9 @@ import ( "k8s.io/component-base/logs/logreduction" internalapi "k8s.io/cri-api/pkg/apis" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/cri/remote/util" utilexec "k8s.io/utils/exec" + + "github.com/containerd/cri/integration/remote/util" ) // RemoteRuntimeService is a gRPC implementation of internalapi.RuntimeService. diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unix.go b/integration/remote/util/util_unix.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unix.go rename to integration/remote/util/util_unix.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unsupported.go b/integration/remote/util/util_unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unsupported.go rename to integration/remote/util/util_unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_windows.go b/integration/remote/util/util_windows.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_windows.go rename to integration/remote/util/util_windows.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/utils.go b/integration/remote/utils.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/utils.go rename to integration/remote/utils.go