Merge branch 'master' into lb

Author: hyperbolic2346

cluster/addons/storage-class/openstack/default.yaml

@@ -1,4 +1,4 @@
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: standard

pkg/cloudprovider/providers/openstack/BUILD

@@ -39,10 +39,6 @@ go_library(
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers:go_default_library",
-        "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/members:go_default_library",
-        "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/monitors:go_default_library",
-        "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/pools:go_default_library",
-        "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/vips:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors:go_default_library",

pkg/cloudprovider/providers/openstack/metadata.go

@@ -52,7 +52,7 @@ const (
 	configDriveID = "configDrive"
 )
 
-var ErrBadMetadata = errors.New("Invalid OpenStack metadata, got empty uuid")
+var ErrBadMetadata = errors.New("invalid OpenStack metadata, got empty uuid")
 
 // Assumes the "2012-08-10" meta_data.json format.
 // See http://docs.openstack.org/user-guide/cli_config_drive.html
@@ -89,8 +89,7 @@ func getMetadataFromConfigDrive() (*Metadata, error) {
 			"-o", "device",
 		).CombinedOutput()
 		if err != nil {
-			glog.V(2).Infof("Unable to run blkid: %v", err)
-			return nil, err
+			return nil, fmt.Errorf("unable to run blkid: %v", err)
 		}
 		dev = strings.TrimSpace(string(out))
 	}
@@ -109,8 +108,7 @@ func getMetadataFromConfigDrive() (*Metadata, error) {
 		err = mounter.Mount(dev, mntdir, "vfat", []string{"ro"})
 	}
 	if err != nil {
-		glog.Errorf("Error mounting configdrive %s: %v", dev, err)
-		return nil, err
+		return nil, fmt.Errorf("error mounting configdrive %s: %v", dev, err)
 	}
 	defer mounter.Unmount(mntdir)
 
