From 4fe32c846c4ed0d78fc0d677156edade70709f54 Mon Sep 17 00:00:00 2001 From: Roman Dobosz Date: Wed, 23 Dec 2020 14:27:05 +0100 Subject: [PATCH] Adapt selfLink calculation for KuryrNetwork CRD objects. Implements: blueprint selflink Change-Id: I889178d2bd2718fda2b04057ba45280bda42b0eb --- kuryr_kubernetes/controller/handlers/kuryrnetwork.py | 7 +++---- .../controller/handlers/kuryrnetwork_population.py | 2 +- kuryr_kubernetes/controller/handlers/namespace.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kuryr_kubernetes/controller/handlers/kuryrnetwork.py b/kuryr_kubernetes/controller/handlers/kuryrnetwork.py index 5275d50e2..fda0f85cf 100644 --- a/kuryr_kubernetes/controller/handlers/kuryrnetwork.py +++ b/kuryr_kubernetes/controller/handlers/kuryrnetwork.py @@ -21,6 +21,7 @@ from kuryr_kubernetes.controller.drivers import base as drivers from kuryr_kubernetes.controller.drivers import utils as driver_utils from kuryr_kubernetes import exceptions as k_exc from kuryr_kubernetes.handlers import k8s_base +from kuryr_kubernetes import utils LOG = logging.getLogger(__name__) @@ -146,11 +147,9 @@ class KuryrNetworkHandler(k8s_base.ResourceEventHandler): try: if labels: kubernetes.patch_crd('status', - kuryrnet_crd['metadata']['selfLink'], - status) + utils.get_res_link(kuryrnet_crd), status) else: - kubernetes.patch('status', - kuryrnet_crd['metadata']['selfLink'], + kubernetes.patch('status', utils.get_res_link(kuryrnet_crd), status) except k_exc.K8sResourceNotFound: LOG.debug('KuryrNetwork CRD not found %s', kuryrnet_crd) diff --git a/kuryr_kubernetes/controller/handlers/kuryrnetwork_population.py b/kuryr_kubernetes/controller/handlers/kuryrnetwork_population.py index 56f062acc..04a529e73 100644 --- a/kuryr_kubernetes/controller/handlers/kuryrnetwork_population.py +++ b/kuryr_kubernetes/controller/handlers/kuryrnetwork_population.py @@ -84,7 +84,7 @@ class KuryrNetworkPopulationHandler(k8s_base.ResourceEventHandler): crd_name = kns_crd['metadata']['name'] LOG.debug('Patching KuryrNetwork CRD %s' % crd_name) try: - kubernetes.patch_crd('status', kns_crd['metadata']['selfLink'], + kubernetes.patch_crd('status', utils.get_res_link(kns_crd), {'populated': populated}) except exceptions.K8sClientException: LOG.exception('Error updating kuryrnet CRD %s', crd_name) diff --git a/kuryr_kubernetes/controller/handlers/namespace.py b/kuryr_kubernetes/controller/handlers/namespace.py index ef2b9a675..b3ee40104 100644 --- a/kuryr_kubernetes/controller/handlers/namespace.py +++ b/kuryr_kubernetes/controller/handlers/namespace.py @@ -97,7 +97,7 @@ class NamespaceHandler(k8s_base.ResourceEventHandler): kubernetes = clients.get_kubernetes_client() LOG.debug('Patching KuryrNetwork CRD %s', kns_crd) try: - kubernetes.patch_crd('spec', kns_crd['metadata']['selfLink'], + kubernetes.patch_crd('spec', utils.get_res_link(kns_crd), {'nsLabels': ns_labels}) except exceptions.K8sResourceNotFound: LOG.debug('KuryrNetwork CRD not found %s', kns_crd)