openstack/kuryr-kubernetes
Code Issues Proposed changes

Add IPv6 support to namespace subnet driver

Browse Source 
Change-Id: If3bd633b36694dedaf65cb14287e9b9519958de8
This commit is contained in:
Luis Tomas Bolivar 2020-02-19 15:16:37 +01:00
parent c5aa56122e
commit eeee83d0f3
2 changed files with 13 additions and 1 deletions
kuryr_kubernetes
controller/drivers
namespace_subnet.py
utils.py

3
kuryr_kubernetes/controller/drivers/namespace_subnet.py

@ -181,10 +181,11 @@ class NamespacePodSubnetDriver(default_subnet.DefaultPodSubnetDriver):
# create subnet with namespace as name # create subnet with namespace as name
subnet_pool_id = oslo_cfg.CONF.namespace_subnet.pod_subnet_pool subnet_pool_id = oslo_cfg.CONF.namespace_subnet.pod_subnet_pool
ip_version = utils.get_subnetpool_version(subnet_pool_id)
try: try:
neutron_subnet = (os_net neutron_subnet = (os_net
.create_subnet(network_id=net_id, .create_subnet(network_id=net_id,
ip_version=4, ip_version=ip_version,
name=subnet_name, name=subnet_name,
enable_dhcp=False, enable_dhcp=False,
subnetpool_id=subnet_pool_id, subnetpool_id=subnet_pool_id,

11
kuryr_kubernetes/utils.py

@ -201,6 +201,17 @@ def get_subnet_cidr(subnet_id):
return subnet_obj.cidr return subnet_obj.cidr
@MEMOIZE
def get_subnetpool_version(subnetpool_id):
os_net = clients.get_network_client()
try:
subnetpool_obj = os_net.get_subnet_pool(subnetpool_id)
except os_exc.ResourceNotFound:
LOG.exception("Subnetpool %s not found!", subnetpool_id)
raise
return subnetpool_obj.ip_version
def extract_pod_annotation(annotation): def extract_pod_annotation(annotation):
obj = objects.base.VersionedObject.obj_from_primitive(annotation) obj = objects.base.VersionedObject.obj_from_primitive(annotation)
# FIXME(dulek): This is code to maintain compatibility with Queens. We can # FIXME(dulek): This is code to maintain compatibility with Queens. We can