initial add for xbackbone (#507)

* ombi: remove mariadb dep

* remove mariadb from values

.github/renovate.json5

@@ -2,8 +2,6 @@
   "enabled": true,
   "dependencyDashboard": true,
   "dependencyDashboardTitle": "Renovate Dashboard",
-  "commitMessagePrefix": "[{{{parentDir}}}]",
-  "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
   "assigneesFromCodeOwners": true,
   "reviewersFromCodeOwners": true,
   "suppressNotifications": ["prIgnoreNotification"],
@@ -16,10 +14,18 @@
     "fileMatch": ["charts/.+/Chart\\.yaml$"]
   },
   "packageRules": [
+    // Setup datasources
+    {
+      "datasources": ["helm"],
+      "commitMessageTopic": "Helm chart {{depName}}",
+      "separateMinorPatch": true
+    },
     //
     // Common library dep
     //
     {
+      "commitMessagePrefix": "[{{{parentDir}}}]",
+      "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
       "updateTypes": ["major"],
       "bumpVersion": "major",
       "labels": ["dependency/major"],
@@ -29,18 +35,22 @@
       "updateTypes": ["minor"],
       "bumpVersion": "minor",
       "labels": ["dependency/minor"],
-      "packageNames": ["common"]
+      "packageNames": ["common"],
+      "groupName": ["internal minor dep"]
     },
     {
       "updateTypes": ["patch"],
       "bumpVersion": "patch",
       "labels": ["dependency/patch"],
-      "packageNames": ["common"]
+      "packageNames": ["common"],
+      "groupName": ["internal patch dep"]
     },
     //
     // Other library deps
     //
     {
+      "commitMessagePrefix": "[{{{parentDir}}}]",
+      "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
       "updateTypes": ["major"],
       "bumpVersion": "major",
       "labels": ["dependency/major"],
@@ -54,6 +64,7 @@
       "bumpVersion": "minor",
       "labels": ["dependency/minor"],
       "excludePackageNames": ["common"],
+      "groupName": ["external minor dep"],
       "schedule": [
         "every 2 months on the first day of the month"
       ]
@@ -63,6 +74,7 @@
       "bumpVersion": "patch",
       "labels": ["dependency/patch"],
       "excludePackageNames": ["common"],
+      "groupName": ["external patch dep"],
       "schedule": [
         "every 1 months on the first day of the month"
       ]

.github/stale.yml

@@ -0,0 +1,18 @@
+daysUntilStale: 60
+daysUntilClose: 7
+exemptLabels:
+  - pinned
+staleLabel: lifecycle/stale
+pulls:
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs. Thank you
+    for your contributions.
+issues:
+  markComment: >
+    This issue request has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs. Thank you
+    for your contributions.
+closeComment: false
+unmarkComment: >
+  /remove-lifecycle stale

.github/workflows/charts-lint-test.yaml

@@ -0,0 +1,114 @@
+name: "Charts: Lint and test"
+
+on: 
+  pull_request:
+    paths:
+    - 'charts/**'
+    - '!charts/**/README.md'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    outputs:
+      changed: ${{ steps.list-changed.outputs.changed }}
+      common: ${{ steps.list-changed.outputs.common }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.0.1
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config .github/ct.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+
+          changed_unfiltered=$(ct list-changed --config .github/ct.yaml --excluded-charts "")
+          if [[ $(grep -E "^charts/common(-test)?$" <<< "$changed_unfiltered") ]]; then
+            echo "::set-output name=common::true"
+          fi
+
+      - name: Run chart-testing (lint)
+        id: lint
+        run: ct lint --config .github/ct.yaml --excluded-charts ""
+        if: steps.list-changed.outputs.changed == 'true' || steps.list-changed.outputs.common == 'true'
+
+  unittest:
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Dev tools
+        run: sudo apt-get update && sudo apt-get install -y jq libjq-dev
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7            
+  
+      - name: Install dependencies
+        run: |
+          export RUBYJQ_USE_SYSTEM_LIBRARIES=1
+          bundle install
+      
+      - name: Run tests
+        run: |
+          bundle exec m -r test/charts
+
+  install:
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.0.1
+
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.1.0
+        if: needs.lint.outputs.changed == 'true' || needs.lint.outputs.common == 'true'
+
+      - name: Run chart-testing (install)
+        run: ct install --config .github/ct.yaml
+        if: needs.lint.outputs.changed == 'true'
+
+      - name: Run chart-testing (common-test)
+        run: |
+          ct install --config .github/ct.yaml --charts 'charts/common-test'
+        if: needs.lint.outputs.common == 'true'

.github/workflows/charts-release.yaml

@@ -1,11 +1,12 @@
-name: Release Charts
+name: "Charts: Release"
 
 on:
   push:
     branches:
       - master
     paths:
-      - "charts/**"
+      - 'charts/**'
+      - '!charts/**/README.md'
 
 jobs:
   pre-release:

.github/workflows/lint-test.yaml

@@ -1,60 +0,0 @@
-name: Lint and Test Charts
-
-on: pull_request
-
-jobs:
-  lint-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Install Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.4.0
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
-
-      - name: Run chart-testing (list-changed)
-        id: list-changed
-        run: |
-          changed=$(ct list-changed --config .github/ct.yaml)
-          if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
-          fi
-
-          changed_unfiltered=$(ct list-changed --config .github/ct.yaml --excluded-charts "")
-          if [[ $(grep -E "^charts/common(-test)?$" <<< "$changed_unfiltered") ]]; then
-            echo "::set-output name=common::true"
-          fi
-
-      - name: Run chart-testing (lint)
-        id: lint
-        run: ct lint --config .github/ct.yaml
-        if: steps.list-changed.outputs.changed == 'true'
-
-      - name: Run chart-testing (lint common-test)
-        run: |
-          ct lint --config .github/ct.yaml --charts 'charts/common-test'
-        if: steps.list-changed.outputs.common == 'true'
-
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.1.0
-        if: steps.list-changed.outputs.changed == 'true' || steps.list-changed.outputs.common == 'true'
-
-      - name: Run chart-testing (install)
-        run: ct install --config .github/ct.yaml
-        if: steps.list-changed.outputs.changed == 'true'
-
-      - name: Run chart-testing (common-test)
-        run: |
-          ct install --config .github/ct.yaml --charts 'charts/common-test'
-        if: steps.list-changed.outputs.common == 'true'

.gitignore

@@ -1,4 +1,12 @@
-.env
+# IDE resources
+.vscode
 .idea
+.devcontainer/
+
+# Helm resources
 charts/*/Chart.lock
 charts/*/charts
+
+# Other rsources
+.env
+Gemfile.lock

Gemfile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+group :test do
+  gem 'm'
+  gem 'minitest'
+  gem 'minitest-implicit-subject'
+  gem 'minitest-reporters'
+  gem 'pry'
+  gem 'ruby-jq'
+end

README.md

@@ -1,9 +1,11 @@
 # 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)
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg)](https://discord.com/invite/7PbmHRK)
 [![](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)
+[![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)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+
 ## Usage
 
 [Helm](https://helm.sh) must be installed to use the charts.
@@ -19,7 +21,18 @@ You can then run `helm search repo k8s-at-home` to see the charts.
 
 ## Charts
 
-See [artifact hub](https://artifacthub.io/packages/search?org=k8s-at-home) for a complete list.
+See [Artifact Hub](https://artifacthub.io/packages/search?org=k8s-at-home) or [charts](./charts/) for a complete list.
+
+## Common Library
+
+The majority of the charts in this repository are using a common library we built. The reason we went with this pattern is a lot of applications are pretty similar in their requirements for Helm charts. Using a library makes maintaining much easier and keeps charts consistent in features. If contributing a new chart first try to make it using the library we built.
+
+More information can be found [here](https://github.com/k8s-at-home/charts/tree/master/charts/common).
+
+## Support
+
+- Having problems with a chart or have a feature request? Open a new [issue](https://github.com/k8s-at-home/charts/issues/new/choose).
+- New idea? Discuss [here](https://github.com/k8s-at-home/charts/discussions) or in our [Discord](https://discord.gg/sTMX7Vh) in the `#charts` channel.
 
 ## Contributing
 

charts/alertmanager-bot/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.4.2
 description: Bot for Prometheus Alertmanager
 name: alertmanager-bot
-version: 2.0.0
+version: 2.3.1
 keywords:
   - alertmanager
   - telegram
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/alertmanager-bot/ci/ct-values.yaml

@@ -1,7 +0,0 @@
-service:
-  enabled: false
-probes:
-  liveness:
-    enabled: false
-  readiness:
-    enabled: false

charts/appdaemon/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.0.5
 description: AppDaemon is a loosely coupled, multi-threaded, sandboxed python execution environment for writing automation apps for various types of Home Automation Software including Home Assistant and MQTT.
 name: appdaemon
-version: 2.0.0
+version: 2.3.1
 keywords:
   - appdaemon
   - home-automation
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/bazarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.9.0.5
 description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements
 name: bazarr
-version: 5.0.0
+version: 5.3.1
 keywords:
   - bazarr
   - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/bitwardenrs/Chart.yaml

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

charts/bitwardenrs/README.md

@@ -46,3 +46,13 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 ```console
 helm install bitwarden k8s-at-home/bitwardenrs  --values values.yaml 
 ```
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 1.1.1 -> 2.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 1.x.x to 2.x.x
+
+Chart version 2.0.0 introduces external database support.
+ * No actions required to continue with the default sqlite backend.
+ * Refer to the `bitwardenrs.externalDatabase` section of [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bitwardenrs/values.yaml) to configure MySQL or PostgreSQL database backends.

charts/bitwardenrs/templates/_database.tpl

@@ -0,0 +1,38 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Generate environment variables for external database
+*/}}
+{{- define "bitwardenrs.externalDatabaseConfigMap" -}}
+{{- with .Values.bitwardenrs.externalDatabase }}
+{{- if and .enabled (or (eq .type "postgresql") (eq .type "mysql")) }}
+{{- if and (not .existingSecret.enabled) .user }}
+DATABASE_USER: {{ .user | quote }}
+{{- end }}
+{{- if and (not .existingSecret.enabled) .password }}
+DATABASE_PASSWORD: {{ .password | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "bitwardenrs.externalDatabaseEnv" -}}
+{{- with .Values.bitwardenrs.externalDatabase }}
+{{- if and .enabled (or (eq .type "postgresql") (eq .type "mysql")) }}
+{{- if .existingSecret.enabled }}
+- name: DATABASE_USER
+  valueFrom:
+    secretKeyRef:
+      name: {{ .existingSecret.name | quote }}
+      key: {{ .existingSecret.userKey | quote }}
+- name: DATABASE_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ .existingSecret.name | quote }}
+      key: {{ .existingSecret.passwordKey | quote }}
+{{- end }}
+{{- $dbport := not (empty .port) | ternary (printf ":%v" .port) "" }}
+- name: DATABASE_URL
+  value: {{ printf "%v://$(DATABASE_USER):$(DATABASE_PASSWORD)@%v%v/%v" .type .host $dbport .database }}
+{{- end }}
+{{- end }}
+{{- end }}

charts/bitwardenrs/templates/configmap.yaml

@@ -12,8 +12,8 @@ data:
   WEBSOCKET_ENABLED: {{ .Values.bitwardenrs.websockets.enabled | quote }}
   {{- if and .Values.bitwardenrs.admin.enabled .Values.bitwardenrs.admin.disableAdminToken }}
   DISABLE_ADMIN_TOKEN: "true"
-    {{- end }}
-    {{- with .Values.bitwardenrs.smtp }}
+  {{- end }}
+  {{- with .Values.bitwardenrs.smtp }}
   {{- if .enabled }}
   SMTP_HOST: {{ required "SMTP host is required to enable SMTP" .host | quote }}
   SMTP_FROM: {{ required "SMTP sender address ('from') is required to enable SMTP" .from | quote }}
@@ -31,6 +31,20 @@ data:
   {{- end }}
   {{- end }}
   {{- end }}
+  {{- with .Values.bitwardenrs.yubico }}
+  {{- if .enabled }}
+  {{- if .server }}
+  YUBICO_SERVER: {{ .server | quote }}
+  {{- end }}
+  {{- if and (not .existingSecret.enabled) .clientId }}
+  YUBICO_CLIENT_ID: {{ .clientId | quote }}
+  {{- end }}
+  {{- if and (not .existingSecret.enabled) .secretKey }}
+  YUBICO_SECRET_KEY: {{ .secretKey | quote }}
+  {{- end }}
+  {{- end }}
+  {{- end }}
+  {{- include "bitwardenrs.externalDatabaseConfigMap" . | nindent 2 }}
   {{- if .Values.env }}
   {{- toYaml .Values.env | nindent 2 }}
   {{- end }}

charts/bitwardenrs/templates/deployment.yaml

@@ -54,11 +54,11 @@ spec:
                   {{- else }}
                   name: {{ $fullName }}
                   key: admin-token
-                {{- end }}
-                {{- end }}
-                {{- end }}
-                {{- with .Values.bitwardenrs.smtp }}
-                {{- if eq .enabled true }}
+                  {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- with .Values.bitwardenrs.smtp }}
+            {{- if eq .enabled true }}
             {{- if and .existingSecret.enabled (not .user) }}
             - name: SMTP_USERNAME
               valueFrom:
@@ -70,12 +70,27 @@ spec:
                 secretKeyRef:
                   name: {{ .existingSecret.name | quote }}
                   key: {{ .existingSecret.passwordKey | quote }}
-              {{- end }}
-          {{- end }}
-          {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- with .Values.bitwardenrs.yubico }}
+            {{- if and .enabled .existingSecret.enabled }}
+            - name: YUBICO_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .existingSecret.name | quote }}
+                  key: {{ .existingSecret.clientIdKey | quote }}
+            - name: YUBICO_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .existingSecret.name | quote }}
+                  key: {{ .existingSecret.secretKeyKey | quote }}
+            {{- end }}
+            {{- end }}
+            {{- include "bitwardenrs.externalDatabaseEnv" . | nindent 12 }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ .Values.bitwardenrs.gui.port }}
               protocol: TCP
             {{- if .Values.bitwardenrs.websockets.enabled }}
             - name: websocket

