From d71f7f1c49017b492cca7eac61455921781536c1 Mon Sep 17 00:00:00 2001 From: Malar Invention Date: Thu, 7 Nov 2024 23:43:17 +0530 Subject: [PATCH] enable multiple gateway ip support --- node_external_ip_controller_async.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/node_external_ip_controller_async.py b/node_external_ip_controller_async.py index e87c270..6ff7471 100644 --- a/node_external_ip_controller_async.py +++ b/node_external_ip_controller_async.py @@ -1,8 +1,5 @@ import asyncio from kubernetes_asyncio import client, config, watch - -# node_external_ip_controller_async.py - import os # Configuration @@ -14,16 +11,18 @@ NAMESPACE = os.getenv("NAMESPACE", "kube-system") 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_REQUEST_TIMEOUT = int(os.getenv("SERVICE_REQUEST_TIMEOUT", 300)) +NODE_REQUEST_TIMEOUT = int(os.getenv("NODE_REQUEST_TIMEOUT", 300)) -async def update_service_annotation(v1, service_name, external_ip): +async def update_service_annotation(v1, service_name, external_ips): try: # Get the current service object service = await v1.read_namespaced_service(service_name, NAMESPACE) # Check if the annotation needs to be updated current_annotation = service.metadata.annotations.get(ANNOTATION_KEY) - target_annotation = ",".join({external_ip, ZERO_GATEWAY_IP}) + target_annotation = ",".join(external_ips) + "," + ZERO_GATEWAY_IP if current_annotation != target_annotation: # Update the annotation body = {"metadata": {"annotations": {ANNOTATION_KEY: target_annotation}}} @@ -45,21 +44,22 @@ async def watch_nodes(): while True: try: async for event in w.stream( - v1.list_node, label_selector=NODE_LABEL, _request_timeout=300 + v1.list_node, + label_selector=NODE_LABEL, + _request_timeout=NODE_REQUEST_TIMEOUT, ): node = event["object"] node_name = node.metadata.name # Check for external IP - external_ip = None + external_ips = [] for address in node.status.addresses: if address.type == "ExternalIP": - external_ip = address.address - break + external_ips.append(address.address) - if external_ip: + if len(external_ips) > 0: print( - f"Detected external IP {external_ip} for node {node_name}", + f"Detected external IP {str(external_ips)} for node {node_name}", flush=True, ) @@ -70,7 +70,7 @@ async def watch_nodes(): service = await v1.read_namespaced_service(SERVICE_NAME, NAMESPACE) # for service in services.items: await update_service_annotation( - v1, service.metadata.name, external_ip + v1, service.metadata.name, external_ips ) except client.exceptions.ApiException as e: @@ -97,7 +97,7 @@ async def watch_services(): v1.list_namespaced_service, NAMESPACE, label_selector=SERVICE_NAME_LABEL_PATTERN, - _request_timeout=300, + _request_timeout=SERVICE_REQUEST_TIMEOUT, ): service = event["object"] service_name = service.metadata.name