From d2ed55b6067f9c9336ad4218479d8bf35b21c098 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Thu, 17 Apr 2025 15:41:01 +0200 Subject: [PATCH 1/2] Fix secret retrieval --- src/servala/core/models/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servala/core/models/service.py b/src/servala/core/models/service.py index 2f83d8d..0a59989 100644 --- a/src/servala/core/models/service.py +++ b/src/servala/core/models/service.py @@ -636,7 +636,7 @@ class ServiceInstance(ServalaModelMixin, models.Model): self.context.control_plane.get_kubernetes_client() ) secret = v1.read_namespaced_secret( - name=secret_name, namespace=secret_ref.get("namespace") + name=secret_name, namespace=self.organization.namespace ) # Secret data is base64 encoded From 9ddca7c0a4d5cdd886d2666cf66d7a7bbac3689d Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Thu, 17 Apr 2025 15:42:10 +0200 Subject: [PATCH 2/2] Fix secret retrieval condition --- src/servala/core/models/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servala/core/models/service.py b/src/servala/core/models/service.py index 0a59989..20a843c 100644 --- a/src/servala/core/models/service.py +++ b/src/servala/core/models/service.py @@ -618,7 +618,7 @@ class ServiceInstance(ServalaModelMixin, models.Model): # Check if secrets are available based on conditions secrets_available = any( [ - condition.get("type") == "Status" and condition.get("status") == "True" + condition.get("type") == "Ready" and condition.get("status") == "True" for condition in self.status_conditions ] )