github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52821 from FengyunPan/deprecated-LbaasV1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 52843, 52710, 52821, 52844). 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>..

Mark the LBaaS v1 of OpenStack cloud provider deprecated

Since LBaaS v1 is deprecated in the OpenStack Liberty release, we
deprecated it on Kubernetes.
Reference OpenStack doc:
https://docs.openstack.org/mitaka/networking-guide/config-lbaas.html
Related to: #52717

**Release note**:
```release-note
Mark the LBaaS v1 of OpenStack cloud provider deprecated.
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-21 09:56:53 -07:00
committed by GitHub
parent 3ba46ee9fa a769c11d4b
commit 77e4831732
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cloudprovider/providers/openstack/openstack.go
View File

@@ -520,6 +520,9 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
if lbVersion == "v2" { if lbVersion == "v2" {
return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true return &LbaasV2{LoadBalancer{network, compute, os.lbOpts}}, true
} else if lbVersion == "v1" { } 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 return &LbaasV1{LoadBalancer{network, compute, os.lbOpts}}, true
} else { } else {
glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbVersion) glog.Warningf("Config error: unrecognised lb-version \"%v\"", lbVersion)

2
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@@ -75,6 +75,8 @@ const (
ServiceAnnotationLoadBalancerInternal = "service.beta.kubernetes.io/openstack-internal-load-balancer" ServiceAnnotationLoadBalancerInternal = "service.beta.kubernetes.io/openstack-internal-load-balancer"
) )
// Deprecated; Since LBaaS v1 is deprecated in the OpenStack Liberty release, Kubernetes deprecated it at V1.8.
// TODO(FengyunPan): remove LBaaS v1 after kubernetes V1.9.
// LoadBalancer implementation for LBaaS v1 // LoadBalancer implementation for LBaaS v1
type LbaasV1 struct { type LbaasV1 struct {
LoadBalancer LoadBalancer