From 6007c354a6e3514ee28f717658b6233b8aaa815b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:23:45 -0400 Subject: [PATCH] Copy kubernetes/pkg/kubelet/util Signed-off-by: Davanum Srinivas --- integration/main_test.go | 4 ++-- .../pkg/kubelet => integration}/util/boottime_util_darwin.go | 0 .../pkg/kubelet => integration}/util/boottime_util_linux.go | 0 .../k8s.io/kubernetes/pkg/kubelet => integration}/util/doc.go | 2 +- .../kubernetes/pkg/kubelet => integration}/util/util.go | 0 .../kubernetes/pkg/kubelet => integration}/util/util_unix.go | 0 .../pkg/kubelet => integration}/util/util_unsupported.go | 0 .../pkg/kubelet => integration}/util/util_windows.go | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/boottime_util_darwin.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/boottime_util_linux.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/doc.go (91%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_unix.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/kubelet => integration}/util/util_windows.go (100%) diff --git a/integration/main_test.go b/integration/main_test.go index a03fe99c1..4f04e4261 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" - kubeletutil "k8s.io/kubernetes/pkg/kubelet/util" "github.com/containerd/cri/integration/remote" + dialer "github.com/containerd/cri/integration/util" criconfig "github.com/containerd/cri/pkg/config" "github.com/containerd/cri/pkg/constants" "github.com/containerd/cri/pkg/server" @@ -346,7 +346,7 @@ func PidOf(name string) (int, error) { // RawRuntimeClient returns a raw grpc runtime service client. func RawRuntimeClient() (runtime.RuntimeServiceClient, error) { - addr, dialer, err := kubeletutil.GetAddressAndDialer(*criEndpoint) + addr, dialer, err := dialer.GetAddressAndDialer(*criEndpoint) if err != nil { return nil, errors.Wrap(err, "failed to get dialer") } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_darwin.go b/integration/util/boottime_util_darwin.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_darwin.go rename to integration/util/boottime_util_darwin.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_linux.go b/integration/util/boottime_util_linux.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_linux.go rename to integration/util/boottime_util_linux.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go b/integration/util/doc.go similarity index 91% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go rename to integration/util/doc.go index eaccd63a3..0f119d2f5 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/util/doc.go +++ b/integration/util/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package util holds utility functions. -package util // import "k8s.io/kubernetes/pkg/kubelet/util" +package util diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util.go b/integration/util/util.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util.go rename to integration/util/util.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go b/integration/util/util_unix.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go rename to integration/util/util_unix.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unsupported.go b/integration/util/util_unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unsupported.go rename to integration/util/util_unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/util/util_windows.go b/integration/util/util_windows.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/util/util_windows.go rename to integration/util/util_windows.go