openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Adapt selfLink calculation for KuryrNet CRD objects. 

Implements: blueprint selflink
Change-Id: Ibef7880af6850277ea6954c693f122c09b4e7815
This commit is contained in:
Roman Dobosz 2020-12-23 14:29:08 +01:00
parent 4fe32c846c
commit b38f0584a0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr_kubernetes/controller/handlers/namespace.py
View File

@ -67,7 +67,7 @@ class NamespaceHandler(k8s_base.ResourceEventHandler):
k8s.remove_annotations(ns['metadata']['selfLink'], k8s.remove_annotations(ns['metadata']['selfLink'],
constants.K8S_ANNOTATION_NET_CRD) constants.K8S_ANNOTATION_NET_CRD)
try: try:
k8s.delete(net_crd['metadata']['selfLink']) k8s.delete(utils.get_res_link(net_crd))
except exceptions.K8sResourceNotFound: except exceptions.K8sResourceNotFound:
LOG.debug('Kuryrnet object already deleted: %s', net_crd) LOG.debug('Kuryrnet object already deleted: %s', net_crd)

1
kuryr_kubernetes/utils.py
View File

@ -75,6 +75,7 @@ cache.configure_cache_region(CONF, nodes_cache_region)
RESOURCE_MAP = {'Endpoints': 'endpoints', RESOURCE_MAP = {'Endpoints': 'endpoints',
'KuryrLoadBalancer': 'kuryrloadbalancers', 'KuryrLoadBalancer': 'kuryrloadbalancers',
'KuryrNet': 'kuryrnets',
'KuryrNetPolicy': 'kuryrnetpolicies', 'KuryrNetPolicy': 'kuryrnetpolicies',
'KuryrNetwork': 'kuryrnetworks', 'KuryrNetwork': 'kuryrnetworks',
'KuryrNetworkPolicy': 'kuryrnetworkpolicies', 'KuryrNetworkPolicy': 'kuryrnetworkpolicies',