Bumping k8s dependencies to 1.13
This commit is contained in:
20
vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go
generated
vendored
20
vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go
generated
vendored
@@ -26,6 +26,7 @@ import (
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -52,7 +53,10 @@ import (
|
||||
|
||||
const (
|
||||
// ProviderName is the name of the openstack provider
|
||||
ProviderName = "openstack"
|
||||
ProviderName = "openstack"
|
||||
|
||||
// TypeHostName is the name type of openstack instance
|
||||
TypeHostName = "hostname"
|
||||
availabilityZone = "availability_zone"
|
||||
defaultTimeOut = 60 * time.Second
|
||||
)
|
||||
@@ -497,6 +501,15 @@ func nodeAddresses(srv *servers.Server) ([]v1.NodeAddress, error) {
|
||||
)
|
||||
}
|
||||
|
||||
if srv.Metadata[TypeHostName] != "" {
|
||||
v1helper.AddToNodeAddresses(&addrs,
|
||||
v1.NodeAddress{
|
||||
Type: v1.NodeHostName,
|
||||
Address: srv.Metadata[TypeHostName],
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
return addrs, nil
|
||||
}
|
||||
|
||||
@@ -573,6 +586,11 @@ func (os *OpenStack) HasClusterID() bool {
|
||||
func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
|
||||
glog.V(4).Info("openstack.LoadBalancer() called")
|
||||
|
||||
if reflect.DeepEqual(os.lbOpts, LoadBalancerOpts{}) {
|
||||
glog.V(4).Info("LoadBalancer section is empty/not defined in cloud-config")
|
||||
return nil, false
|
||||
}
|
||||
|
||||
network, err := os.NewNetworkV2()
|
||||
if err != nil {
|
||||
return nil, false
|
||||
|
||||
Reference in New Issue
Block a user