start the apimachinery repo

2026-01-06 07:57:35 +00:00 · 2017-01-11 09:09:48 -05:00
parent 98acd800da
commit 6a4d5cd7cc
2853 changed files with 51100 additions and 9519 deletions
--- a/pkg/proxy/BUILD
+++ b/pkg/proxy/BUILD
@@ -16,7 +16,7 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//pkg/api:go_default_library",
-        "//pkg/types:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/types",
    ],
 )

--- a/pkg/proxy/config/BUILD
+++ b/pkg/proxy/config/BUILD
@@ -20,10 +20,10 @@ go_library(
        "//pkg/api:go_default_library",
        "//pkg/client/cache:go_default_library",
        "//pkg/fields:go_default_library",
-        "//pkg/types:go_default_library",
        "//pkg/util/config:go_default_library",
        "//vendor:github.com/davecgh/go-spew/spew",
        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/types",
    ],
 )

@@ -36,8 +36,8 @@ go_test(
        "//pkg/api:go_default_library",
        "//pkg/api/v1:go_default_library",
        "//pkg/client/cache:go_default_library",
-        "//pkg/runtime:go_default_library",
-        "//pkg/watch:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/watch",
    ],
 )

@@ -48,7 +48,7 @@ go_test(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy/config:go_default_library",
-        "//pkg/util/wait:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
    ],
 )

--- a/pkg/proxy/config/api_test.go
+++ b/pkg/proxy/config/api_test.go
@@ -20,11 +20,11 @@ import (
 	"testing"
 	"time"

+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
-	"k8s.io/kubernetes/pkg/runtime"
-	"k8s.io/kubernetes/pkg/watch"
 )

 type fakeLW struct {
--- a/pkg/proxy/config/config.go
+++ b/pkg/proxy/config/config.go
@@ -21,8 +21,8 @@ import (

 	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/config"
 )

--- a/pkg/proxy/config/config_test.go
+++ b/pkg/proxy/config/config_test.go
@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"

+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/api"
 	. "k8s.io/kubernetes/pkg/proxy/config"
-	"k8s.io/kubernetes/pkg/util/wait"
 )

 const TomcatPort int = 8080
--- a/pkg/proxy/healthcheck/BUILD
+++ b/pkg/proxy/healthcheck/BUILD
@@ -21,10 +21,10 @@ go_library(
    tags = ["automanaged"],
    deps = [
        "//pkg/client/cache:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/sets:go_default_library",
-        "//pkg/util/wait:go_default_library",
        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/sets",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
    ],
 )

@@ -34,8 +34,8 @@ go_test(
    library = ":go_default_library",
    tags = ["automanaged"],
    deps = [
-        "//pkg/types:go_default_library",
-        "//pkg/util/sets:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/sets",
    ],
 )

--- a/pkg/proxy/healthcheck/api.go
+++ b/pkg/proxy/healthcheck/api.go
@@ -17,9 +17,9 @@ limitations under the License.
 package healthcheck

 import (
-	"k8s.io/kubernetes/pkg/types"
-	"k8s.io/kubernetes/pkg/util/sets"
-	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/util/wait"
 )

 // All public API Methods for this package
--- a/pkg/proxy/healthcheck/healthcheck.go
+++ b/pkg/proxy/healthcheck/healthcheck.go
@@ -22,9 +22,9 @@ import (
 	"net/http"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/client/cache"
-	"k8s.io/kubernetes/pkg/types"
-	"k8s.io/kubernetes/pkg/util/sets"
 )

 // proxyMutationRequest: Message to request addition/deletion of endpoints for a service
--- a/pkg/proxy/healthcheck/healthcheck_test.go
+++ b/pkg/proxy/healthcheck/healthcheck_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 	"time"

