Skip to content

Commit 1117fa2

Browse files
authored
Remove neutron lbaas v1 version code (kubernetes#1882)
1 parent af22261 commit 1117fa2

File tree

8 files changed

+132
-1312
lines changed

8 files changed

+132
-1312
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ This Repository hosts various plugins relevant to OpenStack and Kubernetes Integ
1717

1818
* Cinder Standalone Provisioner, Manila Provisioner and Cinder FlexVolume Driver were removed since release v1.18.0.
1919
* Version 1.17 was the last release of Manila Provisioner, which is unmaintained from now on. Due to dependency issues, we removed the code from master but it is still accessible in the [release-1.17](https://github.com/kubernetes/cloud-provider-openstack/tree/release-1.17) branch. Please consider migrating to Manila CSI Plugin.
20+
* Start from release v1.26.0, neutron lbaasv1 support is removed and only Octavia is supported.
2021

2122
## Developing
2223

docs/openstack-cloud-controller-manager/expose-applications-using-loadbalancer-type-service.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ username="myuser"
244244
password="mypassword"
245245

246246
[LoadBalancer]
247-
use-octavia=true
248247
floating-network-id="a57af0a0-da92-49be-a98a-345ceca004b3"
249248
floating-subnet-id="a02eb6c3-fc69-46ae-a3fe-fb43c1563cbc"
250249
subnet-id="fa6a4e6c-6ae4-4dde-ae86-3e2f452c1f03"

docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ Although the openstack-cloud-controller-manager was initially implemented with N
182182
Whether or not to enable the LoadBalancer type of Services integration at all.
183183
Default: true
184184
185-
* `use-octavia`
186-
Whether or not to use Octavia for LoadBalancer type of Service implementation instead of using Neutron-LBaaS. Default: true
187-
188185
* `floating-network-id`
189186
Optional. The external network used to create floating IP for the load balancer VIP. If there are multiple external networks in the cloud, either this option must be set or user must specify `loadbalancer.openstack.org/floating-network-id` in the Service annotation.
190187
@@ -240,7 +237,7 @@ Although the openstack-cloud-controller-manager was initially implemented with N
240237
The id of the loadbalancer flavor to use. Uses octavia default if not set.
241238
242239
* `availability-zone`
243-
The name of the loadbalancer availability zone to use. It is applicable if use-octavia is set to True and requires Octavia API version 2.14 or later (Ussuri release). The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
240+
The name of the loadbalancer availability zone to use. The Octavia availability zone capabilities will not be used if it is not set. The parameter will be ignored if the Octavia version doesn't support availability zones yet.
244241
245242
* `LoadBalancerClass "ClassName"`
246243
This is a config section including a set of config options. User can choose the `ClassName` by specifying the Service annotation `loadbalancer.openstack.org/class`. The following options are supported:

manifests/controller-manager/cloud-config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@ tenant-id=
1111
domain-id=
1212

1313
[LoadBalancer]
14-
use-octavia=true
1514
subnet-id=9c018814-f2a8-45dd-9679-5400d49b333a
16-
floating-network-id=80c9fc78-a2be-45d5-a85b-f17a6c98df92
15+
floating-network-id=80c9fc78-a2be-45d5-a85b-f17a6c98df92

pkg/client/service.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,10 @@ func NewBlockStorageV3(provider *gophercloud.ProviderClient, eo *gophercloud.End
5151
}
5252

5353
// NewLoadBalancerV2 creates a ServiceClient that may be used with the Neutron LBaaS v2 API
54-
func NewLoadBalancerV2(provider *gophercloud.ProviderClient, eo *gophercloud.EndpointOpts, useOctavia bool) (*gophercloud.ServiceClient, error) {
54+
func NewLoadBalancerV2(provider *gophercloud.ProviderClient, eo *gophercloud.EndpointOpts) (*gophercloud.ServiceClient, error) {
5555
var lb *gophercloud.ServiceClient
5656
var err error
57-
if useOctavia {
58-
lb, err = openstack.NewLoadBalancerV2(provider, *eo)
59-
} else {
60-
lb, err = openstack.NewNetworkV2(provider, *eo)
61-
}
57+
lb, err = openstack.NewLoadBalancerV2(provider, *eo)
6258
if err != nil {
6359
return nil, fmt.Errorf("failed to find load-balancer v2 %s endpoint for region %s: %v", eo.Availability, eo.Region, err)
6460
}

0 commit comments

Comments
 (0)