@@ -119,27 +117,24 @@ func getMetadataFromConfigDrive() (*Metadata, error) {
 	f, err := os.Open(
 		filepath.Join(mntdir, configDrivePath))
 	if err != nil {
-		glog.Errorf("Error reading %s on config drive: %v", configDrivePath, err)
-		return nil, err
+		return nil, fmt.Errorf("error reading %s on config drive: %v", configDrivePath, err)
 	}
 	defer f.Close()
 
 	return parseMetadata(f)
 }
 
 func getMetadataFromMetadataService() (*Metadata, error) {
-	// Try to get JSON from metdata server.
+	// Try to get JSON from metadata server.
 	glog.V(4).Infof("Attempting to fetch metadata from %s", metadataUrl)
 	resp, err := http.Get(metadataUrl)
 	if err != nil {
-		glog.V(3).Infof("Cannot read %s: %v", metadataUrl, err)
-		return nil, err
+		return nil, fmt.Errorf("error fetching %s: %v", metadataUrl, err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("Unexpected status code when reading metadata from %s: %s", metadataUrl, resp.Status)
-		glog.V(3).Infof("%v", err)
+		err = fmt.Errorf("unexpected status code when reading metadata from %s: %s", metadataUrl, resp.Status)
 		return nil, err
 	}
 

pkg/cloudprovider/providers/openstack/openstack.go

@@ -53,9 +53,9 @@ const (
 	defaultTimeOut   = 60 * time.Second
 )
 
-var ErrNotFound = errors.New("Failed to find object")
-var ErrMultipleResults = errors.New("Multiple results where only one expected")
-var ErrNoAddressFound = errors.New("No address found for host")
+var ErrNotFound = errors.New("failed to find object")
+var ErrMultipleResults = errors.New("multiple results where only one expected")
+var ErrNoAddressFound = errors.New("no address found for host")
 
 // encoding.TextUnmarshaler interface for time.Duration
 type MyDuration struct {
@@ -78,10 +78,11 @@ type LoadBalancer struct {
 }
 
 type LoadBalancerOpts struct {
-	LBVersion            string     `gcfg:"lb-version"`          // overrides autodetection. v1 or v2
+	LBVersion            string     `gcfg:"lb-version"`          // overrides autodetection. Only support v2.
 	SubnetId             string     `gcfg:"subnet-id"`           // overrides autodetection.
 	FloatingNetworkId    string     `gcfg:"floating-network-id"` // If specified, will create floating ip for loadbalancer, or do not create floating ip.
 	LBMethod             string     `gcfg:"lb-method"`           // default to ROUND_ROBIN.
+	LBProvider           string     `gcfg:"lb-provider"`
 	CreateMonitor        bool       `gcfg:"create-monitor"`
 	MonitorDelay         MyDuration `gcfg:"monitor-delay"`
 	MonitorTimeout       MyDuration `gcfg:"monitor-timeout"`
@@ -179,8 +180,7 @@ func (cfg Config) toAuth3Options() tokens3.AuthOptions {
 
 func readConfig(config io.Reader) (Config, error) {
 	if config == nil {
-		err := fmt.Errorf("no OpenStack cloud provider config file given")
-		return Config{}, err
+		return Config{}, fmt.Errorf("no OpenStack cloud provider config file given")
 	}
 
 	var cfg Config
@@ -507,39 +507,17 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
 		return nil, false
 	}
 
+	// LBaaS v1 is deprecated in the OpenStack Liberty release.
+	// Currently kubernetes OpenStack cloud provider just support LBaaS v2.
 	lbVersion := os.lbOpts.LBVersion
-	if lbVersion == "" {
-		// No version specified, try newest supported by server
-		netExts, err := networkExtensions(network)
-		if err != nil {
-			glog.Warningf("Failed to list neutron extensions: %v", err)
-			return nil, false
-		}
-
-		if netExts["lbaasv2"] {
-			lbVersion = "v2"
-		} else if netExts["lbaas"] {
-			lbVersion = "v1"
-		} else {
-			glog.Warningf("Failed to find neutron LBaaS extension (v1 or v2)")
-			return nil, false
-		}
-		glog.V(3).Infof("Using LBaaS extension %v", lbVersion)
+	if lbVersion != "" && lbVersion != "v2" {
+		glog.Warningf("Config error: currently only support LBaaS v2, unrecognised lb-version \"%v\"", lbVersion)
+		return nil, false
 	}
 
 	glog.V(1).Info("Claiming to support LoadBalancer")
 
-	if lbVersion == "v2" {
-		return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
-	} else if lbVersion == "v1" {
-		// Since LBaaS v1 is deprecated in the OpenStack Liberty release, so deprecate LBaaSV1 at V1.8, then remove LBaaSV1 after V1.9.
-		// Reference OpenStack doc:	https://docs.openstack.org/mitaka/networking-guide/config-lbaas.html
-		glog.Warningf("The LBaaS v1 of OpenStack cloud provider has been deprecated, Please use LBaaS v2")
-		return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
-	} else {
-		glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbVersion)
-		return nil, false
-	}
+	return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
 }
 
 func isNotFound(err error) bool {
@@ -549,7 +527,6 @@ func isNotFound(err error) bool {
 
 func (os *OpenStack) Zones() (cloudprovider.Zones, bool) {
 	glog.V(1).Info("Claiming to support Zones")
-
 	return os, true
 }
 
@@ -563,8 +540,7 @@ func (os *OpenStack) GetZone() (cloudprovider.Zone, error) {
 		FailureDomain: md.AvailabilityZone,
 		Region:        os.region,
 	}
-	glog.V(1).Infof("Current zone is %v", zone)
-
+	glog.V(4).Infof("Current zone is %v", zone)
 	return zone, nil
 }
 
@@ -592,7 +568,6 @@ func (os *OpenStack) GetZoneByProviderID(providerID string) (cloudprovider.Zone,
 		Region:        os.region,
 	}
 	glog.V(4).Infof("The instance %s in zone %v", srv.Name, zone)
-
 	return zone, nil
 }
 
@@ -618,7 +593,6 @@ func (os *OpenStack) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Z
 		Region:        os.region,
 	}
 	glog.V(4).Infof("The instance %s in zone %v", srv.Name, zone)
-
 	return zone, nil
 }
 
@@ -653,7 +627,6 @@ func (os *OpenStack) Routes() (cloudprovider.Routes, bool) {
 	}
 
 	glog.V(1).Info("Claiming to support Routes")
-
 	return r, true
 }
 
@@ -703,19 +676,18 @@ func (os *OpenStack) volumeService(forceVersion string) (volumeService, error) {
 		}
 	default:
 		err_txt := fmt.Sprintf("Config error: unrecognised bs-version \"%v\"", os.bsOpts.BSVersion)
-		glog.Warningf(err_txt)
 		return nil, errors.New(err_txt)
 	}
 }
 
 func checkMetadataSearchOrder(order string) error {
 	if order == "" {
-		return errors.New("Invalid value in section [Metadata] with key `search-order`. Value cannot be empty")
+		return errors.New("invalid value in section [Metadata] with key `search-order`. Value cannot be empty")
 	}
 
 	elements := strings.Split(order, ",")
 	if len(elements) > 2 {
-		return errors.New("Invalid value in section [Metadata] with key `search-order`. Value cannot contain more than 2 elements")
+		return errors.New("invalid value in section [Metadata] with key `search-order`. Value cannot contain more than 2 elements")
 	}
 
 	for _, id := range elements {
@@ -724,9 +696,8 @@ func checkMetadataSearchOrder(order string) error {
 		case configDriveID:
 		case metadataID:
 		default:
-			errTxt := "Invalid element '%s' found in section [Metadata] with key `search-order`." +
-				"Supported elements include '%s' and '%s'"
-			return fmt.Errorf(errTxt, id, configDriveID, metadataID)
+			return fmt.Errorf("invalid element %q found in section [Metadata] with key `search-order`."+
+				"Supported elements include %q and %q", id, configDriveID, metadataID)
 		}
 	}
 

pkg/cloudprovider/providers/openstack/openstack_client.go

@@ -17,19 +17,18 @@ limitations under the License.
 package openstack
 
 import (
+	"fmt"
+
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
-
-	"github.com/golang/glog"
 )
 
 func (os *OpenStack) NewNetworkV2() (*gophercloud.ServiceClient, error) {
 	network, err := openstack.NewNetworkV2(os.provider, gophercloud.EndpointOpts{
 		Region: os.region,
 	})
 	if err != nil {
-		glog.Warningf("Failed to find network v2 endpoint for region %s: %v", os.region, err)
-		return nil, err
+		return nil, fmt.Errorf("failed to find network v2 endpoint for region %s: %v", os.region, err)
 	}
 	return network, nil
 }
@@ -39,8 +38,7 @@ func (os *OpenStack) NewComputeV2() (*gophercloud.ServiceClient, error) {
 		Region: os.region,
 	})
 	if err != nil {
-		glog.Warningf("Failed to find compute v2 endpoint for region %s: %v", os.region, err)
-		return nil, err
+		return nil, fmt.Errorf("failed to find compute v2 endpoint for region %s: %v", os.region, err)
 	}
 	return compute, nil
 }