-	"k8s.io/kubernetes/pkg/types"
-	"k8s.io/kubernetes/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 )

 type TestCaseData struct {
--- a/pkg/proxy/iptables/BUILD
+++ b/pkg/proxy/iptables/BUILD
@@ -19,17 +19,17 @@ go_library(
        "//pkg/client/record:go_default_library",
        "//pkg/proxy:go_default_library",
        "//pkg/proxy/healthcheck:go_default_library",
-        "//pkg/types:go_default_library",
        "//pkg/util/config:go_default_library",
        "//pkg/util/exec:go_default_library",
        "//pkg/util/flowcontrol:go_default_library",
        "//pkg/util/iptables:go_default_library",
-        "//pkg/util/sets:go_default_library",
        "//pkg/util/slice:go_default_library",
        "//pkg/util/sysctl:go_default_library",
        "//pkg/util/version:go_default_library",
        "//vendor:github.com/davecgh/go-spew/spew",
        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/sets",
    ],
 )

@@ -41,10 +41,10 @@ go_test(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy:go_default_library",
-        "//pkg/types:go_default_library",
        "//pkg/util/exec:go_default_library",
        "//pkg/util/iptables:go_default_library",
        "//pkg/util/iptables/testing:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/types",
    ],
 )

--- a/pkg/proxy/iptables/proxier.go
+++ b/pkg/proxy/iptables/proxier.go
@@ -34,18 +34,18 @@ import (

 	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/api"
 	apiservice "k8s.io/kubernetes/pkg/api/service"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/client/record"
 	"k8s.io/kubernetes/pkg/proxy"
 	"k8s.io/kubernetes/pkg/proxy/healthcheck"
-	"k8s.io/kubernetes/pkg/types"
 	featuregate "k8s.io/kubernetes/pkg/util/config"
 	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	"k8s.io/kubernetes/pkg/util/flowcontrol"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
-	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/slice"
 	utilsysctl "k8s.io/kubernetes/pkg/util/sysctl"
 	utilversion "k8s.io/kubernetes/pkg/util/version"
--- a/pkg/proxy/iptables/proxier_test.go
+++ b/pkg/proxy/iptables/proxier_test.go
@@ -23,9 +23,9 @@ import (
 	"net"
 	"strings"

+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/exec"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	iptablestest "k8s.io/kubernetes/pkg/util/iptables/testing"
--- a/pkg/proxy/types.go
+++ b/pkg/proxy/types.go
@@ -19,8 +19,8 @@ package proxy
 import (
 	"fmt"

+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/types"
 )

 // ProxyProvider is the interface provided by proxier implementations.
--- a/pkg/proxy/userspace/BUILD
+++ b/pkg/proxy/userspace/BUILD
@@ -23,14 +23,14 @@ go_library(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/errors:go_default_library",
        "//pkg/util/iptables:go_default_library",
-        "//pkg/util/net:go_default_library",
-        "//pkg/util/runtime:go_default_library",
        "//pkg/util/slice:go_default_library",
-        "//pkg/util/wait:go_default_library",
        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/errors",
+        "//vendor:k8s.io/apimachinery/pkg/util/net",
+        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
    ],
 )

@@ -46,10 +46,10 @@ go_test(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy:go_default_library",
-        "//pkg/types:go_default_library",
        "//pkg/util/iptables/testing:go_default_library",
-        "//pkg/util/net:go_default_library",
-        "//pkg/util/runtime:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/net",
+        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
    ],
 )

--- a/pkg/proxy/userspace/port_allocator.go
+++ b/pkg/proxy/userspace/port_allocator.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"

