[common] Fix classes logic (#112)

* Added metricRelabelings for service monitor

* Fixes

* Added end

* Changed chart version to 2.6.0

Co-authored-by: Jeff Billimek <jeff@billimek.com>

.github/workflows/lint-test.yaml

@@ -1,30 +1,28 @@
 name: Lint and Test Charts
-
 on: pull_request
-
 jobs:
   lint-test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-
       - name: Fetch history
-        run: git fetch --prune --unshallow
-
+        run: |
+          git fetch --prune --unshallow;
+          echo ::set-env name=commitmsg::$(git log --format=%B -n 1 ${{ github.event.after }})
       - name: Run chart-testing (lint)
         id: lint
         uses: helm/chart-testing-action@v1.0.0
+        if: "! contains(env.commitmsg, '[skip lint]')"
         with:
           command: lint
           config: ct.yaml
-
       - name: Create kind cluster
         uses: helm/kind-action@v1.0.0
-        if: steps.lint.outputs.changed == 'true'
-
+        if: "steps.lint.outputs.changed == 'true' && ! contains(env.commitmsg, '[skip install]')"
       - name: Run chart-testing (install)
         uses: helm/chart-testing-action@v1.0.0
+        if: "steps.lint.outputs.changed == 'true' && ! contains(env.commitmsg, '[skip install]')"
         with:
           command: install
           config: ct.yaml

.github/workflows/release.yaml

@@ -36,10 +36,10 @@ 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:
-          charts_repo_url: https://charts.k8s-at-home.com/
+          charts_repo_url: https://k8s-at-home.com/charts/
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

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

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+# See https://pre-commit.com for more information
+repos:
+- repo: local
+  hooks:
+  - id: ct-lint
+    name: "Chart Test: Lint"
+    language: docker_image
+    pass_filenames: false
+    types: ['file']
+    files: '^charts/.*(\.ya?ml|\.tpl|\.helmignore|NOTES.txt)'
+    entry: -u 0 quay.io/helmpack/chart-testing:v3.0.0 ct
+    args:
+    - lint

CONTRIBUTING.md

@@ -33,9 +33,9 @@ See `git help commit`:
 
 ### Technical Requirements
 
-* Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/)
-* Must pass CI jobs for linting and installing changed charts with the [chart-testing](https://github.com/helm/chart-testing) tool
-* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability(#immutability) and [Versioning](#versioning) below
+* Must follow [Charts best practices](https://helm.sh/docs/topics/chart_best_practices/).
+* Must pass CI jobs for linting and installing changed charts with the [chart-testing](https://github.com/helm/chart-testing) tool See [pre-commit](#pre-commit) below.
+* Any change to a chart requires a version bump following [semver](https://semver.org/) principles. See [Immutability](#immutability) and [Versioning](#versioning) below.
 
 Once changes have been merged, the release job will automatically run to package and release changed charts.
 
@@ -51,3 +51,7 @@ Charts should start at `1.0.0`. Any breaking (backwards incompatible) changes to
 
 1. Bump the MAJOR version
 2. In the README, under a section called "Upgrading", describe the manual steps necessary to upgrade to the new (specified) MAJOR version
+
+### pre-commit
+
+This repo supports the [pre-commit](https://pre-commit.com) framework. By installing the framework (see [docs](https://pre-commit.com/#install)) it is possible to perform the chart linting step before committing your code. This can help prevent linter issues in the pipeline. Note that this requires having Docker running on your development environment.

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2020 Jeff Billimek
+   Copyright 2020 k8s@Home
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,8 +1,9 @@
-# Collection of helm charts
+# k8s@Home collection of helm charts
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![](https://github.com/billimek/billimek-charts/workflows/Release%20Charts/badge.svg?branch=master)](https://github.com/billimek/billimek-charts/actions)
-
+[![](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.
@@ -11,14 +12,14 @@ Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
 Once Helm is set up properly, add the repo as follows:
 
 ```console
-helm repo add billimek https://billimek.com/billimek-charts/
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
 ```
 
-You can then run `helm search billimek` to see the charts.
+You can then run `helm search repo k8s-at-home` to see the charts.
 
 ## Charts
 
-See [helm hub](https://hub.helm.sh/charts/billimek) for a complete list.
+See [artifact hub](https://artifacthub.io/packages/search?org=k8s-at-home) for a complete list.
 
 ## Contributing
 

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

@@ -1,13 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: v0.102.0
 description: DNS proxy as ad-blocker for local network
 name: adguard-home
-version: 1.2.0
+version: 2.2.0
 keywords:
   - adguard-home
   - adguard
   - dns
-home: https://github.com/billimek/billimek-charts/tree/master/charts/adguard-home
+home: https://github.com/k8s-at-home/charts/tree/master/charts/adguard-home
 icon: https://avatars3.githubusercontent.com/u/8361145?s=200&v=4?sanitize=true
 sources:
   - https://github.com/AdguardTeam/AdGuardHome

charts/adguard-home/README.md

@@ -7,8 +7,8 @@ The default values and container images used in this chart will allow for runnin
 ## TL;DR
 
 ```shell
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/adguard-home
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/adguard-home
 ```
 
 ## Installing the Chart
@@ -16,7 +16,7 @@ helm install billimek/adguard-home
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name adguard-home billimek/adguard-home
+helm install --name adguard-home k8s-at-home/adguard-home
 ```
 
 ## Uninstalling the Chart
@@ -31,20 +31,20 @@ The command removes all the Kubernetes components associated with the chart and
 
 ## Configuration
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/adguard-home/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/adguard-home/values.yaml) file. It has several commented out suggested values.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
 ```console
 helm install --name adguard-home \
   --set timeZone="America/New York" \
-    billimek/adguard-home
+    k8s-at-home/adguard-home
 ```
 
 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 adguard-home -f values.yaml billimek/adguard-home
+helm install --name adguard-home -f values.yaml k8s-at-home/adguard-home
 ```
 
 #### Helm force upgrade

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,8 +1,8 @@
-apiVersion: v1
-appVersion: v0.8.4.2-ls72
+apiVersion: v2
+appVersion: v0.9.0.2
 description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements
 name: bazarr
-version: 2.0.2
+version: 3.1.0
 keywords:
   - bazarr
   - radarr
@@ -10,7 +10,7 @@ keywords:
   - subtitles
   - usenet
   - bittorrent
-home: https://github.com/billimek/billimek-charts/tree/master/charts/bazarr
+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:
   - https://hub.docker.com/r/linuxserver/bazarr/

charts/bazarr/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [bazarr](https://github.com/morpheus65535/bazarr) lever
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/bazarr
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/bazarr
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/bazarr
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release billimek/bazarr
+helm install --name my-release k8s-at-home/bazarr
 ```
 
 ## Upgrading
@@ -75,6 +75,7 @@ The following tables lists the configurable parameters of the Sentry chart and t
 | `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`               |
@@ -97,7 +98,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set timezone="America/New York" \
-    billimek/bazarr
+    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,
@@ -114,4 +115,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/bazarr/values.yaml) file. It has several commented out suggested values.
+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.

charts/bazarr/templates/deployment.yaml

@@ -64,6 +64,9 @@ spec:
           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 }}

charts/bazarr/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: linuxserver/bazarr
-  tag: v0.8.4.2-ls72
+  tag: v0.9.0.2-ls89
   pullPolicy: IfNotPresent
 
 # upgrade strategy type (e.g. Recreate or RollingUpdate)
@@ -78,6 +78,7 @@ persistence:
     ## 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

charts/bitwardenrs/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: bitwardenrs
 description: Unofficial Bitwarden compatible server written in Rust
 type: application
-version: 0.1.0
+version: 1.0.0
 appVersion: 1.16.3
 keywords:
   - bitwarden
@@ -10,7 +10,7 @@ keywords:
   - bitwarden_rs
   - password
   - rust
-home: https://github.com/billimek/billimek-charts/tree/master/charts/bitwarden_rs
+home: https://github.com/k8s-at-home/charts/tree/master/charts/bitwarden_rs
 sources:
   - https://github.com/dani-garcia/bitwarden_rs
 maintainers:

charts/bitwardenrs/README.md

@@ -7,8 +7,8 @@ The default values and container images used in this chart will allow for runnin
 ## TL;DR
 
 ```console
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/bitwardenrs
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/bitwardenrs
 ```
 
 ## Installing the Chart
@@ -16,7 +16,7 @@ helm install billimek/bitwardenrs
 To install the chart with the release name `bitwarden`:
 
 ```console
-helm install bitwarden billimek/bitwardenrs
+helm install bitwarden k8s-at-home/bitwardenrs
 ```
 
 ## Uninstalling the Chart
@@ -31,18 +31,18 @@ The command removes all the Kubernetes components associated with the chart and
 
 ## Configuration
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/bitwardenrs/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bitwardenrs/values.yaml) file. It has several commented out suggested values.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
 ```console
 helm install bitwarden \
   --set timeZone="America/New York" \
-    billimek/bitwardenrs
+    k8s-at-home/bitwardenrs
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-helm install bitwarden billimek/bitwardenrs  --values values.yaml 
+helm install bitwarden k8s-at-home/bitwardenrs  --values values.yaml 
 ```

charts/blocky/Chart.yaml

@@ -1,12 +1,12 @@
-apiVersion: v1
-appVersion: "v0.8"
+apiVersion: v2
+appVersion: v0.10
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 3.3.0
+version: 4.0.1
 keywords:
   - blocky
   - dbs
-home: https://github.com/billimek/billimek-charts/tree/master/charts/blocky
+home: https://github.com/k8s-at-home/charts/tree/master/charts/blocky
 icon: https://github.com/0xERR0R/blocky/raw/master/docs/blocky.svg?sanitize=true
 sources:
   - https://github.com/0xERR0R/blocky

charts/blocky/README.md

@@ -7,8 +7,8 @@ The default values and container images used in this chart will allow for runnin
 ## TL;DR
 
 ```shell
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/blocky
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/blocky
 ```
 
 ## Installing the Chart
@@ -16,7 +16,7 @@ helm install billimek/blocky
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name blocky billimek/blocky
+helm install --name blocky k8s-at-home/blocky
 ```
 
 ## Uninstalling the Chart
@@ -31,20 +31,20 @@ The command removes all the Kubernetes components associated with the chart and
 
 ## Configuration
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/blocky/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/blocky/values.yaml) file. It has several commented out suggested values.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 
 ```console
 helm install --name blocky \
   --set timeZone="America/New York" \
-    billimek/blocky
+    k8s-at-home/blocky
 ```
 
 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 blocky -f values.yaml billimek/blocky
+helm install --name blocky -f values.yaml k8s-at-home/blocky
 ```
 
 ## Upgrading an existing Release to a new major version

charts/blocky/values.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: spx01/blocky
-  tag: v0.8
+  tag: v0.10
   pullPolicy: IfNotPresent
 
 nameOverride: ""

charts/calibre-web/Chart.yaml

@@ -1,20 +1,13 @@
 type: application
-
 apiVersion: v2
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.6.8-ls74
+appVersion: 0.6.8
 description: Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database.
 name: calibre-web
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.2
+version: 2.0.1
 keywords:
   - calibre
   - ebook
-home: https://github.com/billimek/billimek-charts/tree/master/charts/calibre-web
+home: https://github.com/k8s-at-home/charts/tree/master/charts/calibre-web
 icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png
 sources:
   - https://hub.docker.com/r/linuxserver/calibre-web/

charts/calibre-web/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [calibre-web](https://github.com/janeczku/calibre-web)
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.github.io/billimek-charts/
-$ helm install billimek/calibre-web
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/calibre-web
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/calibre-web
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release billimek/calibre-web
+helm install --name my-release k8s-at-home/calibre-web
 ```
 
 ## Uninstalling the Chart
@@ -87,7 +87,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set timezone="America/New York" \
-    billimek/calibre-web
+    k8s-at-home/calibre-web
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
@@ -104,4 +104,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.

charts/comcast/Chart.yaml

@@ -1,17 +1,17 @@
-apiVersion: v1
+apiVersion: v2
 name: comcast
-version: 2.0.1
+version: 3.0.0
 appVersion: 1.0.0
 description: periodic comcast data usage checks and save the results to InfluxDB
 keywords:
 - comcast
 - influxdb
 - xfinity
-home: https://github.com/billimek/billimek-charts/tree/master/charts/comcast
+home: https://github.com/k8s-at-home/charts/tree/master/charts/comcast
 icon: https://i.imgur.com/iR1dUpp.png
 sources:
 - https://github.com/billimek/comcastUsage-for-influxdb
-- https://github.com/billimek/billimek-charts
+- https://github.com/k8s-at-home/charts
 maintainers:
 - name: billimek
   email: jeff@billimek.com

charts/comcast/README.md

@@ -7,8 +7,8 @@ This tool allows you to run periodic comcast data usage checks and save the resu
 ## TL;DR;
 
 ```console
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/comcast
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/comcast
 ```
 
 ## Introduction
@@ -20,7 +20,7 @@ This code is adopted from the work done by [barrycarey](https://github.com/barry
 To install the chart with the release name `my-release`:
 
 ```console
-$ helm install --name my-release billimek/comcast
+$ helm install --name my-release k8s-at-home/comcast
 ```
 ## Uninstalling the Chart
 
@@ -62,16 +62,16 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set config.comcast.username=tonystark,config.comcast.password=mypassword \
-    billimek/comcast
+    k8s-at-home/comcast
 ```
 
 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 billimek/comcast
+helm install --name my-release -f values.yaml k8s-at-home/comcast
 ```
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/comcast/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/comcast/values.yaml) file. It has several commented out suggested values.
 
 ## InfluxDB metrics
 ```

charts/common/.helmignore

@@ -14,10 +14,10 @@
 *.swp
 *.bak
 *.tmp
+*.orig
 *~
 # Various IDEs
 .project
 .idea/
 *.tmproj
-# OWNERS file for Kubernetes
-OWNERS
+.vscode/

charts/common/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v2
+name: common
+description: Function library for k8s-at-home charts
+type: library
+version: 1.0.2
+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,24 @@
+{{- define "common.all" -}}
+  {{- /* Merge the local chart values and the common chart defaults */ -}}
+  {{- $defaultValues := .Values.common -}}
+  {{- $_ := deepCopy $defaultValues | merge .Values -}}
+  {{- $_ := unset .Values "common" -}}
+  
+  {{- /* 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,55 @@
+{{- define "common.deployment" -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  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" . | nindent 6 }}
+
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+{{- end }}

charts/common/templates/_ingress.tpl

@@ -0,0 +1,25 @@
+{{- define "common.ingress" -}}
+  {{- if .Values.ingress.enabled -}}
+    {{- $svcPort := .Values.service.port.port -}}
+
+    {{- /* Generate primary ingress */ -}}
+    {{- $ingressValues := .Values.ingress -}}
+    {{- $_ := set $ingressValues "svcPort" $svcPort -}}
+    {{- $_ := 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 -}}
+        {{- $_ := set $ingressValues "svcPort" $svcPort -}}
+        {{- 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 -}}
 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 "sonarr.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 "sonarr.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "sonarr.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 "sonarr.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,15 @@
+{{- define "common.pvc" -}}
+  {{- /* Generate pvc as required */ -}}
+  {{- $context := . -}}
+  {{- 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 $context "ObjectValues" (dict "persistence" $persistenceValues) -}}
+      {{- print ("---") | nindent 0 -}}
+      {{- include "common.classes.pvc" $context -}}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/common/templates/_service.tpl

@@ -0,0 +1,5 @@
+{{- define "common.service" -}}
+  {{- if .Values.service.enabled -}}
+    {{- include "common.classes.service" . }}
+  {{- end }}
+{{- end }}

charts/common/templates/_statefulset.tpl

@@ -0,0 +1,56 @@
+{{- define "common.statefulset" -}}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: {{ template "common.names.fullname" . }}
+  labels:
+  {{- include "common.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  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" . | nindent 6 }}
+
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | indent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | indent 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:
+{{- if .Values.addons.vpn.configFile }}
+  vpnConfigfile: |-
+    {{- .Values.addons.vpn.configFile | nindent 4}}
+{{- end }}
+{{- if .Values.addons.vpn.scripts.up }}
+  up.sh: |-
+    {{- .Values.addons.vpn.scripts.up | nindent 4}}
+{{- end }}
+{{- if .Values.addons.vpn.scripts.down }}
+  down.sh: |-
+    {{- .Values.addons.vpn.scripts.down | 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:
+  {{- if .Values.addons.vpn.networkPolicy.egress }} 
+    {{- .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.vpnConf .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
+name: vpnconfig
+configMap:
+  name: {{ template "common.names.fullname" . }}-vpn
+  items:
+    {{- if .Values.addons.vpn.vpnConf }}
+    - 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 -}}
+  {{- 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 -}}
+  {{- 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 -}}
+  {{- end -}}
+{{- end -}}

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

@@ -0,0 +1,57 @@
+{{/*
+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 }}
+securityContext:
+  capabilities:
+    add: 
+      - NET_ADMIN
+{{- if .Values.addons.vpn.env }}
+env:
+{{- range $k, $v := .Values.addons.vpn.env }}
+  - name: {{ $k }}
+    value: {{ $v }}
+{{- 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 }}
+{{- if .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml .Values.addons.vpn.additionalVolumeMounts | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- if .Values.addons.vpn.livenessProbe }}
+livenessProbe:
+  {{- toYaml .Values.addons.vpn.livenessProbe | nindent 4 }}
+{{- 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" -}}
+{{- if .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: {{ .Values.addons.vpn.openvpn.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 := include "common.addon.wireguard.container" . | fromYaml -}}
+  {{- if $container -}}
+    {{- $additionalContainers := append .Values.additionalContainers $container }}
+    {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
+  {{- end -}}
+{{- end -}}

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

@@ -0,0 +1,50 @@
+{{/*
+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 }}
+securityContext:
+  privileged: true
+  capabilities:
+    add: 
+      - NET_ADMIN
+      - SYS_MODULE
+{{- if .Values.addons.vpn.env }}
+env:
+{{- range $k, $v := .Values.addons.vpn.env }}
+  - name: {{ $k }}
+    value: {{ $v }}
+{{- 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: /config/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 }}
+{{- if .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml .Values.addons.vpn.additionalVolumeMounts | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- if .Values.addons.vpn.livenessProbe }}
+livenessProbe:
+  {{- toYaml .Values.addons.vpn.livenessProbe | nindent 4 }}
+{{- end -}}
+{{- end -}}

charts/common/templates/classes/_ingress.tpl

@@ -0,0 +1,64 @@
+{{- define "common.classes.ingress" -}}
+{{- $apiv1 := .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+{{- $apiv1beta1 := .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
+{{- $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 -}}
+{{- $svcPort := $values.svcPort -}}
+{{- if $apiv1 -}}
+apiVersion: networking.k8s.io/v1
+{{- else if $apiv1beta1 -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{ end }}
+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 }}
+            {{- if or $apiv1beta1 $apiv1 }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if $apiv1 }}
+              service:
+                name: {{ $ingressName }}
+                port:
+                  name: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $ingressName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- 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,70 @@
+{{- define "common.classes.service" -}}
+{{- $values := .Values.service -}}
+{{- if hasKey . "ObjectValues" -}}
+  {{- with .ObjectValues.service -}}
+    {{- $values = . -}}
+  {{- end -}}
+{{ end -}}
+{{- $svcType := $values.type -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  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/_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/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 12 }}
+  {{- 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,33 @@
+{{/*
+volumes included by the controller
+*/}}
+{{- define "common.controller.volumes" -}}
+{{/* Store the context to refer in later scope */}}
+{{- $context := . -}}
+{{/* Determine the PVC name */}}
+{{- range $index, $PVC := .Values.persistence }}
+{{- if $PVC.enabled }}
+
+{{- $claimName := "" -}}
+{{- if $PVC.existingClaim -}}
+  {{- $claimName = $PVC.existingClaim -}}
+{{- else }}
+  {{- if $PVC.nameSuffix -}}
+    {{- $claimName = printf "%s-%s" (include "common.names.fullname" $context) $PVC.nameSuffix -}}
+  {{- else }}
+    {{- $claimName = printf "%s-%s" (include "common.names.fullname" $context) $index -}}
+  {{- end -}}
+{{- end -}}
+- name: {{ $index }}
+  {{- if not $PVC.emptyDir }}
+  persistentVolumeClaim:
+    claimName: {{ $claimName }}
+  {{- else }}
+  emptyDir: {}
+  {{- end }}
+{{ end }}
+{{- end }}
+{{- if .Values.additionalVolumes }}
+  {{- toYaml .Values.additionalVolumes | nindent 0 }}
+{{- end }}
+{{- end }}

charts/common/values.yaml

@@ -0,0 +1,196 @@
+# type: options are statefulset or deployment
+controllerType: deployment
+
+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:
+    portNumber: ""
+    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: {}
+
+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: []
+
+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
+
+    # OpenVPN specific configuration
+    wireguard:
+      image:
+        repository: linuxserver/wireguard
+        tag: version-v1.0.20200827
+
+    imagePullPolicy: IfNotPresent
+
+    # 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/couchpotato/Chart.yaml

@@ -1,13 +1,13 @@
-apiVersion: v1
-appVersion: 7260c12f-ls33
+apiVersion: v2
+appVersion: v3.0.1
 description: couchpotato is a movie downloading client
 name: couchpotato
-version: 1.0.2
+version: 2.0.1
 keywords:
   - couchpotato
   - usenet
   - bittorrent
-home: https://github.com/billimek/billimek-charts/tree/master/charts/couchpotato
+home: https://github.com/k8s-at-home/charts/tree/master/charts/couchpotato
 icon: https://github.com/CouchPotato/CouchPotatoServer/raw/master/couchpotato/static/images/icons/android.png
 sources:
   - https://hub.docker.com/r/linuxserver/couchpotato/

charts/couchpotato/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [couchpotato](https://github.com/couchpotato/couchpotat
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/couchpotato
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/couchpotato
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/couchpotato
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release billimek/couchpotato
+helm install --name my-release k8s-at-home/couchpotato
 ```
 
 ## Uninstalling the Chart
@@ -89,7 +89,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set timezone="America/New York" \
-    billimek/couchpotato
+    k8s-at-home/couchpotato
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
@@ -105,4 +105,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/couchpotato/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/couchpotato/values.yaml) file. It has several commented out suggested values.

charts/couchpotato/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: linuxserver/couchpotato
-  tag: 7260c12f-ls33
+  tag: 7260c12f-ls42
   pullPolicy: IfNotPresent
 
 # upgrade strategy type (e.g. Recreate or RollingUpdate)

charts/dashmachine/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v2
+appVersion: v0.5-4
+description: DashMachine is another web application bookmark dashboard, with fun features.
+icon: https://github.com/rmountjoy92/DashMachine/raw/master/dashmachine/static/images/logo/logo.png
+home: https://github.com/rmountjoy92/DashMachine
+name: dashmachine
+version: 1.0.0
+sources:
+  - https://github.com/rmountjoy92/DashMachine
+maintainers:
+  - name: carpenike
+    email: ryan@ryanholt.net

charts/dashmachine/README.md

@@ -0,0 +1,31 @@
+dashmachine
+===========
+DashMachine is another web application bookmark dashboard, with fun features.
+
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| deploymentAnnotations | object | `{}` |  |
+| fullnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.repository | string | `"rmountjoy/dashmachine"` |  |
+| image.tag | string | `"latest"` |  |
+| ingress.annotations | object | `{}` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts[0] | string | `"chart-example.local"` |  |
+| ingress.paths[0] | string | `"/"` |  |
+| ingress.tls | list | `[]` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| persistence.accessModes[0] | string | `"ReadWriteOnce"` |  |
+| persistence.enabled | bool | `false` |  |
+| persistence.size | string | `"1Gi"` |  |
+| persistence.storageClassName | string | `""` |  |
+| podAnnotations | object | `{}` |  |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| service.port | int | `5000` |  |
+| service.type | string | `"ClusterIP"` |  |
+| tolerations | list | `[]` |  |

charts/dashmachine/templates/NOTES.txt

@@ -1,19 +1,21 @@
 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 }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range $.Values.ingress.paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ . }}
+  {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "radarr.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "dashmachine.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 "radarr.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "radarr.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ include "dashmachine.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "dashmachine.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 "radarr.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 "dashmachine.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 }}

charts/dashmachine/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "lidarr.name" -}}
+{{- define "dashmachine.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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 "lidarr.fullname" -}}
+{{- define "dashmachine.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "lidarr.chart" -}}
+{{- define "dashmachine.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

charts/dashmachine/templates/deployment.yaml

@@ -0,0 +1,78 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "dashmachine.fullname" . }}
+  {{- if .Values.deploymentAnnotations }}
+  annotations:
+    {{- range $key, $value := .Values.deploymentAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    helm.sh/chart: {{ include "dashmachine.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- if .Values.podAnnotations }}
+      annotations:
+        {{- range $key, $value := .Values.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+      {{- end }}
+    spec:
+      {{- 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: 5000
+              protocol: TCP
+          # livenessProbe:
+          #   httpGet:
+          #     path: /notifications
+          #     port: http
+          # readinessProbe:
+          #   httpGet:
+          #     path: /notifications
+          #     port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: config
+              mountPath: /dashmachine/dashmachine/user_data
+      volumes:
+        - name: config
+        {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "dashmachine.fullname" . }}
+        {{- else }}
+          emptyDir: {}
+        {{- end }}
+      {{- 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/dashmachine/templates/ingress.yaml

@@ -1,22 +1,19 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "ombi.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
+{{- $fullName := include "dashmachine.fullname" . -}}
+{{- $ingressPaths := .Values.ingress.paths -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app.kubernetes.io/name: {{ include "ombi.name" . }}
-    helm.sh/chart: {{ include "ombi.chart" . }}
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    helm.sh/chart: {{ include "dashmachine.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 }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 {{- if .Values.ingress.tls }}
   tls:
@@ -33,9 +30,11 @@ spec:
     - host: {{ . | quote }}
       http:
         paths:
-          - path: {{ $ingressPath }}
+  {{- range $ingressPaths }}
+          - path: {{ . }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
   {{- end }}
+  {{- end }}
 {{- end }}

charts/dashmachine/templates/pvc.yaml

@@ -0,0 +1,24 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ template "dashmachine.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    helm.sh/chart: {{ include "dashmachine.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+  {{- with .Values.persistence.annotations  }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
+spec:
+  accessModes:
+    {{- range .Values.persistence.accessModes }}
+    - {{ . | quote }}
+    {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+  storageClassName: {{ .Values.persistence.storageClass }}
+{{- end -}}

charts/dashmachine/templates/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "dashmachine.fullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    helm.sh/chart: {{ include "dashmachine.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}

charts/dashmachine/templates/tests/test-connection.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "dashmachine.fullname" . }}-test-connection"
+  labels:
+    app.kubernetes.io/name: {{ include "dashmachine.name" . }}
+    helm.sh/chart: {{ include "dashmachine.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "dashmachine.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never

charts/dashmachine/values.yaml

@@ -0,0 +1,65 @@
+# Default values for dashmachine.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: rmountjoy/dashmachine
+  tag: v0.5-4
+  pullPolicy: IfNotPresent
+
+nameOverride: ""
+fullnameOverride: ""
+
+service:
+  type: ClusterIP
+  port: 5000
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  paths: ["/"]
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+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: {}
+
+persistence:
+  enabled: false
+  ## 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: ""
+  accessModes:
+    - ReadWriteOnce
+  size: 1Gi
+
+podAnnotations: {}
+
+deploymentAnnotations: {}

charts/deconz/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 name: deconz
 description: A Helm chart for deploying deCONZ
-version: 1.0.2
+version: 2.0.0
 appVersion: 2.05.80
 keywords:
   - deconz
   - home-automation
   - zigbee
-home: https://github.com/billimek/billimek-charts/tree/master/charts/deconz
+home: https://github.com/k8s-at-home/charts/tree/master/charts/deconz
 icon: https://avatars1.githubusercontent.com/u/4217524?s=400&v=4
 sources:
   - https://github.com/dresden-elektronik/deconz-rest-plugin

charts/deconz/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [deCONZ](https://www.dresden-elektronik.de/funk/softwar
 ## TL;DR
 
 ```shell
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/deconz
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/deconz
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ helm install billimek/deconz
 To install the chart with the release name `my-release`:
 
 ```shell
-helm install my-release billimek/deconz
+helm install my-release k8s-at-home/deconz
 ```
 
 ## Uninstalling the Chart
@@ -30,7 +30,7 @@ The command removes all the Kubernetes components associated with the chart and
 ## Configuration
 
 The following tables lists the configurable parameters of the Sentry chart and their default values.
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/deconz/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/deconz/values.yaml) file. It has several commented out suggested values.
 
 | Parameter                                   | Description                                                                                  | Default                                        |
 | ------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------------------------- |
@@ -91,11 +91,11 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install my-release \
   --set timezone="Europe/Amsterdam" \
-    billimek/deconz
+    k8s-at-home/deconz
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-helm install my-release -f values.yaml billimek/deconz
+helm install my-release -f values.yaml k8s-at-home/deconz
 ```

charts/digitalocean-dyndns/Chart.yaml

@@ -1,16 +1,16 @@
-apiVersion: v1
-appVersion: "1.0"
+apiVersion: v2
+appVersion: 1.0
 description: Dynamic DNS using DigitalOcean's DNS Services
 name: digitalocean-dyndns
-version: 1.0.1
+version: 2.0.1
 keywords:
 - digitalocean
 - dynamicdns
-home: https://github.com/billimek/billimek-charts/tree/master/charts/digitalocean-dyndns
+home: https://github.com/k8s-at-home/charts/tree/master/charts/digitalocean-dyndns
 icon: https://i.imgur.com/cS6iqXD.png
 sources:
 - https://github.com/tunix/digitalocean-dyndns
-- https://github.com/billimek/billimek-charts
+- https://github.com/k8s-at-home/charts
 maintainers:
 - name: billimek
   email: jeff@billimek.com

charts/digitalocean-dyndns/README.md

@@ -5,8 +5,8 @@ A script that pushes the public IP address of the running machine to DigitalOcea
 ## TL;DR;
 
 ```console
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/digitalocean-dyndns
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/digitalocean-dyndns
 ```
 
 ## Introduction
@@ -18,7 +18,7 @@ This code is adopted from [this original repo](https://github.com/tunix/digitalo
 To install the chart with the release name `my-release`:
 
 ```console
-$ helm install --name my-release billimek/digitalocean-dyndns
+$ helm install --name my-release k8s-at-home/digitalocean-dyndns
 ```
 ## Uninstalling the Chart
 
@@ -50,13 +50,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set config.digitalocean.token=thisismyapikey \
-    billimek/digitalocean-dyndns
+    k8s-at-home/digitalocean-dyndns
 ```
 
 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 billimek/digitalocean-dyndns
+helm install --name my-release -f values.yaml k8s-at-home/digitalocean-dyndns
 ```
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/digitalocean-dyndns/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/digitalocean-dyndns/values.yaml) file. It has several commented out suggested values.

charts/duplicati/Chart.yaml

@@ -1,11 +1,11 @@
-apiVersion: v1
-appVersion: v2.0.5.1-2.0.5.1_beta_2020-01-18-ls58
+apiVersion: v2
+appVersion: v2.0.5.1
 description: Store securely encrypted backups on cloud storage services!
 name: duplicati
-version: 1.0.2
+version: 2.0.1
 keywords:
   - duplicati
-home: https://github.com/billimek/billimek-charts/tree/master/charts/duplicati
+home: https://github.com/k8s-at-home/charts/tree/master/charts/duplicati
 icon: https://i.imgur.com/KjnkhUJ.png
 sources:
   - https://hub.docker.com/r/linuxserver/duplicati/

charts/duplicati/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [duplicati](https://github.com/duplicati/duplicati) lev
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/duplicati
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/duplicati
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/duplicati
 To install the chart with the release name `my-release`:
 
 ```console
-helm install my-release billimek/duplicati
+helm install my-release k8s-at-home/duplicati
 ```
 
 ## Uninstalling the Chart
@@ -90,13 +90,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install my-release \
   --set timezone="America/New York" \
-    billimek/duplicati
+    k8s-at-home/duplicati
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-helm install my-release -f values.yaml billimek/duplicati
+helm install my-release -f values.yaml k8s-at-home/duplicati
 ```
 
 ---
@@ -106,4 +106,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/duplicati/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/duplicati/values.yaml) file. It has several commented out suggested values.

charts/duplicati/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: linuxserver/duplicati
-  tag: v2.0.5.1-2.0.5.1_beta_2020-01-18-ls58
+  tag: v2.0.5.1-2.0.5.1_beta_2020-01-18-ls72
   pullPolicy: IfNotPresent
 
 # upgrade strategy type (e.g. Recreate or RollingUpdate)

charts/esphome/Chart.yaml

@@ -1,11 +1,11 @@
-apiVersion: v1
-appVersion: 1.14.5
+apiVersion: v2
+appVersion: 1.15.3
 description: ESPHome
 name: esphome
-version: 1.0.1
+version: 2.3.0
 keywords:
 - esphome
-home: https://github.com/billimek/billimek-charts/tree/master/charts/esphome
+home: https://github.com/k8s-at-home/charts/tree/master/charts/esphome
 icon: https://esphome.io/_images/logo-text.svg
 sources:
 - https://github.com/esphome/esphome

charts/esphome/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [ESPHome](https://esphome.io)
 ## TL;DR;
 
 ```shell
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/esphome
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/esphome
 ```
 
 ## Introduction
@@ -18,7 +18,7 @@ This code is adapted for [the official esphome docker image](https://hub.docker.
 To install the chart with the release name `my-release`:
 
 ```shell
-helm install --name my-release billimek/esphome
+helm install --name my-release k8s-at-home/esphome
 ```
 ## Uninstalling the Chart
 
@@ -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                                                   | `{}`                  |
+
 
 
 
@@ -101,13 +108,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```shell
 helm install --name my-release \
   --set image.tag=latest \
-    billimek/esphome
+    k8s-at-home/esphome
 ```
 
 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 billimek/esphome
+helm install --name my-release -f values.yaml k8s-at-home/esphome
 ```
 
 Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.

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,13 +1,13 @@
-apiVersion: v1
-appVersion: "0.5.2"
+apiVersion: v2
+appVersion: "0.6.0"
 description: Realtime object detection on RTSP cameras with the Google Coral
 name: frigate
-version: 3.2.0
+version: 4.0.1
 keywords:
   - tensorflow
   - coral
   - ml
-home: https://github.com/billimek/billimek-charts/tree/master/charts/frigate
+home: https://github.com/k8s-at-home/charts/tree/master/charts/frigate
 icon: https://upload.wikimedia.org/wikipedia/commons/a/a4/Lutine1.jpg
 sources:
   - https://github.com/blakeblackshear/frigate

charts/frigate/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [frigate](https://github.com/blakeblackshear/frigate)
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/frigate
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/frigate
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/frigate
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release billimek/frigate
+helm install --name my-release k8s-at-home/frigate
 ```
 
 ~~**IMPORTANT NOTE:** the [Google Coral USB Accelerator](https://coral.withgoogle.com/products/accelerator/) must be accessible on the node where this pod runs, in order for this chart to function properly.~~
@@ -87,7 +87,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set rtspPassword="nosecrets" \
-    billimek/frigate
+    k8s-at-home/frigate
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
@@ -96,4 +96,4 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 helm install --name my-release -f values.yaml stable/frigate
 ```
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/frigate/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/frigate/values.yaml) file. It has several commented out suggested values.

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/grocy/Chart.yaml

@@ -1,11 +1,11 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: v2.6.1
 description: ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home
 name: grocy
-version: 1.0.2
+version: 2.0.0
 keywords:
   - grocy
-home: https://github.com/billimek/billimek-charts/tree/master/charts/grocy
+home: https://github.com/k8s-at-home/charts/tree/master/charts/grocy
 icon: https://github.com/grocy/grocy/raw/master/public/img/appicons/mstile-150x150.png
 sources:
   - https://github.com/grocy/grocy

charts/grocy/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [Grocy](https://grocy.info/) leveraging the [Linuxserve
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/grocy
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/grocy
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/grocy
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release billimek/grocy
+helm install --name my-release k8s-at-home/grocy
 ```
 
 ## Uninstalling the Chart
@@ -79,13 +79,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install --name my-release \
   --set timezone="America/New York" \
-    billimek/grocy
+    k8s-at-home/grocy
 ```
 
 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 billimek/grocy
+helm install --name my-release -f values.yaml k8s-at-home/grocy
 ```
 
 ---
@@ -95,4 +95,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/grocy/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/grocy/values.yaml) file. It has several commented out suggested values.

charts/heimdall/Chart.yaml

@@ -1,11 +1,11 @@
-apiVersion: v1
-appVersion: 2.2.2-ls84
+apiVersion: v2
+appVersion: 2.2.2
 description: An Application dashboard and launcher
 name: heimdall
-version: 1.0.3
+version: 2.0.1
 keywords:
   - heimdall
-home: https://github.com/billimek/billimek-charts/tree/master/charts/heimdall
+home: https://github.com/k8s-at-home/charts/tree/master/charts/heimdall
 icon: https://i.imgur.com/mM4tcO5.png
 sources:
   - https://hub.docker.com/r/linuxserver/heimdall/

charts/heimdall/README.md

@@ -5,8 +5,8 @@ This is a helm chart for [heimdall](https://github.com/heimdall/heimdall) levera
 ## TL;DR;
 
 ```shell
-$ helm repo add billimek https://billimek.com/billimek-charts/
-$ helm install billimek/heimdall
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/heimdall
 ```
 
 ## Installing the Chart
@@ -14,7 +14,7 @@ $ helm install billimek/heimdall
 To install the chart with the release name `my-release`:
 
 ```console
-helm install my-release billimek/heimdall
+helm install my-release k8s-at-home/heimdall
 ```
 
 ## Uninstalling the Chart
@@ -77,13 +77,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 helm install my-release \
   --set timezone="America/New York" \
-    billimek/heimdall
+    k8s-at-home/heimdall
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-helm install my-release -f values.yaml billimek/heimdall
+helm install my-release -f values.yaml k8s-at-home/heimdall
 ```
 
 ---
@@ -93,4 +93,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-Read through the [values.yaml](https://github.com/billimek/billimek-charts/blob/master/charts/heimdall/values.yaml) file. It has several commented out suggested values.
+Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/heimdall/values.yaml) file. It has several commented out suggested values.

charts/heimdall/values.yaml

@@ -4,7 +4,7 @@
 
 image:
   repository: linuxserver/heimdall
-  tag: 2.2.2-ls84
+  tag: 2.2.2-ls98
   pullPolicy: IfNotPresent
 
 # upgrade strategy type (e.g. Recreate or RollingUpdate)

charts/home-assistant/Chart.yaml

@@ -1,19 +1,19 @@
 apiVersion: v2
-appVersion: 0.114.0
+appVersion: 0.116.1
 description: Home Assistant
 name: home-assistant
-version: 1.2.0
+version: 2.6.0
 keywords:
 - home-assistant
 - hass
 - homeassistant
-home: https://github.com/billimek/billimek-charts/tree/master/charts/home-assistant
+home: https://github.com/k8s-at-home/charts/tree/master/charts/home-assistant
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/6/6e/Home_Assistant_Logo.svg/519px-Home_Assistant_Logo.svg.png
 sources:
 - https://github.com/home-assistant/home-assistant
 - https://github.com/danielperna84/hass-configurator
 - https://github.com/cdr/code-server
-- https://github.com/billimek/billimek-charts/tree/master/charts/home-assistant
+- https://github.com/k8s-at-home/charts/tree/master/charts/home-assistant
 maintainers:
 - name: billimek
   email: jeff@billimek.com
@@ -21,8 +21,8 @@ maintainers:
   email: phil@hellmi.de
 dependencies:
 - name: esphome
-  repository: https://billimek.com/billimek-charts
-  version: ~1.0.0
+  repository: https://k8s-at-home.com/charts/
+  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

@@ -5,8 +5,8 @@ This is a helm chart for [Home Assistant](https://www.home-assistant.io/)
 ## TL;DR;
 
 ```shell
-helm repo add billimek https://billimek.com/billimek-charts/
-helm install billimek/home-assistant
+helm repo add k8s-at-home https://k8s-at-home.com/charts/
+helm install k8s-at-home/home-assistant
 ```
 
 ## Introduction
@@ -18,7 +18,7 @@ This code is adapted for [the official home assistant docker image](https://hub.
 To install the chart with the release name `my-release`:
 
 ```shell
-helm install --name my-release billimek/home-assistant
+helm install --name my-release k8s-at-home/home-assistant
 ```
 
 ## Uninstalling the Chart
@@ -35,171 +35,176 @@ 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`                             |
-| `configurator.image.repository`                 | Image repository                                                                                                                                                                                                                          | `billimek/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`                               |
+| 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.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,
 
 ```shell
 helm install --name my-release \
   --set configurator.hassApiPassword="$HASS_API_PASSWORD" \
-    billimek/home-assistant
+    k8s-at-home/home-assistant
 ```
 
 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 billimek/home-assistant
+helm install --name my-release -f values.yaml k8s-at-home/home-assistant
 ```
 
 Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.
@@ -222,7 +227,18 @@ Much of the home assistant configuration occurs inside the various files persist
 
 ## Git sync secret
 
-In order to sync the home assistant from a git repo, you have to store a ssh key as a kubernetes git secret
+In order to sync the home assistant from a git repo, you can optionally store an ssh key as a kubernetes git secret:
 ```shell
 kubectl create secret generic git-creds --from-file=id_rsa=git/k8s_id_rsa --from-file=known_hosts=git/known_hosts --from-file=id_rsa.pub=git/k8s_id_rsa.pub
 ```
+
+## git-crypt support
+
+When using Git sync it is possible to specify a file called `git-crypt-key` in the secret referred to in `git.secret`. When this file is present, `git-crypt unlock` will automatically be executed after the repo has been synced. 
+
+**Note:** `git-crypt` is not installed by default in the other images! If you wish to push changes from the VS Code or Configurator containers, you will have to make sure that it is installed.
+
+The value for this secret can be obtained by running the following command in an unlocked version of your Home Assistant settings repo. It will export the unlock key, base64 encode it and copy it to your clipboard.
+```shell
+git-crypt export-key ./tmp-key && cat ./tmp-key | base64 | pbcopy && rm ./tmp-key
+```

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:
@@ -48,11 +49,33 @@ spec:
           - {{ . | quote }}
           {{- end }}
         {{- else }}
-        command: ['sh', '-c', '[ "$(ls {{ .Values.git.syncPath }})" ] || git clone {{ .Values.git.repo }} {{ .Values.git.syncPath }}']
+        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
+          subPath: {{ default "" .Values.persistence.configSubPath }}
         - mountPath: {{ .Values.git.keyPath }}
           name: git-secret
         {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 8 }}{{ end }}
@@ -127,6 +150,7 @@ spec:
           volumeMounts:
           - mountPath: /config
             name: config
+            subPath: {{ default "" .Values.persistence.configSubPath }}
           {{- if .Values.zwave.enabled }}
           - mountPath: /dev/ttyACM0
             name: ttyacm
@@ -226,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
@@ -249,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 }}
@@ -289,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
@@ -348,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 }}
@@ -396,6 +417,7 @@ spec:
         secret:
           defaultMode: 256
           secretName: {{ .Values.git.secret }}
+          optional: true
       {{ end }}
       {{- if .Values.extraVolumes  }}{{ toYaml .Values.extraVolumes | trim | nindent 6 }}{{ end }}
     {{- with .Values.nodeSelector }}

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
@@ -118,12 +121,9 @@ usePodSecurityContext: true
 git:
   enabled: false
 
-  ## we just use the hass-configurator container image
-  ## you can use any image which has git and openssh installed
-  ##
   image:
-    repository: causticlab/hass-configurator-docker
-    tag: 0.3.5-x86_64
+    repository: k8sathome/git-crypt
+    tag: 2020.09.28
     pullPolicy: IfNotPresent
 
   ## Specify the command that runs in the git-sync container to pull in configuration.
@@ -134,7 +134,7 @@ git:
     name: ""
     email: ""
 
-  # repo:
+  repo: ""
   secret: git-creds
   syncPath: /config
   keyPath: /root/.ssh
@@ -224,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
@@ -250,6 +261,10 @@ vscode:
   ##
   extraEnv: {}
 
+  ## Set to "-" to use default argument list
+  ## Otherwise convert to list of arguments
+  args: "-"
+
   ingress:
     enabled: false
     annotations: {}
@@ -295,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: {}
@@ -334,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:
@@ -348,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:
@@ -359,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

@@ -14,10 +14,10 @@
 *.swp
 *.bak
 *.tmp
+*.orig
 *~
 # Various IDEs
 .project
 .idea/
 *.tmproj
-# OWNERS file for Kubernetes
-OWNERS
+.vscode/

charts/homebridge/Chart.yaml

@@ -0,0 +1,17 @@
+apiVersion: v2
+appVersion: 3.1.0
+version: 1.0.1
+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.