move all defaults from deployment template to values file

This commit is contained in:
Marko Oldenburg 2024-09-18 21:23:50 +02:00
parent f611dddb9d
commit 1eb14048a3
2 changed files with 53 additions and 51 deletions

View File

@ -58,55 +58,55 @@ spec:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
env: env:
- name: LOGFILE - name: LOGFILE
value: {{ default "./log/fhem-%Y-%m-%d.log" .Values.logfile | quote }} value: {{ .Values.logfile | quote }}
- name: TELNETPORT - name: TELNETPORT
value: {{ default "7072" .Values.telnetport | quote }} value: {{ .Values.telnetport | quote }}
- name: FHEM_UID - name: FHEM_UID
value: {{ default "6061" .Values.fhemUID | quote }} value: {{ .Values.fhemUID | quote }}
- name: FHEM_GID - name: FHEM_GID
value: {{ default "6061" .Values.fhemGID | quote }} value: {{ .Values.fhemGID | quote }}
- name: FHEM_PERM_DIR - name: FHEM_PERM_DIR
value: {{ default "0750" .Values.fhemPermDir | quote }} value: {{ .Values.fhemPermDir | quote }}
- name: FHEM_PERM_FILE - name: FHEM_PERM_FILE
value: {{ default "0640" .Values.fhemPermFile | quote }} value: {{ .Values.fhemPermFile | quote }}
- name: UMASK - name: UMASK
value: {{ default "0037" .Values.umask | quote }} value: {{ .Values.umask | quote }}
- name: BLUETOOTH_GID - name: BLUETOOTH_GID
value: {{ default "6001" .Values.bluetoothGID | quote }} value: {{ .Values.bluetoothGID | quote }}
- name: GPIO_GID - name: GPIO_GID
value: {{ default "6002" .Values.gpioGID | quote }} value: {{ .Values.gpioGID | quote }}
- name: I2C_GID - name: I2C_GID
value: {{ default "6003" .Values.i2cGID | quote }} value: {{ .Values.i2cGID | quote }}
- name: TIMEOUT - name: TIMEOUT
value: {{ default "10" .Values.timeout | quote }} value: {{ .Values.timeout | quote }}
- name: TIMEOUT_STARTING - name: TIMEOUT_STARTING
value: {{ default "60" .Values.timeoutstarting | quote }} value: {{ .Values.timeoutstarting | quote }}
- name: LANG - name: LANG
value: {{ default "en_US.UTF-8" .Values.lang | quote }} value: {{ .Values.lang | quote }}
- name: LANGUAGE - name: LANGUAGE
value: {{ default "en_US:en" .Values.language | quote }} value: {{ .Values.language | quote }}
- name: LC_ADDRESS - name: LC_ADDRESS
value: {{ default "de_DE.UTF-8" .Values.lcAddress | quote }} value: {{ .Values.lcAddress | quote }}
- name: LC_MEASUREMENT - name: LC_MEASUREMENT
value: {{ default "de_DE.UTF-8" .Values.measurement | quote }} value: {{ .Values.measurement | quote }}
- name: LC_MESSAGES - name: LC_MESSAGES
value: {{ default "en_DK.UTF-8" .Values.lcMessages | quote }} value: {{ .Values.lcMessages | quote }}
- name: LC_MONETARY - name: LC_MONETARY
value: {{ default "de_DE.UTF-8" .Values.lcMonetary | quote }} value: {{ .Values.lcMonetary | quote }}
- name: LC_NAME - name: LC_NAME
value: {{ default "de_DE.UTF-8" .Values.lcName | quote }} value: {{ .Values.lcName | quote }}
- name: LC_NUMERIC - name: LC_NUMERIC
value: {{ default "de_DE.UTF-8" .Values.lcNumeric | quote }} value: {{ .Values.lcNumeric | quote }}
- name: LC_PAPER - name: LC_PAPER
value: {{ default "de_DE.UTF-8" .Values.lcPaper | quote }} value: {{ .Values.lcPaper | quote }}
- name: LC_TELEPHONE - name: LC_TELEPHONE
value: {{ default "de_DE.UTF-8" .Values.lcTelephone | quote }} value: {{ .Values.lcTelephone | quote }}
- name: LC_TIME - name: LC_TIME
value: {{ default "de_DE.UTF-8" .Values.lcTime | quote }} value: {{ .Values.lcTime | quote }}
- name: TZ - name: TZ
value: {{ default "Europe/Berlin" .Values.timezone | quote }} value: {{ .Values.timezone | quote }}
- name: CONFIGTYPE - name: CONFIGTYPE
value: {{ default "fhem.cfg.demo" .Values.configtype | quote }} value: {{ .Values.configtype | quote }}
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
@ -125,4 +125,4 @@ spec:
persistentVolumeClaim: persistentVolumeClaim:
claimName: {{ include "fhem.fullname" . }} claimName: {{ include "fhem.fullname" . }}
{{- end }} {{- end }}
restartPolicy: {{ default "Always" .Values.restartPolicy | quote }} restartPolicy: {{ .Values.restartPolicy }}

View File

