Bumping k8s dependencies to 1.13

vendor/k8s.io/kubernetes/pkg/proxy/util/BUILD

@@ -11,14 +11,13 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/proxy/util",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/apis/core:go_default_library",
-        "//pkg/apis/core/helper:go_default_library",
+        "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/util/net:go_default_library",
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//staging/src/k8s.io/client-go/tools/record:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/client-go/tools/record:go_default_library",
     ],
 )
 
@@ -31,11 +30,11 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/apis/core:go_default_library",
         "//pkg/proxy/util/testing:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
     ],
 )
 

vendor/k8s.io/kubernetes/pkg/proxy/util/endpoints_test.go

@@ -50,6 +50,58 @@ func TestIPPart(t *testing.T) {
 	}
 }
 
+func TestPortPart(t *testing.T) {
+	tests := []struct {
+		name     string
+		endpoint string
+		want     int
+		wantErr  bool
+	}{
+		{
+			"no error parsing from ipv4-ip:port",
+			"1.2.3.4:1024",
+			1024,
+			false,
+		},
+		{
+			"no error parsing from ipv6-ip:port",
+			"[2001:db8::2:2]:9999",
+			9999,
+			false,
+		},
+		{
+			"error: missing port",
+			"1.2.3.4",
+			-1,
+			true,
+		},
+		{
+			"error: invalid port '1-2'",
+			"1.2.3.4:1-2",
+			-1,
+			true,
+		},
+		{
+			"error: invalid port 'port'",
+			"100.200.3.4:port",
+			-1,
+			true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := PortPart(tt.endpoint)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("PortPart() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("PortPart() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func TestToCIDR(t *testing.T) {
 	testCases := []struct {
 		ip           string

vendor/k8s.io/kubernetes/pkg/proxy/util/port_test.go

@@ -38,6 +38,8 @@ func TestLocalPortString(t *testing.T) {
 		{"IPv4 UDP", "1.2.3.4", 9999, "udp", "\"IPv4 UDP\" (1.2.3.4:9999/udp)"},
 		{"IPv4 TCP", "5.6.7.8", 1053, "tcp", "\"IPv4 TCP\" (5.6.7.8:1053/tcp)"},
 		{"IPv6 TCP", "2001:db8::1", 80, "tcp", "\"IPv6 TCP\" ([2001:db8::1]:80/tcp)"},
+		{"IPv4 SCTP", "9.10.11.12", 7777, "sctp", "\"IPv4 SCTP\" (9.10.11.12:7777/sctp)"},
+		{"IPv6 SCTP", "2001:db8::2", 80, "sctp", "\"IPv6 SCTP\" ([2001:db8::2]:80/sctp)"},
 	}
 
 	for _, tc := range testCases {

vendor/k8s.io/kubernetes/pkg/proxy/util/utils.go

@@ -24,8 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/record"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/core/helper"
+	helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	utilnet "k8s.io/kubernetes/pkg/util/net"
 
 	"github.com/golang/glog"
@@ -60,14 +59,14 @@ func IsLocalIP(ip string) (bool, error) {
 	return false, nil
 }
 
-func ShouldSkipService(svcName types.NamespacedName, service *api.Service) bool {
+func ShouldSkipService(svcName types.NamespacedName, service *v1.Service) bool {
 	// if ClusterIP is "None" or empty, skip proxying
 	if !helper.IsServiceIPSet(service) {
 		glog.V(3).Infof("Skipping service %s due to clusterIP = %q", svcName, service.Spec.ClusterIP)
 		return true
 	}
 	// Even if ClusterIP is set, ServiceTypeExternalName services don't get proxied
-	if service.Spec.Type == api.ServiceTypeExternalName {
+	if service.Spec.Type == v1.ServiceTypeExternalName {
 		glog.V(3).Infof("Skipping service %s due to Type=ExternalName", svcName)
 		return true
 	}

vendor/k8s.io/kubernetes/pkg/proxy/util/utils_test.go

@@ -20,25 +20,25 @@ import (
 	"net"
 	"testing"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
-	api "k8s.io/kubernetes/pkg/apis/core"
 	fake "k8s.io/kubernetes/pkg/proxy/util/testing"
 )
 
 func TestShouldSkipService(t *testing.T) {
 	testCases := []struct {
-		service    *api.Service
+		service    *v1.Service
 		svcName    types.NamespacedName
 		shouldSkip bool
 	}{
 		{
 			// Cluster IP is None
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
-					ClusterIP: api.ClusterIPNone,
+				Spec: v1.ServiceSpec{
+					ClusterIP: v1.ClusterIPNone,
 				},
 			},
 			svcName:    types.NamespacedName{Namespace: "foo", Name: "bar"},
@@ -46,9 +46,9 @@ func TestShouldSkipService(t *testing.T) {
 		},
 		{
 			// Cluster IP is empty
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
+				Spec: v1.ServiceSpec{
 					ClusterIP: "",
 				},
 			},
@@ -57,11 +57,11 @@ func TestShouldSkipService(t *testing.T) {
 		},
 		{
 			// ExternalName type service
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
+				Spec: v1.ServiceSpec{
 					ClusterIP: "1.2.3.4",
-					Type:      api.ServiceTypeExternalName,
+					Type:      v1.ServiceTypeExternalName,
 				},
 			},
 			svcName:    types.NamespacedName{Namespace: "foo", Name: "bar"},
@@ -69,11 +69,11 @@ func TestShouldSkipService(t *testing.T) {
 		},
 		{
 			// ClusterIP type service with ClusterIP set
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
+				Spec: v1.ServiceSpec{
 					ClusterIP: "1.2.3.4",
-					Type:      api.ServiceTypeClusterIP,
+					Type:      v1.ServiceTypeClusterIP,
 				},
 			},
 			svcName:    types.NamespacedName{Namespace: "foo", Name: "bar"},
@@ -81,11 +81,11 @@ func TestShouldSkipService(t *testing.T) {
 		},
 		{
 			// NodePort type service with ClusterIP set
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
+				Spec: v1.ServiceSpec{
 					ClusterIP: "1.2.3.4",
-					Type:      api.ServiceTypeNodePort,
+					Type:      v1.ServiceTypeNodePort,
 				},
 			},
 			svcName:    types.NamespacedName{Namespace: "foo", Name: "bar"},
@@ -93,11 +93,11 @@ func TestShouldSkipService(t *testing.T) {
 		},
 		{
 			// LoadBalancer type service with ClusterIP set
-			service: &api.Service{
+			service: &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
-				Spec: api.ServiceSpec{
+				Spec: v1.ServiceSpec{
 					ClusterIP: "1.2.3.4",
-					Type:      api.ServiceTypeLoadBalancer,
+					Type:      v1.ServiceTypeLoadBalancer,
 				},
 			},
 			svcName:    types.NamespacedName{Namespace: "foo", Name: "bar"},