Relied on kubectl proxy for testing.

Author: pantierra

.github/workflows/ci.yml

@@ -45,6 +45,9 @@ jobs:
         with:
           python-version: '3.12'
 
+      - name: Set release name
+        run: echo "RELEASE_NAME=eoapi-$(echo "${{ github.sha }}" | cut -c1-8)" >> "$GITHUB_ENV"
+
       - name: Start K3s cluster
         uses: jupyterhub/action-k3s-helm@v4
         with:
@@ -53,21 +56,21 @@ jobs:
           metrics-enabled: true
           docker-enabled: true
 
-      - name: Set release name
-        run: echo "RELEASE_NAME=eoapi-$(echo "${{ github.sha }}" | cut -c1-8)" >> "$GITHUB_ENV"
-
-      - name: Verify K3s readiness
+      - name: Wait until cluster is ready
         run: ./eoapi-cli cluster wait-ready
 
       - name: Deploy eoAPI
         run: ./eoapi-cli deployment run
 
-      - name: Validate deployment
-        run: ./eoapi-cli deployment debug
-
       - name: Run integration tests
         run: ./eoapi-cli test integration
 
+      - name: Run notification tests
+        run: ./eoapi-cli test notification
+
+      - name: Run autoscaling tests
+        run: ./eoapi-cli test autoscaling
+
       - name: Debug failed deployment
         if: failure()
         run: ./eoapi-cli deployment debug

charts/eoapi/values.yaml

@@ -342,6 +342,7 @@ multidim:
       GDAL_HTTP_MERGE_CONSECUTIVE_RANGES: "YES"
       GDAL_HTTP_MULTIPLEX: "YES"
       GDAL_HTTP_VERSION: "2"
+      GDAL_SKIP: "VRT" # skip VRT driver to avoid https://github.com/OSGeo/gdal/issues/12645
       PYTHONWARNINGS: "ignore"
       VSI_CACHE: "TRUE"
       VSI_CACHE_SIZE: "5000000"  # 5 MB (per file-handle)

tests/conftest.py

@@ -42,11 +42,9 @@ def db_connection() -> Generator[psycopg2.extensions.connection, None, None]:
         "password": os.getenv("PGPASSWORD"),
     }
 
-    # All required vars are guaranteed to exist due to check above
     conn = None
     last_error = None
 
