cd-script added

.woodpecker.yml

@@ -0,0 +1,33 @@
+steps:
+  build:
+    image: plugins/kaniko
+    settings:
+      repo: gitea.hottis.de/wn/pv-controller
+      registry: 
+        from_secret: container_registry
+      tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
+      username: 
+        from_secret: container_registry_username
+      password: 
+        from_secret: container_registry_password
+      dockerfile: Dockerfile
+    when:
+      - event: [push, tag]
+
+  deploy:
+    image: portainer/kubectl-shell:latest
+    secrets:
+      - source: kube_config
+        target: KUBE_CONFIG_CONTENT
+      - source: encryption_key
+        target: ENCRYPTION_KEY
+      - source: secrets_checksum
+        target: MD5_CHECKSUM
+    commands:
+      - export IMAGE_TAG=$CI_COMMIT_TAG
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - cat ./deployment/install-yml.tmpl | sed -e 's,%IMAGETAG%,'$IMAGE_TAG','g | kubectl apply -f -
+    when:
+      - event: tag
+

Dockerfile

@@ -2,11 +2,17 @@ FROM python:latest
 
 LABEL Maintainer="Wolfgang Hottgenroth wolfgang.hottgenroth@icloud.com"
 LABEL ImageName="registry.hottis.de/dockerized/pv-controller"
+LABEL HubImageName="wollud1969/pv-controller"
 
 ARG APP_DIR="/opt/app"
-ARG CONF_DIR="${APP_DIR}/config"
 
 
+ENV MQTT__BROKER ""
+ENV MQTT__PORT "1883"
+ENV MQTT__METERPUBLISHTOPIC "IoT/PV/Values"
+ENV MQTT__METERPUBLISHPERIOD "15"
+ENV MQTT__RELAISSUBSCRIBETOPIC "IoT/PV/Cmd"
+ENV MODBUS__GATEWAY ""
 
 RUN \
     apt update && \
@@ -16,18 +22,15 @@ RUN \
 
 RUN \
     mkdir -p ${APP_DIR} && \
-    mkdir -p ${CONF_DIR} && \
     useradd -d ${APP_DIR} -u 1000 user
 
 COPY ./src/pv_controller/*.py ${APP_DIR}/
-COPY config.ini ${CONF_DIR}/
 
 USER 1000:1000
 WORKDIR ${APP_DIR}
-VOLUME ${CONF_DIR}
 
 
-CMD [ "python", "pvc.py", "-f", "/opt/app/config/config.ini" ]
+CMD [ "python", "pvc.py" ]
 
 
 

config.ini

@@ -1,14 +0,0 @@
-[mqtt]
-broker = 172.16.2.16
-port = 1883
-# login =
-# password =
-# ca = 
-# cert = 
-# key = 
-relaisSubscribeTopic = IoT/PV/Cmd
-meterPublishTopic = IoT/PV/Values
-meterPublishPeriod = 15
-
-[modbus]
-gateway = 172.16.2.42

deployment/install-yml.tmpl

@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: pv-controller
+  name: homea
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: pv-controller
-  namespace: pv-controller
+  namespace: homea
 data:
   MQTT__BROKER: "emqx01-anonymous-cluster-internal.broker.svc.cluster.local"
   MQTT__PORT: "1883"
@@ -20,7 +20,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pv-controller
-  namespace: pv-controller
+  namespace: homea
   labels:
     app: pv-controller
 spec:
@@ -35,7 +35,7 @@ spec:
     spec:
       containers:
         - name: pv-controller
-          image: wollud1969/pv-controller:1.0.3
+          image: gitea.hottis.de/wn/pv-controller:%IMAGE%
           envFrom:
             - configMapRef:
                 name: pv-controller

src/pv_controller/ModbusBase.py

@@ -37,7 +37,7 @@ class ModbusHandler:
   def readInputRegister(self, slave, addr):
     res = self.client.read_input_registers(addr, 2, slave=slave)
     if (isinstance(res, ReadInputRegistersResponse)):
-      v = BinaryPayloadDecoder.fromRegisters(res.registers, byteorder=Endian.Big, wordorder=Endian.Big).decode_32bit_float()
+      v = BinaryPayloadDecoder.fromRegisters(res.registers, byteorder=Endian.BIG, wordorder=Endian.BIG).decode_32bit_float()
       return v
     elif (isinstance(res, LocalModbusException)):
       msg = f"Error: {type(res)}, Content: {res}"

src/pv_controller/config.py

@@ -1,4 +1,5 @@
 import os
+from loguru import logger
 
 class Config:
     OPTIONS = {
@@ -23,6 +24,7 @@ class Config:
                 varname = f"{section}__{key}".upper()
                 try:
                     self.values[section][key] = os.environ[varname]
+                    logger.info(f"Config: {section} {key} -> {self.values[section][key]}")
                 except KeyError:
                     pass