@@ -50,8 +48,7 @@ func (os *OpenStack) NewBlockStorageV1() (*gophercloud.ServiceClient, error) {
 		Region: os.region,
 	})
 	if err != nil {
-		glog.Errorf("Unable to initialize cinder v1 client for region %s: %v", os.region, err)
-		return nil, err
+		return nil, fmt.Errorf("unable to initialize cinder v1 client for region %s: %v", os.region, err)
 	}
 	return storage, nil
 }
@@ -61,8 +58,7 @@ func (os *OpenStack) NewBlockStorageV2() (*gophercloud.ServiceClient, error) {
 		Region: os.region,
 	})
 	if err != nil {
-		glog.Errorf("Unable to initialize cinder v2 client for region %s: %v", os.region, err)
-		return nil, err
+		return nil, fmt.Errorf("unable to initialize cinder v2 client for region %s: %v", os.region, err)
 	}
 	return storage, nil
 }

pkg/cloudprovider/providers/openstack/openstack_instances.go

@@ -116,7 +116,25 @@ func (i *Instances) ExternalID(name types.NodeName) (string, error) {
 // InstanceExistsByProviderID returns true if the instance with the given provider id still exists and is running.
 // If false is returned with no error, the instance will be immediately deleted by the cloud controller manager.
 func (i *Instances) InstanceExistsByProviderID(providerID string) (bool, error) {
-	return false, cloudprovider.NotImplemented
+	instanceID, err := instanceIDFromProviderID(providerID)
+	if err != nil {
+		return false, err
+	}
+
+	server, err := servers.Get(i.compute, instanceID).Extract()
+	if err != nil {
+		if isNotFound(err) {
+			return false, nil
+		}
+		return false, err
+	}
+
+	if server.Status != "ACTIVE" {
+		glog.Warningf("the instance %s is not active", instanceID)
+		return false, nil
+	}
+
+	return true, nil
 }
 
 // InstanceID returns the kubelet's cloud provider ID.