-    # Try different SSL modes for flexibility
     for sslmode in ["prefer", "require", "disable"]:
         try:
             conn = psycopg2.connect(
@@ -126,6 +124,21 @@ def kubectl_port_forward(
     return process
 
 
+def kubectl_proxy(
+    port: int = 8001, namespace: str = None
+) -> subprocess.Popen[str]:
+    """Start kubectl proxy for accessing services via Kubernetes API."""
+    cmd = ["kubectl", "proxy", f"--port={port}"]
+
+    process = subprocess.Popen(
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+    )
+
+    # Wait a bit less than port-forward since proxy is usually faster
+    time.sleep(2)
+    return process
+
+
 def wait_for_url(url: str, timeout: int = 30, interval: int = 2) -> bool:
     start_time = time.time()
     while time.time() - start_time < timeout:
@@ -148,7 +161,6 @@ def make_request(url: str, timeout: int = 10) -> bool:
 
 
 def get_base_url() -> str:
-    """Get the base URL for API access."""
     namespace = get_namespace()
 
     # Check if we have an ingress
@@ -179,7 +191,6 @@ def get_base_url() -> str:
 
 
 def get_pod_metrics(namespace: str, service_name: str) -> List[Dict[str, str]]:
-    """Get CPU and memory metrics for pods of a specific service."""
     release_name_val = get_release_name()
     result = subprocess.run(
         [
@@ -213,7 +224,6 @@ def get_pod_metrics(namespace: str, service_name: str) -> List[Dict[str, str]]:
 
 
 def get_hpa_status(namespace: str, hpa_name: str) -> Optional[Dict[str, Any]]:
-    """Get HPA status for a specific HPA."""
     result = kubectl_get("hpa", namespace=namespace, output="json")
     if result.returncode != 0:
         return None
@@ -227,7 +237,6 @@ def get_hpa_status(namespace: str, hpa_name: str) -> Optional[Dict[str, Any]]:
 
 
 def get_pod_count(namespace: str, service_name: str) -> int:
-    """Get the count of running pods for a specific service."""
     release_name_val = get_release_name()
     result = kubectl_get(
         "pods",

tests/integration/test_observability.py

@@ -9,7 +9,7 @@
     get_namespace,
     get_release_name,
     kubectl_get,
-    kubectl_port_forward,
+    kubectl_proxy,
     wait_for_url,
 )
 
@@ -184,26 +184,24 @@ def test_prometheus_targets_reachable(self) -> None:
         service = json.loads(result.stdout)["items"][0]
         service_name = service["metadata"]["name"]
 
-        # Try to port-forward to Prometheus
-        local_port = 19090
-        prometheus_port = 80
+        # Try kubectl proxy instead of port-forward
+        proxy_port = 8001
 
         process = None
         try:
-            process = kubectl_port_forward(
-                service_name, local_port, prometheus_port, namespace
-            )
+            process = kubectl_proxy(proxy_port)
+
+            # Build proxy URL for Prometheus service
+            proxy_url = f"http://localhost:{proxy_port}/api/v1/namespaces/{namespace}/services/{service_name}:80/proxy"
 
-            # Wait for port forward to establish
-            if not wait_for_url(
-                f"http://localhost:{local_port}/api/v1/targets"
-            ):
-                pytest.skip("Could not establish connection to Prometheus")
+            # Wait for proxy to establish
+            if not wait_for_url(f"{proxy_url}/api/v1/targets"):
+                pytest.skip(
+                    "Could not establish connection to Prometheus via proxy"
+                )
 
             # Check Prometheus targets
-            response = requests.get(
-                f"http://localhost:{local_port}/api/v1/targets"
-            )
+            response = requests.get(f"{proxy_url}/api/v1/targets")
             assert response.status_code == 200, (
                 "Failed to get Prometheus targets"
             )
@@ -269,10 +267,10 @@ def test_hpa_resources_exist(self) -> None:
 
         # Expected HPA names based on the Helm chart
         expected_hpas = [
-            f"{release}-pgstac",
-            f"{release}-raster",
-            f"{release}-stac",
-            f"{release}-vector",
+            f"{release}-multidim-hpa",
+            f"{release}-raster-hpa",
+            f"{release}-stac-hpa",
+            f"{release}-vector-hpa",
         ]
 
         found_hpas = {hpa["metadata"]["name"] for hpa in hpas}
@@ -401,20 +399,20 @@ def test_grafana_service_accessibility(self) -> None:
         service = services[0]
         service_name = service["metadata"]["name"]
 
-        # Port forward to Grafana
-        local_port = 13000
-        grafana_port = 80
+        # Use kubectl proxy to access Grafana
+        proxy_port = 8002
 
         process = None
         try:
-            process = kubectl_port_forward(
-                service_name, local_port, grafana_port, namespace
-            )
+            process = kubectl_proxy(proxy_port)
+
+            # Build proxy URL for Grafana service
+            proxy_url = f"http://localhost:{proxy_port}/api/v1/namespaces/{namespace}/services/{service_name}:80/proxy"
 
-            if not wait_for_url(f"http://localhost:{local_port}/api/health"):
-                pytest.skip("Could not connect to Grafana")
+            if not wait_for_url(f"{proxy_url}/api/health"):
+                pytest.skip("Could not connect to Grafana via proxy")
 
-            response = requests.get(f"http://localhost:{local_port}/api/health")
+            response = requests.get(f"{proxy_url}/api/health")
             assert response.status_code == 200, "Grafana health check failed"
 
             health_data = response.json()

tests/requirements.txt

@@ -1,12 +1,9 @@
-# Test dependencies for eoAPI integration and autoscaling tests
+# Test dependencies for eoAPI tests
 
-# HTTP client libraries
 httpx==0.27.0
 requests==2.31.0
 
-# Testing framework
 pytest==8.3.2
 pytest-timeout==2.3.1
 
-# Database connectivity
 psycopg2-binary==2.9.9