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

fix: consider zlan ip when updating

main
Malar Invention 2025-01-12 20:03:46 +05:30
parent ebd9797d59
commit d636f4b59a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node_external_ip_controller_async.py
View File

@ -28,7 +28,6 @@ def is_valid_ip(ip):
async def update_service_annotation(v1, service, external_ipset): async def update_service_annotation(v1, service, external_ipset):
try: try:
external_ips = list(external_ipset)
service_name = service.metadata.name service_name = service.metadata.name
namespace = service.metadata.namespace namespace = service.metadata.namespace
logger.debug(f"Fetching service {service_name} in namespace {namespace}") logger.debug(f"Fetching service {service_name} in namespace {namespace}")
@ -40,12 +39,13 @@ async def update_service_annotation(v1, service, external_ipset):
logger.debug(f"Zlan Gateway IP: {zlan_gateway_ip}") logger.debug(f"Zlan Gateway IP: {zlan_gateway_ip}")
if is_valid_ip(zlan_gateway_ip): if is_valid_ip(zlan_gateway_ip):
target_annotation = ",".join(external_ips) + "," + zlan_gateway_ip external_ipset = set(external_ipset).add(zlan_gateway_ip)
else: else:
target_annotation = ",".join(external_ips)
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"
) )
external_ips = list(external_ipset)
target_annotation = ",".join(external_ips)
if annotated_ipset != external_ipset: if annotated_ipset != external_ipset:
logger.debug(f"Current annotation: {current_annotation}: {annotated_ipset}") logger.debug(f"Current annotation: {current_annotation}: {annotated_ipset}")
logger.debug(f"Target annotation: {target_annotation}: {external_ipset}") logger.debug(f"Target annotation: {target_annotation}: {external_ipset}")