[common] Resolve indenting issues, fixes #155 (#156)

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

.github/workflows/lint-test.yaml

@@ -9,7 +9,7 @@ jobs:
       - name: Fetch history
         run: |
           git fetch --prune --unshallow;
-          echo ::set-env name=commitmsg::$(git log --format=%B -n 1 ${{ github.event.after }})
+          echo "commitmsg=$(git log --format=%B -n 1 ${{ github.event.after }})" >> $GITHUB_ENV
       - name: Run chart-testing (lint)
         id: lint
         uses: helm/chart-testing-action@v1.0.0

.github/workflows/release.yaml

@@ -36,7 +36,7 @@ jobs:
           ./get_helm.sh
       - name: Add dependency chart repos
         run: |
-          helm repo add stable https://kubernetes-charts.storage.googleapis.com/
+          helm repo add stable https://charts.helm.sh/stable
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.0.0
         with:

.gitignore

@@ -1,4 +1,4 @@
 .env
 .idea
 charts/*/Chart.lock
-charts/*/charts
+charts/*/charts

README.md

@@ -3,7 +3,7 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![](https://github.com/k8s-at-home/charts/workflows/Release%20Charts/badge.svg?branch=master)](https://github.com/k8s-at-home/charts/actions)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
-
+[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/k8s-at-home)](https://artifacthub.io/packages/search?repo=k8s-at-home)
 ## Usage
 
 [Helm](https://helm.sh) must be installed to use the charts.

charts/README.templates.md.gotmpl

@@ -0,0 +1,72 @@
+{{- define "repository.organization" -}}
+  k8s-at-home
+{{- end -}}
+
+{{- define "repository.url" -}}
+  https://github.com/k8s-at-home/charts
+{{- end -}}
+
+{{- define "helm.url" -}}
+  https://k8s-at-home.com/charts/
+{{- end -}}
+
+{{- define "helm.path" -}}
+    {{ template "repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+{{- define "badge.artifactHub" -}}
+  [![ArtifactHub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/{{ template "chart.name" . }})](https://artifacthub.io/packages/helm/{{ template "chart.name" . }})
+{{- end -}}
+{{- define "description.multiarch" -}}
+The default values and container images used in this chart will allow for running in a multi-arch cluster (amd64, arm, arm64)
+{{- end -}}
+
+{{- define "install.tldr" -}}
+## TL;DR
+```console
+$ helm repo add {{ template "repository.organization" . }} {{ template "helm.url" . }}
+$ helm install {{ template "helm.path" . }}
+```
+{{- end -}}
+
+{{- define "install" -}}
+## Installing the Chart
+To install the chart with the release name `{{ template "chart.name" . }}`:
+```console
+helm install {{ template "chart.name" . }} {{ template "helm.path" . }}
+```
+{{- end -}}
+
+{{- define "uninstall" -}}
+## Uninstalling the Chart
+To uninstall the `{{ template "chart.name" . }}` deployment:
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+{{- end -}}
+
+{{- define "configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "configuration.readValues" -}}
+Read through the [values.yaml]({{ template "repository.url" . }}/blob/master/charts/{{ template "chart.name" . }}/values.yaml)
+file. It has several commented out suggested values.
+{{- end -}}
+
+{{- define "configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="America/New York" \
+    {{ template "helm.path" . }}
+```
+{{- end -}}
+
+{{- define "configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+For example,
+```console
+helm install {{ template "chart.name" . }} {{ template "helm.path" . }} --values values.yaml
+```
+{{- end -}}

charts/adguard-home/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.102.0
 description: DNS proxy as ad-blocker for local network
 name: adguard-home
-version: 2.0.0
+version: 2.2.0
 keywords:
   - adguard-home
   - adguard

charts/adguard-home/templates/deployment.yaml

@@ -83,6 +83,11 @@ spec:
             - name: config
               mountPath: /opt/adguardhome/conf
               readOnly: false
+            {{- if .Values.tlsSecretName }}
+            - name: certs
+              mountPath: /certs
+              readOnly: false
+            {{- end }}
           ports:
             - name: http
               {{- if .Values.configAsCode.enabled }}
@@ -153,6 +158,11 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:
+      {{- if .Values.tlsSecretName }}
+      - name: certs
+        secret:
+          secretName: {{ .Values.tlsSecretName }}
+      {{- end }}
       {{- if .Values.configAsCode.enabled }}
       - name: configmap
         configMap:

charts/adguard-home/templates/service-dhcp.yaml

@@ -17,6 +17,14 @@ spec:
   {{- if .Values.serviceDHCP.loadBalancerIP }}
   loadBalancerIP: {{ .Values.serviceDHCP.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.serviceDHCP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceDHCP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceDHCP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceDHCP.externalIPs | indent 4 }}
+  {{- end }}
   externalTrafficPolicy: {{ .Values.serviceDHCP.externalTrafficPolicy }}
   ports:
     - port: 67

charts/adguard-home/templates/service-dns-over-tls.yaml

@@ -17,6 +17,14 @@ spec:
   {{- if .Values.serviceDNSOverTLS.loadBalancerIP }}
   loadBalancerIP: {{ .Values.serviceDNSOverTLS.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.serviceDNSOverTLS.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceDNSOverTLS.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceDNSOverTLS.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceDNSOverTLS.externalIPs | indent 4 }}
+  {{- end }}
   externalTrafficPolicy: {{ .Values.serviceDNSOverTLS.externalTrafficPolicy }}
   ports:
     - port: 853

charts/adguard-home/templates/service-tcp.yaml

@@ -17,6 +17,14 @@ spec:
   {{- if .Values.serviceTCP.loadBalancerIP }}
   loadBalancerIP: {{ .Values.serviceTCP.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.serviceTCP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceTCP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceTCP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceTCP.externalIPs | indent 4 }}
+  {{- end }}
   externalTrafficPolicy: {{ .Values.serviceTCP.externalTrafficPolicy }}
   ports:
     - port: 53

charts/adguard-home/templates/service-udp.yaml

@@ -17,6 +17,14 @@ spec:
   {{- if .Values.serviceUDP.loadBalancerIP }}
   loadBalancerIP: {{ .Values.serviceUDP.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.serviceUDP.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.serviceUDP.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.serviceUDP.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceUDP.externalIPs | indent 4 }}
+  {{- end }}
   externalTrafficPolicy: {{ .Values.serviceUDP.externalTrafficPolicy }}
   ports:
     - port: 53

charts/adguard-home/templates/service.yaml

@@ -16,6 +16,14 @@ spec:
   {{- if .Values.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
   {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+  {{- if .Values.service.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.service.externalIPs | indent 4 }}
+  {{- end }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   ports:
     - port: 3000

charts/adguard-home/values.yaml

@@ -165,6 +165,10 @@ configAsCode:
     verbose: false
     schema_version: 6
 
+tlsSecretName: ""
+# name of the secret that contains the tls cert and key.
+# this secret will be mounted inside the adguard container /certs path. e.g. works with cert-manager
+
 image:
   repository: adguard/adguardhome
   # Image tag is set via charts appVersion. If you want to override the tag, specify it here
@@ -224,8 +228,10 @@ probes:
 service:
   type: ClusterIP
   # externalTrafficPolicy: Local
+  # externalIPs: []
   # loadBalancerIP: ""
     # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
   annotations: {}
     # metallb.universe.tf/address-pool: network-services
     # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -234,8 +240,10 @@ serviceTCP:
   enabled: false
   type: NodePort
   # externalTrafficPolicy: Local
+  # externalIPs: []
   loadBalancerIP: ""
     # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
   annotations: {}
     # metallb.universe.tf/address-pool: network-services
     # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -244,8 +252,10 @@ serviceUDP:
   enabled: true
   type: NodePort
   # externalTrafficPolicy: Local
+  # externalIPs: []
   loadBalancerIP: ""
     # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
   annotations: {}
     # metallb.universe.tf/address-pool: network-services
     # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -255,8 +265,10 @@ serviceDNSOverTLS:
   ## Enable if you use AdGuard as a DNS over TLS/HTTPS server
   type: NodePort
   # externalTrafficPolicy: Local
+  # externalIPs: []
   loadBalancerIP: ""
     # a fixed LoadBalancer IP
+  # loadBalancerSourceRanges: []
   annotations: {}
     # metallb.universe.tf/address-pool: network-services
     # metallb.universe.tf/allow-shared-ip: adguard-home-svc
@@ -266,6 +278,7 @@ serviceDHCP:
   ## Enable if you use AdGuard as a DHCP Server
   type: NodePort
   # externalTrafficPolicy: Local
+  # externalIPs: []
   loadBalancerIP: ""
     # a fixed LoadBalancer IP
   annotations: {}

charts/bazarr/Chart.yaml

@@ -1,15 +1,15 @@
 apiVersion: v2
-appVersion: v0.9.0.2
+appVersion: v0.9.0.5
 description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements
 name: bazarr
-version: 3.1.0
+version: 4.3.0
 keywords:
   - bazarr
   - radarr
   - sonarr
   - subtitles
   - usenet
-  - bittorrent
+  - torrent
 home: https://github.com/k8s-at-home/charts/tree/master/charts/bazarr
 icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png
 sources:
@@ -18,3 +18,7 @@ sources:
 maintainers:
   - name: billimek
     email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: ^1.4.0

charts/bazarr/OWNERS

@@ -1,4 +1,4 @@
 approvers:
 - billimek
 reviewers:
-- billimek
+- billimek

charts/bazarr/README.md

@@ -1,6 +1,6 @@
-# bazarr subtitle download client
+# Bazarr
 
-This is a helm chart for [bazarr](https://github.com/morpheus65535/bazarr) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/bazarr)
+This is a helm chart for [Bazarr](https://github.com/morpheus65535/bazarr).
 
 ## TL;DR;
 
@@ -17,20 +17,6 @@ To install the chart with the release name `my-release`:
 helm install --name my-release k8s-at-home/bazarr
 ```
 
-## Upgrading
-
-Version 1.0.0 used separate PVCs for TV and Movies. In order to keep this chart inline
-with changes to charts for Sonarr, etc. this was changed.
-
-This chart now uses a single PVC for all media. This means all of your media must be in, or be subdirectories of, a single media directory. If upgrading from v1 of the chart, do the following:
-
-1. [Uninstall](#uninstalling-the-chart) your current release
-2. On your backing store, organize your media, ie. media/tv, media/movies
-3. If using a pre-existing PVC, create a single new PVC for all of your media
-4. Refer to the [configuration](#configuration) for updates to the chart values
-5. Re-install the chart
-6. Update your settings in the app to point to the new PVC, which is mounted at /media. These can be found at: `Settings -> Path Mappings For TV Shows` and `Settings -> Path Mappings for Movies`
-
 ## Uninstalling the Chart
 
 To uninstall/delete the `my-release` deployment:
@@ -42,77 +28,49 @@ helm delete my-release --purge
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                              | Description                                                                                  | Default               |
-| -------------------------------------- | -------------------------------------------------------------------------------------------- | --------------------- |
-| `image.repository`                     | Image repository                                                                             | `linuxserver/bazarr`  |
-| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/bazarr/tags/). | `v0.8.4.2-ls72`       |
-| `image.pullPolicy`                     | Image pull policy                                                                            | `IfNotPresent`        |
-| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                  | `Recreate`            |
-| `timezone`                             | Timezone the bazarr instance should run as, e.g. 'America/New_York'                          | `UTC`                 |
-| `puid`                                 | process userID the bazarr instance should run as                                             | `1001`                |
-| `pgid`                                 | process groupID the bazarr instance should run as                                            | `1001`                |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                          | `60`                  |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                             | `5`                   |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                               | `10`                  |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                         | `60`                  |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                            | `5`                   |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                              | `10`                  |
-| `Service.type`                         | Kubernetes service type for the bazarr GUI                                                   | `ClusterIP`           |
-| `Service.port`                         | Kubernetes port where the bazarr GUI is exposed                                              | `6767`                |
-| `Service.annotations`                  | Service annotations for the bazarr GUI                                                       | `{}`                  |
-| `Service.labels`                       | Custom labels                                                                                | `{}`                  |
-| `Service.loadBalancerIP`               | Loadbalance IP for the bazarr GUI                                                            | `{}`                  |
-| `Service.loadBalancerSourceRanges`     | List of IP CIDRs allowed access to load balancer (if supported)                              | None                  |
-| `ingress.enabled`                      | Enables Ingress                                                                              | `false`               |
-| `ingress.annotations`                  | Ingress annotations                                                                          | `{}`                  |
-| `ingress.labels`                       | Custom labels                                                                                | `{}`                  |
-| `ingress.path`                         | Ingress path                                                                                 | `/`                   |
-| `ingress.hosts`                        | Ingress accepted hostnames                                                                   | `chart-example.local` |
-| `ingress.tls`                          | Ingress TLS configuration                                                                    | `[]`                  |
-| `persistence.config.enabled`           | Use persistent volume to store configuration data                                            | `true`                |
-| `persistence.config.size`              | Size of persistent volume claim                                                              | `1Gi`                 |
-| `persistence.config.existingClaim`     | Use an existing PVC to persist data                                                          | `nil`                 |
-| `persistence.config.subpath`           | Select a subpath in the PVC                                                          | `nil`                 |
-| `persistence.config.storageClass`      | Type of persistent volume claim                                                              | `-`                   |
-| `persistence.config.accessMode`        | Persistence access mode                                                                      | `ReadWriteOnce`       |
-| `persistence.config.skipuninstall`     | Do not delete the pvc upon helm uninstall                                                    | `false`               |
-| `persistence.media.enabled`            | Use persistent volume to store media data                                                    | `true`                |
-| `persistence.media.size`               | Size of persistent volume claim                                                              | `10Gi`                |
-| `persistence.media.existingClaim`      | Use an existing PVC to persist data                                                          | `nil`                 |
-| `persistence.media.storageClass`       | Type of persistent volume claim                                                              | `-`                   |
-| `persistence.media.accessMode`         | Persistence access mode                                                                      | `ReadWriteOnce`       |
-| `persistence.media.skipuninstall`      | Do not delete the pvc upon helm uninstall                                                    | `false`               |
-| `persistence.extraExistingClaimMounts`      | Optionally add multiple existing claims                                                      | `[]`                                           |
-| `resources`                            | CPU/Memory resource requests/limits                                                          | `{}`                  |
-| `nodeSelector`                         | Node labels for pod assignment                                                               | `{}`                  |
-| `tolerations`                          | Toleration labels for pod assignment                                                         | `[]`                  |
-| `affinity`                             | Affinity settings for pod assignment                                                         | `{}`                  |
-| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                    | `{}`                  |
-| `deploymentAnnotations`                | Key-value pairs to add as deployment annotations                                             | `{}`                  |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bazarr/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
 ```console
-helm install --name my-release \
-  --set timezone="America/New York" \
+helm install bazarr \
+  --set env.TZ="America/New York" \
     k8s-at-home/bazarr
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
-helm install --name my-release -f values.yaml stable/bazarr
+helm install bazarr k8s-at-home/bazarr --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
 ```
 
 ---
-
 **NOTE**
 
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
 
-Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bazarr/values.yaml) file. It has several commented out suggested values.
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 3.x.x to 4.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

charts/bazarr/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/bazarr/templates/NOTES.txt

@@ -1,19 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bazarr.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "bazarr.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bazarr.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bazarr.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/bazarr/templates/_helpers.tpl

@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "bazarr.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "bazarr.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "bazarr.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/bazarr/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/bazarr/templates/config-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "bazarr.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/bazarr/templates/deployment.yaml

@@ -1,113 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "bazarr.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "bazarr.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "bazarr.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 6767
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-          readinessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-          env:
-            - name: TZ
-              value: "{{ .Values.timezone }}"
-            - name: PUID
-              value: "{{ .Values.puid }}"
-            - name: PGID
-              value: "{{ .Values.pgid }}"
-          volumeMounts:
-            - mountPath: /config
-              name: config
-            {{- if .Values.persistence.config.subPath }}
-              subPath: {{ .Values.persistence.config.subPath }}
-            {{- end }}
-            - mountPath: /media
-              name: media
-            {{- if .Values.persistence.media.subPath }}
-              subPath: {{ .Values.persistence.media.subPath }}
-            {{- end }}
-            {{- range .Values.persistence.extraExistingClaimMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-            {{- end }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.config.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "bazarr.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      - name: media
-      {{- if .Values.persistence.media.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.media.existingClaim }}{{ .Values.persistence.media.existingClaim }}{{- else }}{{ template "bazarr.fullname" . }}-media{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      {{- range .Values.persistence.extraExistingClaimMounts }}
-      - name: {{ .name }}
-        persistentVolumeClaim:
-          claimName: {{ .existingClaim }}
-      {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}

charts/bazarr/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "bazarr.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    {{- with .Values.ingress.labels -}}
-    {{ toYaml . | nindent 4 }}
-    {{- end -}}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}

charts/bazarr/templates/media-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.media.enabled (not .Values.persistence.media.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "bazarr.fullname" . }}-media
-  {{- if .Values.persistence.media.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.media.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.media.size | quote }}
-{{- if .Values.persistence.media.storageClass }}
-{{- if (eq "-" .Values.persistence.media.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.media.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/bazarr/templates/service.yaml

@@ -1,52 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "bazarr.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}

charts/bazarr/values.yaml

@@ -1,133 +1,40 @@
-# Default values for bazarr.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+# Default values for Bazarr.
 
 image:
   repository: linuxserver/bazarr
-  tag: v0.9.0.2-ls89
   pullPolicy: IfNotPresent
+  tag: version-v0.9.0.5
 
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
+strategy:
+  type: Recreate
 
 service:
-  type: ClusterIP
-  port: 6767
-  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-  ##
-  # nodePort:
-  ## Provide any additional annotations which may be required. This can be used to
-  ## set the LoadBalancer service type to internal only.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-  ##
-  annotations: {}
-  labels: {}
-  ## Use loadBalancerIP to request a specific static IP,
-  ## otherwise leave blank
-  ##
-  loadBalancerIP:
-  # loadBalancerSourceRanges: []
-  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-  # externalTrafficPolicy: Cluster
+  port:
+    port: 6767
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  labels: {}
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
 
 persistence:
   config:
-    enabled: true
-    ## bazarr configuration data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
+    enabled: false
+    emptyDir: false
+
   media:
-    enabled: true
-    ## bazarr media volume configuration
+    enabled: false
+    emptyDir: false
+    mountPath: /media
+    ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
-    ##
     # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
     ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  extraExistingClaimMounts: []
-    # - name: external-mount
-    #   mountPath: /srv/external-mount
-    ## A manually managed Persistent Volume and Claim
-    ## If defined, PVC must be created manually before volume will be bound
-    #   existingClaim:
-    #   readOnly: true
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-deploymentAnnotations: {}
+    # skipuninstall: false
+    # existingClaim: ""

charts/common/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v2
+name: common
+description: Function library for k8s-at-home charts
+type: library
+version: 1.5.0
+keywords:
+  - k8s-at-home
+  - common
+home: https://github.com/k8s-at-home/charts/tree/master/charts/common
+maintainers:
+  - name: BJW-S
+    email: me@juggels.online

charts/common/README.md

@@ -0,0 +1,30 @@
+# Library chart for k8s@home media charts
+## **THIS CHART IS NOT MEANT TO BE INSTALLED DIRECTLY**
+
+This is a [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm) for grouping common logic between k8s@home charts.
+
+## Introduction
+
+This chart provides common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager.
+
+## TL;DR
+
+```yaml
+dependencies:
+  - name: common
+    version: 0.x.x
+    repository: https://k8s-at-home.com/charts/
+```
+
+```bash
+$ helm dependency update
+```
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}
+data:
+  myvalue: "Hello World"
+```

charts/common/templates/_all.tpl

@@ -0,0 +1,22 @@
+{{- define "common.all" -}}
+  {{- /* Merge the local chart values and the common chart defaults */ -}}
+  {{- include "common.values.setup" . }}
+  
+  {{- /* Enable OpenVPN VPN add-on if required */ -}}
+  {{- if .Values.addons.vpn.enabled }}
+    {{- include "common.addon.vpn" . }}
+  {{- end -}}
+
+  {{- /* Build the templates */ -}}
+  {{- include "common.pvc" . }}
+  {{- print "---" | nindent 0 -}}
+  {{- if eq .Values.controllerType "statefulset" }}
+    {{- include "common.statefulset" . | nindent 0 }}
+  {{ else }}
+    {{- include "common.deployment" . | nindent 0 }}
+  {{- end -}}
+  {{- print "---" | nindent 0 -}}
+  {{ include "common.service" . | nindent 0 }}
+  {{- print "---" | nindent 0 -}}
+  {{ include "common.ingress" .  | nindent 0 }}
+{{- end -}}

charts/common/templates/_deployment.tpl

@@ -0,0 +1,66 @@
+{{- define "common.deployment" -}}
+apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
+kind: Deployment
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.controllerLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.controllerAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicas }}
+  {{- with .Values.strategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+      {{- include "common.labels.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+      {{- include "common.controller.mainContainer" . | nindent 6 }}
+      {{- with .Values.additionalContainers }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+
+      volumes:
+      {{- include "common.controller.volumes" . | trim | nindent 6 }}
+
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

charts/common/templates/_ingress.tpl

@@ -0,0 +1,23 @@
+{{- define "common.ingress" -}}
+  {{- if .Values.ingress.enabled -}}
+    {{- $svcPort := .Values.service.port.port -}}
+
+    {{- /* Generate primary ingress */ -}}
+    {{- $ingressValues := .Values.ingress -}}
+    {{- $_ := set . "ObjectValues" (dict "ingress" $ingressValues) -}}
+    {{- include "common.classes.ingress" . }}
+
+    {{- /* Generate additional ingresses as required */ -}}
+    {{- range $index, $extraIngress := .Values.ingress.additionalIngresses }}
+      {{- if $extraIngress.enabled -}}
+        {{- print ("---") | nindent 0 -}}
+        {{- $ingressValues := $extraIngress -}}
+        {{- if not $ingressValues.nameSuffix -}}
+          {{- $_ := set $ingressValues "nameSuffix" $index -}}
+        {{ end -}}
+        {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
+        {{- include "common.classes.ingress" $ -}}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/common/templates/_notes.tpl

@@ -1,19 +1,25 @@
+{{/*
+Default NOTES.txt content.
+*/}}
+{{- define "common.notes.defaultNotes" -}}
+{{- $svcPort := .Values.service.port.port -}}
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
 {{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .host }}{{ (first .paths).path }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "media-common.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.names.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "media-common.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "media-common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
+           You can watch the status of by running 'kubectl get svc -w {{ include "common.names.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "common.names.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ $svcPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "media-common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "common.names.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
+  kubectl port-forward $POD_NAME 8080:{{ $svcPort }}
+{{- end }}
 {{- end }}

charts/common/templates/_pvc.tpl

@@ -0,0 +1,14 @@
+{{- define "common.pvc" -}}
+  {{- /* Generate pvc as required */ -}}
+  {{- range $index, $PVC := .Values.persistence }}
+    {{- if and $PVC.enabled (not (or $PVC.emptyDir $PVC.existingClaim)) -}}
+      {{- $persistenceValues := $PVC -}}
+      {{- if not $persistenceValues.nameSuffix -}}
+        {{- $_ := set $persistenceValues "nameSuffix" $index -}}
+      {{- end -}}
+      {{- $_ := set $ "ObjectValues" (dict "persistence" $persistenceValues) -}}
+      {{- print ("---") | nindent 0 -}}
+      {{- include "common.classes.pvc" $ -}}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/common/templates/_service.tpl

@@ -0,0 +1,19 @@
+{{- define "common.service" -}}
+  {{- if .Values.service.enabled -}}
+    {{- /* Generate primary service */ -}}
+    {{- include "common.classes.service" . }}
+
+    {{- /* Generate additional services as required */ -}}
+    {{- range $index, $extraService := .Values.service.additionalServices }}
+      {{- if $extraService.enabled -}}
+        {{- print ("---") | nindent 0 -}}
+        {{- $serviceValues := $extraService -}}
+        {{- if not $serviceValues.nameSuffix -}}
+          {{- $_ := set $serviceValues "nameSuffix" $index -}}
+        {{ end -}}
+        {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
+        {{- include "common.classes.service" $ -}}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/common/templates/_statefulset.tpl

@@ -0,0 +1,67 @@
+{{- define "common.statefulset" -}}
+apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
+kind: StatefulSet
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+  {{- with .Values.controllerLabels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.controllerAnnotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  replicas: {{ .Values.replicas }}
+  {{- with .Values.strategy }}
+  updateStrategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+    {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  serviceName: {{ include "common.names.fullname" . }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+      {{- include "common.labels.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.initContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+      {{- include "common.controller.mainContainer" . | nindent 6 }}
+      {{- with .Values.additionalContainers }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+
+      volumes:
+      {{- include "common.controller.volumes" . | trim | nindent 6 }}
+
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

charts/common/templates/addons/vpn/_configmap.tpl

@@ -0,0 +1,26 @@
+{{/*
+The OpenVPN configmaps to be included
+*/}}
+{{- define "common.addon.vpn.configmap" -}}
+{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "common.names.fullname" . }}-vpn
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+data:
+{{- with .Values.addons.vpn.configFile }}
+  vpnConfigfile: |-
+    {{- . | nindent 4}}
+{{- end }}
+{{- with .Values.addons.vpn.scripts.up }}
+  up.sh: |-
+    {{- . | nindent 4}}
+{{- end }}
+{{- with .Values.addons.vpn.scripts.down }}
+  down.sh: |-
+    {{- . | nindent 4}}
+{{- end }}
+{{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/_networkpolicy.tpl

@@ -0,0 +1,21 @@
+{{/*
+The OpenVPN networkpolicy to be included
+*/}}
+{{- define "common.addon.vpn.networkpolicy" -}}
+{{- if .Values.addons.vpn.networkPolicy.enabled -}}
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ template "common.names.fullname" . }}
+spec:
+  podSelector:
+    matchLabels:
+    {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  policyTypes:
+    - Egress
+  egress:
+  {{- with .Values.addons.vpn.networkPolicy.egress }} 
+    {{- . | toYaml | nindent 4 }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/_volume.tpl

@@ -0,0 +1,25 @@
+{{/*
+The OpenVPN shared volume to be inserted
+*/}}
+{{- define "common.addon.vpn.volume" -}}
+{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
+name: vpnconfig
+configMap:
+  name: {{ template "common.names.fullname" . }}-vpn
+  items:
+    {{- if .Values.addons.vpn.configFile }}
+    - key: vpnConfigfile
+      path: vpnConfigfile
+    {{- end }}
+    {{- if .Values.addons.vpn.scripts.up }}
+    - key: up.sh
+      path: up.sh
+      mode: 0777
+    {{- end }}
+    {{- if .Values.addons.vpn.scripts.down }}
+    - key: down.sh
+      path: down.sh
+      mode: 0777
+    {{- end }}
+{{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/_vpn.tpl

@@ -0,0 +1,35 @@
+{{/*
+Template to render VPN addon
+*/}}
+{{- define "common.addon.vpn" -}}
+{{- if .Values.addons.vpn.enabled -}}
+  {{- if eq "openvpn" .Values.addons.vpn.type -}}
+    {{- include "common.addon.openvpn" . }}
+  {{- end -}}
+  
+  {{- if eq "wireguard" .Values.addons.vpn.type -}}
+    {{- include "common.addon.wireguard" . }}
+  {{- end -}}
+
+  {{/* Include the configmap if not empty */}}
+  {{- $configmap := include "common.addon.vpn.configmap" . -}}
+  {{- if $configmap -}}
+    {{- print "---" | nindent 0 -}}
+    {{- $configmap | nindent 0 -}}
+  {{- end -}}
+
+  {{/* Append the vpn config volume to the additionalVolumes */}}
+  {{- $volume := include "common.addon.vpn.volume" . | fromYaml -}}
+  {{- if $volume -}}
+    {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
+    {{- $_ := set .Values "additionalVolumes" $additionalVolumes -}}
+  {{- end -}}
+
+  {{/* Include the networkpolicy if not empty */}}
+  {{- $networkpolicy := include "common.addon.vpn.networkpolicy" . -}}
+  {{- if $networkpolicy -}}
+    {{- print "---" | nindent 0 -}}
+    {{- $networkpolicy | nindent 0 -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/openvpn/_addon.tpl

@@ -0,0 +1,18 @@
+{{/*
+Template to render OpenVPN addon
+*/}}
+{{- define "common.addon.openvpn" -}}
+  {{/* Append the openVPN container to the additionalContainers */}}
+  {{- $container := include "common.addon.openvpn.container" . | fromYaml -}}
+  {{- if $container -}}
+    {{- $additionalContainers := append .Values.additionalContainers $container -}}
+    {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
+  {{- end -}}
+
+  {{/* Include the secret if not empty */}}
+  {{- $secret := include "common.addon.openvpn.secret" . -}}
+  {{- if $secret -}}
+    {{- print "---" | nindent 0 -}}
+    {{- $secret | nindent 0 -}}
+  {{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/openvpn/_container.tpl

@@ -0,0 +1,61 @@
+{{/*
+The OpenVPN container(s) to be inserted
+*/}}
+{{- define "common.addon.openvpn.container" -}}
+name: openvpn
+image: "{{ .Values.addons.vpn.openvpn.image.repository }}:{{ .Values.addons.vpn.openvpn.image.tag }}"
+imagePullPolicy: {{ .Values.addons.vpn.imagePullPolicy }}
+{{- with .Values.addons.vpn.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.addons.vpn.env }}
+env:
+{{- range $k, $v := . }}
+  - name: {{ $k }}
+    value: {{ $v | quote }}
+{{- end }}
+{{- end }}  
+{{- if or .Values.addons.vpn.openvpn.auth .Values.addons.vpn.openvpn.authSecret }}
+envFrom:
+  - secretRef:
+    {{- if .Values.addons.vpn.openvpn.authSecret }}
+      name: {{ .Values.addons.vpn.openvpn.authSecret }}
+    {{- else }}
+      name: {{ template "common.names.fullname" . }}-openvpn
+    {{- end }}
+{{- end }}
+{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down .Values.addons.vpn.additionalVolumeMounts .Values.persistence.shared.enabled }}
+volumeMounts:
+{{- if .Values.addons.vpn.configFile }}
+  - name: vpnconfig
+    mountPath: /vpn/vpn.conf
+    subPath: vpnConfigfile
+{{- end }}
+{{- if .Values.addons.vpn.scripts.up }}
+  - name: vpnconfig
+    mountPath: /vpn/up.sh
+    subPath: up.sh
+{{- end }}
+{{- if .Values.addons.vpn.scripts.down }}
+  - name: vpnconfig
+    mountPath: /vpn/down.sh
+    subPath: down.sh
+{{- end }}
+{{- if .Values.persistence.shared.enabled }}
+  - mountPath: {{ .Values.persistence.shared.mountPath }}
+    name: shared
+{{- end }}
+{{- with .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- with .Values.addons.vpn.livenessProbe }}
+livenessProbe:
+  {{- toYaml . | nindent 2 }}
+{{- end -}}
+{{- with .Values.addons.vpn.resources }}
+resources:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}

charts/common/templates/addons/vpn/openvpn/_secret.tpl

@@ -0,0 +1,15 @@
+{{/*
+The OpenVPN secrets to be included
+*/}}
+{{- define "common.addon.openvpn.secret" -}}
+{{- with .Values.addons.vpn.openvpn.auth -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "common.names.fullname" $ }}-openvpn
+  labels:
+  {{- include "common.labels" $ | nindent 4 }}
+data:
+  VPN_AUTH: {{ . | b64enc }}
+{{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/wireguard/_addon.tpl

@@ -0,0 +1,11 @@
+{{/*
+Template to render Wireguard addon
+*/}}
+{{- define "common.addon.wireguard" -}}
+  {{/* Append the Wireguard container to the additionalContainers */}}
+  {{- $container := fromYaml (include "common.addon.wireguard.container" .) -}}
+  {{- if $container -}}
+    {{- $additionalContainers := append .Values.additionalContainers $container -}}
+    {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
+  {{- end -}}
+{{- end -}}

charts/common/templates/addons/vpn/wireguard/_container.tpl

@@ -0,0 +1,52 @@
+{{/*
+The Wireguard container(s) to be inserted
+*/}}
+{{- define "common.addon.wireguard.container" -}}
+name: wireguard
+image: "{{ .Values.addons.vpn.wireguard.image.repository }}:{{ .Values.addons.vpn.wireguard.image.tag }}"
+imagePullPolicy: {{ .Values.addons.vpn.imagePullPolicy }}
+{{- with .Values.addons.vpn.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.addons.vpn.env }}
+env:
+{{- range $k, $v := . }}
+  - name: {{ $k }}
+    value: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down .Values.addons.vpn.additionalVolumeMounts .Values.persistence.shared.enabled }}
+volumeMounts:
+{{- if .Values.addons.vpn.configFile }}
+  - name: vpnconfig
+    mountPath: /etc/wireguard/wg0.conf
+    subPath: vpnConfigfile
+{{- end }}
+{{- if .Values.addons.vpn.scripts.up }}
+  - name: vpnconfig
+    mountPath: /config/up.sh
+    subPath: up.sh
+{{- end }}
+{{- if .Values.addons.vpn.scripts.down }}
+  - name: vpnconfig
+    mountPath: /config/down.sh
+    subPath: down.sh
+{{- end }}
+{{- if .Values.persistence.shared.enabled }}
+  - mountPath: {{ .Values.persistence.shared.mountPath }}
+    name: shared
+{{- end }}
+{{- with .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- with .Values.addons.vpn.livenessProbe }}
+livenessProbe:
+  {{- toYaml . | nindent 2 }}
+{{- end -}}
+{{- with .Values.addons.vpn.resources }}
+resources:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}

charts/common/templates/classes/_ingress.tpl

@@ -0,0 +1,47 @@
+{{- define "common.classes.ingress" -}}
+{{- $ingressName := include "common.names.fullname" . -}}
+{{- $values := .Values.ingress -}}
+{{- if hasKey . "ObjectValues" -}}
+  {{- with .ObjectValues.ingress -}}
+    {{- $values = . -}}
+  {{- end -}}
+{{ end -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}}
+{{ end -}}
+{{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
+{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
+apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
+kind: Ingress
+metadata:
+  name: {{ $ingressName }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+  {{- with $values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if $values.tls }}
+  tls:
+    {{- range $values.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+  {{- range $values.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            backend:
+              serviceName: {{ $svcName }}
+              servicePort: {{ $svcPort }}
+          {{- end }}
+  {{- end }}
+{{- end }}

charts/common/templates/classes/_pvc.tpl

@@ -0,0 +1,36 @@
+{{- define "common.classes.pvc" -}}
+{{- $values := .Values.persistence -}}
+{{- if hasKey . "ObjectValues" -}}
+  {{- with .ObjectValues.persistence -}}
+    {{- $values = . -}}
+  {{- end -}}
+{{ end -}}
+{{- $pvcName := include "common.names.fullname" . -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $pvcName = printf "%v-%v" $pvcName $values.nameSuffix -}}
+{{ end -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ $pvcName }}
+  {{- if or $values.skipuninstall $values.annotations }}
+  annotations:
+    {{- if $values.skipuninstall }}
+    "helm.sh/resource-policy": keep
+    {{- end }}
+    {{- with $values.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- end }}
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - {{ required (printf "accessMode is required for PVC %v" $pvcName) $values.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ required (printf "size is required for PVC %v" $pvcName) $values.size | quote }}
+  {{- if $values.storageClass }}
+  storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else }}{{ $values.storageClass | quote }}{{- end }}
+  {{- end }}
+{{- end -}}

charts/common/templates/classes/_service.tpl

@@ -0,0 +1,74 @@
+{{- define "common.classes.service" -}}
+{{- $values := .Values.service -}}
+{{- if hasKey . "ObjectValues" -}}
+  {{- with .ObjectValues.service -}}
+    {{- $values = . -}}
+  {{- end -}}
+{{ end -}}
+{{- $serviceName := include "common.names.fullname" . -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}}
+{{ end -}}
+{{- $svcType := $values.type -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ $serviceName }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+  {{- if $values.labels }}
+    {{ toYaml $values.labels | nindent 4 }}
+  {{- end }}
+  {{- with $values.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if (or (eq $svcType "ClusterIP") (empty $svcType)) }}
+  type: ClusterIP
+  {{- if $values.clusterIP }}
+  clusterIP: {{ $values.clusterIP }}
+  {{end}}
+  {{- else if eq $svcType "LoadBalancer" }}
+  type: {{ $svcType }}
+  {{- if $values.loadBalancerIP }}
+  loadBalancerIP: {{ $values.loadBalancerIP }}
+  {{- end }}
+  {{- if $values.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ $values.externalTrafficPolicy }}
+  {{- end }}
+  {{- if $values.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+    {{ toYaml $values.loadBalancerSourceRanges | nindent 4 }}
+  {{- end -}}
+  {{- else }}
+  type: {{ $svcType }}
+  {{- end }}
+  {{- if $values.sessionAffinity }}
+  sessionAffinity: {{ $values.sessionAffinity }}
+  {{- if $values.sessionAffinityConfig }}
+  sessionAffinityConfig:
+    {{ toYaml $values.sessionAffinityConfig | nindent 4 }}
+  {{- end -}}
+  {{- end }}
+  {{- with $values.externalIPs }}
+  externalIPs:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if $values.publishNotReadyAddresses }}
+  publishNotReadyAddresses: {{ $values.publishNotReadyAddresses }}
+  {{- end }}
+  ports:
+    - port: {{ $values.port.port }}
+      targetPort: {{ $values.port.targetPort }}
+      protocol: {{ $values.port.protocol }}
+      name: {{ $values.port.name }}
+      {{- if (and (eq $svcType "NodePort") (not (empty $values.port.nodePort))) }}
+      nodePort: {{ $values.port.nodePort }}
+      {{ end }}
+    {{- with $values.additionalPorts }}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
+  selector:
+    {{- include "common.labels.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/common/templates/lib/chart/_capabilities.tpl

@@ -0,0 +1,32 @@
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "common.capabilities.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for statefulset.
+*/}}
+{{- define "common.capabilities.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "common.capabilities.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- end -}}
+{{- end -}}

charts/common/templates/lib/chart/_labels.tpl

@@ -0,0 +1,19 @@
+{{/*
+Common labels
+*/}}
+{{- define "common.labels" -}}
+helm.sh/chart: {{ include "common.names.chart" . }}
+{{ include "common.labels.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "common.labels.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "common.names.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

charts/common/templates/lib/chart/_names.tpl

@@ -0,0 +1,42 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "common.names.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "common.names.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "common.names.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "common.names.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "k8s-at-home.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

charts/common/templates/lib/chart/_values.tpl

@@ -0,0 +1,9 @@
+{{- define "common.values.setup" -}}
+  {{- /* Merge the local chart values and the common chart defaults */ -}}
+  {{- if .Values.common -}}
+    {{- $defaultValues := deepCopy .Values.common -}}
+    {{- $userValues := deepCopy (omit .Values "common") -}}
+    {{- $mergedValues := mustMergeOverwrite $defaultValues $userValues -}}
+    {{- $_ := set . "Values" (deepCopy $mergedValues) -}}
+  {{- end }}  
+{{- end }}

charts/common/templates/lib/controller/_container.tpl

@@ -0,0 +1,43 @@
+{{- /* The main containter that will be included in the controller */ -}}
+{{- define "common.controller.mainContainer" -}}
+- name: {{ template "common.names.fullname" . }}
+  image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+  imagePullPolicy: {{ .Values.image.pullPolicy }}
+  {{- with .Values.securityContext }}
+  securityContext:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.env }}
+  env:
+  {{- range $key, $value := .Values.env }}
+  - name: {{ $key }}
+    value: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - name: {{ .Values.service.port.name }}
+    containerPort: {{ .Values.service.port.port }}
+    protocol: {{ .Values.service.port.protocol }}
+  {{- range $port := .Values.service.additionalPorts }}
+  - name: {{ $port.name }}
+    containerPort: {{ $port.port }}
+    protocol: {{ $port.protocol }}
+  {{- end }}
+  volumeMounts:
+  {{- range $index, $PVC := .Values.persistence }}
+  {{- if $PVC.enabled }}
+  - mountPath: {{ $PVC.mountPath }}
+    name: {{ $index }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.additionalVolumeMounts }}
+    {{- toYaml .Values.additionalVolumeMounts | nindent 2 }}
+  {{- end }}
+
+  {{- include "common.controller.probes.tcpSocket" . | nindent 2 }}
+
+  {{- with .Values.resources }}
+  resources:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end -}}

charts/common/templates/lib/controller/_probes.tpl

@@ -0,0 +1,29 @@
+{{/*
+Default liveness/readiness/startup probes
+*/}}
+{{- define "common.controller.probes.tcpSocket" -}}
+{{- if .Values.probes.liveness.enabled -}}
+livenessProbe:
+  tcpSocket:
+    port: {{ .Values.service.port.name }}
+  initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+  failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
+  timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
+{{- end }}
+{{- if .Values.probes.readiness.enabled }}
+readinessProbe:
+  tcpSocket:
+    port: {{ .Values.service.port.name }}
+  initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+  failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
+  timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+{{- end }}
+{{- if .Values.probes.startup.enabled }}
+startupProbe:
+  tcpSocket:
+    port: {{ .Values.service.port.name }}
+  initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
+  failureThreshold: {{ .Values.probes.startup.failureThreshold }}
+  periodSeconds: {{ .Values.probes.startup.periodSeconds }}
+{{- end }}
+{{- end }}

charts/common/templates/lib/controller/_volumes.tpl

@@ -0,0 +1,31 @@
+{{/*
+volumes included by the controller
+*/}}
+{{- define "common.controller.volumes" -}}
+{{- range $index, $persistence := .Values.persistence }}
+{{- if $persistence.enabled }}
+- name: {{ $index }}
+{{- if $persistence.existingClaim }}
+{{- /* Always prefer an existingClaim if that is set */}}
+  persistentVolumeClaim:
+    claimName: {{ $persistence.existingClaim }}
+{{- else -}}
+  {{- if $persistence.emptyDir -}}
+  {{- /* Always prefer an emptyDir next if that is set */}}
+  emptyDir: {}
+  {{- else -}}
+  {{- /* Otherwise refer to the PVC name */}}
+  persistentVolumeClaim:
+    {{- if $persistence.nameSuffix }}
+    claimName: {{ printf "%s-%s" (include "common.names.fullname" $) $persistence.nameSuffix }}
+    {{- else }}
+    claimName: {{ printf "%s-%s" (include "common.names.fullname" $) $index }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if .Values.additionalVolumes }}
+  {{- toYaml .Values.additionalVolumes | nindent 0 }}
+{{- end }}
+{{- end -}}

charts/common/values.yaml

@@ -0,0 +1,237 @@
+# type: options are statefulset or deployment
+controllerType: deployment
+# Set annotations on the deployment/statefulset
+controllerAnnotations: {}
+# Set labels on the deployment/statefulset
+controllerLabels: {}
+
+replicas: 1
+strategy:
+  ## For Deployments, valid values are Recreate and RollingUpdate
+  ## For StatefulSets, valid values are OnDelete and RollingUpdate
+  type: RollingUpdate
+
+# Set annotations on the pod
+podAnnotations: {}
+
+env: {}
+
+initContainers: []
+
+additionalContainers: []
+
+# Probes configuration
+probes:
+  liveness:
+    enabled: true
+    initialDelaySeconds: 30
+    failureThreshold: 5
+    timeoutSeconds: 10
+  readiness:
+    enabled: true
+    initialDelaySeconds: 30
+    failureThreshold: 5
+    timeoutSeconds: 10
+  startup:
+    enabled: false
+    initialDelaySeconds: 5
+    failureThreshold: 30
+    periodSeconds: 10
+
+service:
+  enabled: true
+  type: ClusterIP
+  # Specify the default port information
+  port:
+    port:
+    name: http
+    protocol: TCP
+    targetPort: http
+    ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+    ##
+    # nodePort:
+  additionalPorts: []
+
+  ## Provide any additional annotations which may be required. This can be used to
+  ## set the LoadBalancer service type to internal only.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+  ##
+  annotations: {}
+  labels: {}
+
+  additionalServices: []
+  # - enabled: false
+  #   nameSuffix: api
+  #   type: ClusterIP
+  #   # Specify the default port information
+  #   port:
+  #     port: ""
+  #     name: http
+  #     protocol: TCP
+  #     targetPort: http
+  #     # nodePort:
+  #   additionalPorts: []
+  #   annotations: {}
+  #   labels: {}
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  labels: {}
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          # Ignored if not kubeVersion >= 1.14-0
+          pathType: Prefix
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+  additionalIngresses: []
+  # - enabled: false
+  #   nameSuffix: "api"
+  #   annotations: {}
+  #   # kubernetes.io/ingress.class: nginx
+  #   # kubernetes.io/tls-acme: "true"
+  #   labels: {}
+  #   hosts:
+  #     - host: chart-example.local
+  #       paths:
+  #         - path: /api
+  #           # Ignored if not kubeVersion >= 1.14-0
+  #           pathType: Prefix
+  #   tls: []
+  #   #  - secretName: chart-example-tls
+  #   #    hosts:
+  #   #      - chart-example.local
+
+persistence:
+  config:
+    enabled: false
+    mountPath: /config
+    ## configuration data Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    ##
+    # storageClass: "-"
+    ##
+    ## If you want to reuse an existing claim, you can pass the name of the PVC using
+    ## the existingClaim variable
+    # existingClaim: your-claim
+    # subPath: some-subpath
+    accessMode: ReadWriteOnce
+    size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    skipuninstall: false
+
+  # Create an emptyDir volume to share between all containers
+  shared:
+    enabled: false
+    emptyDir: true
+    mountPath: /shared
+
+additionalVolumes: []
+
+additionalVolumeMounts: []
+
+nodeSelector: {}
+
+affinity: {}
+
+tolerations: []
+
+addons:
+  vpn:
+    enabled: false
+
+    # VPN type: options are openvpn or wireguard
+    type: openvpn
+
+    # OpenVPN specific configuration
+    openvpn:
+      image:
+        repository: dperson/openvpn-client
+        tag: latest
+
+      # Credentials to connect to the VPN Service (used with -a)
+      auth:  # "user;password"
+      # OR specify an existing secret that contains the credentials. Credentials should be stored
+      # under the VPN_AUTH key
+      authSecret:  # my-vpn-secret
+
+    # WireGuard specific configuration
+    wireguard:
+      image:
+        repository: k8sathome/wireguard
+        tag: 1.0.20200827
+
+    imagePullPolicy: IfNotPresent
+
+    # Set the VPN container securityContext
+    securityContext:
+      capabilities:
+        add: 
+          - NET_ADMIN
+          - SYS_MODULE
+
+    # All variables specified here will be added to the vpn sidecar container
+    # See the documentation of the VPN image for all config values
+    env: {}
+    # TZ: UTC
+
+    # Provide a customized vpn configuration file to be used by the VPN.
+    configFile:  # |-
+      # Some Example Config
+      # remote greatvpnhost.com 8888
+      # auth-user-pass
+      # Cipher AES
+
+    # Provide custom up/down scripts that can be used by the vpnConf
+    scripts:
+      up:  # |-
+        # #!/bin/bash
+        # echo "connected" > /shared/vpnstatus
+      down:  # |-
+        # #!/bin/bash
+        # echo "disconnected" > /shared/vpnstatus
+
+    additionalVolumeMounts: []
+
+    # Optionally specify a livenessProbe, e.g. to check if the connection is still
+    # being protected by the VPN
+    livenessProbe: {}
+    # exec:
+    #    command:
+    #      - sh
+    #      - -c
+    #      - if [ $(curl -s https://ipinfo.io/country) == 'US' ]; then exit 0; else exit $?; fi
+    #  initialDelaySeconds: 30
+    #  periodSeconds: 60
+    #  failureThreshold: 1
+
+    # If set to true, will deploy a network policy that blocks all outbound
+    # traffic except traffic specified as allowed
+    networkPolicy:
+      enabled: false
+
+      # The egress configuration for your network policy, All outbound traffic
+      # From the pod will be blocked unless specified here. Your cluster must
+      # have a CNI that supports network policies (Canal, Calico, etc...)
+      # https://kubernetes.io/docs/concepts/services-networking/network-policies/
+      # https://github.com/ahmetb/kubernetes-network-policy-recipes
+      egress:
+        # - to:
+        #   - ipBlock:
+        #       cidr: 0.0.0.0/0
+        #   ports:
+        #   - port: 53
+        #     protocol: UDP
+        #   - port: 53
+        #     protocol: TCP

charts/esphome/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.14.5
+appVersion: 1.15.3
 description: ESPHome
 name: esphome
-version: 2.0.0
+version: 2.3.0
 keywords:
 - esphome
 home: https://github.com/k8s-at-home/charts/tree/master/charts/esphome

charts/esphome/README.md

@@ -34,65 +34,72 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following tables lists the configurable parameters of the ESPHome chart and their default values.
 
-| Parameter                  | Description                         | Default                                                 |
-|----------------------------|-------------------------------------|---------------------------------------------------------|
-| `image.repository`         | Image repository | `esphome/esphome` |
-| `image.tag`                | Image tag. Possible values listed [here](https://hub.docker.com/r/esphome/esphome/tags/).| `0.14.5`|
-| `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
-| `image.pullSecrets`        | Secrets to use when pulling the image | `[]` |
-| `strategyType`             | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
-| `probes.liveness.enabled`  | Use the livenessProbe?  | `true` |
-| `probes.liveness.scheme `  | Specify liveness `scheme` parameter for the deployment  | `HTTP` |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment  | `60` |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment     | `5`  |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment       | `10` |
-| `probes.readiness.enabled`  | Use the readinessProbe?  | `true` |
-| `probes.readiness.scheme `  | Specify readiness `scheme` parameter for the deployment  | `HTTP` |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment | `60` |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment      | `10` |
-| `probes.startup.enabled`  | Use the startupProbe? (new in kubernetes 1.16)  | `false` |
-| `probes.startup.scheme `  | Specify startup `scheme` parameter for the deployment  | `HTTP` |
-| `probes.startup.failureThreshold`    | Specify startup `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.startup.periodSeconds`      | Specify startup `periodSeconds` parameter for the deployment      | `10` |
-| `service.type`             | Kubernetes service type for the esphome GUI | `ClusterIP` |
-| `service.port`             | Kubernetes port where the esphome GUI is exposed| `6052` |
-| `service.portName`         | Kubernetes port name where the esphome GUI is exposed | `api` |
-| `service.additionalPorts`  | Add additional ports exposed by the esphome container integrations. Example homematic needs to expose a proxy port | `{}` |
-| `service.annotations`      | Service annotations for the esphome GUI | `{}` |
-| `service.clusterIP`   | Cluster IP for the esphom GUI | `` |
-| `service.externalIPs`   | External IPs for the esphome GUI | `[]` |
-| `service.loadBalancerIP`   | Loadbalancer IP for the esphome GUI | `` |
-| `service.loadBalancerSourceRanges`   | Loadbalancer client IP restriction range for the esphome GUI | `[]` |
-| `service.publishNotReadyAddresses`   | Set to true if the notReadyAddresses should be published | `false` |
-| `service.externalTrafficPolicy`   | Loadbalancer externalTrafficPolicy | `` |
-| `hostNetwork`              | Enable hostNetwork - might be needed for discovery to work | `false` |
-| `service.nodePort`   | nodePort to listen on for the esphome GUI | `` |
-| `ingress.enabled`              | Enables Ingress | `false` |
-| `ingress.annotations`          | Ingress annotations | `{}` |
-| `ingress.path`                 | Ingress path | `/` |
-| `ingress.hosts`                | Ingress accepted hostnames | `chart-example.local` |
-| `ingress.tls`                  | Ingress TLS configuration | `[]` |
-| `persistence.enabled`      | Use persistent volume to store data | `true` |
-| `persistence.size`         | Size of persistent volume claim | `5Gi` |
-| `persistence.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `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` |
-| `hostMounts`        | Array of host directories to mount; can be used for devices | [] |
-| `hostMounts.name`   | Name of the volume | `nil` |
-| `hostMounts.hostPath` | The path on the host machine | `nil` |
-| `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 esphome container | `{}` |
-| `extraEnvSecrets`   | Extra env vars to pass to the esphome container from k8s secrets - see `values.yaml` for an example | `{}` |
-| `resources`                | CPU/Memory resource requests/limits or the esphome GUI | `{}` |
-| `nodeSelector`             | Node labels for pod assignment or the esphome GUI | `{}` |
-| `tolerations`              | Toleration labels for pod assignment or the esphome GUI | `[]` |
-| `affinity`                 | Affinity settings for pod assignment or the esphome GUI | `{}` |
-| `podAnnotations`            | Key-value pairs to add as pod annotations  | `{}` |
-| `extraVolumes`            | Any extra volumes to define for the pod  | `{}` |
-| `extraVolumeMounts`       | Any extra volumes mounts to define for each container of the pod  | `{}` |
+| Parameter                              | Description                                                                                                        | Default               |
+|----------------------------------------|--------------------------------------------------------------------------------------------------------------------|-----------------------|
+| `image.repository`                     | Image repository                                                                                                   | `esphome/esphome`     |
+| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/esphome/esphome/tags/).                          | `0.14.5`              |
+| `image.pullPolicy`                     | Image pull policy                                                                                                  | `IfNotPresent`        |
+| `image.pullSecrets`                    | Secrets to use when pulling the image                                                                              | `[]`                  |
+| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                                        | `Recreate`            |
+| `probes.liveness.enabled`              | Use the livenessProbe?                                                                                             | `true`                |
+| `probes.liveness.scheme `              | Specify liveness `scheme` parameter for the deployment                                                             | `HTTP`                |
+| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                                                | `60`                  |
+| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                                                   | `5`                   |
+| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                                                     | `10`                  |
+| `probes.readiness.enabled`             | Use the readinessProbe?                                                                                            | `true`                |
+| `probes.readiness.scheme `             | Specify readiness `scheme` parameter for the deployment                                                            | `HTTP`                |
+| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                                               | `60`                  |
+| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                                                  | `5`                   |
+| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                                                    | `10`                  |
+| `probes.startup.enabled`               | Use the startupProbe? (new in kubernetes 1.16)                                                                     | `false`               |
+| `probes.startup.scheme `               | Specify startup `scheme` parameter for the deployment                                                              | `HTTP`                |
+| `probes.startup.failureThreshold`      | Specify startup `failureThreshold` parameter for the deployment                                                    | `5`                   |
+| `probes.startup.periodSeconds`         | Specify startup `periodSeconds` parameter for the deployment                                                       | `10`                  |
+| `service.type`                         | Kubernetes service type for the esphome GUI                                                                        | `ClusterIP`           |
+| `service.port`                         | Kubernetes port where the esphome GUI is exposed                                                                   | `6052`                |
+| `service.portName`                     | Kubernetes port name where the esphome GUI is exposed                                                              | `api`                 |
+| `service.additionalPorts`              | Add additional ports exposed by the esphome container integrations. Example homematic needs to expose a proxy port | `{}`                  |
+| `service.annotations`                  | Service annotations for the esphome GUI                                                                            | `{}`                  |
+| `service.clusterIP`                    | Cluster IP for the esphom GUI                                                                                      | ``                    |
+| `service.externalIPs`                  | External IPs for the esphome GUI                                                                                   | `[]`                  |
+| `service.loadBalancerIP`               | Loadbalancer IP for the esphome GUI                                                                                | ``                    |
+| `service.loadBalancerSourceRanges`     | Loadbalancer client IP restriction range for the esphome GUI                                                       | `[]`                  |
+| `service.publishNotReadyAddresses`     | Set to true if the notReadyAddresses should be published                                                           | `false`               |
+| `service.externalTrafficPolicy`        | Loadbalancer externalTrafficPolicy                                                                                 | ``                    |
+| `hostNetwork`                          | Enable hostNetwork - might be needed for discovery to work                                                         | `false`               |
+| `service.nodePort`                     | nodePort to listen on for the esphome GUI                                                                          | ``                    |
+| `ingress.enabled`                      | Enables Ingress                                                                                                    | `false`               |
+| `ingress.annotations`                  | Ingress annotations                                                                                                | `{}`                  |
+| `ingress.path`                         | Ingress path                                                                                                       | `/`                   |
+| `ingress.hosts`                        | Ingress accepted hostnames                                                                                         | `chart-example.local` |
+| `ingress.tls`                          | Ingress TLS configuration                                                                                          | `[]`                  |
+| `persistence.enabled`                  | Use persistent volume to store data                                                                                | `true`                |
+| `persistence.size`                     | Size of persistent volume claim                                                                                    | `5Gi`                 |
+| `persistence.existingClaim`            | Use an existing PVC to persist data                                                                                | `nil`                 |
+| `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`       |
+| `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                                                              | ``                    |
+| `hostMounts`                           | Array of host directories to mount; can be used for devices                                                        | []                    |
+| `hostMounts.name`                      | Name of the volume                                                                                                 | `nil`                 |
+| `hostMounts.hostPath`                  | The path on the host machine                                                                                       | `nil`                 |
+| `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 esphome container                                                                    | `{}`                  |
+| `extraEnvSecrets`                      | Extra env vars to pass to the esphome container from k8s secrets - see `values.yaml` for an example                | `{}`                  |
+| `resources`                            | CPU/Memory resource requests/limits or the esphome GUI                                                             | `{}`                  |
+| `nodeSelector`                         | Node labels for pod assignment or the esphome GUI                                                                  | `{}`                  |
+| `tolerations`                          | Toleration labels for pod assignment or the esphome GUI                                                            | `[]`                  |
+| `affinity`                             | Affinity settings for pod assignment or the esphome GUI                                                            | `{}`                  |
+| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                                          | `{}`                  |
+| `extraVolumes`                         | Any extra volumes to define for the pod                                                                            | `{}`                  |
+| `extraVolumeMounts`                    | Any extra volumes mounts to define for each container of the pod                                                   | `{}`                  |
+
 
 
 

charts/esphome/templates/deployment.yaml

@@ -37,6 +37,56 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       dnsPolicy: ClusterFirstWithHostNet
       {{- end }}
+      initContainers:
+      {{- if .Values.git.enabled }}
+      - name: git-sync
+        image: "{{ .Values.git.image.repository }}:{{ .Values.git.image.tag }}"
+        imagePullPolicy: {{ .Values.git.image.pullPolicy }}
+        {{- if .Values.git.command }}
+        command:
+          {{- range .Values.git.command }}
+          - {{ . | quote }}
+          {{- end }}
+        {{- else }}
+        command: ["/bin/sh", "-c"]
+        args:
+        - set -e;
+          if [ -d "{{ .Values.git.syncPath }}/.git" ];
+          then
+            git -C "{{ .Values.git.syncPath }}" pull || true;
+          else
+            if [ "$(ls -A {{ .Values.git.syncPath }})" ]; 
+            then
+              git clone --depth 2 "{{ .Values.git.repo }}" /tmp/repo;
+              cp -rf /tmp/repo/.git "{{ .Values.git.syncPath }}";
+              cd "{{ .Values.git.syncPath }}";
+              git checkout -f;
+            else
+              git clone --depth 2 "{{ .Values.git.repo }}" "{{ .Values.git.syncPath }}";
+            fi;
+          fi;
+          if [ -f "{{ .Values.git.keyPath }}/git-crypt-key" ];
+          then
+            cd {{ .Values.git.syncPath }};
+            git-crypt unlock "{{ .Values.git.keyPath }}/git-crypt-key";
+          fi;
+        {{- end }}
+        volumeMounts:
+        - mountPath: /config
+          name: config
+        - mountPath: {{ .Values.git.keyPath }}
+          name: git-secret
+        {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 8 }}{{ end }}
+        {{- if .Values.usePodSecurityContext }}
+        securityContext:
+          runAsUser: {{ default 0 .Values.runAsUser }}
+        {{- if and (.Values.runAsUser) (.Values.fsGroup) }}
+        {{- if not (eq .Values.runAsUser 0.0) }}
+          fsGroup: {{ .Values.fsGroup }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+      {{- end }}              
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -144,6 +194,13 @@ spec:
           type: {{ .type }}
           {{- end }}
       {{- end }}
+      {{- if .Values.git.enabled }}
+      - name: git-secret
+        secret:
+          defaultMode: 256
+          secretName: {{ .Values.git.secret }}
+          optional: true
+      {{ end }}      
       {{- if .Values.extraVolumes  }}{{ toYaml .Values.extraVolumes | trim | nindent 6 }}{{ end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:

charts/esphome/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: esphome/esphome
-  tag: 1.14.5
+  tag: 1.15.3
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -152,3 +152,25 @@ extraVolumes: []
 extraVolumeMounts: []
 #   - name: example-name
 #     mountPath: /path/in/container
+
+
+git:
+  enabled: false
+
+  image:
+    repository: k8sathome/git-crypt
+    tag: 2020.09.28
+    pullPolicy: IfNotPresent
+
+  ## Specify the command that runs in the git-sync container to pull in configuration.
+  # command: []
+
+  # Committer settings
+  user:
+    name: ""
+    email: ""
+
+  repo: ""
+  secret: git-creds
+  syncPath: /config
+  keyPath: /root/.ssh

charts/frigate/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.2"
+appVersion: "0.6.0"
 description: Realtime object detection on RTSP cameras with the Google Coral
 name: frigate
-version: 4.0.0
+version: 4.0.1
 keywords:
   - tensorflow
   - coral

charts/frigate/values.yaml

@@ -9,7 +9,7 @@ strategyType: Recreate
 
 image:
   repository: blakeblackshear/frigate
-  tag: 0.5.2
+  tag: 0.6.0
   pullPolicy: IfNotPresent
 
 rtspPassword: password

charts/home-assistant/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.114.0
+appVersion: 0.116.1
 description: Home Assistant
 name: home-assistant
-version: 2.1.0
+version: 2.6.0
 keywords:
 - home-assistant
 - hass
@@ -22,7 +22,7 @@ maintainers:
 dependencies:
 - name: esphome
   repository: https://k8s-at-home.com/charts/
-  version: ~1.0.0
+  version: ~2.2.0
   condition: esphome.enabled
 - name: postgresql
   version: 9.1.2
@@ -32,3 +32,7 @@ dependencies:
   version: 7.7.1
   repository: https://charts.bitnami.com/bitnami
   condition: mariadb.enabled
+- name: influxdb
+  version: 0.6.7
+  repository: https://charts.bitnami.com/bitnami
+  condition: influxdb.enabled

charts/home-assistant/README.md

@@ -35,158 +35,163 @@ The command removes all the Kubernetes components associated with the chart and
 
 The following tables lists the configurable parameters of the Home Assistant chart and their default values.
 
-| Parameter                                       | Description                                                                                                                                                                                                                               | Default                             |
-| ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- |
-| `image.repository`                              | Image repository                                                                                                                                                                                                                          | `homeassistant/home-assistant`      |
-| `image.tag`                                     | Image tag. Possible values listed [here](https://hub.docker.com/r/homeassistant/home-assistant/tags/).                                                                                                                                    | `0.114.0`                           |
-| `image.pullPolicy`                              | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                      |
-| `image.pullSecrets`                             | Secrets to use when pulling the image                                                                                                                                                                                                     | `[]`                                |
-| `strategyType`                                  | Specifies the strategy used to replace old Pods by new ones                                                                                                                                                                               | `Recreate`                          |
-| `probes.liveness.enabled`                       | Use the livenessProbe?                                                                                                                                                                                                                    | `true`                              |
-| `probes.liveness.scheme`                       | Specify liveness `scheme` parameter for the deployment                                                                                                                                                                                    | `HTTP`                              |
-| `probes.liveness.initialDelaySeconds`           | Specify liveness `initialDelaySeconds` parameter for the deployment                                                                                                                                                                       | `60`                                |
-| `probes.liveness.failureThreshold`              | Specify liveness `failureThreshold` parameter for the deployment                                                                                                                                                                          | `5`                                 |
-| `probes.liveness.timeoutSeconds`                | Specify liveness `timeoutSeconds` parameter for the deployment                                                                                                                                                                            | `10`                                |
-| `probes.readiness.enabled`                      | Use the readinessProbe?                                                                                                                                                                                                                   | `true`                              |
-| `probes.readiness.scheme`                      | Specify readiness `scheme` parameter for the deployment                                                                                                                                                                                   | `HTTP`                              |
-| `probes.readiness.initialDelaySeconds`          | Specify readiness `initialDelaySeconds` parameter for the deployment                                                                                                                                                                      | `60`                                |
-| `probes.readiness.failureThreshold`             | Specify readiness `failureThreshold` parameter for the deployment                                                                                                                                                                         | `5`                                 |
-| `probes.readiness.timeoutSeconds`               | Specify readiness `timeoutSeconds` parameter for the deployment                                                                                                                                                                           | `10`                                |
-| `probes.startup.enabled`                        | Use the startupProbe? (new in kubernetes 1.16)                                                                                                                                                                                            | `false`                             |
-| `probes.startup.scheme`                        | Specify startup `scheme` parameter for the deployment                                                                                                                                                                                     | `HTTP`                              |
-| `probes.startup.failureThreshold`               | Specify startup `failureThreshold` parameter for the deployment                                                                                                                                                                           | `5`                                 |
-| `probes.startup.periodSeconds`                  | Specify startup `periodSeconds` parameter for the deployment                                                                                                                                                                              | `10`                                |
-| `service.type`                                  | Kubernetes service type for the home-assistant GUI                                                                                                                                                                                        | `ClusterIP`                         |
-| `service.port`                                  | Kubernetes port where the home-assistant GUI is exposed                                                                                                                                                                                   | `8123`                              |
-| `service.portName`                              | Kubernetes port name where the home-assistant GUI is exposed                                                                                                                                                                              | `api`                               |
-| `service.additionalPorts`                       | Add additional ports exposed by the home assistant container integrations. Example homematic needs to expose a proxy port                                                                                                                 | `{}`                                |
-| `service.annotations`                           | Service annotations for the home-assistant GUI                                                                                                                                                                                            | `{}`                                |
-| `service.clusterIP`                             | Cluster IP for the home-assistant GUI                                                                                                                                                                                                     | ``                                  |
-| `service.externalIPs`                           | External IPs for the home-assistant GUI                                                                                                                                                                                                   | `[]`                                |
-| `service.loadBalancerIP`                        | Loadbalancer IP for the home-assistant GUI                                                                                                                                                                                                | ``                                  |
-| `service.loadBalancerSourceRanges`              | Loadbalancer client IP restriction range for the home-assistant GUI                                                                                                                                                                       | `[]`                                |
-| `service.publishNotReadyAddresses`              | Set to true if the editors (vscode or configurator) should be reachable when home assistant does not run                                                                                                                                  | `false`                             |
-| `service.externalTrafficPolicy`                 | Loadbalancer externalTrafficPolicy                                                                                                                                                                                                        | ``                                  |
-| `hostNetwork`                                   | Enable hostNetwork - might be needed for discovery to work                                                                                                                                                                                | `false`                             |
-| `service.nodePort`                              | nodePort to listen on for the home-assistant GUI                                                                                                                                                                                          | ``                                  |
-| `ingress.enabled`                               | Enables Ingress                                                                                                                                                                                                                           | `false`                             |
-| `ingress.annotations`                           | Ingress annotations                                                                                                                                                                                                                       | `{}`                                |
-| `ingress.path`                                  | Ingress path                                                                                                                                                                                                                              | `/`                                 |
-| `ingress.hosts`                                 | Ingress accepted hostnames                                                                                                                                                                                                                | `chart-example.local`               |
-| `ingress.tls`                                   | Ingress TLS configuration                                                                                                                                                                                                                 | `[]`                                |
-| `persistence.enabled`                           | Use persistent volume to store data                                                                                                                                                                                                       | `true`                              |
-| `persistence.size`                              | Size of persistent volume claim                                                                                                                                                                                                           | `5Gi`                               |
-| `persistence.existingClaim`                     | Use an existing PVC to persist data                                                                                                                                                                                                       | `nil`                               |
-| `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`                     |
-| `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                                                                                                                                                                                     | ``                                  |
-| `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                                                                                                                                                                               | []                                  |
-| `hostMounts.name`                               | Name of the volume                                                                                                                                                                                                                        | `nil`                               |
-| `hostMounts.hostPath`                           | The path on the host machine                                                                                                                                                                                                              | `nil`                               |
-| `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                                                                                                                                | `{}`                                |
-| `configurator.enabled`                          | Enable the optional [configuration UI](https://github.com/danielperna84/hass-configurator)                                                                                                                                                | `false`                             |
+| Parameter                                       | Description                                                                                                                                                                                                                               | Default                                |
+|-------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------|
+| `image.repository`                              | Image repository                                                                                                                                                                                                                          | `homeassistant/home-assistant`         |
+| `image.tag`                                     | Image tag. Possible values listed [here](https://hub.docker.com/r/homeassistant/home-assistant/tags/).                                                                                                                                    | `0.114.0`                              |
+| `image.pullPolicy`                              | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                         |
+| `image.pullSecrets`                             | Secrets to use when pulling the image                                                                                                                                                                                                     | `[]`                                   |
+| `strategyType`                                  | Specifies the strategy used to replace old Pods by new ones                                                                                                                                                                               | `Recreate`                             |
+| `probes.liveness.enabled`                       | Use the livenessProbe?                                                                                                                                                                                                                    | `true`                                 |
+| `probes.liveness.scheme`                        | Specify liveness `scheme` parameter for the deployment                                                                                                                                                                                    | `HTTP`                                 |
+| `probes.liveness.initialDelaySeconds`           | Specify liveness `initialDelaySeconds` parameter for the deployment                                                                                                                                                                       | `60`                                   |
+| `probes.liveness.failureThreshold`              | Specify liveness `failureThreshold` parameter for the deployment                                                                                                                                                                          | `5`                                    |
+| `probes.liveness.timeoutSeconds`                | Specify liveness `timeoutSeconds` parameter for the deployment                                                                                                                                                                            | `10`                                   |
+| `probes.readiness.enabled`                      | Use the readinessProbe?                                                                                                                                                                                                                   | `true`                                 |
+| `probes.readiness.scheme`                       | Specify readiness `scheme` parameter for the deployment                                                                                                                                                                                   | `HTTP`                                 |
+| `probes.readiness.initialDelaySeconds`          | Specify readiness `initialDelaySeconds` parameter for the deployment                                                                                                                                                                      | `60`                                   |
+| `probes.readiness.failureThreshold`             | Specify readiness `failureThreshold` parameter for the deployment                                                                                                                                                                         | `5`                                    |
+| `probes.readiness.timeoutSeconds`               | Specify readiness `timeoutSeconds` parameter for the deployment                                                                                                                                                                           | `10`                                   |
+| `probes.startup.enabled`                        | Use the startupProbe? (new in kubernetes 1.16)                                                                                                                                                                                            | `false`                                |
+| `probes.startup.scheme`                         | Specify startup `scheme` parameter for the deployment                                                                                                                                                                                     | `HTTP`                                 |
+| `probes.startup.failureThreshold`               | Specify startup `failureThreshold` parameter for the deployment                                                                                                                                                                           | `5`                                    |
+| `probes.startup.periodSeconds`                  | Specify startup `periodSeconds` parameter for the deployment                                                                                                                                                                              | `10`                                   |
+| `service.type`                                  | Kubernetes service type for the home-assistant GUI                                                                                                                                                                                        | `ClusterIP`                            |
+| `service.port`                                  | Kubernetes port where the home-assistant GUI is exposed                                                                                                                                                                                   | `8123`                                 |
+| `service.portName`                              | Kubernetes port name where the home-assistant GUI is exposed                                                                                                                                                                              | `api`                                  |
+| `service.additionalPorts`                       | Add additional ports exposed by the home assistant container integrations. Example homematic needs to expose a proxy port                                                                                                                 | `{}`                                   |
+| `service.annotations`                           | Service annotations for the home-assistant GUI                                                                                                                                                                                            | `{}`                                   |
+| `service.clusterIP`                             | Cluster IP for the home-assistant GUI                                                                                                                                                                                                     | ``                                     |
+| `service.externalIPs`                           | External IPs for the home-assistant GUI                                                                                                                                                                                                   | `[]`                                   |
+| `service.loadBalancerIP`                        | Loadbalancer IP for the home-assistant GUI                                                                                                                                                                                                | ``                                     |
+| `service.loadBalancerSourceRanges`              | Loadbalancer client IP restriction range for the home-assistant GUI                                                                                                                                                                       | `[]`                                   |
+| `service.publishNotReadyAddresses`              | Set to true if the editors (vscode or configurator) should be reachable when home assistant does not run                                                                                                                                  | `false`                                |
+| `service.externalTrafficPolicy`                 | Loadbalancer externalTrafficPolicy                                                                                                                                                                                                        | ``                                     |
+| `hostNetwork`                                   | Enable hostNetwork - might be needed for discovery to work                                                                                                                                                                                | `false`                                |
+| `service.nodePort`                              | nodePort to listen on for the home-assistant GUI                                                                                                                                                                                          | ``                                     |
+| `ingress.enabled`                               | Enables Ingress                                                                                                                                                                                                                           | `false`                                |
+| `ingress.annotations`                           | Ingress annotations                                                                                                                                                                                                                       | `{}`                                   |
+| `ingress.path`                                  | Ingress path                                                                                                                                                                                                                              | `/`                                    |
+| `ingress.hosts`                                 | Ingress accepted hostnames                                                                                                                                                                                                                | `chart-example.local`                  |
+| `ingress.tls`                                   | Ingress TLS configuration                                                                                                                                                                                                                 | `[]`                                   |
+| `persistence.enabled`                           | Use persistent volume to store data                                                                                                                                                                                                       | `true`                                 |
+| `persistence.size`                              | Size of persistent volume claim                                                                                                                                                                                                           | `5Gi`                                  |
+| `persistence.existingClaim`                     | Use an existing PVC to persist data                                                                                                                                                                                                       | `nil`                                  |
+| `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                                                                                                                                                                                     | ``                                     |
+| `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                                                                                                                                                                               | []                                     |
+| `hostMounts.name`                               | Name of the volume                                                                                                                                                                                                                        | `nil`                                  |
+| `hostMounts.hostPath`                           | The path on the host machine                                                                                                                                                                                                              | `nil`                                  |
+| `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                                                                                                                                | `{}`                                   |
+| `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`                      |
-| `configurator.image.pullPolicy`                 | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                      |
-| `configurator.hassApiUrl`                       | Home Assistant API URL (e.g. 'http://home-assistant:8123/api/') - will auto-configure to proper URL if not set                                                                                                                            | ``                                  |
-| `configurator.hassApiPassword`                  | Home Assistant API Password                                                                                                                                                                                                               | ``                                  |
-| `configurator.basepath`                         | Base path of the home assistant configuration files                                                                                                                                                                                       | `/config`                           |
-| `configurator.enforceBasepath`                  | If set to true, will prevent navigation to other directories in the configurator UI                                                                                                                                                       | `true`                              |
-| `configurator.username`                         | If this and password (below) are set, will require basic auth to access the configurator UI                                                                                                                                               | ``                                  |
-| `configurator.password`                         | If this and username (above) are set, will require basic auth to access the configurator UI. password is in the format of a sha256 hash (e.g. "test" would be "{sha256}9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08") | ``                                  |
-| `configurator.extraEnv`                         | Extra ENV vars to pass to the configuration UI                                                                                                                                                                                            | `{}`                                |
-| `configurator.ingress.enabled`                  | Enables Ingress for the configurator UI                                                                                                                                                                                                   | `false`                             |
-| `configurator.ingress.annotations`              | Ingress annotations for the configurator UI                                                                                                                                                                                               | `{}`                                |
-| `configurator.ingress.hosts`                    | Ingress accepted hostnames for the configurator UI                                                                                                                                                                                        | `chart-example.local`               |
-| `configurator.ingress.tls`                      | Ingress TLS configuration for the configurator UI                                                                                                                                                                                         | `[]`                                |
-| `configurator.strategy.type`                    | hass-configurator Deployment Strategy type                                                                                                                                                                                                | ``                                  |
-| `configurator.tolerations`                      | Toleration labels for pod assignment for the configurator UI                                                                                                                                                                              | `[]`                                |
-| `configurator.nodeSelector`                     | Node labels for pod assignment for the configurator UI                                                                                                                                                                                    | `{}`                                |
-| `configurator.schedulerName`                    | Use an alternate scheduler, e.g. "stork" for the configurator UI                                                                                                                                                                          | ``                                  |
-| `configurator.podAnnotations`                   | Affinity settings for pod assignment for the configurator UI                                                                                                                                                                              | `{}`                                |
-| `configurator.resources`                        | CPU/Memory resource requests/limits for the configurator UI                                                                                                                                                                               | `{}`                                |
-| `configurator.securityContext`                  | Security context to be added to hass-configurator pods for the configurator UI                                                                                                                                                            | `{}`                                |
-| `configurator.service.type`                     | Kubernetes service type for the configurator UI                                                                                                                                                                                           | `ClusterIP`                         |
-| `configurator.service.port`                     | Kubernetes port where the configurator UI is exposed                                                                                                                                                                                      | `3218`                              |
-| `configurator.service.nodePort`                 | nodePort to listen on for the configurator UI                                                                                                                                                                                             | ``                                  |
-| `configurator.service.annotations`              | Service annotations for the configurator UI                                                                                                                                                                                               | `{}`                                |
-| `configurator.service.labels`                   | Service labels to use for the configurator UI                                                                                                                                                                                             | `{}`                                |
-| `configurator.service.clusterIP`                | Cluster IP for the configurator UI                                                                                                                                                                                                        | ``                                  |
-| `configurator.service.externalIPs`              | External IPs for the configurator UI                                                                                                                                                                                                      | `[]`                                |
-| `configurator.service.loadBalancerIP`           | Loadbalancer IP for the configurator UI                                                                                                                                                                                                   | ``                                  |
-| `configurator.service.loadBalancerSourceRanges` | Loadbalancer client IP restriction range for the configurator UI                                                                                                                                                                          | `[]`                                |
-| `vscode.enabled`                                | Enable the optional [VS Code Server Sidecar](https://github.com/cdr/code-server)                                                                                                                                                          | `false`                             |
-| `vscode.image.repository`                       | Image repository                                                                                                                                                                                                                          | `codercom/code-server`              |
-| `vscode.image.tag`                              | Image tag                                                                                                                                                                                                                                 | `3.4.1`                             |
-| `vscode.image.pullPolicy`                       | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                      |
-| `vscode.hassConfig`                             | Base path of the home assistant configuration files                                                                                                                                                                                       | `/config`                           |
-| `vscode.vscodePath`                             | Base path of the VS Code configuration files                                                                                                                                                                                              | `/config/.vscode`                   |
-| `vscode.password`                               | If this is set, will require a password to access the VS Code Server UI                                                                                                                                                                   | ``                                  |
-| `vscode.extraEnv`                               | Extra ENV vars to pass to the configuration UI                                                                                                                                                                                            | `{}`                                |
-| `vscode.ingress.enabled`                        | Enables Ingress for the VS Code UI                                                                                                                                                                                                        | `false`                             |
-| `vscode.ingress.annotations`                    | Ingress annotations for the VS Code UI                                                                                                                                                                                                    | `{}`                                |
-| `vscode.ingress.hosts`                          | Ingress accepted hostnames for the VS Code UI                                                                                                                                                                                             | `chart-example.local`               |
-| `vscode.ingress.tls`                            | Ingress TLS configuration for the VS Code UI                                                                                                                                                                                              | `[]`                                |
-| `vscode.resources`                              | CPU/Memory resource requests/limits for the VS Code UI                                                                                                                                                                                    | `{}`                                |
-| `vscode.securityContext`                        | Security context to be added to hass-vscode pods for the VS Code UI                                                                                                                                                                       | `{}`                                |
-| `vscode.service.type`                           | Kubernetes service type for the VS Code UI                                                                                                                                                                                                | `ClusterIP`                         |
-| `vscode.service.port`                           | Kubernetes port where the vscode UI is exposed                                                                                                                                                                                            | `80`                                |
-| `vscode.service.nodePort`                       | nodePort to listen on for the VS Code UI                                                                                                                                                                                                  | ``                                  |
-| `vscode.service.annotations`                    | Service annotations for the VS Code UI                                                                                                                                                                                                    | `{}`                                |
-| `vscode.service.labels`                         | Service labels to use for the VS Code UI                                                                                                                                                                                                  | `{}`                                |
-| `vscode.service.clusterIP`                      | Cluster IP for the VS Code UI                                                                                                                                                                                                             | ``                                  |
-| `vscode.service.externalIPs`                    | External IPs for the VS Code UI                                                                                                                                                                                                           | `[]`                                |
-| `vscode.service.loadBalancerIP`                 | Loadbalancer IP for the VS Code UI                                                                                                                                                                                                        | ``                                  |
-| `vscode.service.loadBalancerSourceRanges`       | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                |
-| `appdaemon.enabled`                             | Enable the optional [Appdaemon Sidecar](https://appdaemon.readthedocs.io/en/latest/)                                                                                                                                                      | `false`                             |
-| `appdaemon.image.repository`                    | Image repository                                                                                                                                                                                                                          | `acockburn/appdaemon`               |
-| `appdaemon.image.tag`                           | Image tag                                                                                                                                                                                                                                 | `3.0.5`                             |
-| `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.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`                   |
-| `appdaemon.ingress.tls`                         | Ingress TLS configuration for the AppDaemon UI                                                                                                                                                                                            | `[]`                                |
-| `appdaemon.resources`                           | CPU/Memory resource requests/limits for the AppDaemon                                                                                                                                                                                     | `{}`                                |
-| `appdaemon.securityContext`                     | Security context to be added to hass-appdaemon container                                                                                                                                                                                  | `{}`                                |
-| `appdaemon.service.type`                        | Kubernetes service type for the AppDaemon UI                                                                                                                                                                                              | `ClusterIP`                         |
-| `appdaemon.service.port`                        | Kubernetes port where the AppDaemon UI is exposed                                                                                                                                                                                         | `5050`                              |
-| `appdaemon.service.nodePort`                    | nodePort to listen on for the AppDaemon UI                                                                                                                                                                                                | ``                                  |
-| `appdaemon.service.annotations`                 | Service annotations for the AppDaemon UI                                                                                                                                                                                                  | `{}`                                |
-| `appdaemon.service.labels`                      | Service labels to use for the AppDaemon UI                                                                                                                                                                                                | `{}`                                |
-| `appdaemon.service.clusterIP`                   | Cluster IP for the AppDaemon UI                                                                                                                                                                                                           | ``                                  |
-| `appdaemon.service.externalIPs`                 | External IPs for the AppDaemon UI                                                                                                                                                                                                         | `[]`                                |
-| `appdaemon.service.loadBalancerIP`              | Loadbalancer IP for the AppDaemon UI                                                                                                                                                                                                      | ``                                  |
-| `appdaemon.service.loadBalancerSourceRanges`    | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                |
-| `esphome.enabled`                               | Enable the optional [ESPHome](https://esphome.io) deployment                                                                                                                                                                              | `false`                             |
-| `mariadb.enabled`                               | Enable the optional [Mariadb](https://github.com/bitnami/charts) deployment                                                                                                                                                               | `false`                             |
-| `postgresql.enabled`                            | Enable the optional [Postgres](https://github.com/bitnami/charts) deployment                                                                                                                                                              | `false`                             |
-| `resources`                                     | CPU/Memory resource requests/limits or the home-assistant GUI                                                                                                                                                                             | `{}`                                |
-| `nodeSelector`                                  | Node labels for pod assignment or the home-assistant GUI                                                                                                                                                                                  | `{}`                                |
-| `tolerations`                                   | Toleration labels for pod assignment or the home-assistant GUI                                                                                                                                                                            | `[]`                                |
-| `affinity`                                      | Affinity settings for pod assignment or the home-assistant GUI                                                                                                                                                                            | `{}`                                |
-| `podAnnotations`                                | Key-value pairs to add as pod annotations                                                                                                                                                                                                 | `{}`                                |
-| `extraVolumes`                                  | Any extra volumes to define for the pod                                                                                                                                                                                                   | `{}`                                |
-| `extraVolumeMounts`                             | Any extra volumes mounts to define for each container of the pod                                                                                                                                                                          | `{}`                                |
-| `monitoring.enabled`                            | Enables Monitoring support                                                                                                                                                                                                                | `false`                             |
-| `monitoring.serviceMonitor.enabled`             | Setup a ServiceMonitor to configure scraping                                                                                                                                                                                              | `false`                             |
-| `monitoring.serviceMonitor.namespace`           | Set the namespace the ServiceMonitor should be deployed                                                                                                                                                                                   | `false`                             |
-| `monitoring.serviceMonitor.interval`            | Set how frequently Prometheus should scrape                                                                                                                                                                                               | `30`                                |
-| `monitoring.serviceMonitor.labels`              | Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator                                                                                                                                           | `{}`                                |
-| `monitoring.serviceMonitor.bearerTokenFile`     | Set bearerTokenFile for home-assistant auth (use long lived access tokens)                                                                                                                                                                | `nil`                               |
-| `monitoring.serviceMonitor.bearerTokenSecret`   | Set bearerTokenSecret for home-assistant auth (use long lived access tokens)                                                                                                                                                              | `nil`                               |
+| `configurator.image.tag`                        | Image tag                                                                                                                                                                                                                                 | `0.3.5-x86_64`                         |
+| `configurator.image.pullPolicy`                 | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                         |
+| `configurator.hassApiUrl`                       | Home Assistant API URL (e.g. 'http://home-assistant:8123/api/') - will auto-configure to proper URL if not set                                                                                                                            | ``                                     |
+| `configurator.hassApiPassword`                  | Home Assistant API Password                                                                                                                                                                                                               | ``                                     |
+| `configurator.basepath`                         | Base path of the home assistant configuration files                                                                                                                                                                                       | `/config`                              |
+| `configurator.enforceBasepath`                  | If set to true, will prevent navigation to other directories in the configurator UI                                                                                                                                                       | `true`                                 |
+| `configurator.username`                         | If this and password (below) are set, will require basic auth to access the configurator UI                                                                                                                                               | ``                                     |
+| `configurator.password`                         | If this and username (above) are set, will require basic auth to access the configurator UI. password is in the format of a sha256 hash (e.g. "test" would be "{sha256}9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08") | ``                                     |
+| `configurator.extraEnv`                         | Extra ENV vars to pass to the configuration UI                                                                                                                                                                                            | `{}`                                   |
+| `configurator.ingress.enabled`                  | Enables Ingress for the configurator UI                                                                                                                                                                                                   | `false`                                |
+| `configurator.ingress.annotations`              | Ingress annotations for the configurator UI                                                                                                                                                                                               | `{}`                                   |
+| `configurator.ingress.hosts`                    | Ingress accepted hostnames for the configurator UI                                                                                                                                                                                        | `chart-example.local`                  |
+| `configurator.ingress.tls`                      | Ingress TLS configuration for the configurator UI                                                                                                                                                                                         | `[]`                                   |
+| `configurator.strategy.type`                    | hass-configurator Deployment Strategy type                                                                                                                                                                                                | ``                                     |
+| `configurator.tolerations`                      | Toleration labels for pod assignment for the configurator UI                                                                                                                                                                              | `[]`                                   |
+| `configurator.nodeSelector`                     | Node labels for pod assignment for the configurator UI                                                                                                                                                                                    | `{}`                                   |
+| `configurator.schedulerName`                    | Use an alternate scheduler, e.g. "stork" for the configurator UI                                                                                                                                                                          | ``                                     |
+| `configurator.podAnnotations`                   | Affinity settings for pod assignment for the configurator UI                                                                                                                                                                              | `{}`                                   |
+| `configurator.resources`                        | CPU/Memory resource requests/limits for the configurator UI                                                                                                                                                                               | `{}`                                   |
+| `configurator.securityContext`                  | Security context to be added to hass-configurator pods for the configurator UI                                                                                                                                                            | `{}`                                   |
+| `configurator.service.type`                     | Kubernetes service type for the configurator UI                                                                                                                                                                                           | `ClusterIP`                            |
+| `configurator.service.port`                     | Kubernetes port where the configurator UI is exposed                                                                                                                                                                                      | `3218`                                 |
+| `configurator.service.nodePort`                 | nodePort to listen on for the configurator UI                                                                                                                                                                                             | ``                                     |
+| `configurator.service.annotations`              | Service annotations for the configurator UI                                                                                                                                                                                               | `{}`                                   |
+| `configurator.service.labels`                   | Service labels to use for the configurator UI                                                                                                                                                                                             | `{}`                                   |
+| `configurator.service.clusterIP`                | Cluster IP for the configurator UI                                                                                                                                                                                                        | ``                                     |
+| `configurator.service.externalIPs`              | External IPs for the configurator UI                                                                                                                                                                                                      | `[]`                                   |
+| `configurator.service.loadBalancerIP`           | Loadbalancer IP for the configurator UI                                                                                                                                                                                                   | ``                                     |
+| `configurator.service.loadBalancerSourceRanges` | Loadbalancer client IP restriction range for the configurator UI                                                                                                                                                                          | `[]`                                   |
+| `vscode.enabled`                                | Enable the optional [VS Code Server Sidecar](https://github.com/cdr/code-server)                                                                                                                                                          | `false`                                |
+| `vscode.image.repository`                       | Image repository                                                                                                                                                                                                                          | `codercom/code-server`                 |
+| `vscode.image.tag`                              | Image tag                                                                                                                                                                                                                                 | `3.4.1`                                |
+| `vscode.image.pullPolicy`                       | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                         |
+| `vscode.hassConfig`                             | Base path of the home assistant configuration files                                                                                                                                                                                       | `/config`                              |
+| `vscode.vscodePath`                             | Base path of the VS Code configuration files                                                                                                                                                                                              | `/config/.vscode`                      |
+| `vscode.password`                               | If this is set, will require a password to access the VS Code Server UI                                                                                                                                                                   | ``                                     |
+| `vscode.extraEnv`                               | Extra ENV vars to pass to the configuration UI                                                                                                                                                                                            | `{}`                                   |
+| `vscode.args`                                   | Optional arguments to pass into vscode image. Defaulting to "-" uses default arguments.         | `-`                                   |
+| `vscode.ingress.enabled`                        | Enables Ingress for the VS Code UI                                                                                                                                                                                                        | `false`                                |
+| `vscode.ingress.annotations`                    | Ingress annotations for the VS Code UI                                                                                                                                                                                                    | `{}`                                   |
+| `vscode.ingress.hosts`                          | Ingress accepted hostnames for the VS Code UI                                                                                                                                                                                             | `chart-example.local`                  |
+| `vscode.ingress.tls`                            | Ingress TLS configuration for the VS Code UI                                                                                                                                                                                              | `[]`                                   |
+| `vscode.resources`                              | CPU/Memory resource requests/limits for the VS Code UI                                                                                                                                                                                    | `{}`                                   |
+| `vscode.securityContext`                        | Security context to be added to hass-vscode pods for the VS Code UI                                                                                                                                                                       | `{}`                                   |
+| `vscode.service.type`                           | Kubernetes service type for the VS Code UI                                                                                                                                                                                                | `ClusterIP`                            |
+| `vscode.service.port`                           | Kubernetes port where the vscode UI is exposed                                                                                                                                                                                            | `80`                                   |
+| `vscode.service.nodePort`                       | nodePort to listen on for the VS Code UI                                                                                                                                                                                                  | ``                                     |
+| `vscode.service.annotations`                    | Service annotations for the VS Code UI                                                                                                                                                                                                    | `{}`                                   |
+| `vscode.service.labels`                         | Service labels to use for the VS Code UI                                                                                                                                                                                                  | `{}`                                   |
+| `vscode.service.clusterIP`                      | Cluster IP for the VS Code UI                                                                                                                                                                                                             | ``                                     |
+| `vscode.service.externalIPs`                    | External IPs for the VS Code UI                                                                                                                                                                                                           | `[]`                                   |
+| `vscode.service.loadBalancerIP`                 | Loadbalancer IP for the VS Code UI                                                                                                                                                                                                        | ``                                     |
+| `vscode.service.loadBalancerSourceRanges`       | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                   |
+| `appdaemon.enabled`                             | Enable the optional [Appdaemon Sidecar](https://appdaemon.readthedocs.io/en/latest/)                                                                                                                                                      | `false`                                |
+| `appdaemon.image.repository`                    | Image repository                                                                                                                                                                                                                          | `acockburn/appdaemon`                  |
+| `appdaemon.image.tag`                           | Image tag                                                                                                                                                                                                                                 | `3.0.5`                                |
+| `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`                      |
+| `appdaemon.ingress.tls`                         | Ingress TLS configuration for the AppDaemon UI                                                                                                                                                                                            | `[]`                                   |
+| `appdaemon.resources`                           | CPU/Memory resource requests/limits for the AppDaemon                                                                                                                                                                                     | `{}`                                   |
+| `appdaemon.securityContext`                     | Security context to be added to hass-appdaemon container                                                                                                                                                                                  | `{}`                                   |
+| `appdaemon.service.type`                        | Kubernetes service type for the AppDaemon UI                                                                                                                                                                                              | `ClusterIP`                            |
+| `appdaemon.service.port`                        | Kubernetes port where the AppDaemon UI is exposed                                                                                                                                                                                         | `5050`                                 |
+| `appdaemon.service.nodePort`                    | nodePort to listen on for the AppDaemon UI                                                                                                                                                                                                | ``                                     |
+| `appdaemon.service.annotations`                 | Service annotations for the AppDaemon UI                                                                                                                                                                                                  | `{}`                                   |
+| `appdaemon.service.labels`                      | Service labels to use for the AppDaemon UI                                                                                                                                                                                                | `{}`                                   |
+| `appdaemon.service.clusterIP`                   | Cluster IP for the AppDaemon UI                                                                                                                                                                                                           | ``                                     |
+| `appdaemon.service.externalIPs`                 | External IPs for the AppDaemon UI                                                                                                                                                                                                         | `[]`                                   |
+| `appdaemon.service.loadBalancerIP`              | Loadbalancer IP for the AppDaemon UI                                                                                                                                                                                                      | ``                                     |
+| `appdaemon.service.loadBalancerSourceRanges`    | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                   |
+| `esphome.enabled`                               | Enable the optional [ESPHome](https://esphome.io) deployment                                                                                                                                                                              | `false`                                |
+| `mariadb.enabled`                               | Enable the optional [Mariadb](https://github.com/bitnami/charts) deployment                                                                                                                                                               | `false`                                |
+| `postgresql.enabled`                            | Enable the optional [Postgres](https://github.com/bitnami/charts) deployment                                                                                                                                                              | `false`                                |
+| `influxdb.enabled`                              | Enable the optional [Influxdb](https://github.com/bitnami/charts) deployment                                                                                                                                                              | `false`                                |
+| `resources`                                     | CPU/Memory resource requests/limits or the home-assistant GUI                                                                                                                                                                             | `{}`                                   |
+| `nodeSelector`                                  | Node labels for pod assignment or the home-assistant GUI                                                                                                                                                                                  | `{}`                                   |
+| `tolerations`                                   | Toleration labels for pod assignment or the home-assistant GUI                                                                                                                                                                            | `[]`                                   |
+| `affinity`                                      | Affinity settings for pod assignment or the home-assistant GUI                                                                                                                                                                            | `{}`                                   |
+| `podAnnotations`                                | Key-value pairs to add as pod annotations                                                                                                                                                                                                 | `{}`                                   |
+| `extraVolumes`                                  | Any extra volumes to define for the pod                                                                                                                                                                                                   | `{}`                                   |
+| `extraVolumeMounts`                             | Any extra volumes mounts to define for each container of the pod                                                                                                                                                                          | `{}`                                   |
+| `monitoring.enabled`                            | Enables Monitoring support                                                                                                                                                                                                                | `false`                                |
+| `monitoring.serviceMonitor.enabled`             | Setup a ServiceMonitor to configure scraping                                                                                                                                                                                              | `false`                                |
+| `monitoring.serviceMonitor.namespace`           | Set the namespace the ServiceMonitor should be deployed                                                                                                                                                                                   | `false`                                |
+| `monitoring.serviceMonitor.interval`            | Set how frequently Prometheus should scrape                                                                                                                                                                                               | `30`                                   |
+| `monitoring.serviceMonitor.labels`              | Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator                                                                                                                                           | `{}`                                   |
+| `monitoring.serviceMonitor.bearerTokenFile`     | Set bearerTokenFile for home-assistant auth (use long lived access tokens)                                                                                                                                                                | `nil`                                  |
+| `monitoring.serviceMonitor.bearerTokenSecret`   | Set bearerTokenSecret for home-assistant auth (use long lived access tokens)                                                                                                                                                              | `nil`                                  |
+| `monitoring.serviceMonitor.metricRelabelings`   | Add metricRelabelings [Documentation](https://coreos.com/operators/prometheus/docs/latest/api.html#relabelconfig)                                                                                                                         | `{}`                                   |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

charts/home-assistant/templates/_helpers.tpl

@@ -30,3 +30,24 @@ Create chart name and version as used by the chart label.
 {{- define "home-assistant.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Create argument list for vscode image.
+*/}}
+{{- define "home-assistant.vscode.args" -}}
+{{- if empty .Values.vscode.args -}}
+{{- "" -}}
+{{- else if (eq (typeOf .Values.vscode.args) "string") -}}
+- --port={{ .Values.vscode.service.port }}
+{{- if not (.Values.vscode.password) }}
+- --auth=none
+{{- end }}
+{{- if .Values.vscode.vscodePath }}
+- --extensions-dir={{ .Values.vscode.vscodePath }}
+- --user-data-dir={{ .Values.vscode.vscodePath }}
+- {{ .Values.vscode.hassConfig }}
+{{- end }}
+{{- else -}}
+{{ toYaml .Values.vscode.args }}
+{{- end -}}
+{{- end -}}

charts/home-assistant/templates/deployment.yaml

@@ -1,3 +1,4 @@
+{{- $args := include "home-assistant.vscode.args" . -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -74,6 +75,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 +150,7 @@ spec:
           volumeMounts:
           - mountPath: /config
             name: config
+            subPath: {{ default "" .Values.persistence.configSubPath }}
           {{- if .Values.zwave.enabled }}
           - mountPath: /dev/ttyACM0
             name: ttyacm
@@ -247,6 +250,7 @@ spec:
           volumeMounts:
           - mountPath: /config
             name: config
+            subPath: {{ default "" .Values.persistence.configSubPath }}
           {{- if .Values.git.enabled }}
           - mountPath: {{ .Values.git.keyPath }}
             name: git-secret
@@ -270,15 +274,9 @@ spec:
           imagePullPolicy: {{ .Values.vscode.image.pullPolicy }}
           workingDir: {{ .Values.vscode.hassConfig }}
           args:
-            - --port={{ .Values.vscode.service.port }}
-            {{- if not (.Values.vscode.password) }}
-            - --auth=none
-            {{- end }}
-            {{- if .Values.vscode.vscodePath }}
-            - --extensions-dir={{ .Values.vscode.vscodePath }}
-            - --user-data-dir={{ .Values.vscode.vscodePath }}
-            - {{ .Values.vscode.hassConfig }}
-            {{- end }}
+{{- with $args }}
+{{ . | indent 12 }}
+{{- end }}
           ports:
             - name: vscode
               containerPort: {{ .Values.vscode.service.port }}
@@ -310,6 +308,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 +368,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 }}

charts/home-assistant/templates/servicemonitor.yaml

@@ -27,6 +27,10 @@ spec:
       {{- if .Values.monitoring.serviceMonitor.bearerTokenSecret.optional }}
       optional: {{ .Values.monitoring.serviceMonitor.bearerTokenSecret.optional }}
       {{- end }}
+{{- end }}
+{{- if .Values.monitoring.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+{{ toYaml .Values.monitoring.serviceMonitor.metricRelabelings | indent 4 }}
 {{- end }}
   jobLabel: {{ template "home-assistant.fullname" . }}-prometheus-exporter
   namespaceSelector:

charts/home-assistant/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: homeassistant/home-assistant
-  tag: 0.114.0
+  tag: 0.116.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -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
@@ -120,7 +123,7 @@ git:
 
   image:
     repository: k8sathome/git-crypt
-    tag: 2020.09.07
+    tag: 2020.09.28
     pullPolicy: IfNotPresent
 
   ## Specify the command that runs in the git-sync container to pull in configuration.
@@ -221,7 +224,18 @@ monitoring:
     # bearerTokenFile:
     # Set bearerTokenSecret for home assistant auth (use long lived access tokens)
     # bearerTokenSecret:
-
+    # Relabel metrics if needed example removes pod and instance labels from metrics beginning with hass
+    # metricRelabelings: []
+    #  - regex: hass.*
+    #    replacement: ""
+    #    sourceLabels:
+    #     - __name__
+    #    targetLabel: pod
+    #  - regex: hass_.*
+    #    replacement: ""
+    #    sourceLabels:
+    #     - __name__
+    #    targetLabel: instance
 
 vscode:
   enabled: false
@@ -247,6 +261,10 @@ vscode:
   ##
   extraEnv: {}
 
+  ## Set to "-" to use default argument list
+  ## Otherwise convert to list of arguments
+  args: "-"
+
   ingress:
     enabled: false
     annotations: {}
@@ -292,6 +310,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: {}
@@ -331,6 +354,8 @@ esphome:
       mountPath: /config/secrets.yaml
       subPath: secrets.yaml
 
+# Enabled mariadb
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
 mariadb:
   enabled: false
   db:
@@ -345,6 +370,9 @@ mariadb:
     persistence:
       enabled: false
       # storageClass: ""
+
+# Enabled postgres
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
 postgresql:
   enabled: false
   global:
@@ -356,6 +384,19 @@ postgresql:
     enabled: false
     # storageClass: ""
 
+# Enable influxdb
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/influxdb
+influxdb:
+  enabled: false
+  architecture: standalone
+  database: home_assistant
+  authEnabled: false
+  persistence:
+    enabled: false
+    # storageClass: ""
+    # size: 8Gi
+
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

charts/homebridge/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/homebridge/Chart.yaml

@@ -0,0 +1,17 @@
+apiVersion: v2
+appVersion: 3.1.0
+version: 1.0.2
+name: homebridge
+description: A lightweight NodeJS server that emulates the iOS HomeKit API
+type: application
+keywords:
+  - homebridge
+  - homekit
+home: https://github.com/k8s-at-home/charts/tree/master/charts/homebridge
+icon: https://avatars0.githubusercontent.com/u/38217527?s=400&v=4?sanitize=true
+sources:
+  - https://homebridge.io/
+  - https://github.com/oznu/docker-homebridge
+maintainers:
+  - name: bjw-s
+    email: bjw-s@users.noreply.github.com

charts/homebridge/README.md

@@ -0,0 +1,100 @@
+# Homebridge
+
+This is a helm chart for [Homebridge](https://homebridge.io) based on [Docker Homebridge](https://github.com/oznu/docker-homebridge).
+
+## TL;DR;
+
+```shell
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/homebridge
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```shell
+helm install --name my-release k8s-at-home/homebridge
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```shell
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following tables lists the configurable parameters of the Home Assistant chart and their default values.
+
+| Parameter                                       | Description                                                                                                                       | Default                             |
+| ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------- |
+| `image.repository`                              | Image repository                                                                                                                  | `oznu/homebridge`                   |
+| `image.tag`                                     | Image tag. Possible values listed [here](https://hub.docker.com/r/oznu/homebridge/tags).                                          | `3.1.0`                             |
+| `image.pullPolicy`                              | Image pull policy                                                                                                                 | `IfNotPresent`                      |
+| `image.pullSecrets`                             | Secrets to use when pulling the image                                                                                             | `[]`                                |
+| `strategyType`                                  | Specifies the strategy used to replace old Pods by new ones                                                                       | `Recreate`                          |
+| `timezone`                                      | Specify the container timezone                                                                                                    | `UTC`                               |
+| `puid`                                          | process userID the instance should run as                                                                                         | `1000`                              |
+| `pgid`                                          | process groupID the instance should run as                                                                                        | `1000`                              |
+| `config.enableUI`                               | Enable the Homebridge UI plugin                                                                                                   | `true`                              |
+| `config.plugins`                                | Additional Homebridge plugins to install at container startup                                                                     | `[]`                                |
+| `config.additionalPackages`                     | Additional Alpine packages to install at container statup                                                                         | `[]  `                              |
+| `probes.liveness.enabled`                       | Use the livenessProbe?                                                                                                            | `true`                              |
+| `probes.liveness.initialDelaySeconds`           | Specify liveness `initialDelaySeconds` parameter for the deployment                                                               | `60`                                |
+| `probes.liveness.failureThreshold`              | Specify liveness `failureThreshold` parameter for the deployment                                                                  | `5`                                 |
+| `probes.liveness.timeoutSeconds`                | Specify liveness `timeoutSeconds` parameter for the deployment                                                                    | `10`                                |
+| `probes.readiness.enabled`                      | Use the readinessProbe?                                                                                                           | `true`                              |
+| `probes.readiness.initialDelaySeconds`          | Specify readiness `initialDelaySeconds` parameter for the deployment                                                              | `60`                                |
+| `probes.readiness.failureThreshold`             | Specify readiness `failureThreshold` parameter for the deployment                                                                 | `5`                                 |
+| `probes.readiness.timeoutSeconds`               | Specify readiness `timeoutSeconds` parameter for the deployment                                                                   | `10`                                |
+| `probes.startup.enabled`                        | Use the startupProbe? (new in kubernetes 1.16)                                                                                    | `false`                             |
+| `probes.startup.failureThreshold`               | Specify startup `failureThreshold` parameter for the deployment                                                                   | `5`                                 |
+| `probes.startup.periodSeconds`                  | Specify startup `periodSeconds` parameter for the deployment                                                                      | `10`                                |
+| `service.type`                                  | Kubernetes service type for the homebridge GUI                                                                                    | `ClusterIP`                         |
+| `service.httpPort`                              | Kubernetes port where the homebridge GUI is exposed                                                                               | `8123`                              |
+| `service.annotations`                           | Service annotations for the homebridge GUI                                                                                        | `{}`                                |
+| `service.clusterIP`                             | Cluster IP for the homebridge GUI                                                                                                 | ``                                  |
+| `service.externalIPs`                           | External IPs for the homebridge GUI                                                                                               | `[]`                                |
+| `service.loadBalancerIP`                        | Loadbalancer IP for the homebridge GUI                                                                                            | ``                                  |
+| `service.loadBalancerSourceRanges`              | Loadbalancer client IP restriction range for the homebridge GUI                                                                   | `[]`                                |
+| `service.externalTrafficPolicy`                 | Loadbalancer externalTrafficPolicy                                                                                                | ``                                  |
+| `hostNetwork`                                   | Enable hostNetwork - needed for discovery to work                                                                                 | `false`                             |
+| `service.nodePort`                              | nodePort to listen on for the homebridge GUI                                                                                      | ``                                  |
+| `ingress.enabled`                               | Enables Ingress                                                                                                                   | `false`                             |
+| `ingress.annotations`                           | Ingress annotations                                                                                                               | `{}`                                |
+| `ingress.path`                                  | Ingress path                                                                                                                      | `/`                                 |
+| `ingress.hosts`                                 | Ingress accepted hostnames                                                                                                        | `chart-example.local`               |
+| `ingress.tls`                                   | Ingress TLS configuration                                                                                                         | `[]`                                |
+| `persistence.enabled`                           | Use persistent volume to store data                                                                                               | `true`                              |
+| `persistence.size`                              | Size of persistent volume claim                                                                                                   | `1Gi`                               |
+| `persistence.existingClaim`                     | Use an existing PVC to persist data                                                                                               | `nil`                               |
+| `persistence.storageClass`                      | Type of persistent volume claim                                                                                                   | `-`                                 |
+| `persistence.accessMode`                        | Persistence access modes                                                                                                          | `ReadWriteMany`                     |
+| `persistence.skipuninstall`                     | Do not delete the pvc upon helm uninstall                                                                                         | `false`                             |
+| `extraEnvs`                                     | Extra ENV vars to pass to the homebridge container                                                                                | `[]`                                |
+| `resources`                                     | CPU/Memory resource requests/limits or the homebridge GUI                                                                         | `{}`                                |
+| `nodeSelector`                                  | Node labels for pod assignment or the homebridge GUI                                                                              | `{}`                                |
+| `tolerations`                                   | Toleration labels for pod assignment or the homebridge GUI                                                                        | `[]`                                |
+| `affinity`                                      | Affinity settings for pod assignment or the homebridge GUI                                                                        | `{}`                                |
+| `podAnnotations`                                | Key-value pairs to add as pod annotations                                                                                         | `{}`                                |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```shell
+helm install --name my-release \
+  --set timezone="UTC" \
+    k8s-at-home/homebridge
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```shell
+helm install --name my-release -f values.yaml k8s-at-home/homebridge
+```
+
+Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.

charts/homebridge/templates/NOTES.txt

@@ -0,0 +1,22 @@
+{{- if .Values.config.enableUI }}
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- $ingressPath := .Values.ingress.path -}}
+{{- range $host := .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ $ingressPath }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "homebridge.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "homebridge.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "homebridge.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.httpPort }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "homebridge.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:{{ .Values.service.httpPort }}
+{{- end }}
+{{- end }}

charts/homebridge/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "homebridge.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "homebridge.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "homebridge.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "homebridge.labels" -}}
+helm.sh/chart: {{ include "homebridge.chart" . }}
+{{ include "homebridge.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "homebridge.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "homebridge.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "homebridge.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "homebridge.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

charts/homebridge/templates/configmap.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "homebridge.fullname" . }}
+  labels:
+{{ include "homebridge.labels" . | indent 4 }}
+data:
+  startup.sh: |
+    #!/bin/sh
+    
+    # Docker Homebridge startup.sh overriden by Helm Chart
+    
+    # Plugins
+    {{- range .Values.config.plugins }}
+    npm install {{ . }}
+    {{- end }}
+
+    # Packages
+    {{- range .Values.config.additionalPackages }}
+    apk add --no-cache {{ . }}
+    {{- end }}

charts/homebridge/templates/deployment.yaml

@@ -0,0 +1,136 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "homebridge.fullname" . }}
+  labels:
+    {{- include "homebridge.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.strategyType }}
+  selector:
+    matchLabels:
+      {{- include "homebridge.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      labels:
+        {{- include "homebridge.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "homebridge.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- if .Values.hostNetwork }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      dnsPolicy: ClusterFirstWithHostNet
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            {{- if .Values.timezone }}
+            - name: TZ
+              value: {{ .Values.timezone | quote }}
+            {{- end }}
+            {{- if .Values.puid }}
+            - name: PUID
+              value: "{{ .Values.puid }}"
+            {{- end }}
+            {{- if .Values.pgid }}  
+            - name: PGID
+              value: "{{ .Values.pgid }}"
+            {{- end }}
+            {{- if .Values.config.enableUI }}
+            - name: HOMEBRIDGE_CONFIG_UI
+              value: "1"
+            - name: HOMEBRIDGE_CONFIG_UI_PORT
+              value: {{ .Values.service.httpPort | quote }}
+            {{- end }}
+            {{- with .Values.extraEnvs }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          ports:
+            - name: homebridge
+              containerPort: {{ .Values.service.homebridgePort }}
+              protocol: TCP
+            {{- if .Values.config.enableUI }}
+            - name: http
+              containerPort: {{ .Values.service.httpPort }}
+              protocol: TCP
+            {{- end }}
+          volumeMounts:
+          - mountPath: /homebridge
+            name: config
+          - mountPath: /homebridge/startup.sh
+            name: homebridge-configmap
+            subPath: startup.sh
+          {{- if .Values.config.enableUI }}
+          {{- if .Values.probes.liveness.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
+            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
+          {{- end }}
+          {{- if .Values.probes.readiness.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
+            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
+          {{- end }}
+          {{- if .Values.probes.startup.enabled }}
+          startupProbe:
+            httpGet:
+              path: /
+              port: http
+            failureThreshold: {{ .Values.probes.startup.failureThreshold }}
+            periodSeconds: {{ .Values.probes.startup.periodSeconds }}
+          {{- end }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      volumes:
+      - name: config
+      {{- if .Values.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "homebridge.fullname" . }}-config{{- end }}
+      {{- else }}
+        emptyDir: {}
+      {{- end }}
+      - name: homebridge-configmap
+        projected:
+          defaultMode: 0444
+          sources:
+          - configMap:
+              name: {{ template "homebridge.fullname" . }}
+              items:
+                - key: startup.sh
+                  path: startup.sh
+                  mode: 0755
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/homebridge/templates/ingress.yaml

@@ -1,29 +1,33 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "zwave2mqtt.fullname" . -}}
+{{- if and .Values.config.enableUI .Values.ingress.enabled -}}
+{{- $fullName := include "homebridge.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-{{ include "zwave2mqtt.labels" . | indent 4 }}
+    {{- include "homebridge.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
+  {{- if .Values.ingress.tls }}
   tls:
-  {{- range .Values.ingress.tls }}
+    {{- range .Values.ingress.tls }}
     - hosts:
-      {{- range .hosts }}
+        {{- range .hosts }}
         - {{ . | quote }}
-      {{- end }}
+        {{- end }}
       secretName: {{ .secretName }}
+    {{- end }}
   {{- end }}
-{{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
+    {{- range .Values.ingress.hosts }}
     - host: {{ . | quote }}
       http:
         paths:
@@ -31,5 +35,5 @@ spec:
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
+    {{- end }}
   {{- end }}
-{{- end }}

charts/homebridge/templates/pvc.yaml

@@ -1,18 +1,14 @@
-
 {{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "zwave2mqtt.fullname" . }}
+  name: {{ template "homebridge.fullname" . }}-config
   {{- if .Values.persistence.skipuninstall }}
   annotations:
     "helm.sh/resource-policy": keep
   {{- end }}
   labels:
-    app.kubernetes.io/name: {{ include "zwave2mqtt.name" . }}
-    helm.sh/chart: {{ include "zwave2mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "homebridge.labels" . | nindent 4 }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}
@@ -23,7 +19,7 @@ spec:
 {{- if (eq "-" .Values.persistence.storageClass) }}
   storageClassName: ""
 {{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
+  storageClassName: {{ .Values.persistence.storageClass | quote }}
 {{- end }}
 {{- end }}
-{{- end -}}
+{{- end -}}

charts/homebridge/templates/service.yaml

@@ -1,22 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "zwave2mqtt.fullname" . }}
-  labels:
-{{ include "zwave2mqtt.labels" . | indent 4 }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
+  name: {{ include "homebridge.fullname" . }}
+  {{- if .Values.service.annotations }}
   annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- toYaml .Values.service.annotations | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "homebridge.labels" . | nindent 4 }}
 spec:
 {{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
   type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
 {{- else if eq .Values.service.type "LoadBalancer" }}
   type: {{ .Values.service.type }}
   {{- if .Values.service.loadBalancerIP }}
@@ -29,21 +23,26 @@ spec:
 {{- else }}
   type: {{ .Values.service.type }}
 {{- end }}
-{{- if .Values.service.externalIPs }}
+  {{- if .Values.service.externalIPs }}
   externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
+  {{- toYaml .Values.service.externalIPs | nindent 4 }}
+  {{- end }}
   {{- if .Values.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
   {{- end }}
   ports:
-    - name: http
-      port: {{ .Values.service.port }}
+    - port: {{ .Values.service.homebridgePort }}
+      targetPort: homebridge
       protocol: TCP
+      name: homebridge
+    {{- if .Values.config.enableUI }}
+    - port: {{ .Values.service.httpPort }}
       targetPort: http
+      protocol: TCP
+      name: http
+    {{- end }}
 {{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
       nodePort: {{.Values.service.nodePort}}
 {{ end }}
   selector:
-    app.kubernetes.io/name: {{ include "zwave2mqtt.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    {{- include "homebridge.selectorLabels" . | nindent 4 }}

charts/homebridge/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "homebridge.serviceAccountName" . }}
+  labels:
+    {{- include "homebridge.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/homebridge/values.yaml

@@ -0,0 +1,124 @@
+# Default values for homebridge.
+
+replicaCount: 1
+
+image:
+  repository: oznu/homebridge
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "3.1.0"
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+# upgrade strategy type (e.g. Recreate or RollingUpdate)
+strategyType: Recreate
+
+timezone: "UTC"
+puid: 1000
+pgid: 1000
+
+config:
+  enableUI: true
+  plugins: []
+    # - homebridge-hue
+  additionalPackages: []
+    # - bash
+
+extraEnvs: []
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  homebridgePort: 51826
+  httpPort: 8080
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+hostNetwork: false
+
+persistence:
+  enabled: true
+  ## homebridge data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  # storageClass: "-"
+  ##
+  ## If you want to reuse an existing claim, you can pass the name of the PVC using
+  ## the existingClaim variable
+  # existingClaim: your-claim
+  accessMode: ReadWriteOnce
+  size: 1Gi
+  ## Do not delete the pvc upon helm uninstall
+  skipuninstall: false
+
+probes:
+  liveness:
+    enabled: true
+    initialDelaySeconds: 60
+    failureThreshold: 5
+    timeoutSeconds: 10
+  readiness:
+    enabled: true
+    initialDelaySeconds: 60
+    failureThreshold: 5
+    timeoutSeconds: 10
+  startup:
+    enabled: false
+    failureThreshold: 30
+    periodSeconds: 10
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

charts/intel-gpu-plugin/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/intel-gpu-plugin/Chart.yaml

@@ -0,0 +1,17 @@
+apiVersion: v2
+name: intel-gpu-plugin
+version: 1.0.0
+appVersion: 0.18.1
+description: The Intel GPU plugin facilitates offloading the processing of computation intensive workloads to GPU hardware
+keywords:
+  - kubernetes
+  - cluster
+  - hardware
+  - gpu
+home: https://github.com/k8s-at-home/charts/tree/master/charts/intel-gpu-plugin
+icon: https://avatars0.githubusercontent.com/u/17888862?s=400&v=4
+sources:
+  - https://github.com/intel/intel-device-plugins-for-kubernetes/blob/master/cmd/gpu_plugin
+maintainers:
+  - name: billimek
+    email: jeff@billimek.com

charts/intel-gpu-plugin/README.md

@@ -0,0 +1,73 @@
+# intel-gpu-plugin helm chart
+
+This is a helm chart that will deploy [intel-gpu-plugin](https://github.com/intel/intel-device-plugins-for-kubernetes/blob/master/cmd/gpu_plugin) as a DaemonSet.
+
+The GPU plugin facilitates offloading the processing of computation intensive workloads to GPU hardware.
+
+## TL;DR
+
+```shell
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/intel-gpu-plugin
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```shell
+helm install my-release k8s-at-home/intel-gpu-plugin
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```shell
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following tables lists the configurable parameters of the Sentry chart and their default values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/intel-gpu-plugin/values.yaml) file. It has several commented out suggested values.
+
+| Parameter                                   | Description                                                                                  | Default                                               |
+| ------------------------------------------- | -------------------------------------------------------------------------------------------- | ----------------------------------------------------- |
+| `image.repository`                          | Image repository                                                                             | `intel/intel-gpu-plugin` |
+| `image.tag`                                 | Image tag. Possible values listed [here](https://hub.docker.com/r/intel/intel-gpu-plugin/tags).     | `0.18.1`                         |
+| `image.pullPolicy`                          | Image pull policy                                                                            | `IfNotPresent`                                        |
+| `strategyType`                              | Specifies the strategy used to replace old Pods by new ones                                  | `Recreate`                                            |
+| `podAnnotations`                            | Key-value pairs to add as pod annotations                                                    | `{}`                                                  |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```shell
+helm install my-release \
+  --set image.pullPolicy="Always" \
+    k8s-at-home/intel-gpu-plugin
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```shell
+helm install my-release -f values.yaml k8s-at-home/intel-gpu-plugin
+```
+
+### Node Feature Discovery
+
+If your cluster runs [Node Feature Discovery](https://github.com/k8s-at-home/charts/blob/master/charts/node-feature-discovery), you can deploy the device plugin only on nodes with Intel GPU by specifying the desired `nodeSelector` or `affinity` in your values. For example (make sure to update to your exact feature label):
+
+```yaml
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: feature.node.kubernetes.io/pci-0300_8086.present
+              operator: In
+              values:
+                - "true"
+```

charts/intel-gpu-plugin/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "intel-gpu-plugin.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "intel-gpu-plugin.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "intel-gpu-plugin.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "intel-gpu-plugin.labels" -}}
+helm.sh/chart: {{ include "intel-gpu-plugin.chart" . }}
+{{ include "intel-gpu-plugin.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "intel-gpu-plugin.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "intel-gpu-plugin.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "intel-gpu-plugin.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "intel-gpu-plugin.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

charts/intel-gpu-plugin/templates/daemonset.yaml

@@ -0,0 +1,71 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ include "intel-gpu-plugin.fullname" . }}
+  labels:
+    {{- include "intel-gpu-plugin.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "intel-gpu-plugin.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      labels:
+        {{- include "intel-gpu-plugin.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "intel-gpu-plugin.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          volumeMounts:
+            - name: devfs
+              mountPath: /dev/dri
+              readOnly: true
+            - name: sysfs
+              mountPath: /sys/class/drm
+              readOnly: true
+            - name: kubeletsockets
+              mountPath: /var/lib/kubelet/device-plugins
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      volumes:
+        - name: devfs
+          hostPath:
+            path: /dev/dri
+        - name: sysfs
+          hostPath:
+            path: /sys/class/drm
+        - name: kubeletsockets
+          hostPath:
+            path: /var/lib/kubelet/device-plugins
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/intel-gpu-plugin/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "intel-gpu-plugin.serviceAccountName" . }}
+  labels:
+    {{- include "intel-gpu-plugin.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/intel-gpu-plugin/values.yaml

@@ -0,0 +1,50 @@
+# Default values for intel-gpu-plugin.
+
+image:
+  repository: intel/intel-gpu-plugin
+  pullPolicy: IfNotPresent
+  tag: 0.18.1
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

charts/jackett/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.16.1045
+appVersion: v0.16.2106
 description: API Support for your favorite torrent trackers
 name: jackett
-version: 3.1.0
+version: 5.3.0
 keywords:
   - jackett
   - torrent
@@ -14,3 +14,7 @@ sources:
 maintainers:
   - name: billimek
     email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: ^1.4.0

charts/jackett/README.md

@@ -1,6 +1,6 @@
 # Jackett
 
-This is a helm chart for [Jackett](https://github.com/Jackett/Jackett) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/jackett/)
+This is a helm chart for [Jackett](https://github.com/Jackett/Jackett).
 
 ## TL;DR;
 
@@ -28,82 +28,49 @@ helm delete my-release --purge
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                                    | Description                                                                                                                                                                        | Default               |
-| -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
-| `image.repository`                           | Image repository                                                                                                                                                                   | `linuxserver/jackett` |
-| `image.tag`                                  | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/jackett/tags/).                                                                                      | `v0.12.1132-ls37`     |
-| `image.pullPolicy`                           | Image pull policy                                                                                                                                                                  | `IfNotPresent`        |
-| `strategyType`                               | Specifies the strategy used to replace old Pods by new ones                                                                                                                        | `Recreate`            |
-| `timezone`                                   | Timezone the Jackett instance should run as, e.g. 'America/New_York'                                                                                                               | `UTC`                 |
-| `puid`                                       | process userID the Jackett instance should run as                                                                                                                                  | `1001`                |
-| `pgid`                                       | process groupID the Jackett instance should run as                                                                                                                                 | `1001`                |
-| `probes.liveness.failureThreshold`           | Specify liveness `failureThreshold` parameter for the deployment                                                                                                                   | `5`                   |
-| `probes.liveness.periodSeconds`              | Specify liveness `periodSeconds` parameter for the deployment                                                                                                                      | `10`                  |
-| `probes.readiness.failureThreshold`          | Specify readiness `failureThreshold` parameter for the deployment                                                                                                                  | `5`                   |
-| `probes.readiness.periodSeconds`             | Specify readiness `periodSeconds` parameter for the deployment                                                                                                                     | `10`                  |
-| `probes.startup.initialDelaySeconds`         | Specify startup `initialDelaySeconds` parameter for the deployment                                                                                                                 | `5`                   |
-| `probes.startup.failureThreshold`            | Specify startup `failureThreshold` parameter for the deployment                                                                                                                    | `30`                  |
-| `probes.startup.periodSeconds`               | Specify startup `periodSeconds` parameter for the deployment                                                                                                                       | `10`                  |
-| `Service.type`                               | Kubernetes service type for the Jackett GUI                                                                                                                                        | `ClusterIP`           |
-| `Service.port`                               | Kubernetes port where the Jackett GUI is exposed                                                                                                                                   | `9117`                |
-| `Service.annotations`                        | Service annotations for the Jackett GUI                                                                                                                                            | `{}`                  |
-| `Service.labels`                             | Custom labels                                                                                                                                                                      | `{}`                  |
-| `Service.loadBalancerIP`                     | Loadbalance IP for the Jackett GUI                                                                                                                                                 | `{}`                  |
-| `Service.loadBalancerSourceRanges`           | List of IP CIDRs allowed access to load balancer (if supported)                                                                                                                    | None                  |
-| `ingress.enabled`                            | Enables Ingress                                                                                                                                                                    | `false`               |
-| `ingress.annotations`                        | Ingress annotations                                                                                                                                                                | `{}`                  |
-| `ingress.labels`                             | Custom labels                                                                                                                                                                      | `{}`                  |
-| `ingress.path`                               | Ingress path                                                                                                                                                                       | `/`                   |
-| `ingress.hosts`                              | Ingress accepted hostnames                                                                                                                                                         | `chart-example.local` |
-| `ingress.tls`                                | Ingress TLS configuration                                                                                                                                                          | `[]`                  |
-| `persistence.config.enabled`                 | Use persistent volume to store configuration data                                                                                                                                  | `true`                |
-| `persistence.config.size`                    | Size of persistent volume claim                                                                                                                                                    | `1Gi`                 |
-| `persistence.config.existingClaim`           | Use an existing PVC to persist data                                                                                                                                                | `nil`                 |
-| `persistence.config.subPath`                 | Mount a sub directory of the persistent volume if set                                                                                                                              | `""`                  |
-| `persistence.config.storageClass`            | Type of persistent volume claim                                                                                                                                                    | `-`                   |
-| `persistence.config.accessMode`              | Persistence access mode                                                                                                                                                            | `ReadWriteOnce`       |
-| `persistence.config.skipuninstall`           | Do not delete the pvc upon helm uninstall                                                                                                                                          | `false`               |
-| `persistence.torrentblackhole.enabled`       | Use persistent volume to store torrent files                                                                                                                                       | `false`               |
-| `persistence.torrentblackhole.size`          | Size of persistent volume claim                                                                                                                                                    | `1Gi`                 |
-| `persistence.torrentblackhole.existingClaim` | Use an existing PVC to persist data                                                                                                                                                | `nil`                 |
-| `persistence.torrentblackhole.subPath`       | Mount a sub directory of the persistent volume if set                                                                                                                              | `""`                  |
-| `persistence.torrentblackhole.storageClass`  | Type of persistent volume claim                                                                                                                                                    | `-`                   |
-| `persistence.torrentblackhole.accessMode`    | Persistence access mode                                                                                                                                                            | `ReadWriteOnce`       |
-| `persistence.torrentblackhole.skipuninstall` | Do not delete the pvc upon helm uninstall                                                                                                                                          | `false`               |
-| `persistence.extraExistingClaimMounts`       | Optionally add multiple existing claims                                                                                                                                            | `[]`                  |
-| `resources`                                  | CPU/Memory resource requests/limits                                                                                                                                                | `{}`                  |
-| `nodeSelector`                               | Node labels for pod assignment                                                                                                                                                     | `{}`                  |
-| `tolerations`                                | Toleration labels for pod assignment                                                                                                                                               | `[]`                  |
-| `affinity`                                   | Affinity settings for pod assignment                                                                                                                                               | `{}`                  |
-| `podAnnotations`                             | Key-value pairs to add as pod annotations                                                                                                                                          | `{}`                  |
-| `deploymentAnnotations`                      | Key-value pairs to add as deployment annotations                                                                                                                                   | `{}`                  |
-| `hostNetwork`                                | Specify whether pods should use host networking                                                                                                                                    | `false`               |
-| `dnsPolicy`                                  | Set the DNS policy for pods, ex: ClusterFirst, ClusterFirstWithHostNet. See info [here](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy) | `ClusterFirst`        |
-| `dnsConfig`                                  | Specify DNS options for pods, see values.yaml for details, or see [here](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config)                  | `{}`                  |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/jackett/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
 ```console
-helm install --name my-release \
-  --set timezone="America/New York" \
+helm install jackett \
+  --set env.TZ="America/New York" \
     k8s-at-home/jackett
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
-helm install --name my-release -f values.yaml k8s-at-home/jackett
+helm install jackett k8s-at-home/jackett --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
 ```
 
 ---
-
 **NOTE**
 
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
 
-Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/jackett/values.yaml) file. It has several commented out suggested values.
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 4.x.x to 5.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

charts/jackett/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/jackett/templates/NOTES.txt

@@ -1,19 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "jackett.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "jackett.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "jackett.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "jackett.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:9117 to use your application"
-  kubectl port-forward $POD_NAME 9117:80
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/jackett/templates/_helpers.tpl

@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "jackett.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "jackett.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "jackett.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/jackett/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/jackett/templates/config-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "jackett.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    helm.sh/chart: {{ include "jackett.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/jackett/templates/deployment.yaml

@@ -1,122 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "jackett.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    helm.sh/chart: {{ include "jackett.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "jackett.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "jackett.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      hostNetwork: {{ .Values.hostNetwork }}
-      dnsPolicy: {{ .Values.dnsPolicy }}
-      {{- if .Values.dnsConfig }}
-      dnsConfig: {{ toYaml .Values.dnsConfig | nindent 8}}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 9117
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
-          readinessProbe:
-            tcpSocket:
-              port: http
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
-          startupProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.startup.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startup.periodSeconds }}
-          env:
-            - name: TZ
-              value: "{{ .Values.timezone }}"
-            - name: PUID
-              value: "{{ .Values.puid }}"
-            - name: PGID
-              value: "{{ .Values.pgid }}"
-          volumeMounts:
-            - mountPath: /config
-              name: config
-              {{- if .Values.persistence.config.subPath }}
-              subPath: "{{ .Values.persistence.config.subPath }}"
-              {{- end }}
-            - mountPath: /downloads
-              name: torrentblackhole
-              {{- if .Values.persistence.torrentblackhole.subPath }}
-              subPath: "{{ .Values.persistence.torrentblackhole.subPath }}"
-              {{- end }}
-            {{- range .Values.persistence.extraExistingClaimMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-            {{- end }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.config.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "jackett.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-      - name: torrentblackhole
-      {{- if .Values.persistence.torrentblackhole.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.torrentblackhole.existingClaim }}{{ .Values.persistence.torrentblackhole.existingClaim }}{{- else }}{{ template "jackett.fullname" . }}-torrentblackhole{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      {{- range .Values.persistence.extraExistingClaimMounts }}
-      - name: {{ .name }}
-        persistentVolumeClaim:
-          claimName: {{ .existingClaim }}
-      {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}

charts/jackett/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "jackett.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    helm.sh/chart: {{ include "jackett.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    {{- with .Values.ingress.labels -}}
-    {{ toYaml . | nindent 4 }}
-    {{- end -}}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}

charts/jackett/templates/service.yaml

@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "jackett.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    helm.sh/chart: {{ include "jackett.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    

charts/jackett/templates/torrent-blackhole-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.torrentblackhole.enabled (not .Values.persistence.torrentblackhole.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "jackett.fullname" . }}-torrentblackhole
-  {{- if .Values.persistence.torrentblackhole.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "jackett.name" . }}
-    helm.sh/chart: {{ include "jackett.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.torrentblackhole.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.torrentblackhole.size | quote }}
-{{- if .Values.persistence.torrentblackhole.storageClass }}
-{{- if (eq "-" .Values.persistence.torrentblackhole.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.torrentblackhole.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/jackett/values.yaml

@@ -1,149 +1,40 @@
 # Default values for Jackett.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
 
 image:
   repository: linuxserver/jackett
-  tag: v0.16.1045-ls14
   pullPolicy: IfNotPresent
+  tag: version-v0.16.2106
 
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    failureThreshold: 5
-    periodSeconds: 10
-  readiness:
-    failureThreshold: 5
-    periodSeconds: 10
-  startup:
-    initialDelaySeconds: 5
-    failureThreshold: 30
-    periodSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
+strategy:
+  type: Recreate
 
 service:
-  type: ClusterIP
-  port: 9117
-  ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-  ##
-  # nodePort:
-  ## Provide any additional annotations which may be required. This can be used to
-  ## set the LoadBalancer service type to internal only.
-  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-  ##
-  annotations: {}
-  labels: {}
-  ## Use loadBalancerIP to request a specific static IP,
-  ## otherwise leave blank
-  ##
-  loadBalancerIP:
-  # loadBalancerSourceRanges: []
-  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-  # externalTrafficPolicy: Cluster
+  port:
+    port: 9117
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  labels: {}
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
 
 persistence:
   config:
-    enabled: true
-    ## Jackett configuration data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteOnce
-    size: 1Gi
+    enabled: false
+    emptyDir: false
 
-    ## If subPath is set mount a sub folder of a volume instead of the root of the volume.
-    ## This is especially handy for volume plugins that don't natively support sub mounting (like glusterfs).
-    ##
-    subPath: ""
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
   torrentblackhole:
     enabled: false
-    ## Jackett torrentblackhole directory volume configuration
+    emptyDir: false
+    mountPath: /downloads
+    ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
     ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
-    ##
     # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 1Gi
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
     ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-dnsPolicy: ClusterFirst
-
-dnsConfig: {}
-  # dnsConfig may be used with any dnsPolicy, but is required when dnsPolicy: "None"
-  # To use, remove the braces above, and uncomment/modify the following lines.
-  # See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config
-  # for additional information
-  # nameservers:
-  #   - 1.1.1.1
-  # searches:
-  #   - ns1.mysearch.domain
-  # options:
-  #   - name: ndots
-  #     value: "1"
-
-hostNetwork: false
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-deploymentAnnotations: {}
+    # skipuninstall: false
+    # existingClaim: ""

charts/lidarr/Chart.yaml

@@ -1,21 +1,21 @@
 apiVersion: v2
-name: lidarr
+appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
-type: application
-version: 4.0.0
-appVersion: 0.7.1.1785-ls18
+name: lidarr
+version: 5.3.0
 keywords:
   - lidarr
+  - torrent
+  - usenet
 home: https://github.com/k8s-at-home/charts/tree/master/charts/lidarr
 icon: https://github.com/lidarr/Lidarr/blob/develop/Logo/512.png?raw=true
 sources:
   - https://github.com/Lidarr/Lidarr
   - https://hub.docker.com/r/linuxserver/lidarr
 maintainers:
-  - name: DirtyCajunRice
-    email: nick@cajun.pro
+  - name: billimek
+    email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ~1.0.0
-    alias: lidarr
+    version: ^1.4.0