openstack/kuryr-kubernetes
Code Issues Proposed changes

Remove deprecated [pod_vif_nested] worker_nodes_subnet

Browse Source 
This option was deprecated in 4.0.0[1] in favor of the new subnet"s"
option. The latest release is 9.0.0, so we can assume enough times has
been given to users so that they can switch to the new option.

[1] b3814a33d6

Change-Id: Ie86c019bbb560cca9b5a3a77319ed639a2245a2d
This commit is contained in:
Takashi Kajinami 2024-02-28 18:24:16 +09:00
parent a3095c0485
commit fd1bacf738
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kuryr_kubernetes/config.py
View File

@ -290,9 +290,7 @@ cache_defaults = [
nested_vif_driver_opts = [
cfg.ListOpt('worker_nodes_subnets',
help=_("Neutron subnet IDs for k8s worker node VMs."),
default=[],
deprecated_name='worker_nodes_subnet',
deprecated_group='pod_vif_nested'),
default=[]),
cfg.IntOpt('rev_update_attempts',
help=_("How many time to try to re-update the neutron resource "
"when revision has been changed by other thread"),

8
kuryr_kubernetes/tests/unit/controller/drivers/test_node_subnets.py
View File

@ -34,14 +34,6 @@ class TestConfigNodesSubnetsDriver(test_base.TestCase):
self.assertEqual(subnets, driver.get_nodes_subnets())
def test_get_nodes_subnets_alias(self):
subnet = 'subnet1'
cfg.CONF.set_override('worker_nodes_subnet', subnet,
group='pod_vif_nested')
driver = node_subnets.ConfigNodesSubnets()
self.assertEqual([subnet], driver.get_nodes_subnets())
def test_get_project_not_set_raise(self):
cfg.CONF.set_override('worker_nodes_subnets', None,
group='pod_vif_nested')

5
releasenotes/notes/remove-worker_nodes_subnet-3e64510c0342e739.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated ``[pod_vif_nested] worker_nodes_subnet`` option has been
removed. Use the ``[pod_vif_nested] worker_nodes_subnets`` option instead.

2
tools/generate_k8s_resource_definitions.sh
View File

@ -34,7 +34,7 @@ if [ -z $CONF_PATH ]; then
pod_subnet_id=${KURYR_K8S_POD_SUBNET_ID}
pod_sg=${KURYR_K8S_POD_SG}
service_subnet_id=${KURYR_K8S_SERVICE_SUBNET_ID}
worker_nodes_subnets=${KURYR_K8S_WORKER_NODES_SUBNETS:-${KURYR_K8S_WORKER_NODES_SUBNET}}
worker_nodes_subnets=${KURYR_K8S_WORKER_NODES_SUBNET}
binding_driver=${KURYR_K8S_BINDING_DRIVER:-kuryr.lib.binding.drivers.vlan}
binding_iface=${KURYR_K8S_BINDING_IFACE:-eth0}
pod_subnet_pool=${KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID}