Skip to content
Snippets Groups Projects
Commit 0397c616 authored by Alex ubuntu vm's avatar Alex ubuntu vm
Browse files

operator: bug fix

fixed bug where the database wasnt corretly called when deleting a pod
parent 6e599f13
No related branches found
No related tags found
1 merge request!2repo: added new directory where utils scripts will be
...@@ -182,7 +182,7 @@ def create_vn(spec, name, namespace, logger, **kwargs): ...@@ -182,7 +182,7 @@ def create_vn(spec, name, namespace, logger, **kwargs):
def pod_vn(body, name, namespace, logger, annotations, **kwargs): def pod_vn(body, name, namespace, logger, annotations, **kwargs):
"""Assign Pod to a network if a specific annotation is present.""" """Assign Pod to a network if a specific annotation is present."""
# Avoid database overlap by introducing a random sleep time #time.sleep(random.uniform(0,0.8)) # Avoid database overlap by introducing a random sleep time
multus_networks = extract_multus_networks(annotations) multus_networks = extract_multus_networks(annotations)
if not multus_networks: if not multus_networks:
...@@ -316,10 +316,6 @@ def update_pod_annotation(pod_name, namespace, networks_info): ...@@ -316,10 +316,6 @@ def update_pod_annotation(pod_name, namespace, networks_info):
v1 = client.CoreV1Api() v1 = client.CoreV1Api()
pod = v1.read_namespaced_pod(pod_name, namespace) pod = v1.read_namespaced_pod(pod_name, namespace)
pod_annotations = pod.metadata.annotations or {} pod_annotations = pod.metadata.annotations or {}
print("pod")
print(pod_name)
print("networks")
print(networks_info)
# Format the annotations based on whether IPs are provided # Format the annotations based on whether IPs are provided
formatted_networks = [] formatted_networks = []
for network_info in networks_info: for network_info in networks_info:
...@@ -470,9 +466,9 @@ def remove_node(body, logger, annotations, **kwargs): ...@@ -470,9 +466,9 @@ def remove_node(body, logger, annotations, **kwargs):
with connection.cursor() as cursor: with connection.cursor() as cursor:
sql = """ sql = """
DELETE FROM interfaces DELETE FROM interfaces
WHERE switch_id = (SELECT id FROM switches WHERE node_name = '%s'); WHERE switch_id = (SELECT id FROM switches WHERE node_name = %s);
""" """
switchSql = "DELETE FROM switches WHERE node_name = '%s';" switchSql = "DELETE FROM switches WHERE node_name = %s;"
cursor.execute(sql,body['spec']['nodeName']) cursor.execute(sql,body['spec']['nodeName'])
cursor.execute(switchSql,body['spec']['nodeName']) cursor.execute(switchSql,body['spec']['nodeName'])
connection.commit() connection.commit()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment