From e902d221ea5a3a6ea8afbd0f4a9ef4887c33f386 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 1 Dec 2025 10:39:16 +0100 Subject: [PATCH] fix configMap --- apps/abstraction/Dockerfile | 4 +++- apps/rules/Dockerfile | 2 +- deployment/api-deployment.yaml | 5 ----- deployment/configmap.yaml | 6 ++---- deployment/ingress.yaml | 1 - deployment/rules-deployment.yaml | 5 ----- 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/apps/abstraction/Dockerfile b/apps/abstraction/Dockerfile index 3483bd2..9b983e6 100644 --- a/apps/abstraction/Dockerfile +++ b/apps/abstraction/Dockerfile @@ -10,7 +10,9 @@ ENV PYTHONDONTWRITEBYTECODE=1 \ MQTT_PORT=1883 \ REDIS_HOST=localhost \ REDIS_PORT=6379 \ - REDIS_DB=0 + REDIS_DB=0 \ + REDIS_CHANNEL=ui:updates + # Create non-root user RUN addgroup -g 10001 -S app && \ diff --git a/apps/rules/Dockerfile b/apps/rules/Dockerfile index 78e7c07..5561b16 100644 --- a/apps/rules/Dockerfile +++ b/apps/rules/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.14-alpine # Prevent Python from writing .pyc files and enable unbuffered output ENV PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ - RULES_CONFIG=config/rules.yaml \ + RULES_CONFIG=/app/config/rules.yaml \ MQTT_BROKER=172.16.2.16 \ MQTT_PORT=1883 \ REDIS_HOST=localhost \ diff --git a/deployment/api-deployment.yaml b/deployment/api-deployment.yaml index 8c95d87..09e7470 100644 --- a/deployment/api-deployment.yaml +++ b/deployment/api-deployment.yaml @@ -52,11 +52,6 @@ spec: configMapKeyRef: name: home-automation-environment key: SHARED_REDIS_DB - - name: REDIS_CHANNEL - valueFrom: - configMapKeyRef: - name: home-automation-environment - key: API_REDIS_CHANNEL volumeMounts: - name: config-volume mountPath: /app/config diff --git a/deployment/configmap.yaml b/deployment/configmap.yaml index 8db1b7a..dd72598 100644 --- a/deployment/configmap.yaml +++ b/deployment/configmap.yaml @@ -16,8 +16,6 @@ data: UI_API_BASE: "https://homea2-api.hottis.de" UI_BASE_PATH: "/" - # API specific environment variables - API_REDIS_CHANNEL: "ui:updates" - # Rules specific environment variables - RULES_RULES_CONFIG: "/app/config/rules.yaml" \ No newline at end of file + + \ No newline at end of file diff --git a/deployment/ingress.yaml b/deployment/ingress.yaml index e5bfcb8..f0f70b9 100644 --- a/deployment/ingress.yaml +++ b/deployment/ingress.yaml @@ -60,7 +60,6 @@ spec: - name: api port: 80 --- ---- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/deployment/rules-deployment.yaml b/deployment/rules-deployment.yaml index cdd6dd1..1188929 100644 --- a/deployment/rules-deployment.yaml +++ b/deployment/rules-deployment.yaml @@ -48,11 +48,6 @@ spec: configMapKeyRef: name: home-automation-environment key: SHARED_REDIS_DB - - name: RULES_CONFIG - valueFrom: - configMapKeyRef: - name: home-automation-environment - key: RULES_RULES_CONFIG volumeMounts: - name: config-volume mountPath: /app/config