charts/bitwardenrs/templates/ingress.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "bitwardenrs.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
+{{- $websockets := .Values.bitwardenrs.websockets -}}
 {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
@@ -36,6 +37,16 @@ spec:
             backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
+          {{- if $websockets.enabled }}
+          - path: {{ . | trimSuffix "/" }}/notifications/hub
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $websockets.port }}
+          - path: {{ . | trimSuffix "/" }}/notifications/hub/negotiate
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort}}
+          {{- end }}
           {{- end }}
     {{- end }}
   {{- end }}

charts/bitwardenrs/templates/statefulset.yaml

@@ -55,11 +55,11 @@ spec:
                   {{- else }}
                   name: {{ $fullName }}
                   key: admin-token
-                {{- end }}
-                {{- end }}
-                {{- end }}
-                {{- with .Values.bitwardenrs.smtp }}
-                {{- if eq .enabled true }}
+                  {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- with .Values.bitwardenrs.smtp }}
+            {{- if eq .enabled true }}
             {{- if and .existingSecret.enabled (not .user) }}
             - name: SMTP_USERNAME
               valueFrom:
@@ -71,12 +71,27 @@ spec:
                 secretKeyRef:
                   name: {{ .existingSecret.name | quote }}
                   key: {{ .existingSecret.passwordKey | quote }}
