Merge "Skip KuryrLoadbalancer creation for Headless Service"
This commit is contained in:
commit
f852e76056
|
@ -69,6 +69,8 @@ K8S_ANNOTATION_OLD_DRIVER = 'old_driver'
|
||||||
K8S_ANNOTATION_CURRENT_DRIVER = 'current_driver'
|
K8S_ANNOTATION_CURRENT_DRIVER = 'current_driver'
|
||||||
K8S_ANNOTATION_NEUTRON_PORT = 'neutron_id'
|
K8S_ANNOTATION_NEUTRON_PORT = 'neutron_id'
|
||||||
|
|
||||||
|
K8S_ANNOTATION_HEADLESS_SERVICE = 'service.kubernetes.io/headless'
|
||||||
|
|
||||||
POD_FINALIZER = KURYR_FQDN + '/pod-finalizer'
|
POD_FINALIZER = KURYR_FQDN + '/pod-finalizer'
|
||||||
KURYRNETWORK_FINALIZER = 'kuryrnetwork.finalizers.kuryr.openstack.org'
|
KURYRNETWORK_FINALIZER = 'kuryrnetwork.finalizers.kuryr.openstack.org'
|
||||||
KURYRLB_FINALIZER = 'kuryr.openstack.org/kuryrloadbalancer-finalizers'
|
KURYRLB_FINALIZER = 'kuryr.openstack.org/kuryrloadbalancer-finalizers'
|
||||||
|
|
|
@ -272,7 +272,9 @@ class EndpointsHandler(k8s_base.ResourceEventHandler):
|
||||||
k8s = clients.get_kubernetes_client()
|
k8s = clients.get_kubernetes_client()
|
||||||
loadbalancer_crd = k8s.get_loadbalancer_crd(endpoints)
|
loadbalancer_crd = k8s.get_loadbalancer_crd(endpoints)
|
||||||
|
|
||||||
if not self._has_pods(endpoints):
|
if (not self._has_pods(endpoints) or
|
||||||
|
k_const.K8S_ANNOTATION_HEADLESS_SERVICE
|
||||||
|
in endpoints['metadata'].get('labels', [])):
|
||||||
LOG.debug("Ignoring Kubernetes endpoints %s",
|
LOG.debug("Ignoring Kubernetes endpoints %s",
|
||||||
endpoints['metadata']['name'])
|
endpoints['metadata']['name'])
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue