diff --git a/charts/home-assistant/Chart.yaml b/charts/home-assistant/Chart.yaml index 9028ba63..ba46176e 100644 --- a/charts/home-assistant/Chart.yaml +++ b/charts/home-assistant/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.115.2 description: Home Assistant name: home-assistant -version: 2.2.0 +version: 2.3.0 keywords: - home-assistant - hass diff --git a/charts/home-assistant/README.md b/charts/home-assistant/README.md index ffaa5473..a7f088ed 100644 --- a/charts/home-assistant/README.md +++ b/charts/home-assistant/README.md @@ -80,12 +80,13 @@ The following tables lists the configurable parameters of the Home Assistant cha | `persistence.hostPath` | The path to the config directory on the host, instead of a PVC | `nil` | | `persistence.storageClass` | Type of persistent volume claim | `-` | | `persistence.accessMode` | Persistence access modes | `ReadWriteMany` | +| `persistence.configSubPath` | An optional subPath for the config volumeMount | `` | | `git.enabled` | Use git-sync in init container | `false` | | `git.secret` | Git secret to use for git-sync | `git-creds` | | `git.syncPath` | Git sync path | `/config` | | `git.keyPath` | Git ssh key path | `/root/.ssh` | | `git.user.name` | Human-readable name in the “committer” and “author” fields | `` | -| `git.user.email` | Email address for the “committer” and “author” fields | `` | +| `git.user.email` | Email address for the “committer” and “author” fields | `` | | `zwave.enabled` | Enable zwave host device passthrough. Also enables privileged container mode. | `false` | | `zwave.device` | Device to passthrough to guest | `ttyACM0` | | `hostMounts` | Array of host directories to mount; can be used for devices | [] | @@ -94,7 +95,7 @@ The following tables lists the configurable parameters of the Home Assistant cha | `hostMounts.mountPath` | The path at which to mount (optional; assumed same as hostPath) | `nil` | | `hostMounts.type` | The type to mount (optional, i.e., `Directory`) | `nil` | | `extraEnv` | Extra ENV vars to pass to the home-assistant container | `{}` | -| `extraEnvSecrets` | Extra env vars to pass to the home-assistant container from k8s secrets - see `values.yaml` for an example | `{}` | +| `extraEnvSecrets` | Extra env vars to pass to the home-assistant container from k8s secrets - see `values.yaml` for an example | `{}` | | `configurator.enabled` | Enable the optional [configuration UI](https://github.com/danielperna84/hass-configurator) | `false` | | `configurator.image.repository` | Image repository | `k8s-at-home/hass-configurator-docker` | | `configurator.image.tag` | Image tag | `0.3.5-x86_64` | @@ -155,6 +156,7 @@ The following tables lists the configurable parameters of the Home Assistant cha | `appdaemon.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `appdaemon.haToken` | Home Assistant API token - you need to generate it in your Home Assistant profile and then copy here | `` | | `appdaemon.extraEnv` | Extra ENV vars to pass to the AppDaemon container | `{}` | +| `appdaemon.configSubPath` | An optional subPath for the AppDaemon container's config volume mount | `appdaemon` | | `appdaemon.ingress.enabled` | Enables Ingress for the AppDaemon UI | `false` | | `appdaemon.ingress.annotations` | Ingress annotations for the AppDaemon UI | `{}` | | `appdaemon.ingress.hosts` | Ingress accepted hostnames for the AppDaemonUI | `appdaemon.local` | diff --git a/charts/home-assistant/templates/deployment.yaml b/charts/home-assistant/templates/deployment.yaml index 0d539f52..c3419292 100644 --- a/charts/home-assistant/templates/deployment.yaml +++ b/charts/home-assistant/templates/deployment.yaml @@ -74,6 +74,7 @@ spec: volumeMounts: - mountPath: /config name: config + subPath: {{ default "" .Values.persistence.configSubPath }} - mountPath: {{ .Values.git.keyPath }} name: git-secret {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 8 }}{{ end }} @@ -148,6 +149,7 @@ spec: volumeMounts: - mountPath: /config name: config + subPath: {{ default "" .Values.persistence.configSubPath }} {{- if .Values.zwave.enabled }} - mountPath: /dev/ttyACM0 name: ttyacm @@ -247,6 +249,7 @@ spec: volumeMounts: - mountPath: /config name: config + subPath: {{ default "" .Values.persistence.configSubPath }} {{- if .Values.git.enabled }} - mountPath: {{ .Values.git.keyPath }} name: git-secret @@ -310,6 +313,7 @@ spec: volumeMounts: - mountPath: /config name: config + subPath: {{ default "" .Values.persistence.configSubPath }} {{- if .Values.git.enabled }} - mountPath: {{ .Values.git.keyPath }} name: git-secret @@ -369,8 +373,9 @@ spec: volumeMounts: - mountPath: /ha-conf name: config + subPath: {{ default "" .Values.persistence.configSubPath }} - mountPath: /conf - subPath: appdaemon + subPath: {{ default "appdaemon" .Values.appdaemon.configSubPath }} name: config {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 10 }}{{ end }} {{- if .Values.usePodSecurityContext }} diff --git a/charts/home-assistant/values.yaml b/charts/home-assistant/values.yaml index 1b01850d..84ff4a83 100644 --- a/charts/home-assistant/values.yaml +++ b/charts/home-assistant/values.yaml @@ -84,6 +84,9 @@ persistence: # hostPath: /path/to/the/config/folder accessMode: ReadWriteOnce size: 5Gi + # If you use an existingClaim is sometimes useful to specify a subPath within the volume to mount instead of mounting the root. + # This allows several charts to share a common volume. For example for configurations. + # configSubPath: configs/hass ## Additional hass container environment variable ## For instance to add a http_proxy @@ -292,6 +295,11 @@ appdaemon: ## extraEnv: {} + # If you use an existingClaim for the config volume then it is sometimes useful to specify a subPath + # within the volume to mount instead of mounting the root. + # This allows several charts to share a common volume. For example for configurations. + # configSubPath: configs/hass/appdaemon + ingress: enabled: false annotations: {}