-              {{- end }}
-          {{- end }}
-          {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
+            {{- with .Values.bitwardenrs.yubico }}
+            {{- if and .enabled .existingSecret.enabled }}
+            - name: YUBICO_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .existingSecret.name | quote }}
+                  key: {{ .existingSecret.clientIdKey | quote }}
+            - name: YUBICO_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .existingSecret.name | quote }}
+                  key: {{ .existingSecret.secretKeyKey | quote }}
+            {{- end }}
+            {{- end }}
+            {{- include "bitwardenrs.externalDatabaseEnv" . | nindent 12 }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: {{ .Values.bitwardenrs.gui.port }}
               protocol: TCP
             {{- if .Values.bitwardenrs.websockets.enabled }}
             - name: websocket

charts/bitwardenrs/values.yaml

@@ -14,6 +14,9 @@ fullnameOverride: ""
 bitwardenrs:
   domain: ""
   signupsAllowed: false
+  gui:
+    # If you set a different port here, you must also provide it under env
+    port: 80
   websockets:
     enabled: true
     port: 3012
@@ -24,6 +27,31 @@ bitwardenrs:
       enabled: false
       name: ""
       tokenKey: ""
+  # External database configuration.
+  # Requires bitwardenrs/server >= 1.17.0 or bitwardenrs/server-{mysql,postgres} images
+  # ref: https://github.com/dani-garcia/bitwarden_rs/wiki/Using-the-MySQL-Backend
+  #      https://github.com/dani-garcia/bitwarden_rs/wiki/Using-the-PostgreSQL-Backend
+  externalDatabase:
+    enabled: false
+    # Supported values: 'mysql', 'postgresql'.
+    type: ""
+    # Database host. Required if external database is enabled.
+    host: ""
+    # Database port. Optional, default value is specific to the database backend.
+    port: ""
+    # Database name.
+    database: ""
+    # Database user.
+    user: ""
+    # Database password. Special characters must be escaped with percent encoding.
+    password: ""
+    # Use existing secret for database credentials.
+    existingSecret:
+      enabled: false
+      name: ""
+      userKey: ""
+      # Special characters in the password value must be escaped with percent encoding.
+      passwordKey: ""
   # Enable SMTP. https://github.com/dani-garcia/bitwarden_rs/wiki/SMTP-configuration
   smtp:
     enabled: false
@@ -47,8 +75,26 @@ bitwardenrs:
       name: ""
       userKey: ""
       passwordKey: ""
+  # Enable Yubikey 2FA: https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-Yubikey-OTP-authentication
+  yubico:
+    enabled: false
+    # OTP verification server. Will use the default YubiCloud servers if not specified
+    server: ""
+    # API Client ID for OTP server. Ignored if existingSecret is provided.
+    clientId: ""
+    # API Secret Key for OTP server. Required if clientId is specified, ignored when using existingSecret.
+    secretKey: ""
+    # Use existing secret for API keys
+    existingSecret:
+      enabled: false
+      name: ""
+      clientIdKey: ""
+      secretKeyKey: ""
 
 env: {}
+# If you plan to run the WebUI on a port other than port 80, specify that here:
+# For example, if running the container as a non-root user.
+#  ROCKET_PORT: "80"
 
 persistence:
   type: statefulset

charts/blocky/Chart.yaml

@@ -1,11 +1,12 @@
 apiVersion: v2
-appVersion: v0.11
+appVersion: v0.12
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 4.1.0
+version: 5.0.0
 keywords:
   - blocky
-  - dbs
+  - adblock
+  - dns
 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:

charts/blocky/README.md

@@ -47,6 +47,8 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 helm install --name blocky -f values.yaml k8s-at-home/blocky
 ```
 
+---
+
 ## Upgrading an existing Release to a new major version
 
 A major chart version change (like 2.2.2 -> 3.0.0) indicates that there is an
@@ -72,3 +74,6 @@ kubectl delete svc/blocky
 
 This is the 'easiest' approach, but will incur downtime which can be problematic if you rely on blocky for DNS
 
+### Upgrading from 4.x.x to 5.x.x
+
+Configuration inside `config` is no longer a yaml object, it is now a multiline string

charts/blocky/templates/configmap.yaml

@@ -9,12 +9,5 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
-{{- if .Values.config }}
-{{ $root := . }}
   config.yml: |
-{{ tpl (toYaml .Values.config | indent 4) $root }}
-{{- end }}
-{{- range $name, $value := .Values.extraLists }}
-  {{ $name }}: |-
-{{ $value | indent 4}}
-{{- end }}
+{{ .Values.config | indent 4 }}

charts/blocky/templates/deployment.yaml

@@ -1,3 +1,4 @@
+{{- $blockyConfig := .Values.config | fromYaml }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -45,9 +46,9 @@ spec:
               subPath: {{ $name }}
               readOnly: true
             {{- end }}
-            {{- if .Values.config.queryLog }}
+            {{- if hasKey $blockyConfig "queryLog" }}
             - name: data
-              mountPath: {{ .Values.config.queryLog.dir }}
+              mountPath: {{ $blockyConfig.queryLog.dir }}
               {{- if .Values.persistence.subPath }}
               subPath: {{ .Values.persistence.subPath }}
               {{- end }}
@@ -63,19 +64,19 @@ spec:
               protocol: UDP
           livenessProbe:
             httpGet:
-              path: /metrics
+              path: /
               port: api
             failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
             periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
           readinessProbe:
             httpGet:
-              path: /metrics
+              path: /
               port: api
             failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
             periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
           startupProbe:
             httpGet:
-              path: /metrics
+              path: /
               port: api
             initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
             failureThreshold: {{ .Values.probes.startup.failureThreshold }}
@@ -96,7 +97,7 @@ spec:
                     - key: {{ $name }}
                       path: {{ $name }}
                   {{- end }}
-        {{- if .Values.config.queryLog }}
+        {{- if hasKey $blockyConfig "queryLog" }}
         - name: data
           {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:

charts/blocky/values.yaml

@@ -1,8 +1,6 @@
-replicaCount: 1
-
 image:
   repository: spx01/blocky
-  tag: v0.11
+  tag: v0.12
   pullPolicy: IfNotPresent
 
 nameOverride: ""
@@ -12,29 +10,30 @@ replicas: 1
 
 timeZone: "UTC"
 
-# blocky configuration - will translate to config.yml file inside the pod
-config:
+# Blocky configuration, for a full list of options see
+# https://github.com/0xERR0R/blocky/blob/master/docs/config.yml
+config: |
   upstream:
     # these external DNS resolvers will be used. Blocky picks 2 random resolvers from the list for each query
-    # format for resolver: net:host:[port][/path]. net could be tcp, udp, tcp-tls or https (DoH). If port is empty, default port will be used (53 for udp and tcp, 853 for tcp-tls, 443 for https (Doh))
+    # format for resolver: [net:]host:[port][/path]. net could be empty (default, shortcut for tcp+udp), tcp+udp, tcp, udp, tcp-tls or https (DoH). If port is empty, default port will be used (53 for udp and tcp, 853 for tcp-tls, 443 for https (Doh))
     externalResolvers:
-      - udp:8.8.8.8
-      - udp:8.8.4.4
-      - udp:1.1.1.1
-      - tcp-tls:1.0.0.1:853
-      - https://cloudflare-dns.com/dns-query
+      - 46.182.19.48
+      - 80.241.218.68
+      - tcp-tls:fdns1.dismail.de:853
+      - https://dns.digitale-gesellschaft.ch/dns-query
 
   # optional: custom IP address for domain name (with all sub-domains)
   # example: query "printer.lan" or "my.printer.lan" will return 192.168.178.3
-  # customDNS:
-  #   mapping:
-  #     printer.lan: 192.168.178.3
+  customDNS:
+    mapping:
+      printer.lan: 192.168.178.3
 
-  # optional: definition, which DNS resolver should be used for queries to the domain (with all sub-domains).
+  # optional: definition, which DNS resolver(s) should be used for queries to the domain (with all sub-domains). Multiple resolvers must be separated by comma
   # Example: Query client.fritz.box will ask DNS server 192.168.178.1. This is necessary for local network, to resolve clients by host name
-  # conditional:
-  #   mapping:
-  #     fritz.box: udp:192.168.178.1
+  conditional:
+    mapping:
+      fritz.box: udp:192.168.178.1
+      lan.net: udp:192.168.178.1,udp:192.168.178.2
 
   # optional: use black and white lists to block queries (for example ads, trackers, adult pages etc.)
   blocking:
@@ -48,77 +47,95 @@ config:
         - https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
         - https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
       special:
-        - https://hosts-file.net/ad_servers.txt
-    # definition of whitelist groups. Attention: if the same group has black and whitelists,
-    # whitelists will be used to disable particular blacklist entries. If a group has only
-    # whitelist entries -> this means only domains from this list are allowed,
-    # all other domains will be blocked.
-    # Also see the extraLists section below to add your own in-line whitelists
-    # whiteLists:
-    #   ads:
-    #     - whitelist.txt
+        - https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews/hosts
+    # definition of whitelist groups. Attention: if the same group has black and whitelists, whitelists will be used to disable particular blacklist entries. If a group has only whitelist entries -> this means only domains from this list are allowed, all other domains will be blocked
+    whiteLists:
+      ads:
+        - whitelist.txt
     # definition: which groups should be applied for which client
     clientGroupsBlock:
       # default will be used, if no special definition for a client name exists
       default:
         - ads
         - special
-      # use client name or ip address
-      # laptop.fritz.box:
-      #   - ads
-
+      # use client name (with wildcard support: * - sequence of any characters, [0-9] - range)
+      # or single ip address / client subnet as CIDR notation
+      laptop*:
+        - ads
+      192.168.178.1/24:
+        - special
     # which response will be sent, if query is blocked:
-    #   zeroIp: 0.0.0.0 will be returned (default)
-    #   nxDomain: return NXDOMAIN as return code
-    # blockType: zeroIp
-
+    # zeroIp: 0.0.0.0 will be returned (default)
+    # nxDomain: return NXDOMAIN as return code
+    # comma separated list of destination IP adresses (for example: 192.100.100.15, 2001:0db8:85a3:08d3:1319:8a2e:0370:7344). Should contain ipv4 and ipv6 to cover all query types. Useful with running web server on this address to display the "blocked" page.
+    blockType: zeroIp
     # optional: automatically list refresh period in minutes. Default: 4h.
     # Negative value -> deactivate automatically refresh.
     # 0 value -> use default
-    # refreshPeriod: 1
+    refreshPeriod: 0
 
   # optional: configuration for caching of DNS responses
-  # caching:
-  #   # amount in minutes, how long a response must be cached (min value).
-  #   # If <=0, use response's TTL, if >0 use this value, if TTL is smaller
-  #   # Default: 0
-  #   minTime: 40
-  #   # amount in minutes, how long a response must be cached (max value).
-  #   # If <0, do not cache responses
-  #   # If 0, use TTL
-  #   # If > 0, use this value, if TTL is greater
-  #   # Default: 0
-  #   maxTime: -1
+  caching:
+    # amount in minutes, how long a response must be cached (min value).
+    # If <=0, use response's TTL, if >0 use this value, if TTL is smaller
+    # Default: 0
+    minTime: 5
+    # amount in minutes, how long a response must be cached (max value).
+    # If <0, do not cache responses
+    # If 0, use TTL
+    # If > 0, use this value, if TTL is greater
+    # Default: 0
+    maxTime: -1
+    # if true, will preload DNS results for often used queries (names queried more than 5 times in a 2 hour time window)
+    # this improves the response time for often used queries, but significantly increases external traffic
+    # default: false
+    prefetching: true
 
   # optional: configuration of client name resolution
-  # clientLookup:
-  #   # this DNS resolver will be used to perform reverse DNS lookup (typically local router)
-  #   upstream: udp:192.168.178.1
-  #   # optional: some routers return multiple names for client (host name and user defined name). Define which single name should be used.
-  #   # Example: take second name if present, if not take first name
-  #   singleNameOrder:
-  #     - 2
-  #     - 1
+  clientLookup:
+    # optional: this DNS resolver will be used to perform reverse DNS lookup (typically local router)
+    upstream: udp:192.168.178.1
+    # optional: some routers return multiple names for client (host name and user defined name). Define which single name should be used.
+    # Example: take second name if present, if not take first name
+    singleNameOrder:
+      - 2
+      - 1
+    # optional: custom mapping of client name to IP addresses. Useful if reverse DNS does not work properly or just to have custom client names.
+    clients:
+      laptop:
+        - 192.168.178.29
+
   # optional: configuration for prometheus metrics endpoint
-  prometheus:
-    # enabled if true
-    enable: true
-    # url path, optional (default '/metrics')
-    path: /metrics
+  # prometheus:
+  #   # enabled if true
+  #   enable: true
+  #   # url path, optional (default '/metrics')
+  #   path: /metrics
 
   # optional: write query information (question, answer, client, duration etc) to daily csv file
   # queryLog:
-  #     # directory (will be mounted as volume in the pod)
-  #     dir: /logs
-  #     # if true, write one file per client. Writes all queries to single file otherwise
-  #     perClient: true
-  #     # if > 0, deletes log files which are older than ... days
-  #     logRetentionDays: 7
+  #   # directory (should be mounted as volume in docker)
+  #   dir: /logs
+  #   # if true, write one file per client. Writes all queries to single file otherwise
+  #   perClient: true
+  #   # if > 0, deletes log files which are older than ... days
+  #   logRetentionDays: 7
 
-  # optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, ...
+  # optional: DNS listener port and bind ip address, default 53 (UDP and TCP). Example: 53, :53, 127.0.0.1:53
+  port: 53
+  # optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH ...
   httpPort: 4000
+  # optional: HTTPS listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, REST API, DoH...
+  #httpsPort: 443
+  # mandatory, if https port > 0: path to cert and key file for SSL encryption
+  #httpsCertFile: server.crt
+  #httpsKeyFile: server.key
+  # optional: use this DNS server to resolve blacklist urls and upstream DNS servers (DOH). Useful if no DNS resolver is configured and blocky needs to resolve a host name. Format net:IP:port, net must be udp or tcp
+  bootstrapDns: tcp:1.1.1.1
   # optional: Log level (one from debug, info, warn, error). Default: info
   logLevel: info
+  # optional: Log format (text or json). Default: text
+  logFormat: text
 
 ## Add persistence for query logs (if enabled)
 persistence:

charts/booksonic-air/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2009.1.0
 description: Booksonic is a platform for accessing the audibooks you own wherever you are
 name: booksonic-air
-version: 2.0.0
+version: 2.3.1
 keywords:
   - booksonic
   - audiobook
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/booksonic-air/ci/ct-values.yaml

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

charts/calibre-web/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.6.9
 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
-version: 4.0.0
+version: 4.3.1
 keywords:
   - calibre
   - ebook
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/calibre-web/ci/ct-values.yaml

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

charts/common-test/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common-test
 description: Helper chart to test different use cases of the common library
-version: 1.0.1
+version: 1.0.2
 keywords:
   - k8s-at-home
   - common

charts/common-test/ci/basic-values.yaml

@@ -9,3 +9,11 @@ service:
 
 ingress:
   enabled: true
+
+probes:
+  liveness:
+    enabled: true
+  readiness:
+    enabled: true
+  startup:
+    enabled: true

charts/common/CHANGELOG.md

@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.1]
+
+### Fixed
+
+- Made explicit that `service.port.targetPort` cannot be a named port.
+
+## [2.2.0]
+
+### Added
+
+- Allow serviceLinks to be enabled/disabled.
+- Support for ingressClassName on apiVersion `networking.k8s.io/v1` by setting `ingress.ingressClassName`.
+- Added some initial proper unit tests for the `common` chart.
+
+### Changed
+
+- `service.port.targetPort` is now used in the container spec instead of `service.port.port` if specified. This allows for different service and container ports. (Implements [#465](https://github.com/k8s-at-home/charts/issues/465)).
+
+### Fixed
+
+- Document setting environment variables for code-server add-on in `values.yaml` (Fixes [#436](https://github.com/k8s-at-home/charts/issues/436)).
+- Set service targetPort to the service port name first if no `targetPort` value is given.
+
+## [2.1.0]
+
+### Added
+
+- Allow for additional arguments to be added to code-server runtime via `addons.codeserver.args`
+
+## [2.0.4]
+
+### Fixed
+
+- `periodSeconds` now works for all probe types.
+
 ## [2.0.0]
 
 ### Changed
@@ -24,6 +59,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 This is the last version before starting this changelog. All sorts of cool stuff was changed, but only `git log` remembers what that was :slightly_frowning_face:
 
+[2.2.1]: https://github.com/k8s-at-home/charts/tree/common-2.2.1/charts/common
+
+[2.2.0]: https://github.com/k8s-at-home/charts/tree/common-2.2.0/charts/common
+
+[2.1.0]: https://github.com/k8s-at-home/charts/tree/common-2.1.0/charts/common
+
+[2.0.4]: https://github.com/k8s-at-home/charts/tree/common-2.0.4/charts/common
+
 [2.0.0]: https://github.com/k8s-at-home/charts/tree/common-2.0.0/charts/common
 
 [1.7.0]: https://github.com/k8s-at-home/charts/tree/common-1.7.0/charts/common

charts/common/Chart.yaml

@@ -2,11 +2,11 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 2.0.3
+version: 2.2.1
 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
+  - name: bjw-s
+    email: me@bjw-s.dev

charts/common/templates/addons/code-server/_container.tpl

@@ -24,10 +24,11 @@ ports:
   containerPort: {{ .Values.addons.codeserver.service.port.port }}
   protocol: TCP
 args:
+{{- range .Values.addons.codeserver.args }}
+- {{ . | quote }}
+{{- end }}
 - "--port"
 - "{{ .Values.addons.codeserver.service.port.port }}"
-- "--auth"
-- "none"
 - {{ .Values.addons.codeserver.workingDir | default (first .Values.addons.codeserver.volumeMounts).mountPath }}
 {{- with .Values.addons.codeserver.volumeMounts }}
 volumeMounts:

charts/common/templates/classes/_ingress.tpl

@@ -26,6 +26,11 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+  {{- if $values.ingressClassName }}
+  ingressClassName: {{ $values.ingressClassName }}
+  {{- end }}
+  {{- end }}
   {{- if $values.tls }}
   tls:
     {{- range $values.tls }}

charts/common/templates/classes/_service_ports.tpl

@@ -12,7 +12,7 @@ Render all the ports and additionalPorts for a Service object.
   ports:
   {{- range $_ := $ports }}
   - port: {{ .port }}
-    targetPort: {{ .targetPort | default "http" }}
+    targetPort: {{ .targetPort | default .name | default "http" }}
     protocol: {{ .protocol | default "TCP" }}
     name: {{ .name | default "http" }}
     {{- if (and (eq $.svcType "NodePort") (not (empty .nodePort))) }}

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

@@ -29,6 +29,9 @@ The main container included in the controller.
   {{- if $PVC.enabled }}
   - mountPath: {{ $PVC.mountPath }}
     name: {{ $index }}
+  {{- if $PVC.subPath }}
+    subPath: {{ $PVC.subPath }}
+  {{- end }}
   {{- end }}
   {{- end }}
   {{- if .Values.additionalVolumeMounts }}

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

@@ -21,6 +21,7 @@ dnsPolicy: {{ . }}
 dnsConfig:
   {{- toYaml . | nindent 2 }}
 {{- end }}
+enableServiceLinks: {{ .Values.enableServiceLinks }}
 {{- with .Values.initContainers }}
 initContainers:
   {{- toYaml . | nindent 2 }}

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

@@ -32,7 +32,10 @@ Ports included by the controller.
 ports:
 {{- range $_ := $ports }}
 - name: {{ .name }}
-  containerPort: {{ .port }}
+  {{- if and .targetPort (kindIs "string" .targetPort) }}
+  {{- fail (printf "Our charts do not support named ports for targetPort. (port name %s, targetPort %s)" .name .targetPort) }}
+  {{- end }}
+  containerPort: {{ .targetPort | default .port }}
   protocol: {{ .protocol | default "TCP" }}
 {{- end -}}
 {{- end -}}

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

@@ -15,6 +15,7 @@ Probes selection logic.
       {{- printf "initialDelaySeconds: %v" $probe.spec.initialDelaySeconds  | nindent 2 }}
       {{- printf "failureThreshold: %v" $probe.spec.failureThreshold  | nindent 2 }}
       {{- printf "timeoutSeconds: %v" $probe.spec.timeoutSeconds  | nindent 2 }}
+      {{- printf "periodSeconds: %v" $probe.spec.periodSeconds | nindent 2 }}
     {{- end }}
   {{- end }}
 {{- end }}

charts/common/values.yaml

@@ -51,6 +51,11 @@ dnsPolicy: ClusterFirst
 #     - name: ndots
 #       value: "1"
 
+# Enable/disable the generation of environment variables for services.
+# See https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/#accessing-the-service
+# for more information.
+enableServiceLinks: true
+
 initContainers: []
 
 additionalContainers: []
@@ -61,45 +66,50 @@ probes:
     enabled: true
     ## Set this to true if you wish to specify your own livenessProbe
     custom: false
-    ## The spec field contains the values for the default livenessProbe. 
+    ## The spec field contains the values for the default livenessProbe.
     ## If you selected custom: true, this field holds the definition of the livenessProbe.
     spec:
       initialDelaySeconds: 30
       failureThreshold: 5
+      periodSeconds: 10
       timeoutSeconds: 10
 
   readiness:
     enabled: true
     ## Set this to true if you wish to specify your own readinessProbe
     custom: false
-    ## The spec field contains the values for the default readinessProbe. 
+    ## The spec field contains the values for the default readinessProbe.
     ## If you selected custom: true, this field holds the definition of the readinessProbe.
     spec:
       initialDelaySeconds: 30
       failureThreshold: 5
+      periodSeconds: 10
       timeoutSeconds: 10
 
   startup:
     enabled: false
     ## Set this to true if you wish to specify your own startupProbe
     custom: false
-    ## The spec field contains the values for the default startupProbe. 
+    ## The spec field contains the values for the default startupProbe.
     ## If you selected custom: true, this field holds the definition of the startupProbe.
     spec:
       initialDelaySeconds: 5
       failureThreshold: 30
       periodSeconds: 10
+      timeoutSeconds: 10
 
 service:
   enabled: true
   type: ClusterIP
-  # Specify the default port information
+  ## Specify the default port information
   port:
     port:
-    # name defaults to http
+    ## name defaults to http
     name:
     protocol: TCP
-    # targetPort defaults to http
+    ## Specify a service targetPort if you wish to differ the service port from the application port.
+    ## If targetPort is specified, this port number is used in the container definition instead of
+    ## service.port.port. Therefore named ports are not supported for this field.
     targetPort:
     ## Specify the nodePort value for the LoadBalancer and NodePort service types.
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
@@ -120,7 +130,7 @@ service:
   #   type: ClusterIP
   #   # Specify the default port information
   #   port:
-  #     port: 
+  #     port:
   #     # name defaults to http
   #     name:
   #     protocol: TCP
@@ -243,7 +253,7 @@ addons:
     # Set the VPN container securityContext
     securityContext:
       capabilities:
-        add: 
+        add:
           - NET_ADMIN
           - SYS_MODULE
 
@@ -311,6 +321,18 @@ addons:
       pullPolicy: IfNotPresent
       tag: 3.7.4
 
+    # Set any environment variables for code-server here
+    env: {}
+      # TZ: UTC
+
+    # Set codeserver command line arguments
+    # consider setting --user-data-dir to a persistent location to preserve code-server setting changes
+    args:
+      - --auth
+      - none
+      # - --user-data-dir
+      # - "/config/.vscode"
+
     # Specify a list of volumes that get mounted in the code-server container.
     # At least 1 volumeMount is required!
     volumeMounts: []

charts/couchpotato/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: latest
 description: CouchPotato (CP) is an automatic NZB and torrent downloader.
 name: couchpotato
-version: 4.0.0
+version: 4.3.1
 keywords:
   - couchpotato
   - usenet
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/couchpotato/ci/ct-values.yaml

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

charts/dashmachine/Chart.yaml

@@ -4,7 +4,7 @@ description: DashMachine is another web application bookmark dashboard, with fun
 icon: https://github.com/rmountjoy92/DashMachine/raw/master/dashmachine/static/images/logo/logo.png
 home: https://github.com/rmountjoy92/DashMachine
 name: dashmachine
-version: 3.0.0
+version: 3.3.1
 sources:
   - https://github.com/rmountjoy92/DashMachine
 maintainers:
@@ -12,5 +12,5 @@ maintainers:
     email: ryan@ryanholt.net
 dependencies:
   - name: common
-    version: 2.0.3
+    version: 2.2.1
     repository: https://k8s-at-home.com/charts/

charts/dashmachine/ci/ct-values.yaml

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

charts/ddclient/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.9.1
 description: Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Providers
 name: ddclient
-version: 2.0.0
+version: 2.3.1
 keywords:
   - ddclient
   - dns
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/ddclient/ci/ct-values.yaml

@@ -1,7 +1,2 @@
 service:
   enabled: false
-probes:
-  liveness:
-    enabled: false
-  readiness:
-    enabled: false

charts/ddclient/values.yaml

@@ -18,6 +18,8 @@ probes:
     enabled: false
   readiness:
     enabled: false
+  startup:
+    enabled: false
 
 strategy:
   type: Recreate

charts/deluge/.helmignore

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

charts/deluge/Chart.yaml

@@ -0,0 +1,20 @@
+apiVersion: v2
+appVersion: v2.0.3-2201906121747
+description: Deluge is a torrent download client
+name: deluge
+version: 1.1.1
+keywords:
+  - deluge
+  - torrent
+home: https://github.com/k8s-at-home/charts/tree/master/charts/deluge
+icon: https://avatars2.githubusercontent.com/u/6733935?v=3&s=200
+sources:
+  - https://hub.docker.com/r/linuxserver/deluge/
+  - https://deluge-torrent.org/
+maintainers:
+  - name: mcmarkj
+    email: mark@markmcw.uk
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 2.2.1

charts/deluge/OWNERS

@@ -0,0 +1,8 @@
+approvers:
+- billimek
+- onedr0p
+- bjw-s
+reviewers:
+- billimek
+- onedr0p
+- bjw-s

charts/deluge/README.md

@@ -0,0 +1,57 @@
+# Deluge
+
+This is a helm chart for [Deluge](https://deluge-torrent.org/).
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## TL;DR;
+
+```shell
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/deluge
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/deluge
+```
+
+The default login details (change ASAP) are:
+
+* password:deluge
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/deluge/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+```console
+helm install deluge \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/deluge
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install deluge k8s-at-home/deluge --values values.yaml
+```
+
+These values will be nested as it is a dependency, for example
+```yaml
+image:
+  tag: ...
+```

charts/deluge/templates/NOTES.txt

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

charts/deluge/templates/common.yaml

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

charts/deluge/values.yaml

@@ -0,0 +1,45 @@
+# Default values for deluge.
+
+image:
+  repository: linuxserver/deluge
+  pullPolicy: IfNotPresent
+  tag: version-2.0.3-2201906121747ubuntu18.04.1
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 8112
+
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
+    mountPath: /config
+
+  downloads:
+    enabled: false
+    emptyDir: false
+    mountPath: /downloads
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
+
+env: {}
+  ## Optional ENV Vars that can be set.
+  ## All values below are the current default values.
+  # PUID: "1000"
+  # PGID: "1000"
+  # TZ: "Europe/London"
+  # UMASK_SET: "022"
+  # DELUGE_LOGLEVEL: "error"

charts/dsmr-reader/.helmignore

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

charts/dsmr-reader/Chart.yaml

@@ -0,0 +1,24 @@
+apiVersion: v2
+appVersion: v4.9.0
+description: DSMR-protocol reader, telegram data storage and energy consumption visualizer.
+name: dsmr-reader
+version: 1.1.1
+keywords:
+- dsmr-reader
+- energy
+home: https://github.com/k8s-at-home/charts/tree/master/charts/dsmr-reader
+icon: https://avatars2.githubusercontent.com/u/57727360?s=400&v=4
+sources:
+- https://github.com/dsmrreader/dsmr-reader
+- https://github.com/xirixiz/dsmr-reader-docker
+maintainers:
+- name: billimek
+  email: jeff@billimek.com
+dependencies:
+- name: common
+  repository: https://k8s-at-home.com/charts/
+  version: 2.2.1
+- name: postgresql
+  version: 10.2.0
+  repository: https://charts.bitnami.com/bitnami
+  condition: postgresql.enabled

charts/dsmr-reader/OWNERS

@@ -0,0 +1,8 @@
+approvers:
+- billimek
+- onedr0p
+- bjw-s
+reviewers:
+- billimek
+- onedr0p
+- bjw-s

charts/dsmr-reader/README.md

@@ -0,0 +1,67 @@
+# DSMR-reader
+
+This is a helm chart for [DSMR-reader](https://github.com/dsmrreader/dsmr-reader).
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## TL;DR;
+
+```shell
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/dsmr-reader
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/dsmr-reader
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/dsmr-reader/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+```console
+helm install dsmr-reader \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/dsmr-reader
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install dsmr-reader k8s-at-home/dsmr-reader --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
+```
+
+---
+**NOTE**
+
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+
+---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

charts/dsmr-reader/ci/ct-values.yaml

@@ -0,0 +1,9 @@
+fullnameOverride: dsmr-reader
+
+env:
+  DATALOGGER_MODE: receiver
+  DJANGO_DATABASE_HOST: dsmr-reader-db
+
+postgresql:
+  enabled: true
+  fullnameOverride: dsmr-reader-db

charts/dsmr-reader/templates/NOTES.txt

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

charts/dsmr-reader/templates/common.yaml

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

charts/dsmr-reader/values.yaml

@@ -0,0 +1,47 @@
+# Default values for dsmr-reader.
+
+image:
+  repository: xirixiz/dsmr-reader-docker
+  pullPolicy: IfNotPresent
+  tag: latest-v4.9.0-amd64
+
+securityContext:
+  privileged: true
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 80
+
+# For all options see https://github.com/xirixiz/dsmr-reader-docker#dsmr-reader---environment-variables
+env:
+  # TZ: UTC
+  # DJANGO_TIME_ZONE: UTC
+  DJANGO_DATABASE_USER: dsmr-reader
+  DJANGO_DATABASE_PASSWORD: dsmr-reader-pass
+  DJANGO_DATABASE_PORT: 5432
+  DJANGO_DATABASE_NAME: dsmr-reader
+
+# Path to your p1 reader device in the container
+# additionalVolumeMounts:
+# - name: p1reader
+#   mountPath: /dev/ttyUSB0
+
+# Path to your p1 reader device on the host
+# additionalVolumes:
+# - name: p1reader
+#   hostPath:
+#     path: /dev/ttyUSB0
+
+# Enable postgres
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
+postgresql:
+  enabled: false
+  postgresqlUsername: dsmr-reader
+  postgresqlPassword: dsmr-reader-pass
+  postgresqlDatabase: dsmr-reader
+  persistence:
+    enabled: false
+    # storageClass: ""

charts/esphome/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.15.3
 description: ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems.
 name: esphome
-version: 4.0.0
+version: 4.3.1
 keywords:
   - esphome
   - home-automation
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/esphome/ci/ct-values.yaml

@@ -1,4 +1,2 @@
 env:
   ESPHOME_DASHBOARD_USE_PING: true
-ingress:
-  enabled: true

charts/flaresolverr/.helmignore

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

charts/flaresolverr/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v2
+appVersion: v1.2.3
+description: FlareSolverr is a proxy server to bypass Cloudflare protection
+name: flaresolverr
+version: 1.0.0
+keywords:
+  - flaresolverr
+  - jackett
+home: https://github.com/k8s-at-home/charts/tree/master/charts/flaresolverr
+sources:
+  - https://github.com/FlareSolverr/FlareSolverr
+  - https://hub.docker.com/r/flaresolverr/flaresolverr
+maintainers:
+  - name: billimek
+    email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 2.2.1

charts/flaresolverr/OWNERS

@@ -0,0 +1,8 @@
+approvers:
+- billimek
+- onedr0p
+- bjw-s
+reviewers:
+- billimek
+- onedr0p
+- bjw-s

charts/flaresolverr/README.md

@@ -0,0 +1,67 @@
+# FlareSolverr
+
+This is a helm chart for [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr).
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## TL;DR;
+
+```shell
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/flaresolverr
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/flaresolverr
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/flaresolverr/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+```console
+helm install flaresolverr \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/flaresolverr
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install flaresolverr k8s-at-home/flaresolverr --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
+```
+
+---
+**NOTE**
+
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+
+---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

charts/flaresolverr/templates/NOTES.txt

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

charts/flaresolverr/templates/common.yaml

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

charts/flaresolverr/values.yaml

@@ -0,0 +1,16 @@
+# Default values for FlareSolverr.
+
+image:
+  repository: flaresolverr/flaresolverr
+  pullPolicy: IfNotPresent
+  tag: v1.2.3
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 8191
+
+env: {}
+  # LOG_LEVEL: UTC

charts/flood/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.1.1
 description: Flood is a monitoring service for various torrent clients
 name: flood
-version: 2.0.0
+version: 2.3.1
 keywords:
   - flood
   - rtorrent
@@ -19,4 +19,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/flood/ci/ct-values.yaml

@@ -1,5 +1,3 @@
-ingress:
-  enabled: true
 persistence:
   data:
     enabled: true

charts/freshrss/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.17.0
 description: FreshRSS is a self-hosted RSS feed aggregator
 name: freshrss
-version: 2.0.0
+version: 2.3.1
 keywords:
   - freshrss
   - rss
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 2.0.3
+    version: 2.2.1

charts/gaps/.helmignore

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

charts/gaps/Chart.yaml

@@ -0,0 +1,19 @@
+apiVersion: v2
+appVersion: latest
+description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection.
+name: gaps
+version: 1.1.1
+keywords:
+  - plex
+  - plex-media-server
+home: https://github.com/k8s-at-home/charts/tree/master/charts/gaps
+icon: https://raw.githubusercontent.com/JasonHHouse/gaps/master/images/Final-Black.png
+sources:
+  - https://github.com/JasonHHouse/gaps
+maintainers:
+  - name: billimek
+    email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 2.2.1

charts/gaps/OWNERS

@@ -0,0 +1,8 @@
+approvers:
+- billimek
+- onedr0p
+- bjw-s
+reviewers:
+- billimek
+- onedr0p
+- bjw-s

charts/gaps/README.md

@@ -0,0 +1,67 @@
+# Gaps
+
+This is a helm chart for [Gaps](https://github.com/JasonHHouse/gaps).
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
+
+## TL;DR;
+
+```shell
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/gaps
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/gaps
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+helm delete my-release --purge
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/gaps/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+```console
+helm install gaps \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/gaps
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install gaps k8s-at-home/gaps --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
+```
+
+---
+**NOTE**
+
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+
+---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

charts/gaps/templates/NOTES.txt

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

charts/gaps/templates/common.yaml

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

charts/gaps/values.yaml

@@ -0,0 +1,22 @@
+# Default values for Gaps.
+
+image:
+  repository: housewrecker/gaps
+  pullPolicy: IfNotPresent
+  tag: latest
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 8484
+
+env: {}
+  # TZ: UTC
+
+persistence:
+  data:
+    enabled: false
+    emptyDir: false
+    mountPath: /usr/data

charts/grocy/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.7.1
 description: ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home
 name: grocy
-version: 4.0.0
+version: 4.3.1
 keywords:
   - grocy
 home: https://github.com/k8s-at-home/charts/tree/master/charts/grocy
@@ -14,5 +14,5 @@ maintainers:
     email: jeff@billimek.com
 dependencies:
   - name: common
-    version: 2.0.3
+    version: 2.2.1
     repository: https://k8s-at-home.com/charts/

charts/heimdall/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.2.2
 description: An Application dashboard and launcher
 name: heimdall
-version: 3.0.0
+version: 4.2.1
 keywords:
   - heimdall
 home: https://github.com/k8s-at-home/charts/tree/master/charts/heimdall
@@ -15,5 +15,5 @@ maintainers:
     email: jeff@billimek.com
 dependencies:
   - name: common
-    version: 1.7.0
+    version: 2.2.1
     repository: https://k8s-at-home.com/charts/

charts/heimdall/ci/ct-values.yaml

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

charts/heimdall/values.yaml

@@ -1,4 +1,4 @@
-# Default values for grocy.
+# Default values for heimdall.
 
 image:
   repository: linuxserver/heimdall
@@ -17,11 +17,11 @@ env: {}
   # PUID:
   # PGID:
 
+probes:
+  startup:
+    enabled: true
+
 persistence:
   config:
     enabled: false
     emptyDir: false
-
-probes:
-  startup:
-    enabled: true

charts/home-assistant/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.0.0]
+
+### Changed
+
+- Migrated chart over to our common library, this version introduces breaking changes. Be sure to back up your config volume incase something goes wrong.
+- Upgraded `home-assistant` container image to `2020.12.1`
+- Upgraded `postgresql` subchart from version 10.1.3 to version 10.2.0. 
+- Upgraded `influxdb` subchart from version 1.1.2 to version 1.1.4. 
+- Upgraded `mariadb` subchart from version 9.1.2 to version 9.1.4
+
 ## [4.0.0]
 
 ### Changed
