.gitea/workflows/build.yml aktualisiert

Reviewed-on: #2

.gitea/workflows/build.yml

@@ -1,11 +1,10 @@
 name: "Build Helm Chart"
 on:
-  pull_request:
+  push:
     branches:
       - main
     paths:
       - "Chart.yaml"
-
 jobs:
   helm-package:
     runs-on: ubuntu-latest
@@ -26,7 +25,8 @@ jobs:
 
       - name: Setup Helm
         run: |
-          curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+          #curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+          curl -kSso /usr/local/bin/helm https://debmirror.cooltux.net/helm-v3.18.3 && chmod +x /usr/local/bin/helm
           helm version
 
       - name: Package Helm Chart

Chart.yaml

@@ -21,5 +21,5 @@ annotations:
   category: Houseautomation
   licenses: GPL'd
 type: application
-version: 1.0.3
-appVersion: "4.0.5-bullseye"
+version: 1.1.0
+appVersion: "5.0.0-bullseye"

templates/deployment.yaml

@@ -44,6 +44,16 @@ spec:
             - name: telnet
               containerPort: {{ .Values.telnetport }}
               protocol: TCP
+    {{- if .Values.service.extraPorts }}
+    {{- range $servicePort := .Values.service.extraPorts }}
+            - name: {{ $servicePort.name }}
+              containerPort: {{ $servicePort.targetPort }}
+              {{- if $servicePort.protocol }}
+              protocol: {{ $servicePort.protocol }}
+              {{- end }}
+    {{- end }}
+    {{- end }}
+
           livenessProbe:
             httpGet:
               path: /fhem
@@ -54,12 +64,16 @@ spec:
               path: /fhem
               port: fhemweb
           volumeMounts:
+            {{- if .Values.persistence.enabled }}
             - name: fhem-data
               mountPath: /opt/fhem
               subPath: fhem/
+            {{- end }}
+            {{- if eq .Values.configtype "configDB" }}
             - name: configdb-volume
               mountPath: /opt/fhem/configDB.conf
-              subPath: fhem/configDB.conf
+              subPath: configDB.conf
+            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
@@ -136,4 +150,4 @@ spec:
           secret:
             secretName: {{ .Release.Name }}-db-config-secret
         {{- end }}
-      restartPolicy: {{ .Values.restartPolicy }}
+      restartPolicy: {{ .Values.restartPolicy }}

templates/secret.yaml

@@ -7,9 +7,5 @@ metadata:
     app: {{ .Release.Name }}
 type: Opaque
 data:
-  configDB.conf: |
-    {{- $connection := .Values.dbConfig.connection | quote }}
-    {{- $user := .Values.dbConfig.user | quote }}
-    {{- $password := .Values.dbConfig.password | quote }}
-    {{- printf "%%dbconfig= (\n        connection => \"%s\",\n        user => \"%s\",\n        password => \"%s\"\n);" $connection $user $password | b64enc }}
+  configDB.conf: {{ printf "%%dbconfig= (\n  connection => '%s',\n  user => '%s',\n  password => '%s'\n);" .Values.dbConfig.connection .Values.dbConfig.user .Values.dbConfig.password | b64enc }}
 {{- end }}

templates/service.yaml

@@ -25,8 +25,9 @@ spec:
       {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.http))) }}
       nodePort: {{ .Values.service.nodePorts.fhemweb }}
       {{- end }}
-    {{- if .Values.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
+{{- if .Values.service.extraPorts }}
+{{- toYaml .Values.service.extraPorts | nindent 2 }}
+{{- end }}
+
   selector:
     {{- include "fhem.selectorLabels" . | nindent 4 }}