From 2661c264c9671691c6cfef45809bf1992cb69974 Mon Sep 17 00:00:00 2001 From: Malar Invention Date: Sun, 12 Jan 2025 18:23:19 +0530 Subject: [PATCH] fix: keep ip and selector separate --- node_external_ip_controller_async.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/node_external_ip_controller_async.py b/node_external_ip_controller_async.py index 5694d61..b311669 100644 --- a/node_external_ip_controller_async.py +++ b/node_external_ip_controller_async.py @@ -8,8 +8,8 @@ import ipaddress ANNOTATION_KEY = os.getenv("ANNOTATION_KEY", "kube-vip.io/loadbalancerIPs") ZERO_GATEWAY_IP = os.getenv("ZERO_GATEWAY_IP", "172.28.10.1") NODE_LABEL = os.getenv("NODE_LABEL", "svccontroller.k3s.cattle.io/enablelb=true") -SERVICE_LABEL_KEY = os.getenv("SERVICE_LABEL_KEY", "zlanservice") -SERVICE_LABEL_VALUE = os.getenv("SERVICE_LABEL_VALUE", "true") +SERVICE_LABEL = os.getenv("SERVICE_LABEL", "enablezlan=true") +ZLAN_GATEWAY_IP_KEY = os.getenv("ZLAN_GATEWAY_IP_KEY", "zlanip") SERVICE_REQUEST_TIMEOUT = int(os.getenv("SERVICE_REQUEST_TIMEOUT", 300)) NODE_REQUEST_TIMEOUT = int(os.getenv("NODE_REQUEST_TIMEOUT", 30)) @@ -34,7 +34,7 @@ async def update_service_annotation(v1, service, external_ips): service_obj = await v1.read_namespaced_service(service_name, namespace) current_annotation = service_obj.metadata.annotations.get(ANNOTATION_KEY) - zlan_gateway_ip = service_obj.metadata.labels.get(SERVICE_LABEL_KEY) + zlan_gateway_ip = service_obj.metadata.labels.get(ZLAN_GATEWAY_IP_KEY) logger.debug(f"Zlan Gateway IP: {zlan_gateway_ip}") if is_valid_ip(zlan_gateway_ip): @@ -111,14 +111,13 @@ async def watch_nodes(v1, external_ips_update_queue): async def watch_services(v1, external_ips_update_queue): w = watch.Watch() - label_selector = f"{SERVICE_LABEL_KEY}={SERVICE_LABEL_VALUE}" while True: try: logger.debug("Starting to watch services") async for event in w.stream( v1.list_service_for_all_namespaces, - label_selector=label_selector, + label_selector=SERVICE_LABEL, _request_timeout=SERVICE_REQUEST_TIMEOUT, ): service = event["object"]