@@ -48,6 +58,8 @@ Any pre-existing StatefulSet will have to be removed before upgrading due to a n
 
 This is the last version before starting this changelog. All sorts of cool stuff was changed, but only `git log` remembers what that was :slightly_frowning_face:
 
+[5.0.0]: https://github.com/k8s-at-home/charts/tree/home-assistant-5.0.0/charts/home-assistant
+
 [4.0.0]: https://github.com/k8s-at-home/charts/tree/home-assistant-4.0.0/charts/home-assistant
 
 [3.1.0]: https://github.com/k8s-at-home/charts/tree/home-assistant-3.1.0/charts/home-assistant

charts/home-assistant/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 0.118.3
+appVersion: 2020.12.1
 description: Home Assistant
 name: home-assistant
-version: 4.0.0
+version: 5.4.1
 keywords:
 - home-assistant
 - hass
@@ -11,24 +11,24 @@ 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/k8s-at-home/charts/tree/master/charts/home-assistant
 maintainers:
 - name: billimek
   email: jeff@billimek.com
-- name: runningman84
-  email: phil@hellmi.de
 dependencies:
+- name: common
+  repository: https://k8s-at-home.com/charts/
+  version: 2.2.1
 - name: postgresql
-  version: 10.1.3
+  version: 10.2.0
   repository: https://charts.bitnami.com/bitnami
   condition: postgresql.enabled
 - name: mariadb