-	"k8s.io/kubernetes/pkg/util/net"
-	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/wait"
 )

 var (
--- a/pkg/proxy/userspace/port_allocator_test.go
+++ b/pkg/proxy/userspace/port_allocator_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"

-	"k8s.io/kubernetes/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/net"
 )

 func TestRangeAllocatorEmpty(t *testing.T) {
--- a/pkg/proxy/userspace/proxier.go
+++ b/pkg/proxy/userspace/proxier.go
@@ -26,14 +26,14 @@ import (
 	"time"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
-	utilnet "k8s.io/kubernetes/pkg/util/net"

-	utilerrors "k8s.io/kubernetes/pkg/util/errors"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/util/iptables"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 type portal struct {
--- a/pkg/proxy/userspace/proxier_test.go
+++ b/pkg/proxy/userspace/proxier_test.go
@@ -29,11 +29,11 @@ import (
 	"testing"
 	"time"

+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 	ipttest "k8s.io/kubernetes/pkg/util/iptables/testing"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 const (
--- a/pkg/proxy/userspace/proxysocket.go
+++ b/pkg/proxy/userspace/proxysocket.go
@@ -26,9 +26,9 @@ import (
 	"time"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 // Abstraction over TCP/UDP sockets which are proxied.
--- a/pkg/proxy/userspace/roundrobin.go
+++ b/pkg/proxy/userspace/roundrobin.go
@@ -26,9 +26,9 @@ import (
 	"time"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/slice"
 )

--- a/pkg/proxy/userspace/roundrobin_test.go
+++ b/pkg/proxy/userspace/roundrobin_test.go
@@ -20,9 +20,9 @@ import (
 	"net"
 	"testing"

+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 )

 func TestValidateWorks(t *testing.T) {
--- a/pkg/proxy/winuserspace/BUILD
+++ b/pkg/proxy/winuserspace/BUILD
@@ -22,14 +22,14 @@ go_library(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/errors:go_default_library",
-        "//pkg/util/net:go_default_library",
        "//pkg/util/netsh:go_default_library",
-        "//pkg/util/runtime:go_default_library",
        "//pkg/util/slice:go_default_library",
-        "//pkg/util/wait:go_default_library",
        "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/errors",
+        "//vendor:k8s.io/apimachinery/pkg/util/net",
+        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
+        "//vendor:k8s.io/apimachinery/pkg/util/wait",
    ],
 )

@@ -45,10 +45,10 @@ go_test(
    deps = [
        "//pkg/api:go_default_library",
        "//pkg/proxy:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/net:go_default_library",
        "//pkg/util/netsh/testing:go_default_library",
-        "//pkg/util/runtime:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/types",
+        "//vendor:k8s.io/apimachinery/pkg/util/net",
+        "//vendor:k8s.io/apimachinery/pkg/util/runtime",
    ],
 )

--- a/pkg/proxy/winuserspace/port_allocator.go
+++ b/pkg/proxy/winuserspace/port_allocator.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"

-	"k8s.io/kubernetes/pkg/util/net"
-	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/wait"
 )

 var (
--- a/pkg/proxy/winuserspace/port_allocator_test.go
+++ b/pkg/proxy/winuserspace/port_allocator_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"

-	"k8s.io/kubernetes/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/net"
 )

 func TestRangeAllocatorEmpty(t *testing.T) {
--- a/pkg/proxy/winuserspace/proxier.go
+++ b/pkg/proxy/winuserspace/proxier.go
@@ -27,13 +27,13 @@ import (

 	"github.com/golang/glog"

+	"k8s.io/apimachinery/pkg/types"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
-	utilerrors "k8s.io/kubernetes/pkg/util/errors"
-	utilnet "k8s.io/kubernetes/pkg/util/net"
 	"k8s.io/kubernetes/pkg/util/netsh"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 type portal struct {
--- a/pkg/proxy/winuserspace/proxier_test.go
+++ b/pkg/proxy/winuserspace/proxier_test.go
@@ -29,11 +29,11 @@ import (
 	"testing"
 	"time"

+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 	netshtest "k8s.io/kubernetes/pkg/util/netsh/testing"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 const (
--- a/pkg/proxy/winuserspace/proxysocket.go
+++ b/pkg/proxy/winuserspace/proxysocket.go
@@ -26,9 +26,9 @@ import (
 	"time"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/util/runtime"
 )

 // Abstraction over TCP/UDP sockets which are proxied.
--- a/pkg/proxy/winuserspace/roundrobin.go
+++ b/pkg/proxy/winuserspace/roundrobin.go
@@ -26,9 +26,9 @@ import (
 	"time"

 	"github.com/golang/glog"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 	"k8s.io/kubernetes/pkg/util/slice"
 )

--- a/pkg/proxy/winuserspace/roundrobin_test.go
+++ b/pkg/proxy/winuserspace/roundrobin_test.go
@@ -20,9 +20,9 @@ import (
 	"net"
 	"testing"

+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/proxy"
-	"k8s.io/kubernetes/pkg/types"
 )

 func TestValidateWorks(t *testing.T) {