add ingress 2

.woodpecker/build.yml

@@ -19,7 +19,7 @@ steps:
       auto_tag: true
       dockerfile: apps/${APP}/Dockerfile
     when:
-      event: [push, tag]
+      event: [tag]
       ref:
         exclude:
           - refs/tags/*-configchange

.woodpecker/deploy.yml

@@ -17,7 +17,7 @@ steps:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
       - echo "Deploying application ${APP} ($IMAGE) to namespace $NAMESPACE"
-      - cat deployment/${APP}/deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
+      - cat deployment/${APP}-deployment.yaml | sed "s,%IMAGE%,$IMAGE,g" | kubectl apply -n $NAMESPACE -f -
     when:
       event: [tag]
       ref:

.woodpecker/predeploy.yml

@@ -25,13 +25,14 @@ steps:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
       - kubectl create configmap home-automation-config 
-        --from-file=devices=config/devices.yaml 
+        --from-file=devices.yaml=config/devices.yaml 
-        --from-file=groups=config/groups.yaml 
+        --from-file=groups.yaml=config/groups.yaml 
-        --from-file=layout=config/layout.yaml 
+        --from-file=layout.yaml=config/layout.yaml 
-        --from-file=rules=config/rules.yaml 
+        --from-file=rules.yaml=config/rules.yaml 
-        --from-file=scenes=config/scenes.yaml 
+        --from-file=scenes.yaml=config/scenes.yaml 
         --namespace=$NAMESPACE 
         --dry-run=client -o yaml | kubectl apply -f - 
+      - kubectl apply -f deployment/configmap.yaml -n $NAMESPACE
     when:
       event: [tag]
 

apps/abstraction/main.py

@@ -391,9 +391,19 @@ async def async_main() -> None:
     validate_devices(devices)
     logger.info(f"Loaded {len(devices)} device(s) from configuration")
     
-    # Get Redis URL from config or environment variable or use default
+    # Build Redis URL from environment variables or config or use default
+    redis_host = os.environ.get("REDIS_HOST")
+    redis_port = os.environ.get("REDIS_PORT")
+    redis_db = os.environ.get("REDIS_DB")
+    
+    if redis_host and redis_port and redis_db:
+        redis_url = f"redis://{redis_host}:{redis_port}/{redis_db}"
+        logger.info(f"Using Redis from environment variables: {redis_url}")
+    else:
+        # Fallback to config file
         redis_config = config.get("redis", {})
-    redis_url = redis_config.get("url") or os.environ.get("REDIS_URL", "redis://localhost:6379/0")
+        redis_url = redis_config.get("url") or "redis://localhost:6379/0"
+        logger.info(f"Using Redis from config file: {redis_url}")
     
     # Connect to Redis with retry
     redis_client = await get_redis_client(redis_url)

config/devices.yaml

@@ -1,14 +1,4 @@
 version: 1
-mqtt:
-  broker: "172.16.2.16"
-  port: 1883
-  client_id: "home-automation-abstraction"
-  username: null
-  password: null
-  keepalive: 60
-redis:
-  url: "redis://172.23.1.116:6379/8"
-  channel: "ui:updates"
 devices:
 - device_id: lampe_semeniere_wohnzimmer
   name: Semeniere

deployment/api-deployment.yaml

@@ -100,3 +100,26 @@ spec:
     targetPort: 8001
     name: http
   type: ClusterIP
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: api-ingress
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production-http
+spec:
+  tls:
+    - hosts:
+        - homea2-api.hottis.de
+      secretName: homea2-api-cert
+  rules:
+    - host: homea2-api.hottis.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: api
+                port:
+                  number: 80

deployment/configmap.yaml

@@ -5,15 +5,15 @@ metadata:
   namespace: homea2
 data:
   # Default environment variables
-  SHARED_MQTT_BROKER: "172.23.1.102"
+  SHARED_MQTT_BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
   SHARED_MQTT_PORT: "1883"
-  SHARED_REDIS_HOST: "172.23.1.116"
+  SHARED_REDIS_HOST: "redis-master.redis.svc.cluster.local"
   SHARED_REDIS_PORT: "6379"
   SHARED_REDIS_DB: "8"
   
   # UI specific environment variables
   UI_UI_PORT: "8002"
-  UI_API_BASE: "http://api:8001"
+  UI_API_BASE: "https://homea2-api.hottis.de"
   UI_BASE_PATH: "/"
   
   # API specific environment variables

deployment/ui-deployment.yaml

@@ -77,3 +77,26 @@ spec:
     targetPort: 8002
     name: http
   type: ClusterIP
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ui-ingress
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production-http
+spec:
+  tls:
+    - hosts:
+        - homea2.hottis.de
+      secretName: homea2-ui-cert
+  rules:
+    - host: homea2.hottis.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: ui
+                port:
+                  number: 80