-  version: 9.1.2
+  version: 9.2.0
   repository: https://charts.bitnami.com/bitnami
   condition: mariadb.enabled
 - name: influxdb
-  version: 1.1.2
+  version: 1.1.6
   repository: https://charts.bitnami.com/bitnami
   condition: influxdb.enabled

charts/home-assistant/OWNERS

@@ -1,7 +1,8 @@
 approvers:
 - billimek
-- runningman84
+- onedr0p
+- bjw-s
 reviewers:
 - billimek
-- runningman84
-
+- onedr0p
+- bjw-s

charts/home-assistant/README.md

@@ -1,189 +1,129 @@
 # Home Assistant
 
-This is a helm chart for [Home Assistant](https://www.home-assistant.io/)
+This is a helm chart for [Home Assistant](https://www.home-assistant.io/).
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)**
 
 ## TL;DR;
 
 ```shell
-helm repo add k8s-at-home https://k8s-at-home.com/charts/
-helm install k8s-at-home/home-assistant
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/home-assistant
 ```
 
 ## :star2: Changelog
 
 Please refer to [CHANGELOG.md](CHANGELOG.md) for an overview of notable changes to the chart. **This is especially important for major version updates!**
 
-## Introduction
-
-This code is adapted for [the official home assistant docker image](https://hub.docker.com/r/homeassistant/home-assistant/)
-
 ## Installing the Chart
 
 To install the chart with the release name `my-release`:
 
-```shell
+```console
 helm install --name my-release k8s-at-home/home-assistant
 ```
 
+### Z-Wave / Zigbee
+
+A Z-Wave and/or Zigbee controller device could be used with Home Assistant if passed through from the host to the pod. Skip this section if you are using zwave2mqtt and/or zigbee2mqtt or plan to.
+
+First you will need to mount your Z-Wave and/or Zigbee device into the pod, you can do so by adding the following to your values:
+
+```yaml
+additionalVolumeMounts:
+  - name: zwave-usb
+    mountPath: /path/to/device
+
+additionalVolumes:
+  - name: zwave-usb
+    hostPath:
+      path: /path/to/device
+```
+
+Second you will need to set a nodeAffinity rule, for example:
+
+```yaml
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: app
+          operator: In
+          values:
+          - zwave-controller
+```
+
+... where a node with an attached zwave and/or zigbee controller USB device is labeled with `app: zwave-controller`
+
+### Websockets
+
+If an ingress controller is being used with home assistant, web sockets must be enabled using annotations to enable support of web sockets.
+
+Using NGINX as an example the following will need to be added to your values:
+
+```yaml
+ingress:
+  enabled: true
+  annotations:
+    nginx.org/websocket-services: home-assistant
+```
+
+The value derived is the name of the kubernetes service object for home-assistant
+
 ## Uninstalling the Chart
 
 To uninstall/delete the `my-release` deployment:
 
-```shell
+```console
 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                                                                                                                                                                                                                          | `homeassistant/home-assistant`         |
-| `image.tag`                                     | Image tag. Possible values listed [here](https://hub.docker.com/r/homeassistant/home-assistant/tags/).                                                                                                                                    | `0.118.3`                              |
-| `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`                                |
-| `hostAliases`                                   | Define custom entries in /etc/hosts                                                                                                                                                                                                       | `[]`                                   |
-| `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                                                                                                                                | `{}`                                   |
-| `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.7.2`                                |
-| `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                                                                                                                                                                               | `[]`                                   |
-| `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)                                                                                                                         | `{}`                                   |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/home-assistant/values.yaml)
+file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
-```shell
-helm install --name my-release \
-  --set configurator.hassApiPassword="$HASS_API_PASSWORD" \
+```console
+helm install my-release \
+  --set env.TZ="America/New_York" \
     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 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,
