From b38f0584a0f5ff1ffc10a15077a483d4194c32b2 Mon Sep 17 00:00:00 2001 From: Roman Dobosz Date: Wed, 23 Dec 2020 14:29:08 +0100 Subject: [PATCH] Adapt selfLink calculation for KuryrNet CRD objects. Implements: blueprint selflink Change-Id: Ibef7880af6850277ea6954c693f122c09b4e7815 --- kuryr_kubernetes/controller/handlers/namespace.py | 2 +- kuryr_kubernetes/utils.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kuryr_kubernetes/controller/handlers/namespace.py b/kuryr_kubernetes/controller/handlers/namespace.py index b3ee40104..2e04efd6f 100644 --- a/kuryr_kubernetes/controller/handlers/namespace.py +++ b/kuryr_kubernetes/controller/handlers/namespace.py @@ -67,7 +67,7 @@ class NamespaceHandler(k8s_base.ResourceEventHandler): k8s.remove_annotations(ns['metadata']['selfLink'], constants.K8S_ANNOTATION_NET_CRD) try: - k8s.delete(net_crd['metadata']['selfLink']) + k8s.delete(utils.get_res_link(net_crd)) except exceptions.K8sResourceNotFound: LOG.debug('Kuryrnet object already deleted: %s', net_crd) diff --git a/kuryr_kubernetes/utils.py b/kuryr_kubernetes/utils.py index b4007d362..3e2c9211e 100644 --- a/kuryr_kubernetes/utils.py +++ b/kuryr_kubernetes/utils.py @@ -75,6 +75,7 @@ cache.configure_cache_region(CONF, nodes_cache_region) RESOURCE_MAP = {'Endpoints': 'endpoints', 'KuryrLoadBalancer': 'kuryrloadbalancers', + 'KuryrNet': 'kuryrnets', 'KuryrNetPolicy': 'kuryrnetpolicies', 'KuryrNetwork': 'kuryrnetworks', 'KuryrNetworkPolicy': 'kuryrnetworkpolicies',