Merge pull request #58 from tiqi-group/podman-kube-play

Replace podman-compose dev environment with a podman kube play environment

Author: mosmuell

README.md

@@ -88,13 +88,12 @@ Set up the development environment:
 
 ```bash
 uv sync --all-extras --dev
-````
+```
 
 Start a development InfluxDB instance:
 
-```bash
-cd docker
-uv run podman compose up
+```sh
+podman kube play k8s/dev.yml
 ```
 
 In a separate terminal, run the ICON server:

docker/docker-compose.yml

@@ -0,0 +1,94 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: influxdb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: influxdb
+  template:
+    metadata:
+      labels:
+        app: influxdb
+    spec:
+      containers:
+        - name: influxdb
+          image: influxdb:1.11
+          ports:
+            - containerPort: 8087
+              hostPort: 8087
+          volumeMounts:
+            - name: influxdb-storage
+              mountPath: /var/lib/influxdb
+          env:
+            - name: INFLUXDB_DB
+              value: testing
+            - name: INFLUXDB_ADMIN_USER
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-credentials
+                  key: admin-user
+            - name: INFLUXDB_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-credentials
+                  key: admin-password
+            - name: INFLUXDB_HTTP_BIND_ADDRESS
+              value: ":8087"
+            - name: INFLUXDB_HTTP_AUTH_ENABLED
+              value: false
+      volumes:
+        - name: influxdb-storage
+          persistentVolumeClaim:
+            claimName: influxdb-storage
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chronograf
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chronograf
+  template:
+    metadata:
+      labels:
+        app: chronograf
+    spec:
+      containers:
+        - name: chronograf
+          image: chronograf:latest
+          ports:
+            - containerPort: 8888
+              hostPort: 8888
+          volumeMounts:
+            - name: chronograf-storage
+              mountPath: /var/lib/chronograf
+          env:
+            - name: INFLUXDB_URL
+              value: http://influxdb:8087
+            - name: INFLUXDB_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-credentials
+                  key: admin-user
+            - name: INFLUXDB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: influxdb-credentials
+                  key: admin-password
+      volumes:
+        - name: chronograf-storage
+          persistentVolumeClaim:
+            claimName: chronograf-storage
+---
+kind: Secret
+apiVersion: v1
+metadata:
+  name: influxdb-credentials
+data:
+  admin-user: dGVzdGVy  # <- tester
+  admin-password: cGFzc3cwcmQ=  # <- passw0rd

docker/influxdb3-ui/config.json

@@ -42,11 +42,9 @@ allow-direct-references = true
 [dependency-groups]
 dev = [
     "mypy>=1.13.0",
-    "podman-compose>=1.2.0",
     "pyright>=1.1.391",
     "pytest>=8.3.4",
     "pytest-asyncio>=0.25.0",
-    "pytest-docker>=3.1.1",
     "pyyaml>=6.0.2",
     "requests>=2.32.3",
     "ruff>=0.8.4",

docker/influxdb3/admin-token.json

@@ -1,3 +1,5 @@
-import os
+from pathlib import Path
 
-os.environ["ENVIRONMENT"] = "testing"
+from icon.config.config_path import set_config_path
+
+set_config_path(Path(__file__).parent / "config.yaml")

k8s/dev.yml

@@ -1,7 +1,7 @@
 from pathlib import Path
 
-from icon.config.config import get_config_source
+from icon.config.config import get_config_path
 
 
-def test_get_config_source() -> None:
-    assert get_config_source() == Path(__file__).parent.parent / "config.yaml"
+def test_get_config_path() -> None:
+    assert get_config_path() == Path(__file__).parent.parent / "config.yaml"

pyproject.toml

@@ -1,7 +1,11 @@
 import logging
+import os
+import socket
+import time
+from collections.abc import Iterable
+from pathlib import Path
 
 import pytest
-import pytest_docker.plugin
 import requests
 
 from icon.config.config import get_config
@@ -26,21 +30,28 @@ def is_responsive(host: str, port: int) -> bool:
 
 
 @pytest.fixture(scope="session")
-def influxdbv1_service(
-    docker_ip: str, docker_services: pytest_docker.plugin.Services
-) -> tuple[str, int]:
+def influxdbv1_service() -> Iterable[None]:
     """Ensure that influxdbv1 service is up and responsive."""
 
-    port = 8087
-    logger.debug("http://%s:%s", docker_ip, port)
-    docker_services.wait_until_responsive(
-        timeout=10.0, pause=0.1, check=lambda: is_responsive(docker_ip, port)
-    )
+    def check_port(port: int) -> bool:
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+            # Attempting to connect to localhost on the specified port
+            return sock.connect_ex(("127.0.0.1", port)) == 0
 
-    return docker_ip, port
+    port = 8087
+    logger.debug("http://localhost:%s", port)
+    if not check_port(port):
+        yml = Path(__file__).parent.parent.parent.parent.parent / "k8s" / "dev.yml"
+        os.system(f"podman kube play {yml}")
+        while not check_port(port):
+            time.sleep(0.5)
+        yield
+        os.system(f"podman kube play --down {yml}")
+    else:
+        yield
 
 
-def test_InfluxDBv1Session(influxdbv1_service: tuple[str, int]) -> None:  # noqa: N802
+def test_InfluxDBv1Session(influxdbv1_service: None) -> None:  # noqa: N802
     test_value = 1337
 
     with InfluxDBv1Session() as session: