openstack/kuryr-kubernetes
Code Issues Proposed changes

Ensure allowed_cidrs field is present on older openstacksdk versions

Browse Source 
As openstacksdk 0.36.0 is needed on lower-constraints and it
does not support allowed_cidrs field on the listener, we must
ensure that field is present to properly update the listeners ACLs.

Closes-bug: 1881914
Change-Id: I46d14e9088a0643ba02b0a7d4c8000fa2a22d379
This commit is contained in:
Maysa Macedo 2020-06-03 13:42:38 +00:00 committed by Maysa de Macedo Souza
parent 9e3076f36a
commit c8bd311766
1 changed files with 6 additions and 0 deletions

6
kuryr_kubernetes/clients.py

@ -20,6 +20,7 @@ import os
from kuryr.lib import utils from kuryr.lib import utils
from openstack import connection from openstack import connection
from openstack import exceptions as os_exc from openstack import exceptions as os_exc
from openstack.load_balancer.v2 import listener as os_listener
from openstack.network.v2 import port as os_port from openstack.network.v2 import port as os_port
from openstack.network.v2 import trunk as os_trunk from openstack.network.v2 import trunk as os_trunk
from openstack import resource as os_resource from openstack import resource as os_resource
@ -158,6 +159,11 @@ def setup_openstacksdk():
# into requests. At the moment we only need it for ports. # into requests. At the moment we only need it for ports.
# Remove when lower-constraints openstacksdk supports this. # Remove when lower-constraints openstacksdk supports this.
os_port.Port.if_match = os_resource.Header('If-Match') os_port.Port.if_match = os_resource.Header('If-Match')
# TODO(maysams): We need to manually insert allowed_cidrs option
# as it's only supported from 0.41.0 version. Remove it once
# lower-constraints supports it.
os_listener.Listener.allowed_cidrs = os_resource.Body('allowed_cidrs',
type=list)
conn = connection.Connection( conn = connection.Connection(
session=session, session=session,
region_name=getattr(config.CONF.neutron, 'region_name', None)) region_name=getattr(config.CONF.neutron, 'region_name', None))