Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 5cab8c1

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #52717 from FengyunPan/remove-LbassV1
Automatic merge from submit-queue (batch tested with PRs 52717, 54568, 54452, 53997, 54237). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. [OpenStack]Remove the LbaasV1 of OpenStack cloud provider The Neutron LbaasV1 has been declared obsolete, LbaasV2 is a better choice. So let's remove the codes of LbaasV1, only support LbaasV2. xref: #52609 Reference OpenStack doc: https://docs.openstack.org/mitaka/networking-guide/config-lbaas.html **Special notes for your reviewer**: /assign @dims /assign @anguslees **Release note**: ```release-note Remove the LbaasV1 of OpenStack cloud provider, currently only support LbaasV2. ```
2 parents 3dcdd70 + e3b888f commit 5cab8c1

3 files changed

Lines changed: 7 additions & 466 deletions

File tree

pkg/cloudprovider/providers/openstack/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ go_library(
3939
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions:go_default_library",
4040
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips:go_default_library",
4141
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers:go_default_library",
42-
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/members:go_default_library",
43-
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/monitors:go_default_library",
44-
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/pools:go_default_library",
45-
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas/vips:go_default_library",
4642
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/listeners:go_default_library",
4743
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/loadbalancers:go_default_library",
4844
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/lbaas_v2/monitors:go_default_library",

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ type LoadBalancer struct {
7878
}
7979

8080
type LoadBalancerOpts struct {
81-
LBVersion string `gcfg:"lb-version"` // overrides autodetection. v1 or v2
81+
LBVersion string `gcfg:"lb-version"` // overrides autodetection. Only support v2.
8282
SubnetId string `gcfg:"subnet-id"` // overrides autodetection.
8383
FloatingNetworkId string `gcfg:"floating-network-id"` // If specified, will create floating ip for loadbalancer, or do not create floating ip.
8484
LBMethod string `gcfg:"lb-method"` // default to ROUND_ROBIN.
@@ -507,39 +507,17 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
507507
return nil, false
508508
}
509509

510+
// LBaaS v1 is deprecated in the OpenStack Liberty release.
511+
// Currently kubernetes OpenStack cloud provider just support LBaaS v2.
510512
lbVersion := os.lbOpts.LBVersion
511-
if lbVersion == "" {
512-
// No version specified, try newest supported by server
513-
netExts, err := networkExtensions(network)
514-
if err != nil {
515-
glog.Warningf("Failed to list neutron extensions: %v", err)
516-
return nil, false
517-
}
518-
519-
if netExts["lbaasv2"] {
520-
lbVersion = "v2"
521-
} else if netExts["lbaas"] {
522-
lbVersion = "v1"
523-
} else {
524-
glog.Warningf("Failed to find neutron LBaaS extension (v1 or v2)")
525-
return nil, false
526-
}
527-
glog.V(3).Infof("Using LBaaS extension %v", lbVersion)
513+
if lbVersion != "" && lbVersion != "v2" {
514+
glog.Warningf("Config error: currently only support LBaaS v2, unrecognised lb-version \"%v\"", lbVersion)
515+
return nil, false
528516
}
529517

530518
glog.V(1).Info("Claiming to support LoadBalancer")
531519

532-
if lbVersion == "v2" {
533-
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
534-
} else if lbVersion == "v1" {
535-
// Since LBaaS v1 is deprecated in the OpenStack Liberty release, so deprecate LBaaSV1 at V1.8, then remove LBaaSV1 after V1.9.
536-
// Reference OpenStack doc: https://docs.openstack.org/mitaka/networking-guide/config-lbaas.html
537-
glog.Warningf("The LBaaS v1 of OpenStack cloud provider has been deprecated, Please use LBaaS v2")
538-
return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
539-
} else {
540-
glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbVersion)
541-
return nil, false
542-
}
520+
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
543521
}
544522

545523
func isNotFound(err error) bool {

0 commit comments

Comments
 (0)