From c577c1803b58c32156fd34b5503b65bec5859350 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Tue, 14 Apr 2026 14:13:14 +0300 Subject: [PATCH 1/2] fix app selector data --- app/helpers/kube.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/helpers/kube.py b/app/helpers/kube.py index d7116c73..a79e995e 100644 --- a/app/helpers/kube.py +++ b/app/helpers/kube.py @@ -183,6 +183,9 @@ def deploy_user_app(kube_client, project: Project, user: User, app: App = None, mount_path = '/data' + selector_data = {'app': app_alias, + 'app.kubernetes.io/instance': app_alias} + # create app deployment's pvc meta and spec is_ai = app_data.get('is_ai', False) if is_ai: @@ -214,12 +217,11 @@ def deploy_user_app(kube_client, project: Project, user: User, app: App = None, # spec template = client.V1PodTemplateSpec( - metadata=client.V1ObjectMeta(labels={ - 'app': app_alias - }), + metadata=client.V1ObjectMeta(labels=selector_data), spec=client.V1PodSpec( containers=[container], - image_pull_secrets=[image_pull_secret], + image_pull_secrets=[ + image_pull_secret] if image_pull_secret else None, volumes=volumes if is_ai else None ) ) @@ -228,7 +230,7 @@ def deploy_user_app(kube_client, project: Project, user: User, app: App = None, spec = client.V1DeploymentSpec( replicas=replicas, template=template, - selector={'matchLabels': {'app': app_alias}} + selector={'matchLabels': selector_data} ) # Instantiate the deployment @@ -255,15 +257,14 @@ def deploy_user_app(kube_client, project: Project, user: User, app: App = None, service_meta = client.V1ObjectMeta( name=service_name, - labels={'app': app_alias, 'app.kubernetes.io/instance': app_alias} + labels=selector_data ) service_spec = client.V1ServiceSpec( type='ClusterIP', ports=[client.V1ServicePort( port=int(current_app.config['KUBE_SERVICE_PORT']), target_port=app_port)], - selector={'app': app_alias, - 'app.kubernetes.io/instance': app_alias} + selector=selector_data ) service = client.V1Service( From 39b9eef4114f2a1d2403cd24dbc43835e55c7033 Mon Sep 17 00:00:00 2001 From: Mubangizi Allan Date: Tue, 14 Apr 2026 14:21:10 +0300 Subject: [PATCH 2/2] update ingress path --- app/helpers/kube.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/helpers/kube.py b/app/helpers/kube.py index a79e995e..38a057fd 100644 --- a/app/helpers/kube.py +++ b/app/helpers/kube.py @@ -312,8 +312,10 @@ def deploy_user_app(kube_client, project: Project, user: User, app: App = None, host=sub_domain, http=client.V1HTTPIngressRuleValue( paths=[client.V1HTTPIngressPath( - path="", - path_type="ImplementationSpecific", + path="/", + path_type="Prefix", + # path="", + # path_type="ImplementationSpecific", backend=new_ingress_backend )] )