Merge "Ignore 422 Unprocessable Entity on KLB patching"
This commit is contained in:
Zuul
Gerrit Code Review
commit
33af99d6d3
|
|
@ -111,17 +111,7 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
loadbalancer_crd['status'][
|
||||
'service_pub_ip_info'] = service_pub_ip_info
|
||||
self._update_lb_status(loadbalancer_crd)
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status', utils.get_res_link(
|
||||
loadbalancer_crd), loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
self._patch_status(loadbalancer_crd)
|
||||
|
||||
def _should_ignore(self, loadbalancer_crd):
|
||||
return (not(self._has_endpoints(loadbalancer_crd) or
|
||||
|
|
@ -180,6 +170,24 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
'for %s', service["metadata"]["name"])
|
||||
raise
|
||||
|
||||
def _patch_status(self, loadbalancer_crd):
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status', utils.get_res_link(
|
||||
loadbalancer_crd), loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadBalancer CRD not found %s', loadbalancer_crd)
|
||||
return False
|
||||
except k_exc.K8sUnprocessableEntity:
|
||||
LOG.warning('KuryrLoadBalancer %s modified, retrying later.',
|
||||
utils.get_res_unique_name(loadbalancer_crd))
|
||||
return False
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
return True
|
||||
|
||||
def _sync_lbaas_members(self, loadbalancer_crd):
|
||||
changed = False
|
||||
|
||||
|
|
@ -226,8 +234,7 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
'due to missing loadbalancer field.')
|
||||
return None
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error syncing KuryrLoadBalancer'
|
||||
' %s', svc_name)
|
||||
LOG.exception('Error syncing KuryrLoadBalancer %s', svc_name)
|
||||
raise
|
||||
return klb_crd
|
||||
|
||||
|
|
@ -339,17 +346,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
loadbalancer_crd['status']['members'] = []
|
||||
loadbalancer_crd['status'].get('members', []).append(
|
||||
member)
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status', utils.get_res_link(
|
||||
loadbalancer_crd), loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
|
@ -456,18 +454,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
if m['id'] not in removed_ids]
|
||||
loadbalancer_crd['status']['members'] = members
|
||||
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
return bool(removed_ids)
|
||||
|
||||
def _sync_lbaas_pools(self, loadbalancer_crd):
|
||||
|
|
@ -505,18 +493,9 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
loadbalancer_crd['status']['pools'] = []
|
||||
loadbalancer_crd['status'].get('pools', []).append(
|
||||
pool)
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryrLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
|
@ -553,18 +532,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
if m['pool_id'] not in
|
||||
removed_ids]
|
||||
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
return bool(removed_ids)
|
||||
|
||||
def _sync_lbaas_listeners(self, loadbalancer_crd):
|
||||
|
|
@ -641,18 +610,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
loadbalancer_crd['status'].get('listeners', []).append(
|
||||
listener)
|
||||
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryrLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
changed = True
|
||||
return changed
|
||||
|
||||
|
|
@ -672,18 +631,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
[]) if l['id']
|
||||
not in removed_ids]
|
||||
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
if not self._patch_status(loadbalancer_crd):
|
||||
return False
|
||||
return bool(removed_ids)
|
||||
|
||||
def _update_lb_status(self, lb_crd):
|
||||
|
|
@ -707,7 +656,6 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
raise
|
||||
|
||||
def _sync_lbaas_loadbalancer(self, loadbalancer_crd):
|
||||
changed = False
|
||||
lb = loadbalancer_crd['status'].get('loadbalancer')
|
||||
|
||||
if lb and lb['ip'] != loadbalancer_crd['spec'].get('ip'):
|
||||
|
|
@ -746,21 +694,8 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
provider=loadbalancer_crd['spec'].get('provider'))
|
||||
loadbalancer_crd['status']['loadbalancer'] = lb
|
||||
|
||||
kubernetes = clients.get_kubernetes_client()
|
||||
try:
|
||||
kubernetes.patch_crd('status',
|
||||
utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryrLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
changed = True
|
||||
|
||||
return changed
|
||||
return self._patch_status(loadbalancer_crd)
|
||||
return False
|
||||
|
||||
def _ensure_release_lbaas(self, loadbalancer_crd):
|
||||
attempts = 0
|
||||
|
|
@ -789,17 +724,7 @@ class KuryrLoadBalancerHandler(k8s_base.ResourceEventHandler):
|
|||
retry = True
|
||||
|
||||
loadbalancer_crd['status'] = {}
|
||||
k8s = clients.get_kubernetes_client()
|
||||
try:
|
||||
k8s.patch_crd('status', utils.get_res_link(loadbalancer_crd),
|
||||
loadbalancer_crd['status'])
|
||||
except k_exc.K8sResourceNotFound:
|
||||
LOG.debug('KuryrLoadbalancer CRD not found %s',
|
||||
loadbalancer_crd)
|
||||
except k_exc.K8sClientException:
|
||||
LOG.exception('Error updating KuryrLoadbalancer CRD %s',
|
||||
loadbalancer_crd)
|
||||
raise
|
||||
self._patch_status(loadbalancer_crd)
|
||||
# NOTE(ltomasbo): give some extra time to ensure the Load
|
||||
# Balancer VIP is also released
|
||||
time.sleep(1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue