From d216ebef73606b5679f032aca4443dce945a0f12 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Tue, 24 Jan 2017 15:59:06 +0100
Subject: [PATCH] pkg/util: move proxy into k8s.io/apiserver

---
 .../registry/generic/rest/proxy.go            |  2 +-
 .../registry/generic/rest/proxy_test.go       |  2 +-
 pkg/util/proxy/BUILD                          | 51 -------------------
 .../k8s.io/apiserver/pkg}/util/proxy/dial.go  |  0
 .../apiserver/pkg}/util/proxy/dial_test.go    |  0
 .../k8s.io/apiserver/pkg}/util/proxy/doc.go   |  2 +-
 .../apiserver/pkg}/util/proxy/transport.go    |  0
 .../pkg}/util/proxy/transport_test.go         |  0
 8 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 pkg/util/proxy/BUILD
 rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/proxy/dial.go (100%)
 rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/proxy/dial_test.go (100%)
 rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/proxy/doc.go (91%)
 rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/proxy/transport.go (100%)
 rename {pkg => staging/src/k8s.io/apiserver/pkg}/util/proxy/transport_test.go (100%)

diff --git a/pkg/genericapiserver/registry/generic/rest/proxy.go b/pkg/genericapiserver/registry/generic/rest/proxy.go
index 3bf655ddb35..58e2911c258 100644
--- a/pkg/genericapiserver/registry/generic/rest/proxy.go
+++ b/pkg/genericapiserver/registry/generic/rest/proxy.go
@@ -34,8 +34,8 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	genericfeatures "k8s.io/apiserver/pkg/features"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	"k8s.io/apiserver/pkg/util/proxy"
 	"k8s.io/kubernetes/pkg/util/httpstream"
-	"k8s.io/kubernetes/pkg/util/proxy"
 
 	"github.com/golang/glog"
 	"github.com/mxk/go-flowrate/flowrate"
diff --git a/pkg/genericapiserver/registry/generic/rest/proxy_test.go b/pkg/genericapiserver/registry/generic/rest/proxy_test.go
index 471b9aebe21..f6c9f4bd176 100644
--- a/pkg/genericapiserver/registry/generic/rest/proxy_test.go
+++ b/pkg/genericapiserver/registry/generic/rest/proxy_test.go
@@ -44,8 +44,8 @@ import (
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apiserver/pkg/features"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	"k8s.io/apiserver/pkg/util/proxy"
 	"k8s.io/kubernetes/pkg/util/httpstream"
-	"k8s.io/kubernetes/pkg/util/proxy"
 )
 
 const fakeStatusCode = 567
diff --git a/pkg/util/proxy/BUILD b/pkg/util/proxy/BUILD
deleted file mode 100644
index 31a6b815f84..00000000000
--- a/pkg/util/proxy/BUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "dial.go",
-        "doc.go",
-        "transport.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//third_party/forked/golang/netutil:go_default_library",
-        "//vendor:github.com/golang/glog",
-        "//vendor:golang.org/x/net/html",
-        "//vendor:golang.org/x/net/html/atom",
-        "//vendor:k8s.io/apimachinery/pkg/util/net",
-        "//vendor:k8s.io/apimachinery/pkg/util/sets",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "dial_test.go",
-        "transport_test.go",
-    ],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = ["//vendor:k8s.io/apimachinery/pkg/util/net"],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)
diff --git a/pkg/util/proxy/dial.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/dial.go
similarity index 100%
rename from pkg/util/proxy/dial.go
rename to staging/src/k8s.io/apiserver/pkg/util/proxy/dial.go
diff --git a/pkg/util/proxy/dial_test.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/dial_test.go
similarity index 100%
rename from pkg/util/proxy/dial_test.go
rename to staging/src/k8s.io/apiserver/pkg/util/proxy/dial_test.go
diff --git a/pkg/util/proxy/doc.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
similarity index 91%
rename from pkg/util/proxy/doc.go
rename to staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
index eb741e65044..0b212f3daff 100644
--- a/pkg/util/proxy/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/doc.go
@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package proxy provides transport and upgrade support for proxies
-package proxy // import "k8s.io/kubernetes/pkg/util/proxy"
+package proxy // import "k8s.io/apiserver/pkg/util/proxy"
diff --git a/pkg/util/proxy/transport.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/transport.go
similarity index 100%
rename from pkg/util/proxy/transport.go
rename to staging/src/k8s.io/apiserver/pkg/util/proxy/transport.go
diff --git a/pkg/util/proxy/transport_test.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/transport_test.go
similarity index 100%
rename from pkg/util/proxy/transport_test.go
rename to staging/src/k8s.io/apiserver/pkg/util/proxy/transport_test.go