From c2186d781706146d1d9ce2e7fcbd800638688b15 Mon Sep 17 00:00:00 2001 From: Joerg Lehmann Date: Sat, 20 May 2023 10:46:37 +0200 Subject: [PATCH] add tasmota, make it work on new podman version (add hostPort) --- minibeielidev/minibeielidev.yaml | 2 ++ mqtt/mqtt.yaml | 27 +++++++++++++++++++++++++++ wobischdev/wobischdev.yaml | 2 ++ 3 files changed, 31 insertions(+) diff --git a/minibeielidev/minibeielidev.yaml b/minibeielidev/minibeielidev.yaml index 5e5f0a4..fded5e1 100644 --- a/minibeielidev/minibeielidev.yaml +++ b/minibeielidev/minibeielidev.yaml @@ -64,6 +64,7 @@ spec: image: docker.io/library/influxdb:2.6 ports: - containerPort: 8086 + hostPort: 9052 resources: {} securityContext: capabilities: @@ -79,6 +80,7 @@ spec: args: ["--save 60 1", "--loglevel warning"] ports: - containerPort: 5432 + hostPort: 9053 resources: {} securityContext: capabilities: diff --git a/mqtt/mqtt.yaml b/mqtt/mqtt.yaml index ed1fa57..bbb09d3 100644 --- a/mqtt/mqtt.yaml +++ b/mqtt/mqtt.yaml @@ -57,12 +57,15 @@ spec: - mountPath: /data name: datashellies - name: mqtt2prometheus + command: ["/mqtt2prometheus"] + args: ["-listen-port","9641","-log-level","warn"] image: ghcr.io/hikhvar/mqtt2prometheus:latest env: - name: TZ value: Europe/Zurich ports: - containerPort: 9641 + hostPort: 9081 resources: {} securityContext: capabilities: @@ -73,6 +76,26 @@ spec: volumeMounts: - mountPath: /config.yaml name: mqtt2prometheusconfig + - name: mqtt2prometheustasmota + command: ["/mqtt2prometheus"] + args: ["-listen-port","9642","-log-level","warn"] + image: ghcr.io/hikhvar/mqtt2prometheus:latest + env: + - name: TZ + value: Europe/Zurich + ports: + - containerPort: 9642 + hostPort: 9082 + resources: {} + securityContext: + capabilities: + drop: + - CAP_MKNOD + - CAP_NET_RAW + - CAP_AUDIT_WRITE + volumeMounts: + - mountPath: /config.yaml + name: tasmotamqtt2prometheusconfig - name: prometheus image: registry.hub.docker.com/prom/prometheus:latest env: @@ -110,6 +133,10 @@ spec: path: /data/mqtt/config/mqtt2prometheus-config.yaml type: File name: mqtt2prometheusconfig + - hostPath: + path: /data/mqtt/config/tasmotamqtt2prometheus-config.yaml + type: File + name: tasmotamqtt2prometheusconfig - hostPath: path: /data/mqtt/config/prometheus.yml type: File diff --git a/wobischdev/wobischdev.yaml b/wobischdev/wobischdev.yaml index 114562c..cd3a0ff 100644 --- a/wobischdev/wobischdev.yaml +++ b/wobischdev/wobischdev.yaml @@ -66,6 +66,7 @@ spec: image: docker.io/library/influxdb:2.6 ports: - containerPort: 8086 + hostPort: 9042 resources: {} securityContext: capabilities: @@ -81,6 +82,7 @@ spec: args: ["--save 60 1", "--loglevel warning"] ports: - containerPort: 5432 + hostPort: 9043 resources: {} securityContext: capabilities: