From 96f46f5618c386cab7799a0ea563baa36445347f Mon Sep 17 00:00:00 2001 From: Roman Dobosz Date: Wed, 23 Dec 2020 14:20:49 +0100 Subject: [PATCH] Adapt selfLink calculation for KuryrNetworkPolicy CRD objects. Implements: blueprint selflink Change-Id: I1fcd15c17d387fea207f8eedabfff684d3be512b --- kuryr_kubernetes/controller/drivers/utils.py | 2 +- kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/utils.py b/kuryr_kubernetes/controller/drivers/utils.py index 9e78c7d8b..f00355d48 100644 --- a/kuryr_kubernetes/controller/drivers/utils.py +++ b/kuryr_kubernetes/controller/drivers/utils.py @@ -248,7 +248,7 @@ def patch_kuryrnetworkpolicy_crd(crd, i_rules, e_rules): 'egressSgRules': e_rules, } - kubernetes.patch_crd('spec', crd['metadata']['selfLink'], spec) + kubernetes.patch_crd('spec', utils.get_res_link(crd), spec) except k_exc.K8sResourceNotFound: LOG.debug('KuryrNetworkPolicy CRD not found %s', crd_name) except k_exc.K8sClientException: diff --git a/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py b/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py index ebc4eb400..0cf3d1e32 100644 --- a/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py +++ b/kuryr_kubernetes/controller/handlers/kuryrnetworkpolicy.py @@ -84,7 +84,7 @@ class KuryrNetworkPolicyHandler(k8s_base.ResourceEventHandler): name = knp['metadata']['name'] LOG.debug('Patching KuryrNet CRD %s', name) try: - status = self.k8s.patch_crd(field, knp['metadata']['selfLink'], + status = self.k8s.patch_crd(field, utils.get_res_link(knp), data, action=action) except exceptions.K8sResourceNotFound: LOG.debug('KuryrNetworkPolicy CRD not found %s', name)