infra
/
node-external-ip-controller
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: logs

main
Malar Invention 2025-01-12 19:49:19 +05:30
parent bb50947391
commit ebd9797d59
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
node_external_ip_controller_async.py
View File

@ -35,9 +35,7 @@ async def update_service_annotation(v1, service, external_ipset):
service_obj = await v1.read_namespaced_service(service_name, namespace) service_obj = await v1.read_namespaced_service(service_name, namespace)
current_annotation = service_obj.metadata.annotations.get(ANNOTATION_KEY, "") current_annotation = service_obj.metadata.annotations.get(ANNOTATION_KEY, "")
annotated_ips = ( annotated_ipset = set(current_annotation.split(","))
set(current_annotation.split(",")) if current_annotation else set()
)
zlan_gateway_ip = service_obj.metadata.labels.get(ZLAN_GATEWAY_IP_KEY) zlan_gateway_ip = service_obj.metadata.labels.get(ZLAN_GATEWAY_IP_KEY)
logger.debug(f"Zlan Gateway IP: {zlan_gateway_ip}") logger.debug(f"Zlan Gateway IP: {zlan_gateway_ip}")
@ -48,9 +46,9 @@ async def update_service_annotation(v1, service, external_ipset):
logger.debug( logger.debug(
f"Invalid Zlan Gateway IP: {zlan_gateway_ip}, excluding from target annotation" f"Invalid Zlan Gateway IP: {zlan_gateway_ip}, excluding from target annotation"
) )
if annotated_ips != external_ipset: if annotated_ipset != external_ipset:
logger.debug(f"Current annotation: {current_annotation}") logger.debug(f"Current annotation: {current_annotation}: {annotated_ipset}")
logger.debug(f"Target annotation: {target_annotation}") logger.debug(f"Target annotation: {target_annotation}: {external_ipset}")
body = {"metadata": {"annotations": {ANNOTATION_KEY: target_annotation}}} body = {"metadata": {"annotations": {ANNOTATION_KEY: target_annotation}}}
logger.debug(f"Patching service {service_name} with body: {body}") logger.debug(f"Patching service {service_name} with body: {body}")
await v1.patch_namespaced_service(service_name, namespace, body) await v1.patch_namespaced_service(service_name, namespace, body)
@ -101,7 +99,7 @@ async def watch_nodes(v1, external_ips_update_queue):
# remove old ip lists before populating # remove old ip lists before populating
while not external_ips_update_queue.empty(): while not external_ips_update_queue.empty():
_previous_external_ips = await external_ips_update_queue.get() _previous_external_ips = await external_ips_update_queue.get()
await external_ips_update_queue.put(external_node_ipset) await external_ips_update_queue.put(set(external_node_ips))
logger.debug(f"Added external IPs to update queue: {external_node_ips}") logger.debug(f"Added external IPs to update queue: {external_node_ips}")
except client.exceptions.ApiException as e: except client.exceptions.ApiException as e: