Bumping k8s dependencies to 1.13

vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack/BUILD

@@ -13,53 +13,20 @@ go_library(
         "cloudstack_instances.go",
         "cloudstack_loadbalancer.go",
         "metadata.go",
-    ] + select({
-        "@io_bazel_rules_go//go/platform:android": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:darwin": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:dragonfly": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:freebsd": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:linux": [
-            "metadata_linux.go",
-        ],
-        "@io_bazel_rules_go//go/platform:nacl": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:netbsd": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:openbsd": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:plan9": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:solaris": [
-            "metadata_other.go",
-        ],
-        "@io_bazel_rules_go//go/platform:windows": [
-            "metadata_other.go",
-        ],
-        "//conditions:default": [],
-    }),
+        "metadata_linux.go",
+        "metadata_other.go",
+    ],
     importpath = "k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack",
     deps = [
         "//pkg/cloudprovider:go_default_library",
         "//pkg/controller:go_default_library",
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/github.com/d2g/dhcp4:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/kardianos/osext:go_default_library",
         "//vendor/github.com/xanzy/go-cloudstack/cloudstack:go_default_library",
         "//vendor/gopkg.in/gcfg.v1:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:android": [
             "//vendor/github.com/d2g/dhcp4client:go_default_library",
@@ -103,8 +70,8 @@ go_test(
     srcs = ["cloudstack_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1: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",
     ],
 )
 

vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack/cloudstack_instances.go

@@ -69,6 +69,10 @@ func (cs *CSCloud) nodeAddresses(instance *cloudstack.VirtualMachine) ([]v1.Node
 		{Type: v1.NodeInternalIP, Address: instance.Nic[0].Ipaddress},
 	}
 
+	if instance.Hostname != "" {
+		addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: instance.Hostname})
+	}
+
 	if instance.Publicip != "" {
 		addresses = append(addresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: instance.Publicip})
 	} else {

vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack/cloudstack_loadbalancer.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/xanzy/go-cloudstack/cloudstack"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 )
@@ -238,11 +239,16 @@ func (cs *CSCloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName st
 	return nil
 }
 
+// GetLoadBalancerName retrieves the name of the LoadBalancer.
+func (cs *CSCloud) GetLoadBalancerName(ctx context.Context, clusterName string, service *v1.Service) string {
+	return cloudprovider.DefaultLoadBalancerName(service)
+}
+
 // getLoadBalancer retrieves the IP address and ID and all the existing rules it can find.
 func (cs *CSCloud) getLoadBalancer(service *v1.Service) (*loadBalancer, error) {
 	lb := &loadBalancer{
 		CloudStackClient: cs.client,
-		name:             cloudprovider.GetLoadBalancerName(service),
+		name:             cs.GetLoadBalancerName(context.TODO(), "", service),
 		projectID:        cs.projectID,
 		rules:            make(map[string]*cloudstack.LoadBalancerRule),
 	}

vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack/metadata.go

@@ -39,6 +39,7 @@ type metadata struct {
 type metadataType string
 
 const (
+	metadataTypeHostname     metadataType = "local-hostname"
 	metadataTypeExternalIP   metadataType = "public-ipv4"
 	metadataTypeInternalIP   metadataType = "local-ipv4"
 	metadataTypeInstanceID   metadataType = "instance-id"
@@ -58,10 +59,20 @@ func (m *metadata) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1
 		return nil, fmt.Errorf("could not get internal IP: %v", err)
 	}
 
-	return []v1.NodeAddress{
+	addresses := []v1.NodeAddress{
 		{Type: v1.NodeExternalIP, Address: externalIP},
 		{Type: v1.NodeInternalIP, Address: internalIP},
-	}, nil
+	}
+
+	hostname, err := m.get(metadataTypeHostname)
+	if err != nil {
+		return nil, fmt.Errorf("could not get hostname: %v", err)
+	}
+	if hostname != "" {
+		addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: hostname})
+	}
+
+	return addresses, nil
 }
 
 // NodeAddressesByProviderID returns the addresses of the specified instance.