From bc14340223683bd43d8e6a928ed071c37e24fae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Goinvic?= Date: Tue, 11 Feb 2025 15:16:08 +0100 Subject: [PATCH] MAS: Enhance 503 handling --- newsfragments/166.internal.md | 1 + tests/integration/fixtures/helm.py | 32 +++++++++++++++++-- .../lib/matrix_authentication_service.py | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 newsfragments/166.internal.md diff --git a/newsfragments/166.internal.md b/newsfragments/166.internal.md new file mode 100644 index 00000000..196abad5 --- /dev/null +++ b/newsfragments/166.internal.md @@ -0,0 +1 @@ +Integration tests: Enhance handling of ingresses readiness. diff --git a/tests/integration/fixtures/helm.py b/tests/integration/fixtures/helm.py index 981f2129..32e6567a 100644 --- a/tests/integration/fixtures/helm.py +++ b/tests/integration/fixtures/helm.py @@ -10,7 +10,8 @@ import pytest import yaml from lightkube import AsyncClient from lightkube.models.meta_v1 import ObjectMeta -from lightkube.resources.core_v1 import Namespace, Secret +from lightkube.resources.core_v1 import Endpoints, Namespace, Secret, Service +from lightkube.resources.networking_v1 import Ingress from ..lib.helpers import kubernetes_tls_secret from ..lib.utils import value_file_has @@ -179,7 +180,7 @@ async def matrix_stack( @pytest.fixture(scope="session") -def ingress_ready(cluster, matrix_stack, generated_data: ESSData): +def ingress_ready(cluster, kube_client: AsyncClient, matrix_stack, generated_data: ESSData): async def _ingress_ready(ingress_suffix): await asyncio.to_thread( cluster.wait, @@ -187,5 +188,32 @@ def ingress_ready(cluster, matrix_stack, generated_data: ESSData): namespace=generated_data.ess_namespace, waitfor="jsonpath='{.status.loadBalancer.ingress[0].ip}'", ) + ingress = await kube_client.get( + Ingress, f"{generated_data.release_name}-{ingress_suffix}", namespace=generated_data.ess_namespace + ) + for rule in ingress.spec.rules: + for path in rule.http.paths: + service = await kube_client.get( + Service, path.backend.service.name, namespace=generated_data.ess_namespace + ) + await asyncio.to_thread( + cluster.wait, + name=f"endpoints/{service.metadata.name}", + namespace=generated_data.ess_namespace, + waitfor="jsonpath='{.subsets[].addresses}'", + ) + + endpoints_ready = False + while not endpoints_ready: + endpoint = await kube_client.get( + Endpoints, name=service.metadata.name, namespace=generated_data.ess_namespace + ) + + for subset in endpoint.subsets: + if not subset or subset.notReadyAddresses or not subset.addresses or not subset.ports: + await asyncio.sleep(0.1) + break + else: + endpoints_ready = True return _ingress_ready diff --git a/tests/integration/lib/matrix_authentication_service.py b/tests/integration/lib/matrix_authentication_service.py index c838fd1c..d34b0d2d 100644 --- a/tests/integration/lib/matrix_authentication_service.py +++ b/tests/integration/lib/matrix_authentication_service.py @@ -19,7 +19,7 @@ async def get_client_token(mas_fqdn: str, generated_data: ESSData, ssl_context: async with ( aiohttp.ClientSession(connector=aiohttp.TCPConnector(ssl=ssl_context)) as session, - RetryClient(session, _options=retry_options, raise_for_status=True) as retry, + RetryClient(session, retry_options=retry_options, raise_for_status=True) as retry, retry.post( url.replace(host, "127.0.0.1"), headers={"Host": host},