@ -21,47 +21,47 @@ fullnameOverride: ""
### Tweak container settings using environment variables ### Tweak container settings using environment variables
## Change FHEM logfile format: To set a different logfile path and format (default is ./log/fhem-%Y-%m-%d.log): ## Change FHEM logfile format: To set a different logfile path and format (default is ./log/fhem-%Y-%m-%d.log):
logfile: "" logfile: "./log/fhem-%Y-%m-%d.log"
## Change FHEM local Telnet port for health check and container restart handling: To set a different Telnet port for local connection during health check and container restart (default is 7072): ## Change FHEM local Telnet port for health check and container restart handling: To set a different Telnet port for local connection during health check and container restart (default is 7072):
telnetport: "" telnetport: "7072"
## Change FHEM system user ID: To set a different UID for the user fhem (default is 6061): ## Change FHEM system user ID: To set a different UID for the user fhem (default is 6061):
fhemUID: "" fhemUID: "6061"
## Change FHEM group ID: To set a different GID for the group fhem (default is 6061): ## Change FHEM group ID: To set a different GID for the group fhem (default is 6061):
fhemGID: "" fhemGID: "6061"
## Change FHEM directory permissions: To set different directory permissions for $FHEM_DIR (default is 0750): ## Change FHEM directory permissions: To set different directory permissions for $FHEM_DIR (default is 0750):
fhemPermDir: "" fhemPermDir: "0750"
## Change FHEM file permissions: To set different file permissions for $FHEM_DIR (default is 0640): ## Change FHEM file permissions: To set different file permissions for $FHEM_DIR (default is 0640):
fhemPermFile: "" fhemPermFile: "0640"
## Change umask: To set a different umask for FHEM_UID (default is 0037): ## Change umask: To set a different umask for FHEM_UID (default is 0037):
umask: "" umask: "0037"
## Change Bluetooth group ID: To set a different GID for the group bluetooth (default is 6001): ## Change Bluetooth group ID: To set a different GID for the group bluetooth (default is 6001):
bluetoothGID: "" bluetoothGID: "6001"
## Change GPIO group ID: To set a different GID for the group gpio (default is 6002): ## Change GPIO group ID: To set a different GID for the group gpio (default is 6002):
gpioGID: "" gpioGID: "6001"
## Change I2C group ID: To set a different GID for the group i2c (default is 6003): ## Change I2C group ID: To set a different GID for the group i2c (default is 6003):
i2cGID: "" i2cGID: "6003"
## Change shutdown timeout: To set a different setting for the timer during FHEM shutdown handling, you may add this environment variable: 10 ## Change shutdown timeout: To set a different setting for the timer during FHEM shutdown handling, you may add this environment variable: 10
timeout: "" timeout: "10"
## Set FHEM startup timeout: Set a Timeout, how long the docker container waits until the FHEM process will finished starting. If the timeout is over, and FHEM is not started, the container is stopped. You will see an error like this in the container log, if starting wasn't finished early enough: ERROR: Fatal: No message from FHEM since 60 seconds that server has started. ## Set FHEM startup timeout: Set a Timeout, how long the docker container waits until the FHEM process will finished starting. If the timeout is over, and FHEM is not started, the container is stopped. You will see an error like this in the container log, if starting wasn't finished early enough: ERROR: Fatal: No message from FHEM since 60 seconds that server has started.
## If you have a slow system and a module which blocks FHEM to be ready adjust this to a higher value. ## If you have a slow system and a module which blocks FHEM to be ready adjust this to a higher value.
timeoutstarting: "" timeoutstarting: "60"
## Set locale: For maximum compatibility, standard locale is set to US english with some refinements towards the European standards and German defaults. This may be changed according to your needs (also see Debian Wiki for more information): ## Set locale: For maximum compatibility, standard locale is set to US english with some refinements towards the European standards and German defaults. This may be changed according to your needs (also see Debian Wiki for more information):
lang: "" lang: "en_US.UTF-8"
language: "" language: "en_US:en"
lcAddress: "" lcAddress: "de_DE.UTF-8"
lcMeasurement: "" lcMeasurement: "de_DE.UTF-8"
lcMessages: "" lcMessages: "en_DK.UTF-8"
lcMonetary: "" lcMonetary: "de_DE.UTF-8"
lcName: "" lcName: "de_DE.UTF-8"
lcNumeric: "" lcNumeric: "de_DE.UTF-8"
lcPaper: "" lcPaper: "de_DE.UTF-8"
lcTelephone: "" lcTelephone: "de_DE.UTF-8"
lcTime: "" lcTime: "de_DE.UTF-8"
## Set timezone: Set a specific timezone in POSIX format: Europe/Berlin ## Set timezone: Set a specific timezone in POSIX format: Europe/Berlin
timezone: "" timezone: "Europe/Berlin"
## Using configDB: Should you be using FHEM config type configDB, you need to change the FHEM configuration source for correct startup by setting the following environment variable: configDB ## Using configDB: Should you be using FHEM config type configDB, you need to change the FHEM configuration source for correct startup by setting the following environment variable: configDB
## fhem.cfg.demo for Democonfig ## fhem.cfg.demo for Democonfig
configtype: "" configtype: "fhem.cfg.demo"
### ENDE Container environment variables ### ENDE Container environment variables
serviceAccount: serviceAccount:
@ -189,6 +189,8 @@ resources:
cpu: 100m cpu: 100m
memory: 128Mi memory: 128Mi
restartPolicy: Always
autoscaling: autoscaling:
enabled: false enabled: false
minReplicas: 1 minReplicas: 1