From 489bf4bb13a0c16993d1071bb02a0311e4cc9ef0 Mon Sep 17 00:00:00 2001 From: Bruce Schultz Date: Tue, 10 Feb 2026 11:42:37 +0100 Subject: [PATCH] refactor: change result-service to storage-service --- src/k8s/kubernetes.py | 10 +++++----- src/resources/utils.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/k8s/kubernetes.py b/src/k8s/kubernetes.py index 495c76e..118ffec 100644 --- a/src/k8s/kubernetes.py +++ b/src/k8s/kubernetes.py @@ -384,7 +384,7 @@ def _create_nginx_config_map(analysis_name: str, analysis_ip = pod_list_object.items[0].status.pod_ip time.sleep(1) - # get the name of the hub adapter, kong proxy, and result service + # get the name of the hub adapter, kong proxy, and storage service hub_adapter_service_name = get_k8s_resource_names('service', 'label', 'component=flame-hub-adapter', @@ -394,9 +394,9 @@ def _create_nginx_config_map(analysis_name: str, 'app.kubernetes.io/name=kong', manual_name_selector='proxy', namespace=namespace) - result_service_name = get_k8s_resource_names('service', + storage_service_name = get_k8s_resource_names('service', 'label', - 'component=flame-result-service', + 'component=flame-storage-service', namespace=namespace) # generate config map @@ -434,10 +434,10 @@ def _create_nginx_config_map(analysis_name: str, }} - # egress: analysis deployment to result-service + # egress: analysis deployment to storage-service location ~ ^/storage/(final|local|intermediate)/ {{ rewrite ^/storage(/.*) $1 break; - proxy_pass http://{result_service_name}:8080; + proxy_pass http://{storage_service_name}:8080; allow {analysis_ip}; deny all; }} diff --git a/src/resources/utils.py b/src/resources/utils.py index e8ec615..73c9853 100644 --- a/src/resources/utils.py +++ b/src/resources/utils.py @@ -213,13 +213,13 @@ def cleanup(cleanup_type: str, delete_resource(message_broker_pod_name, 'pod', namespace) response_content[cleanup_type] = "Reset message broker" if cleanup_type in ['all', 'services', 'rs']: - # reinitialize result-service pod - result_service_name = get_k8s_resource_names('pod', + # reinitialize storage-service pod + storage_service_name = get_k8s_resource_names('pod', 'label', - 'component=flame-result-service', + 'component=flame-storage-service', namespace=namespace) - delete_resource(result_service_name, 'pod', namespace) - response_content[cleanup_type] = "Reset result service" + delete_resource(storage_service_name, 'pod', namespace) + response_content[cleanup_type] = "Reset storage service" if cleanup_type in ['all', 'keycloak']: # cleanup keycloak clients without corresponding analysis # if all is all flame clients are deleted because ther are no analyzes in the db