From e2072b71ccdbf62a38e5e1b583cd403c66cdf727 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 22 Jun 2020 14:20:57 -0400 Subject: [PATCH] Copy kubernetes/pkg/util/bandwidth Signed-off-by: Davanum Srinivas --- .../k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/doc.go | 2 +- .../kubernetes/pkg/util => pkg/server}/bandwidth/fake_shaper.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/interfaces.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/linux.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/unsupported.go | 0 .../kubernetes/pkg/util => pkg/server}/bandwidth/utils.go | 0 pkg/server/sandbox_run.go | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/doc.go (90%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/fake_shaper.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/interfaces.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/linux.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/unsupported.go (100%) rename {vendor/k8s.io/kubernetes/pkg/util => pkg/server}/bandwidth/utils.go (100%) diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go b/pkg/server/bandwidth/doc.go similarity index 90% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go rename to pkg/server/bandwidth/doc.go index 3c26aebbf..289b17fe2 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/doc.go +++ b/pkg/server/bandwidth/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package bandwidth provides utilities for bandwidth shaping -package bandwidth // import "k8s.io/kubernetes/pkg/util/bandwidth" +package bandwidth diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/fake_shaper.go b/pkg/server/bandwidth/fake_shaper.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/fake_shaper.go rename to pkg/server/bandwidth/fake_shaper.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/interfaces.go b/pkg/server/bandwidth/interfaces.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/interfaces.go rename to pkg/server/bandwidth/interfaces.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/linux.go b/pkg/server/bandwidth/linux.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/linux.go rename to pkg/server/bandwidth/linux.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/unsupported.go b/pkg/server/bandwidth/unsupported.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/unsupported.go rename to pkg/server/bandwidth/unsupported.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/bandwidth/utils.go b/pkg/server/bandwidth/utils.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/bandwidth/utils.go rename to pkg/server/bandwidth/utils.go diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go index 942388369..1fc92adbf 100644 --- a/pkg/server/sandbox_run.go +++ b/pkg/server/sandbox_run.go @@ -33,13 +33,13 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/net/context" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/util/bandwidth" "github.com/containerd/cri/pkg/annotations" criconfig "github.com/containerd/cri/pkg/config" customopts "github.com/containerd/cri/pkg/containerd/opts" ctrdutil "github.com/containerd/cri/pkg/containerd/util" "github.com/containerd/cri/pkg/netns" + "github.com/containerd/cri/pkg/server/bandwidth" sandboxstore "github.com/containerd/cri/pkg/store/sandbox" "github.com/containerd/cri/pkg/util" selinux "github.com/opencontainers/selinux/go-selinux"