Adapt selfLink calculation for KuryrNetwork CRD objects.
Implements: blueprint selflink Change-Id: I889178d2bd2718fda2b04057ba45280bda42b0eb
This commit is contained in:
parent
96f46f5618
commit
4fe32c846c
|
@ -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.controller.drivers import utils as driver_utils
|
||||||
from kuryr_kubernetes import exceptions as k_exc
|
from kuryr_kubernetes import exceptions as k_exc
|
||||||
from kuryr_kubernetes.handlers import k8s_base
|
from kuryr_kubernetes.handlers import k8s_base
|
||||||
|
from kuryr_kubernetes import utils
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -146,11 +147,9 @@ class KuryrNetworkHandler(k8s_base.ResourceEventHandler):
|
||||||
try:
|
try:
|
||||||
if labels:
|
if labels:
|
||||||
kubernetes.patch_crd('status',
|
kubernetes.patch_crd('status',
|
||||||
kuryrnet_crd['metadata']['selfLink'],
|
utils.get_res_link(kuryrnet_crd), status)
|
||||||
status)
|
|
||||||
else:
|
else:
|
||||||
kubernetes.patch('status',
|
kubernetes.patch('status', utils.get_res_link(kuryrnet_crd),
|
||||||
kuryrnet_crd['metadata']['selfLink'],
|
|
||||||
status)
|
status)
|
||||||
except k_exc.K8sResourceNotFound:
|
except k_exc.K8sResourceNotFound:
|
||||||
LOG.debug('KuryrNetwork CRD not found %s', kuryrnet_crd)
|
LOG.debug('KuryrNetwork CRD not found %s', kuryrnet_crd)
|
||||||
|
|
|
@ -84,7 +84,7 @@ class KuryrNetworkPopulationHandler(k8s_base.ResourceEventHandler):
|
||||||
crd_name = kns_crd['metadata']['name']
|
crd_name = kns_crd['metadata']['name']
|
||||||
LOG.debug('Patching KuryrNetwork CRD %s' % crd_name)
|
LOG.debug('Patching KuryrNetwork CRD %s' % crd_name)
|
||||||
try:
|
try:
|
||||||
kubernetes.patch_crd('status', kns_crd['metadata']['selfLink'],
|
kubernetes.patch_crd('status', utils.get_res_link(kns_crd),
|
||||||
{'populated': populated})
|
{'populated': populated})
|
||||||
except exceptions.K8sClientException:
|
except exceptions.K8sClientException:
|
||||||
LOG.exception('Error updating kuryrnet CRD %s', crd_name)
|
LOG.exception('Error updating kuryrnet CRD %s', crd_name)
|
||||||
|
|
|
@ -97,7 +97,7 @@ class NamespaceHandler(k8s_base.ResourceEventHandler):
|
||||||
kubernetes = clients.get_kubernetes_client()
|
kubernetes = clients.get_kubernetes_client()
|
||||||
LOG.debug('Patching KuryrNetwork CRD %s', kns_crd)
|
LOG.debug('Patching KuryrNetwork CRD %s', kns_crd)
|
||||||
try:
|
try:
|
||||||
kubernetes.patch_crd('spec', kns_crd['metadata']['selfLink'],
|
kubernetes.patch_crd('spec', utils.get_res_link(kns_crd),
|
||||||
{'nsLabels': ns_labels})
|
{'nsLabels': ns_labels})
|
||||||
except exceptions.K8sResourceNotFound:
|
except exceptions.K8sResourceNotFound:
|
||||||
LOG.debug('KuryrNetwork CRD not found %s', kns_crd)
|
LOG.debug('KuryrNetwork CRD not found %s', kns_crd)
|
||||||
|
|
Loading…
Reference in New Issue