+```console
+helm install my-release k8s-at-home/home-assistant --values values.yaml 
 ```
 
-Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.
-
-## Configuring home assistant
-
-Much of the home assistant configuration occurs inside the various files persisted to the `/config` directory.  This will require external access to the persistent storage location where the home assistant configuration data is stored.  Because this may be a limitation, there are two options built-in to this chart:
-
-### VS Code Server
-
-[VS Code Server](https://github.com/cdr/code-server) is added as an optional sidecar container to Home Assistant with access to the home assistant configuration for easy in-browser editing and manipulation of Home Assistant.  If using this, it is possible to manually install the [Home Assistant Config Helper Extension](https://github.com/keesschollaart81/vscode-home-assistant) in order to have a deeper integration with Home Assistant within VS Code while editing the configuration files.
-
-## Git sync 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
+```yaml
+image:
+  tag: ...
 ```
 
-## git-crypt support
+---
+**NOTE**
 
-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
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
 ```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+
+---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 4.x.x to 5.x.x
+
+As of 5.0.0 this chart was migrated to a centralized [common](https://github.com/k8s-at-home/charts/tree/master/charts/common) library, some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the [common](https://github.com/k8s-at-home/charts/tree/master/charts/common) library for more configuration options.

charts/home-assistant/templates/NOTES.txt

@@ -1,19 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "home-assistant.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 {{ template "home-assistant.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "home-assistant.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={{ template "home-assistant.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/home-assistant/templates/_helpers.tpl

@@ -1,53 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "home-assistant.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 "home-assistant.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 "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/common.yaml

@@ -0,0 +1,22 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the ssh secret to the additionalVolumes */}}
+{{- define "home-assistant.gitSecret.volume" -}}
+name: deploykey
+secret:
+  secretName: {{ template "common.names.fullname" . }}-deploykey
+  defaultMode: 256
+  optional: true
+{{- end -}}
+
+{{- if or .Values.git.deployKey .Values.git.deployKeyBase64 -}}
+  {{- $volume := include "home-assistant.gitSecret.volume" . | fromYaml -}}
+  {{- if $volume -}}
+      {{- $additionalVolumes := append .Values.additionalVolumes $volume }}
+      {{- $_ := set .Values "additionalVolumes" (deepCopy $additionalVolumes) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/* Render the templates */}}
+{{ include "common.all" . }}

charts/home-assistant/templates/deployment.yaml

@@ -1,295 +0,0 @@
-{{- $args := include "home-assistant.vscode.args" . -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "home-assistant.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
-    helm.sh/chart: {{ include "home-assistant.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "home-assistant.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "home-assistant.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range . }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.hostNetwork }}
-      hostNetwork: {{ .Values.hostNetwork }}
-      dnsPolicy: ClusterFirstWithHostNet
-      {{- end }}
-      {{- if .Values.hostAliases }}
-      hostAliases:
-{{ toYaml .Values.hostAliases | indent 8 }}
-      {{- 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
-          subPath: {{ default "" .Values.persistence.configSubPath }}
-        - 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 }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: api
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          {{- range .Values.service.additionalPorts }}
-            - name: {{ .name }}
-              containerPort: {{ .targetPort }}
-          {{- end }}
-          {{- if .Values.probes.liveness.enabled }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: api
-              scheme: {{ .Values.probes.liveness.scheme }}
-            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-          {{- end }}
-          {{- if .Values.probes.readiness.enabled }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: api
-              scheme: {{ .Values.probes.readiness.scheme }}
-            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-          {{- end }}
-          {{- if .Values.probes.startup.enabled }}
-          startupProbe:
-            httpGet:
-              path: /
-              port: api
-              scheme: {{ .Values.probes.startup.scheme }}
-            failureThreshold: {{ .Values.probes.startup.failureThreshold }}
-            periodSeconds: {{ .Values.probes.startup.periodSeconds }}
-          {{- end }}
-          env:
-            {{- range $key, $value := .Values.extraEnv }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-            {{- end }}
-            {{- range $name, $opts := .Values.extraEnvSecrets }}
-            - name: {{ $name }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $opts.secret }}
-                  key: {{ $opts.key }}
-            {{- end }}
-          envFrom:
-          {{- range .Values.extraSecretForEnvFrom }}
-            - secretRef:
-                name: {{ . }}
-          {{- end }}
-          volumeMounts:
-          - mountPath: /config
-            name: config
-            subPath: {{ default "" .Values.persistence.configSubPath }}
-          {{- if .Values.zwave.enabled }}
-          - mountPath: /dev/ttyACM0
-            name: ttyacm
-          {{- end }}
-          {{- range .Values.hostMounts }}
-          {{- if .mountPath }}
-          - mountPath: {{ .mountPath }}
-          {{- else }}
-          - mountPath: {{ .hostPath }}
-          {{- end }}
-            name: {{ .name }}
-          {{- end }}
-          {{- if .Values.git.enabled }}
-          - mountPath: {{ .Values.git.keyPath }}
-            name: git-secret
-          {{- end }}
-          {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 10 }}{{ 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 }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-          {{- if or .Values.zwave.enabled (.Values.hostMounts) }}
-          securityContext:
-            privileged: true
-            allowPrivilegeEscalation: true
-          {{- end }}
-        {{- if .Values.vscode.enabled }}
-        - name: vscode
-          image: "{{ .Values.vscode.image.repository }}:{{ .Values.vscode.image.tag }}"
-          imagePullPolicy: {{ .Values.vscode.image.pullPolicy }}
-          workingDir: {{ .Values.vscode.hassConfig }}
-          args:
-{{- with $args }}
-{{ . | indent 12 }}
-{{- end }}
-          ports:
-            - name: vscode
-              containerPort: {{ .Values.vscode.service.port }}
-              protocol: TCP
-          env:
-            {{- if .Values.vscode.password }}
-            - name: PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "home-assistant.fullname" . }}-vscode
-                  key: password
-            {{- end }}
-            {{- if and (.Values.git.enabled) (.Values.git.user.name) }}
-            - name: GIT_AUTHOR_NAME
-              value: {{ .Values.git.user.name }}
-            - name: GIT_COMMITTER_NAME
-              value: {{ .Values.git.user.name }}
-            {{ end }}
-            {{- if and (.Values.git.enabled) (.Values.git.user.email) }}
-            - name: GIT_AUTHOR_EMAIL
-              value: {{ .Values.git.user.email }}
-            - name: GIT_COMMITTER_EMAIL
-              value: {{ .Values.git.user.email }}
-            {{ end }}
-            {{- range $key, $value := .Values.vscode.extraEnv }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-            {{- end }}
-          volumeMounts:
-          - mountPath: /config
-            name: config
-            subPath: {{ default "" .Values.persistence.configSubPath }}
-          {{- if .Values.git.enabled }}
-          - mountPath: {{ .Values.git.keyPath }}
-            name: git-secret
-          {{- end }}
-          {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 10 }}{{ 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 }}
-          resources:
-{{ toYaml .Values.vscode.resources | indent 12 }}
-        {{- end }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.enabled }}
-        {{- if .Values.persistence.hostPath }}
-        hostPath:
-          path: {{.Values.persistence.hostPath}}
-          type: Directory
-        {{- else }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "home-assistant.fullname" . }}{{- end }}
-        {{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-      {{- if .Values.zwave.enabled }}
-      - name: ttyacm
-        hostPath:
-          path: /dev/{{.Values.zwave.device}}
-      {{- end }}
-      {{- range .Values.hostMounts }}
-      - name: {{ .name }}
-        hostPath:
-          path: {{.hostPath}}
-          {{- if .type }}
-          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:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}

charts/home-assistant/templates/ingress.yaml

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

charts/home-assistant/templates/pvc.yaml

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

charts/home-assistant/templates/secret.yaml

@@ -1,17 +1,15 @@
-{{- if .Values.vscode.enabled }}
----
+{{- if or .Values.git.deployKey .Values.git.deployKeyBase64 }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "home-assistant.fullname" . }}-vscode
+  name: {{ template "common.names.fullname" . }}-deploykey
   labels:
-    app.kubernetes.io/name: {{ include "home-assistant.name" . }}
-    helm.sh/chart: {{ include "home-assistant.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- include "common.labels" . | nindent 4 }}
 type: Opaque
 data:
-  {{- if .Values.vscode.password }}
-  password: {{ .Values.vscode.password | b64enc | quote }}
+  {{- if .Values.git.deployKey }}
+  id_rsa: {{ .Values.git.deployKey | b64enc | quote }}
+  {{- else }}
+  id_rsa: {{ .Values.git.deployKeyBase64 | quote }}
   {{- end }}
 {{- end }}

charts/home-assistant/templates/service.yaml

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

charts/home-assistant/templates/servicemonitor.yaml

@@ -1,43 +1,32 @@
-{{- if and ( .Values.monitoring.serviceMonitor.enabled ) ( .Values.monitoring.enabled ) }}
+{{- if .Values.prometheus.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-{{- if .Values.monitoring.serviceMonitor.labels }}
+  name: {{ template "common.names.fullname" . }}
   labels:
-{{ toYaml .Values.monitoring.serviceMonitor.labels | indent 4}}
-{{- end }}
-  name: {{ template "home-assistant.fullname" . }}-prometheus-exporter
-{{- if .Values.monitoring.serviceMonitor.namespace }}
-  namespace: {{ .Values.monitoring.serviceMonitor.namespace }}
-{{- end }}
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
-  endpoints:
-  - targetPort: {{ .Values.service.portName }}
-    path: /api/prometheus
-{{- if .Values.monitoring.serviceMonitor.interval }}
-    interval: {{ .Values.monitoring.serviceMonitor.interval }}
-{{- end }}
-{{- if .Values.monitoring.serviceMonitor.bearerTokenFile }}
-    bearerTokenFile: {{ .Values.monitoring.serviceMonitor.bearerTokenFile }}
-{{- end }}
-{{- if .Values.monitoring.serviceMonitor.bearerTokenSecret }}
-    bearerTokenSecret:
-      name: {{ .Values.monitoring.serviceMonitor.bearerTokenSecret.name }}
-      key: {{ .Values.monitoring.serviceMonitor.bearerTokenSecret.key }}
-      {{- 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:
-    matchNames:
-    - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "home-assistant.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - port: {{ default "http" .Values.service.port.name }}
+    {{- with .Values.prometheus.serviceMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.serviceMonitor.bearerTokenFile }}
+    bearerTokenFile: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.serviceMonitor.bearerTokenSecret }}
+    bearerTokenSecret:
+      name: {{ .name }}
+      key: {{ .key }}
+      {{- with .optional }}
+      optional: {{ . }}
+      {{- end }}
+    {{- end }}
+    path: /api/prometheus
 {{- end }}

charts/home-assistant/templates/vscode-ingress.yaml

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