[common] 2.0.3 (#368)

Co-authored-by: Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs <6213398+bjw-s@users.noreply.github.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,40 @@
-#### Special notes for your reviewer:
+<!--
+Before you open the request please review the following guidelines and tips to help it be more easily integrated:
 
-#### Checklist
-[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
-- [ ] Chart Version bumped
-- [ ] Variables are documented in the README.md
-- [ ] Title of the PR starts with chart name (e.g. `[radarr]`)
+- Describe the scope of your change - i.e. what the change does.
+- Describe any known limitations with your change.
+- Please run any tests or examples that can exercise your modified code.
+
+Thank you for contributing! We will try to test and integrate the change as soon as we can. There is no need to bump or check in on a pull request (it will clutter the discussion of the request).
+
+Also don't be worried if the request is closed or not integrated sometimes our priorities might not match the priorities of the pull request. Don't fret, the open source community thrives on forks and GitHub makes it easy to keep your changes in a forked repo.
+-->
+
+**Description of the change**
+
+<!-- Describe the scope of your change - i.e. what the change does. -->
+
+**Benefits**
+
+<!-- What benefits will be realized by the code change? -->
+
+**Possible drawbacks**
+
+<!-- Describe any known limitations with your change -->
+
+**Applicable issues**
+
+<!-- Enter any applicable Issues here (You can reference an issue using #) -->
+- fixes #
+
+**Additional information**
+
+<!-- If there's anything else that's important and relevant to your pull request, mention that information here.-->
+
+**Checklist** <!-- [Place an '[X]' (no spaces) in all applicable fields. Please remove unrelated fields.] -->
+- [ ] Chart version bumped in `Chart.yaml` according to [semver](http://semver.org/).
+- [ ] Title of the PR starts with chart name (e.g. `[home-assistant]`)
+- [ ] Chart is using our [common](https://github.com/k8s-at-home/charts/tree/master/charts/common) library as a dependency.
+- [ ] (optional) Variables are documented in the README.md
+
+<!-- Keep in mind that if you are submitting a new chart, try to use our [common](https://github.com/k8s-at-home/charts/tree/master/charts/common) library as a dependency. This will help maintaining charts here and keep them consistent between each other -->

.github/ct.yaml

@@ -5,6 +5,7 @@ chart-dirs:
   - charts
 excluded-charts:
   - common
+  - common-test
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
   - k8s-at-home=https://k8s-at-home.com/charts

.github/renovate.json

@@ -1,27 +0,0 @@
-{
-  "enabled": true,
-  "commitMessagePrefix": "[{{{parentDir}}}]",
-  "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
-  "assigneesFromCodeOwners": true,
-  "reviewersFromCodeOwners": true,
-  "suppressNotifications": ["prIgnoreNotification"],
-  "rebaseWhen": "conflicted",
-  "helm-values": {
-    "enabled": false
-  },
-  "helmv3": {
-    "fileMatch": ["charts/.+/Chart\\.yaml$"]
-  },
-  "packageRules": [
-    {
-      "updateTypes": ["major"],
-      "bumpVersion": "major",
-      "labels": ["dependency/major"]
-    },
-    {
-      "updateTypes": ["minor", "patch"],
-      "bumpVersion": "minor",
-      "labels": ["dependency/minor"]
-    }
-  ]
-}

.github/renovate.json5

@@ -0,0 +1,89 @@
+{
+  "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"],
+  "rebaseWhen": "conflicted",
+  "prConcurrentLimit": 5,
+  "helm-values": {
+    "enabled": false
+  },
+  "helmv3": {
+    "fileMatch": ["charts/.+/Chart\\.yaml$"]
+  },
+  "packageRules": [
+    //
+    // Common library dep
+    //
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["major"],
+      "bumpVersion": "major",
+      "labels": ["dependency/major"],
+      "packageNames": [
+        "common"
+      ]
+    },
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["minor"],
+      "bumpVersion": "minor",
+      "labels": ["dependency/minor"],
+      "packageNames": [
+        "common"
+      ]
+    },
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["patch"],
+      "bumpVersion": "patch",
+      "labels": ["dependency/patch"],
+      "packageNames": [
+        "common"
+      ]
+    },
+    //
+    // Other library deps
+    //
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["major"],
+      "bumpVersion": "major",
+      "labels": ["dependency/major"],
+      "excludePackageNames": [
+        "common"
+      ],
+      "schedule": [
+        "every 3 months on the first day of the month"
+      ]
+    },
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["minor"],
+      "bumpVersion": "minor",
+      "labels": ["dependency/minor"],
+      "excludePackageNames": [
+        "common"
+      ],
+      "schedule": [
+        "every 2 months on the first day of the month"
+      ]
+    },
+    {
+      "datasources": ["helmv3"],
+      "updateTypes": ["patch"],
+      "bumpVersion": "patch",
+      "labels": ["dependency/patch"],
+      "excludePackageNames": [
+        "common"
+      ],
+      "schedule": [
+        "every 1 months on the first day of the month"
+      ]
+    }
+  ]
+}

.github/workflows/lint-test.yaml

@@ -31,15 +31,30 @@ jobs:
             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'
+        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'

.github/workflows/release.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: Block concurrent releases
+      - name: Block concurrent jobs
         uses: softprops/turnstyle@v1
         with:
           continue-after-seconds: 180
@@ -23,6 +23,13 @@ jobs:
     needs: pre-release
     runs-on: ubuntu-latest
     steps:
+      - name: Block concurrent jobs
+        uses: softprops/turnstyle@v1
+        with:
+          continue-after-seconds: 180
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -52,6 +59,13 @@ jobs:
     needs: release
     runs-on: ubuntu-latest
     steps:
+      - name: Block concurrent jobs
+        uses: softprops/turnstyle@v1
+        with:
+          continue-after-seconds: 180
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Checkout
         uses: actions/checkout@v2
         with:
@@ -66,6 +80,7 @@ jobs:
       - name: Commit and push timestamp updates
         run: |
           if [[ -f index.yaml ]]; then
+            git pull
             export generated_date=$(date --utc +%FT%T.%9NZ)
             sed -i -e "s/^generated:.*/generated: \"$generated_date\"/" index.yaml
             git add index.yaml

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

@@ -0,0 +1,20 @@
+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: 1.0.2
+keywords:
+  - appdaemon
+  - home-automation
+  - home-assistant
+  - mqtt
+home: https://github.com/k8s-at-home/charts/tree/master/charts/appdaemon
+sources:
+- https://github.com/AppDaemon/appdaemon
+maintainers:
+  - name: billimek
+    email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0

charts/appdaemon/OWNERS

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

charts/appdaemon/README.md

@@ -0,0 +1,67 @@
+# appdaemon
+
+This is a helm chart for [appdaemon](https://github.com/AppDaemon/appdaemon).
+
+**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/appdaemon
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/appdaemon
+```
+
+## 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/appdaemon/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 appdaemon \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/appdaemon
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install appdaemon k8s-at-home/appdaemon --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/appdaemon/ci/ct-values.yaml

@@ -0,0 +1,8 @@
+env:
+  TZ: "Africa/Cairo"
+  LATITUDE: "29.9792"
+  LONGITUDE: "31.1342"
+  ELEVATION: "64"
+  DASH_URL: "http://0.0.0.0:5050"
+ingress:
+  enabled: true

charts/appdaemon/templates/NOTES.txt

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

charts/appdaemon/templates/common.yaml

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

charts/appdaemon/values.yaml

@@ -0,0 +1,93 @@
+# Default values for Appdaemon.
+
+# Use our own image at https://github.com/k8s-at-home/container-images/tree/main/appdaemon
+# until https://github.com/AppDaemon/appdaemon/pull/1002 is merged
+image:
+  repository: k8sathome/appdaemon
+  pullPolicy: IfNotPresent
+  tag: v4.0.5
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 5050
+  # # Boilerplate config for code-server functionality, be sure to make changes to suit your environment
+  # additionalServices:
+  # - enabled: true
+  #   nameSuffix: vscode
+  #   type: ClusterIP
+  #   port:
+  #     port: 12321
+  #     name: vscode
+  #     protocol: TCP
+  #     targetPort: 12321
+
+# Environment variables that can be configure can be seen at
+# https://appdaemon.readthedocs.io/en/latest/DOCKER_TUTORIAL.html
+env: {}
+  # TZ:
+  # LATITUDE:
+  # LONGITUDE:
+  # ELEVATION:
+  # HA_URL:
+  # DASH_URL:
+  # TOKEN:
+
+# # Boilerplate config for code-server functionality, be sure to make changes to suit your environment
+# additionalContainers:
+# - name: vscode
+#   image: codercom/code-server:3.7.2
+#   imagePullPolicy: IfNotPresent
+#   workingDir: /www/assets
+#   args:
+#   - "--port"
+#   - "12321"
+#   - "--auth"
+#   - "none"
+#   ports:
+#   - name: vscode
+#     containerPort: 12321
+#     protocol: TCP
+#   volumeMounts:
+#   - name: config
+#     mountPath: /www/assets
+#   securityContext:
+#     runAsUser: 0
+
+ingress:
+  enabled: false
+  # # Boilerplate config for code-server functionality, be sure to make changes to suit your environment
+  # additionalIngresses:
+  # - enabled: true
+  #   nameSuffix: "vscode"
+  #   serviceName: appdaemon-vscode
+  #   servicePort: 12321
+  #   annotations:
+  #     kubernetes.io/ingress.class: "nginx"
+  #   hosts:
+  #   - host: appdaemon-editor.k8s-at-home.com
+  #     paths:
+  #     - path: /
+  #       pathType: Prefix
+  #   tls:
+  #   - hosts:
+  #     - appdaemon-editor.k8s-at-home.com
+
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
+    ## 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
+    ## Set to true to retain the PVC upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""

charts/blocky/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.10
+appVersion: v0.11
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 4.0.1
+version: 4.1.0
 keywords:
   - blocky
   - dbs

charts/blocky/templates/deployment.yaml

@@ -45,6 +45,13 @@ spec:
               subPath: {{ $name }}
               readOnly: true
             {{- end }}
+            {{- if .Values.config.queryLog }}
+            - name: data
+              mountPath: {{ .Values.config.queryLog.dir }}
+              {{- if .Values.persistence.subPath }}
+              subPath: {{ .Values.persistence.subPath }}
+              {{- end }}
+            {{- end }}
           ports:
             - name: api
               containerPort: 4000
@@ -89,6 +96,15 @@ spec:
                     - key: {{ $name }}
                       path: {{ $name }}
                   {{- end }}
+        {{- if .Values.config.queryLog }}
+        - name: data
+          {{- if .Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "blocky.fullname" . }}{{- end }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/blocky/templates/persistentvolumeclaim.yaml

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

charts/blocky/values.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: spx01/blocky
-  tag: v0.10
+  tag: v0.11
   pullPolicy: IfNotPresent
 
 nameOverride: ""
@@ -106,11 +106,33 @@ config:
     # 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
+
   # optional: HTTP listener port, default 0 = no http listener. If > 0, will be used for prometheus metrics, pprof, ...
   httpPort: 4000
   # optional: Log level (one from debug, info, warn, error). Default: info
   logLevel: info
 
+## Add persistence for query logs (if enabled)
+persistence:
+  enabled: false
+  # storageClassName: default
+  accessModes:
+    - ReadWriteOnce
+  size: 10Gi
+  # annotations: {}
+  finalizers:
+    - kubernetes.io/pvc-protection
+  # selectorLabels: {}
+  # subPath: ""
+  # existingClaim:
 
 # Probes configuration
 probes:

charts/calibre-web/.helmignore

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

charts/calibre-web/Chart.yaml

@@ -1,9 +1,8 @@
-type: application
 apiVersion: v2
-appVersion: 0.6.8
+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: 2.0.1
+version: 3.0.0
 keywords:
   - calibre
   - ebook
@@ -15,3 +14,7 @@ sources:
 maintainers:
   - name: wojoinc
     email: wojoinc@pm.me
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0

charts/calibre-web/OWNERS

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

charts/calibre-web/README.md

@@ -1,14 +1,22 @@
-# calibre-web
+# Calibre-Web
 
-This is a helm chart for [calibre-web](https://github.com/janeczku/calibre-web) utilizing the [Linuxserver.io calibre-web image](https://hub.docker.com/r/linuxserver/calibre-web)
+This is a helm chart for [Calibre-Web](https://github.com/janeczku/calibre-web).
+
+**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/calibre-web
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/calibre-web
 ```
 
+## Storage
+
+If you plan to use networked storage to store your media or config for Booksonic, (NFS, etc.) please take a look at the
+Fast Access option in the Booksonic settings. This will help improve the perfomance of the application
+by not constantly monitoring media folders. 
+
 ## Installing the Chart
 
 To install the chart with the release name `my-release`:
@@ -28,80 +36,50 @@ 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 `calibre-web` chart and their default values.
-
-| Parameter                                     | Description                                                                                                                                                             | Default                   |
-| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- |
-| `image.repository`                            | Image repository                                                                                                                                                        | `linuxserver/calibre-web` |
-| `image.tag`                                   | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/calibre-web/tags/).                                                                       | `0.6.8-ls74`              |
-| `image.pullPolicy`                            | Image pull policy                                                                                                                                                       | `IfNotPresent`            |
-| `dockerMods.ebookConversion.enabled`          | Enable optional ebook conversion feature. (x86_64 only) refer [here](https://github.com/linuxserver/docker-calibre-web#application-setup)                               | `false`                   |
-| `dockerMods.ebookConversion.image.repository` | DockerMod image repository                                                                                                                                              | `linuxserver/calibre-web` |
-| `dockerMods.ebookConversion.image.tag`        | DockerMod image tag. These typically start with `v`, with the "stable" tag being `calibre`. Can be found [here](https://hub.docker.com/r/linuxserver/calibre-web/tags/) | `calibre`                 |
-| `strategyType`                                | Specifies the strategy used to replace old Pods by new ones                                                                                                             | `Recreate`                |
-| `timezone`                                    | Timezone the calibre-web instance should run as, e.g. 'America/New_York'                                                                                                | `UTC`                     |
-| `puid`                                        | process userID the calibre-web instance should run as                                                                                                                   | `1001`                    |
-| `pgid`                                        | process groupID the calibre-web instance should run as                                                                                                                  | `1001`                    |
-| `umask`                                       | Default umask to use when creating new files                                                                                                                            | `22`                      |
-| `probes.liveness.initialDelaySeconds`         | Specify liveness `initialDelaySeconds` parameter for the deployment                                                                                                     | `60`                      |
-| `probes.liveness.failureThreshold`            | Specify liveness `failureThreshold` parameter for the deployment                                                                                                        | `5`                       |
-| `probes.liveness.timeoutSeconds`              | Specify liveness `timeoutSeconds` parameter for the deployment                                                                                                          | `10`                      |
-| `probes.readiness.initialDelaySeconds`        | Specify readiness `initialDelaySeconds` parameter for the deployment                                                                                                    | `60`                      |
-| `probes.readiness.failureThreshold`           | Specify readiness `failureThreshold` parameter for the deployment                                                                                                       | `5`                       |
-| `probes.readiness.timeoutSeconds`             | Specify readiness `timeoutSeconds` parameter for the deployment                                                                                                         | `10`                      |
-| `Service.type`                                | Kubernetes service type for the calibre-web GUI                                                                                                                         | `ClusterIP`               |
-| `Service.port`                                | Kubernetes port where the calibre-web GUI is exposed                                                                                                                    | `8083`                    |
-| `Service.annotations`                         | Service annotations for the calibre-web GUI                                                                                                                             | `{}`                      |
-| `Service.labels`                              | Custom labels                                                                                                                                                           | `{}`                      |
-| `Service.loadBalancerIP`                      | Loadbalance IP for the calibre-web GUI                                                                                                                                  | `{}`                      |
-| `Service.loadBalancerSourceRanges`            | List of IP CIDRs allowed access to load balancer (if supported)                                                                                                         | None                      |
-| `ingress.enabled`                             | Enables Ingress                                                                                                                                                         | `false`                   |
-| `ingress.annotations`                         | Ingress annotations                                                                                                                                                     | `{}`                      |
-| `ingress.labels`                              | Custom labels                                                                                                                                                           | `{}`                      |
-| `ingress.path`                                | Ingress path                                                                                                                                                            | `/`                       |
-| `ingress.hosts`                               | Ingress accepted hostnames                                                                                                                                              | `chart-example.local`     |
-| `ingress.tls`                                 | Ingress TLS configuration                                                                                                                                               | `[]`                      |
-| `persistence.config.enabled`                  | Use persistent volume to store configuration data                                                                                                                       | `true`                    |
-| `persistence.config.size`                     | Size of persistent volume claim                                                                                                                                         | `1Gi`                     |
-| `persistence.config.existingClaim`            | Use an existing PVC to persist data                                                                                                                                     | `nil`                     |
-| `persistence.config.storageClass`             | Type of persistent volume claim                                                                                                                                         | `-`                       |
-| `persistence.config.accessMode`               | Persistence access mode                                                                                                                                                 | `ReadWriteOnce`           |
-| `persistence.config.skipuninstall`            | Do not delete the pvc upon helm uninstall                                                                                                                               | `false`                   |
-| `persistence.books.enabled`                   | Use persistent volume to store books data                                                                                                                               | `true`                    |
-| `persistence.books.size`                      | Size of persistent volume claim                                                                                                                                         | `10Gi`                    |
-| `persistence.books.existingClaim`             | Use an existing PVC to persist data                                                                                                                                     | `nil`                     |
-| `persistence.books.storageClass`              | Type of persistent volume claim                                                                                                                                         | `-`                       |
-| `persistence.books.accessMode`                | Persistence access mode                                                                                                                                                 | `ReadWriteOnce`           |
-| `persistence.books.skipuninstall`             | Do not delete the pvc upon helm uninstall                                                                                                                               | `false`                   |
-| `persistence.extraExistingClaimMounts`        | Optionally add multiple existing claims                                                                                                                                 | `[]`                      |
-| `resources`                                   | CPU/Memory resource requests/limits                                                                                                                                     | `{}`                      |
-| `nodeSelector`                                | Node labels for pod assignment                                                                                                                                          | `{}`                      |
-| `tolerations`                                 | Toleration labels for pod assignment                                                                                                                                    | `[]`                      |
-| `affinity`                                    | Affinity settings for pod assignment                                                                                                                                    | `{}`                      |
-| `podAnnotations`                              | Key-value pairs to add as pod annotations                                                                                                                               | `{}`                      |
-| `deploymentAnnotations`                       | Key-value pairs to add as deployment annotations                                                                                                                        | `{}`                      |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/calibre-web/values.yaml)
+file. It has several commented out suggested values. Most notably, these include several environment variables used to
+customize the container.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
-
 ```console
-helm install --name my-release \
-  --set timezone="America/New York" \
+helm install calibre-web \
+  --set env.TZ="America/New_York" \
     k8s-at-home/calibre-web
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
-helm install --name my-release -f values.yaml stable/calibre-web
+helm install calibre-web k8s-at-home/calibre-web -f values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
 ```
 
 ---
-
 **NOTE**
 
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
 
-Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 2.x.x to 3.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

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

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

charts/calibre-web/templates/NOTES.txt

@@ -1,25 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "calibre-web.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "calibre-web.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "calibre-web.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "calibre-web.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:{{ .Values.service.port }}
-{{- end }}
-
-{{- if .Values.dockerMods.ebookConversion.enabled }}
-2. DockerMods:
-  You have enabled the EbookConversion Docker Mod using the {{ .Values.dockerMods.ebookConversion.image.repository }}:{{ .Values.dockerMods.ebookConversion.image.tag }} image.
-  Remember to visit https://github.com/linuxserver/docker-calibre-web#application-setup for instructions on configuring this feature in the calibre-web settings.
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/calibre-web/templates/_helpers.tpl

@@ -1,63 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "calibre-web.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 "calibre-web.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 "calibre-web.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "calibre-web.labels" -}}
-helm.sh/chart: {{ include "calibre-web.chart" . }}
-{{ include "calibre-web.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "calibre-web.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "calibre-web.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "calibre-web.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

charts/calibre-web/templates/books-pvc.yaml

@@ -1,25 +0,0 @@
-
-{{- if and .Values.persistence.books.enabled (not .Values.persistence.books.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "calibre-web.fullname" . }}-books
-  {{- if .Values.persistence.books.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels: {{ include "calibre-web.labels" . | nindent 4}}
-spec:
-  accessModes:
-    - {{ .Values.persistence.books.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.books.size | quote }}
-{{- if .Values.persistence.books.storageClass }}
-{{- if (eq "-" .Values.persistence.books.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.books.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/calibre-web/templates/common.yaml

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

charts/calibre-web/templates/config-pvc.yaml

@@ -1,25 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "calibre-web.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels: {{ include "calibre-web.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/calibre-web/templates/deployment.yaml

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

charts/calibre-web/templates/ingress.yaml

@@ -1,34 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "calibre-web.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels: {{ include "calibre-web.labels" . | nindent 4 }}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}

charts/calibre-web/templates/service.yaml

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

charts/calibre-web/templates/tests/test-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "calibre-web.fullname" . }}-test-connection"
-  labels:
-    {{- include "calibre-web.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "calibre-web.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never

charts/calibre-web/values.yaml

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

charts/common-test/Chart.yaml

@@ -0,0 +1,15 @@
+apiVersion: v2
+name: common-test
+description: Helper chart to test different use cases of the common library
+version: 1.0.1
+keywords:
+  - k8s-at-home
+  - common
+home: https://github.com/k8s-at-home/charts/tree/master/charts/common-test
+maintainers:
+  - name: bjw-s
+    email: me@bjw-s.dev
+dependencies:
+  - name: common
+    repository: file://../common
+    version: n/a

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

@@ -0,0 +1,11 @@
+image:
+  repository: b4bz/homer
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  port:
+    port: 8080
+
+ingress:
+  enabled: true

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

@@ -0,0 +1,27 @@
+image:
+  repository: b4bz/homer
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  port:
+    port: 8080
+
+ingress:
+  enabled: true
+
+persistence:
+  config:
+    enabled: true
+    emptyDir: true
+    mountPath: /www/assets
+
+addons:
+  codeserver:
+    enabled: true
+    workingDir: "/www/assets"
+    ingress:
+      enabled: true
+    volumeMounts:
+    - name: config
+      mountPath: /www/assets

charts/common-test/templates/common.yaml

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

charts/common-test/values.yaml

@@ -0,0 +1,11 @@
+image:
+  repository: b4bz/homer
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  port:
+    port: 8080
+
+ingress:
+  enabled: true

charts/common/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+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.0.0]
+
+### Changed
+
+- :warning: Updated `probes` logic to support custom probes, it is now possible to set your own custom probes by setting the `probes.[liveness|readiness|startup].custom` value to `true` and configuring them. Default is `false`.
+- :warning: `addon.vpn.imagePullPolicy` is now `addon.vpn.[openvpn|wireguard].image.pullPolicy`. Default is `IfNotPresent`
+- [code-server](https://github.com/cdr/code-server) is now an `addon` like `vpn`. This enables a code-server container inside the pod which allows you to modify a configuration in a volume attached to the pod. Default for `addons.codeserver.enabled` is `false`
+- Added `envFrom` for more configuration with environment variables
+- Added `dnsConfig` to be configurable
+- Added support for 1.19+ ingress spec
+- Added this [CHANGELOG.md](CHANGELOG.md)
+
+### Fixed
+
+- `nameOverride` and `fullNameOverride` not in `values.yaml`
+
+## [1.7.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.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,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 1.7.0
+version: 2.0.3
 keywords:
   - k8s-at-home
   - common

charts/common/README.md

@@ -10,6 +10,10 @@ Since a lot of charts follow the same pattern this library was built to reduce m
 
 This chart provides common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager.
 
+## :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!**
+
 ## TL;DR
 
 When using one of the many charts that uses this library be sure to view this [values.yaml](./values.yaml) for configuration options. Any setting here can be used to define what values your helm deployment will use.

charts/common/templates/_all.tpl

@@ -5,7 +5,12 @@ Main entrypoint for the common library chart. It will render all underlying temp
   {{- /* Merge the local chart values and the common chart defaults */ -}}
   {{- include "common.values.setup" . }}
   
-  {{- /* Enable OpenVPN VPN add-on if required */ -}}
+  {{- /* Enable code-server add-on if required */ -}}
+  {{- if .Values.addons.codeserver.enabled }}
+    {{- include "common.addon.codeserver" . }}
+  {{- end -}}
+
+  {{- /* Enable VPN add-on if required */ -}}
   {{- if .Values.addons.vpn.enabled }}
     {{- include "common.addon.vpn" . }}
   {{- end -}}

charts/common/templates/_daemonset.tpl

@@ -29,48 +29,5 @@ spec:
       labels:
       {{- include "common.labels.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "common.names.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.hostNetwork }}
-      hostNetwork: {{ . }}
-      {{- end }}
-      {{- with .Values.dnsPolicy }}
-      dnsPolicy: {{ . }}
-      {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-      {{- include "common.controller.mainContainer" . | nindent 6 }}
-      {{- with .Values.additionalContainers }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
-      {{- with (include "common.controller.volumes" . | trim) }}
-      volumes:
-        {{- . | nindent 6 }}
-      {{- end }}
-      {{- with .Values.hostAliases }}
-      hostAliases:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- include "common.controller.pod" . | nindent 6 }}
 {{- end }}

charts/common/templates/_deployment.tpl

@@ -34,48 +34,5 @@ spec:
       labels:
       {{- include "common.labels.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "common.names.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.hostNetwork }}
-      hostNetwork: {{ . }}
-      {{- end }}
-      {{- with .Values.dnsPolicy }}
-      dnsPolicy: {{ . }}
-      {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-      {{- include "common.controller.mainContainer" . | nindent 6 }}
-      {{- with .Values.additionalContainers }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
-      {{- with (include "common.controller.volumes" . | trim) }}
-      volumes:
-        {{- . | nindent 6 }}
-      {{- end }}
-      {{- with .Values.hostAliases }}
-      hostAliases:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- include "common.controller.pod" . | nindent 6 }}
 {{- end }}

charts/common/templates/_statefulset.tpl

@@ -35,38 +35,5 @@ spec:
       labels:
       {{- include "common.labels.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "common.names.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-      {{- include "common.controller.mainContainer" . | nindent 6 }}
-      {{- with .Values.additionalContainers }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
-      {{- with (include "common.controller.volumes" . | trim) }}
-      volumes:
-        {{- . | nindent 6 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- include "common.controller.pod" . | nindent 6 }}
 {{- end }}

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

@@ -0,0 +1,44 @@
+{{/*
+Template to render code-server addon
+It will include / inject the required templates based on the given values.
+*/}}
+{{- define "common.addon.codeserver" -}}
+{{- if .Values.addons.codeserver.enabled -}}
+  {{/* Append the code-server container to the additionalContainers */}}
+  {{- $container := include "common.addon.codeserver.container" . | fromYaml -}}
+  {{- if $container -}}
+    {{- $additionalContainers := append .Values.additionalContainers $container -}}
+    {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
+  {{- end -}}
+
+  {{/* Add the code-server service */}}
+  {{- if .Values.addons.codeserver.service.enabled -}}
+    {{- print ("---") | nindent 0 -}}
+    {{- $serviceValues := .Values.addons.codeserver.service -}}
+    {{- if not $serviceValues.nameSuffix -}}
+        {{- $_ := set $serviceValues "nameSuffix" "codeserver" -}}
+    {{ end -}}
+    {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
+    {{- include "common.classes.service" $ -}}
+    {{- $_ := unset $ "ObjectValues" -}}
+  {{- end -}}
+
+  {{/* Add the code-server ingress */}}
+  {{- if .Values.addons.codeserver.ingress.enabled -}}
+    {{- print ("---") | nindent 0 -}}
+    {{- $ingressValues := .Values.addons.codeserver.ingress -}}
+    {{- if not $ingressValues.nameSuffix -}}
+        {{- $_ := set $ingressValues "nameSuffix" "codeserver" -}}
+    {{ end -}}
+
+    {{/* Determine the target service name & port */}}
+    {{- $svcName := printf "%v-%v" (include "common.names.fullname" .) .Values.addons.codeserver.service.nameSuffix -}}
+    {{- $_ := set $ingressValues "serviceName" $svcName -}}
+    {{- $_ := set $ingressValues "servicePort" .Values.addons.codeserver.service.port.port -}}
+
+    {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
+    {{- include "common.classes.ingress" $ -}}
+    {{- $_ := unset $ "ObjectValues" -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}

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

@@ -0,0 +1,40 @@
+{{/*
+The code-server sidecar container to be inserted.
+*/}}
+{{- define "common.addon.codeserver.container" -}}
+{{- if lt (len .Values.addons.codeserver.volumeMounts) 1 }}
+{{- fail "At least 1 volumeMount is required for codeserver container" }}
+{{- end -}}
+name: codeserver
+image: "{{ .Values.addons.codeserver.image.repository }}:{{ .Values.addons.codeserver.image.tag }}"
+imagePullPolicy: {{ .Values.addons.codeserver.pullPolicy }}
+{{- with .Values.addons.codeserver.securityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.addons.codeserver.env }}
+env:
+{{- range $k, $v := . }}
+  - name: {{ $k }}
+    value: {{ $v | quote }}
+{{- end }}
+{{- end }}
+ports:
+- name: {{ .Values.addons.codeserver.service.port.name }}
+  containerPort: {{ .Values.addons.codeserver.service.port.port }}
+  protocol: TCP
+args:
+- "--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:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.addons.codeserver.resources }}
+resources:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}

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

@@ -4,7 +4,7 @@ The OpenVPN sidecar container to be inserted.
 {{- define "common.addon.openvpn.container" -}}
 name: openvpn
 image: "{{ .Values.addons.vpn.openvpn.image.repository }}:{{ .Values.addons.vpn.openvpn.image.tag }}"
-imagePullPolicy: {{ .Values.addons.vpn.imagePullPolicy }}
+imagePullPolicy: {{ .Values.addons.vpn.openvpn.pullPolicy }}
 {{- with .Values.addons.vpn.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}

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

@@ -4,7 +4,7 @@ The Wireguard sidecar container to be inserted.
 {{- define "common.addon.wireguard.container" -}}
 name: wireguard
 image: "{{ .Values.addons.vpn.wireguard.image.repository }}:{{ .Values.addons.vpn.wireguard.image.tag }}"
-imagePullPolicy: {{ .Values.addons.vpn.imagePullPolicy }}
+imagePullPolicy: {{ .Values.addons.vpn.wireguard.pullPolicy }}
 {{- with .Values.addons.vpn.securityContext }}
 securityContext:
   {{- toYaml . | nindent 2 }}

charts/common/templates/classes/_ingress.tpl

@@ -43,9 +43,19 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
+            {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
             backend:
+            {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $svcName }}
+                port:
+                  number: {{ $svcPort }}
+            {{- else }}
               serviceName: {{ $svcName }}
               servicePort: {{ $svcPort }}
+            {{- end }}
           {{- end }}
   {{- end }}
 {{- end }}

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

@@ -9,6 +9,17 @@ Return the appropriate apiVersion for DaemonSet objects.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.daemonset.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1/DaemonSet" -}}
+{{- print "apps/v1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end -}}
+{{- end -}}
+*/}}
+
 {{/*
 Return the appropriate apiVersion for Deployment objects.
 */}}
@@ -20,6 +31,17 @@ Return the appropriate apiVersion for Deployment objects.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.deployment.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1/Deployment" -}}
+{{- print "apps/v1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end -}}
+{{- end -}}
+*/}}
+
 {{/*
 Return the appropriate apiVersion for StatefulSet objects.
 */}}
@@ -31,13 +53,40 @@ Return the appropriate apiVersion for StatefulSet objects.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.statefulset.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "apps/v1/StatefulSet" -}}
+{{- print "apps/v1" -}}
+{{- else -}}
+{{- print "apps/v1beta1" -}}
+{{- end -}}
+{{- end -}}
+*/}}
+
 {{/*
 Return the appropriate apiVersion for Ingress objects.
 */}}
+
 {{- define "common.capabilities.ingress.apiVersion" -}}
 {{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 {{- print "extensions/v1beta1" -}}
-{{- else -}}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 {{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end }}
 {{- end -}}
+
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.ingress.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "extensions/v1beta1" -}}
+{{- end }}
 {{- end -}}
+*/}}

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

@@ -19,6 +19,10 @@ The main container included in the controller.
     value: {{ $value | quote }}
   {{- end }}
   {{- end }}
+  {{- with .Values.envFrom }}
+  envFrom:
+    {{- toYaml . | nindent 12 }}
+  {{- end }}
   {{- include "common.controller.ports" . | trim | nindent 2 }}
   volumeMounts:
   {{- range $index, $PVC := .Values.persistence }}
@@ -30,9 +34,7 @@ The main container included in the controller.
   {{- if .Values.additionalVolumeMounts }}
     {{- toYaml .Values.additionalVolumeMounts | nindent 2 }}
   {{- end }}
-
-  {{- include "common.controller.probes.tcpSocket" . | nindent 2 }}
-
+  {{- include "common.controller.probes" . | nindent 2 }}
   {{- with .Values.resources }}
   resources:
     {{- toYaml . | nindent 4 }}

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

@@ -0,0 +1,53 @@
+{{- /*
+The pod definition included in the controller.
+*/ -}}
+{{- define "common.controller.pod" -}}
+{{- with .Values.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+serviceAccountName: {{ include "common.names.serviceAccountName" . }}
+{{- with .Values.podSecurityContext }}
+securityContext:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.hostNetwork }}
+hostNetwork: {{ . }}
+{{- end }}
+{{- with .Values.dnsPolicy }}
+dnsPolicy: {{ . }}
+{{- end }}
+{{- with .Values.dnsConfig }}
+dnsConfig:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.initContainers }}
+initContainers:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+containers:
+  {{- include "common.controller.mainContainer" . | nindent 0 }}
+  {{- with .Values.additionalContainers }}
+    {{- toYaml . | nindent 0 }}
+  {{- end }}
+{{- with (include "common.controller.volumes" . | trim) }}
+volumes:
+  {{- . | nindent 0 }}
+{{- end }}
+{{- with .Values.hostAliases }}
+hostAliases:
+{{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.nodeSelector }}
+nodeSelector:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.affinity }}
+affinity:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with .Values.tolerations }}
+tolerations:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}

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

@@ -1,29 +1,21 @@
 {{/*
-Liveness/readiness/startup probes based on tcpSocket checks.
+Probes selection logic.
 */}}
-{{- define "common.controller.probes.tcpSocket" -}}
-{{- if .Values.probes.liveness.enabled -}}
-livenessProbe:
-  tcpSocket:
-    port: {{ .Values.service.port.name }}
-  initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-  failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-  timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-{{- end }}
-{{- if .Values.probes.readiness.enabled }}
-readinessProbe:
-  tcpSocket:
-    port: {{ .Values.service.port.name }}
-  initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-  failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-  timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-{{- end }}
-{{- if .Values.probes.startup.enabled }}
-startupProbe:
-  tcpSocket:
-    port: {{ .Values.service.port.name }}
-  initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
-  failureThreshold: {{ .Values.probes.startup.failureThreshold }}
-  periodSeconds: {{ .Values.probes.startup.periodSeconds }}
+{{- define "common.controller.probes" -}}
+{{- $svcPort := .Values.service.port.name -}}
+{{- range $probeName, $probe := .Values.probes }}
+  {{- if $probe.enabled -}}
+    {{- "" | nindent 0 }}
+    {{- $probeName }}Probe:
+    {{- if $probe.custom -}}
+      {{- $probe.spec | toYaml | nindent 2 }}  
+    {{- else }}
+      {{- "tcpSocket:" | nindent 2 }}
+        {{- printf "port: %v" $svcPort  | nindent 4 }}
+      {{- printf "initialDelaySeconds: %v" $probe.spec.initialDelaySeconds  | nindent 2 }}
+      {{- printf "failureThreshold: %v" $probe.spec.failureThreshold  | nindent 2 }}
+      {{- printf "timeoutSeconds: %v" $probe.spec.timeoutSeconds  | nindent 2 }}
+    {{- end }}
+  {{- end }}
 {{- end }}
 {{- end }}

charts/common/values.yaml

@@ -15,6 +15,9 @@ strategy:
 # Override the default args
 args: []
 
+nameOverride: ""
+fullnameOverride: ""
+
 # Set annotations on the pod
 podAnnotations: {}
 
@@ -28,33 +31,64 @@ serviceAccount:
   name: ""
 
 env: {}
+# TZ: UTC
+
+envFrom: []
+# - configMapRef:
+#     name: config-map-name
+# - secretRef:
+#     name: secret-name
 
 # When using hostNetwork make sure you set dnsPolicy to ClusterFirstWithHostNet
 hostNetwork: false
 
 dnsPolicy: ClusterFirst
 
+# Optional DNS settings, configuring the ndots option may resolve
+# nslookup issues on some Kubernetes setups.
+# dnsConfig:
+#   options:
+#     - name: ndots
+#       value: "1"
+
 initContainers: []
 
 additionalContainers: []
 
-# Probes configuration
+## Probes configuration
 probes:
   liveness:
     enabled: true
-    initialDelaySeconds: 30
-    failureThreshold: 5
-    timeoutSeconds: 10
+    ## Set this to true if you wish to specify your own livenessProbe
+    custom: false
+    ## 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
+      timeoutSeconds: 10
+
   readiness:
     enabled: true
-    initialDelaySeconds: 30
-    failureThreshold: 5
-    timeoutSeconds: 10
+    ## Set this to true if you wish to specify your own readinessProbe
+    custom: false
+    ## 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
+      timeoutSeconds: 10
+
   startup:
     enabled: false
-    initialDelaySeconds: 5
-    failureThreshold: 30
-    periodSeconds: 10
+    ## Set this to true if you wish to specify your own startupProbe
+    custom: false
+    ## 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
 
 service:
   enabled: true
@@ -150,7 +184,7 @@ persistence:
     # subPath: some-subpath
     accessMode: ReadWriteOnce
     size: 1Gi
-    ## Do not delete the pvc upon helm uninstall
+    ## Set to true to retain the PVC upon helm uninstall
     skipuninstall: false
 
   # Create an emptyDir volume to share between all containers
@@ -178,6 +212,8 @@ hostAliases: []
 #   - "www.example.com"
 
 addons:
+
+  # Enable running a VPN in the pod to route traffic through a VPN
   vpn:
     enabled: false
 
@@ -188,6 +224,7 @@ addons:
     openvpn:
       image:
         repository: dperson/openvpn-client
+        pullPolicy: IfNotPresent
         tag: latest
 
       # Credentials to connect to the VPN Service (used with -a)
@@ -200,10 +237,9 @@ addons:
     wireguard:
       image:
         repository: k8sathome/wireguard
+        pullPolicy: IfNotPresent
         tag: 1.0.20200827
 
-    imagePullPolicy: IfNotPresent
-
     # Set the VPN container securityContext
     securityContext:
       capabilities:
@@ -265,3 +301,64 @@ addons:
         #     protocol: UDP
         #   - port: 53
         #     protocol: TCP
+
+  # Enable running a code-server container in the pod to access files
+  codeserver:
+    enabled: false
+
+    image:
+      repository: codercom/code-server
+      pullPolicy: IfNotPresent
+      tag: 3.7.4
+
+    # Specify a list of volumes that get mounted in the code-server container.
+    # At least 1 volumeMount is required!
+    volumeMounts: []
+    # - name: config
+    #   mountPath: /data/config
+
+    # Specify the working dir that will be opened when code-server starts
+    # If not given, the app will default to the mountpah of the first specified volumeMount
+    workingDir: ""
+
+    service:
+      enabled: true
+      type: ClusterIP
+      # Specify the default port information
+      port:
+        port: 12321
+        name: codeserver
+        protocol: TCP
+        targetPort: codeserver
+        ## Specify the nodePort value for the LoadBalancer and NodePort service types.
+        ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
+        ##
+        # nodePort:
+
+      ## Provide any additional annotations which may be required. This can be used to
+      ## set the LoadBalancer service type to internal only.
+      ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
+      ##
+      annotations: {}
+      labels: {}
+
+    ingress:
+      enabled: false
+      nameSuffix: codeserver
+      annotations: {}
+        # kubernetes.io/ingress.class: nginx
+        # kubernetes.io/tls-acme: "true"
+      labels: {}
+      hosts:
+        - host: code.chart-example.local
+          paths:
+            - path: /
+              # Ignored if not kubeVersion >= 1.14-0
+              pathType: Prefix
+      tls: []
+      #  - secretName: chart-example-tls
+      #    hosts:
+      #      - code.chart-example.local
+
+    securityContext:
+      runAsUser: 0

charts/esphome/.helmignore

@@ -19,5 +19,6 @@
 .project
 .idea/
 *.tmproj
+.vscode/
 # OWNERS file for Kubernetes
 OWNERS

charts/esphome/Chart.yaml

@@ -1,14 +1,19 @@
 apiVersion: v2
 appVersion: 1.15.3
-description: ESPHome
+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: 2.3.0
+version: 3.0.0
 keywords:
-- esphome
+  - esphome
+  - home-automation
 home: https://github.com/k8s-at-home/charts/tree/master/charts/esphome
 icon: https://esphome.io/_images/logo-text.svg
 sources:
 - https://github.com/esphome/esphome
 maintainers:
-- name: billimek
-  email: jeff@billimek.com
+  - name: billimek
+    email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0

charts/esphome/OWNERS

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

charts/esphome/README.md

@@ -1,120 +1,78 @@
-# ESPHome
+# esphome
 
-This is a helm chart for [ESPHome](https://esphome.io)
+This is a helm chart for [esphome](https://github.com/esphome/esphome).
+
+**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/esphome
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/esphome
 ```
 
-## Introduction
-
-This code is adapted for [the official esphome docker image](https://hub.docker.com/r/esphome/esphome/)
-
 ## Installing the Chart
 
 To install the chart with the release name `my-release`:
 
-```shell
+```console
 helm install --name my-release k8s-at-home/esphome
 ```
+
 ## 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 ESPHome chart and their default values.
-
-| Parameter                              | Description                                                                                                        | Default               |
-|----------------------------------------|--------------------------------------------------------------------------------------------------------------------|-----------------------|
-| `image.repository`                     | Image repository                                                                                                   | `esphome/esphome`     |
-| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/esphome/esphome/tags/).                          | `0.14.5`              |
-| `image.pullPolicy`                     | Image pull policy                                                                                                  | `IfNotPresent`        |
-| `image.pullSecrets`                    | Secrets to use when pulling the image                                                                              | `[]`                  |
-| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                                        | `Recreate`            |
-| `probes.liveness.enabled`              | Use the livenessProbe?                                                                                             | `true`                |
-| `probes.liveness.scheme `              | Specify liveness `scheme` parameter for the deployment                                                             | `HTTP`                |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                                                | `60`                  |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                                                   | `5`                   |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                                                     | `10`                  |
-| `probes.readiness.enabled`             | Use the readinessProbe?                                                                                            | `true`                |
-| `probes.readiness.scheme `             | Specify readiness `scheme` parameter for the deployment                                                            | `HTTP`                |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                                               | `60`                  |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                                                  | `5`                   |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                                                    | `10`                  |
-| `probes.startup.enabled`               | Use the startupProbe? (new in kubernetes 1.16)                                                                     | `false`               |
-| `probes.startup.scheme `               | Specify startup `scheme` parameter for the deployment                                                              | `HTTP`                |
-| `probes.startup.failureThreshold`      | Specify startup `failureThreshold` parameter for the deployment                                                    | `5`                   |
-| `probes.startup.periodSeconds`         | Specify startup `periodSeconds` parameter for the deployment                                                       | `10`                  |
-| `service.type`                         | Kubernetes service type for the esphome GUI                                                                        | `ClusterIP`           |
-| `service.port`                         | Kubernetes port where the esphome GUI is exposed                                                                   | `6052`                |
-| `service.portName`                     | Kubernetes port name where the esphome GUI is exposed                                                              | `api`                 |
-| `service.additionalPorts`              | Add additional ports exposed by the esphome container integrations. Example homematic needs to expose a proxy port | `{}`                  |
-| `service.annotations`                  | Service annotations for the esphome GUI                                                                            | `{}`                  |
-| `service.clusterIP`                    | Cluster IP for the esphom GUI                                                                                      | ``                    |
-| `service.externalIPs`                  | External IPs for the esphome GUI                                                                                   | `[]`                  |
-| `service.loadBalancerIP`               | Loadbalancer IP for the esphome GUI                                                                                | ``                    |
-| `service.loadBalancerSourceRanges`     | Loadbalancer client IP restriction range for the esphome GUI                                                       | `[]`                  |
-| `service.publishNotReadyAddresses`     | Set to true if the notReadyAddresses should be published                                                           | `false`               |
-| `service.externalTrafficPolicy`        | Loadbalancer externalTrafficPolicy                                                                                 | ``                    |
-| `hostNetwork`                          | Enable hostNetwork - might be needed for discovery to work                                                         | `false`               |
-| `service.nodePort`                     | nodePort to listen on for the esphome GUI                                                                          | ``                    |
-| `ingress.enabled`                      | Enables Ingress                                                                                                    | `false`               |
-| `ingress.annotations`                  | Ingress annotations                                                                                                | `{}`                  |
-| `ingress.path`                         | Ingress path                                                                                                       | `/`                   |
-| `ingress.hosts`                        | Ingress accepted hostnames                                                                                         | `chart-example.local` |
-| `ingress.tls`                          | Ingress TLS configuration                                                                                          | `[]`                  |
-| `persistence.enabled`                  | Use persistent volume to store data                                                                                | `true`                |
-| `persistence.size`                     | Size of persistent volume claim                                                                                    | `5Gi`                 |
-| `persistence.existingClaim`            | Use an existing PVC to persist data                                                                                | `nil`                 |
-| `persistence.hostPath`                 | The path to the config directory on the host, instead of a PVC                                                     | `nil`                 |
-| `persistence.storageClass`             | Type of persistent volume claim                                                                                    | `-`                   |
-| `persistence.accessMode`               | Persistence access modes                                                                                           | `ReadWriteMany`       |
-| `git.enabled`                          | Use git-sync in init container                                                                                     | `false`               |
-| `git.secret`                           | Git secret to use for git-sync                                                                                     | `git-creds`           |
-| `git.syncPath`                         | Git sync path                                                                                                      | `/config`             |
-| `git.keyPath`                          | Git ssh key path                                                                                                   | `/root/.ssh`          |
-| `git.user.name`                        | Human-readable name in the “committer” and “author” fields                                                         | ``                    |
-| `git.user.email`                       | Email address for the “committer” and “author” fields                                                              | ``                    |
-| `hostMounts`                           | Array of host directories to mount; can be used for devices                                                        | []                    |
-| `hostMounts.name`                      | Name of the volume                                                                                                 | `nil`                 |
-| `hostMounts.hostPath`                  | The path on the host machine                                                                                       | `nil`                 |
-| `hostMounts.mountPath`                 | The path at which to mount (optional; assumed same as hostPath)                                                    | `nil`                 |
-| `hostMounts.type`                      | The type to mount (optional, i.e., `Directory`)                                                                    | `nil`                 |
-| `extraEnv`                             | Extra ENV vars to pass to the esphome container                                                                    | `{}`                  |
-| `extraEnvSecrets`                      | Extra env vars to pass to the esphome container from k8s secrets - see `values.yaml` for an example                | `{}`                  |
-| `resources`                            | CPU/Memory resource requests/limits or the esphome GUI                                                             | `{}`                  |
-| `nodeSelector`                         | Node labels for pod assignment or the esphome GUI                                                                  | `{}`                  |
-| `tolerations`                          | Toleration labels for pod assignment or the esphome GUI                                                            | `[]`                  |
-| `affinity`                             | Affinity settings for pod assignment or the esphome GUI                                                            | `{}`                  |
-| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                                          | `{}`                  |
-| `extraVolumes`                         | Any extra volumes to define for the pod                                                                            | `{}`                  |
-| `extraVolumeMounts`                    | Any extra volumes mounts to define for each container of the pod                                                   | `{}`                  |
-
-
-
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/esphome/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 image.tag=latest \
+```console
+helm install esphome \
+  --set env.TZ="America/New_York" \
     k8s-at-home/esphome
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```shell
-helm install --name my-release -f values.yaml k8s-at-home/esphome
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install esphome k8s-at-home/esphome --values values.yaml 
 ```
 
-Read through the [values.yaml](values.yaml) file. It has several commented out suggested values.
+```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.
+
+### Upgrading from 2.x.x to 3.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

charts/esphome/ci/ct-values.yaml

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

charts/esphome/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 "esphome.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 "esphome.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "esphome.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 "esphome.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/esphome/templates/_helpers.tpl

@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "esphome.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 "esphome.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 "esphome.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/esphome/templates/common.yaml

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

charts/esphome/templates/deployment.yaml

@@ -1,216 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "esphome.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "esphome.name" . }}
-    helm.sh/chart: {{ include "esphome.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 "esphome.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "esphome.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 }}
-      initContainers:
-      {{- if .Values.git.enabled }}
-      - name: git-sync
-        image: "{{ .Values.git.image.repository }}:{{ .Values.git.image.tag }}"
-        imagePullPolicy: {{ .Values.git.image.pullPolicy }}
-        {{- if .Values.git.command }}
-        command:
-          {{- range .Values.git.command }}
-          - {{ . | quote }}
-          {{- end }}
-        {{- else }}
-        command: ["/bin/sh", "-c"]
-        args:
-        - set -e;
-          if [ -d "{{ .Values.git.syncPath }}/.git" ];
-          then
-            git -C "{{ .Values.git.syncPath }}" pull || true;
-          else
-            if [ "$(ls -A {{ .Values.git.syncPath }})" ]; 
-            then
-              git clone --depth 2 "{{ .Values.git.repo }}" /tmp/repo;
-              cp -rf /tmp/repo/.git "{{ .Values.git.syncPath }}";
-              cd "{{ .Values.git.syncPath }}";
-              git checkout -f;
-            else
-              git clone --depth 2 "{{ .Values.git.repo }}" "{{ .Values.git.syncPath }}";
-            fi;
-          fi;
-          if [ -f "{{ .Values.git.keyPath }}/git-crypt-key" ];
-          then
-            cd {{ .Values.git.syncPath }};
-            git-crypt unlock "{{ .Values.git.keyPath }}/git-crypt-key";
-          fi;
-        {{- end }}
-        volumeMounts:
-        - mountPath: /config
-          name: config
-        - mountPath: {{ .Values.git.keyPath }}
-          name: git-secret
-        {{- if .Values.extraVolumeMounts }}{{ toYaml .Values.extraVolumeMounts | trim | nindent 8 }}{{ end }}
-        {{- if .Values.usePodSecurityContext }}
-        securityContext:
-          runAsUser: {{ default 0 .Values.runAsUser }}
-        {{- if and (.Values.runAsUser) (.Values.fsGroup) }}
-        {{- if not (eq .Values.runAsUser 0.0) }}
-          fsGroup: {{ .Values.fsGroup }}
-        {{- end }}
-        {{- end }}
-        {{- end }}
-      {{- end }}              
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          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: /ping
-              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: /ping
-              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: /ping
-              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 | quote }}
-              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
-          {{- range .Values.hostMounts }}
-          {{- if .mountPath }}
-          - mountPath: {{ .mountPath }}
-          {{- else }}
-          - mountPath: {{ .hostPath }}
-          {{- end }}
-            name: {{ .name }}
-          {{- 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 .Values.hostMounts }}
-          securityContext:
-            privileged: true
-          {{- 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 "esphome.fullname" . }}{{- end }}
-        {{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ 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/esphome/templates/ingress.yaml

@@ -1,39 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "esphome.fullname" . -}}
-{{- $servicePort := .Values.service.port -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "esphome.name" . }}
-    helm.sh/chart: {{ include "esphome.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/esphome/templates/pvc.yaml

@@ -1,26 +0,0 @@
-{{- if .Values.persistence.enabled -}}
-{{- if not .Values.persistence.existingClaim -}}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "esphome.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "esphome.name" . }}
-    helm.sh/chart: {{ include "esphome.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/esphome/templates/service.yaml

@@ -1,56 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "esphome.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "esphome.name" . }}
-    helm.sh/chart: {{ include "esphome.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: 6052
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-{{- if .Values.service.additionalPorts }}
-    {{- .Values.service.additionalPorts | toYaml | indent 4 }}
-{{- end }}
-  selector:
-    app.kubernetes.io/name: {{ include "esphome.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}

charts/esphome/values.yaml

@@ -1,176 +1,39 @@
-# Default values for esphome.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+# Default values for Bazarr.
 
 image:
   repository: esphome/esphome
-  tag: 1.15.3
   pullPolicy: IfNotPresent
-  pullSecrets: []
+  tag: 1.15.3
 
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
+strategy:
+  type: Recreate
 
-# Probes configuration
-probes:
-  liveness:
-    enabled: true
-    scheme: HTTP
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    enabled: true
-    scheme: HTTP
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  startup:
-    enabled: false
-    scheme: HTTP
-    failureThreshold: 30
-    periodSeconds: 10
 service:
-  type: ClusterIP
-  port: 6052
-  portName: api
-  additionalPorts: []
-  # - name: homematicproxy
-  #   port: 2001
-  #   targetPort: 2001
-  annotations: {}
-  labels: {}
-  clusterIP: ""
-  ## List of IP addresses at which the hass-configurator service is available
-  ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-  ##
-  externalIPs: []
-  loadBalancerIP: ""
-  loadBalancerSourceRanges: []
-  # nodePort: 30000
-  publishNotReadyAddresses: false
+  port:
+    port: 6052
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  path: /
-  hosts:
-    - esphome.local
-  tls: []
-  #  - secretName: esphome-tls
-  #    hosts:
-  #      - esphome.local
-
-hostNetwork: false
+env: {}
+  # ESPHOME_DASHBOARD_USE_PING: true
+  # ESPHOME_DASHBOARD_RELATIVE_URL: "/"
+  # ESPHOME_QUICKWIZARD:
+  # ESPHOME_IS_HASSIO:
+  # DISABLE_HA_AUTHENTICATION:
+  # USERNAME:
+  # PASSWORD:
 
 persistence:
-  enabled: true
-  ## esphome data Persistent Volume Storage Class
-  ## If defined, storageClassName: <storageClass>
-  ## If set to "-", storageClassName: "", which disables dynamic provisioning
-  ## If undefined (the default) or set to null, no storageClassName spec is
-  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-  ##   GKE, AWS & OpenStack)
-  ##
-  # storageClass: "-"
-  ##
-  ## If you want to reuse an existing claim, you can pass the name of the PVC using
-  ## the existingClaim variable
-  # existingClaim: your-claim
-  ##
-  ## If you want to use a volume on the host machine instead of a PVC:
-  # hostPath: /path/to/the/config/folder
-  accessMode: ReadWriteOnce
-  size: 1Gi
-
-## Additional hass container environment variable
-## For instance to add a http_proxy
-##
-extraEnv: {}
-
-## Additional hass container environment variable from k8s secrets
-## For instance to add a password
-## can use `!env_var` in the esphome configuration to reference these variables
-extraEnvSecrets:
-  # Example
-  # This will set ${MQTT_PASSWORD} to the 'password' key from the 'mqtt' secret
-  # MQTT_PASSWORD:
-  #   secret: mqtt
-  #   key: password
-
-## If you'd like to provide your own Kubernetes Secret object instead of passing your values
-## individually, pass in the name of a created + populated Secret.
-## All secrets will be mounted as environment variables, with each key/value mapping to a
-## corresponding environment variable.
-##
-extraSecretForEnvFrom: []
-# - esphome-secrets
-
-# Enable pod security context (must be `true` if runAsUser or fsGroup are set)
-usePodSecurityContext: true
-# Set runAsUser to 1000 to let esphome run as non-root user.
-# When setting runAsUser to a different value than 0 also set fsGroup to the same value:
-# runAsUser: <defaults to 0>
-# fsGroup: <will be omitted in deployment if runAsUser is 0>
-
-# Mount devices or folders from the host machine. Can be used for USB device mounting.
-hostMounts: []
-  # Example
-  # - name: zha
-  #   hostPath: /dev/serial/by-id/usb-Silicon_Labs_HubZ_Smart_Home_Controller_6120245D-if01-port0
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-# Any extra volumes to define for the pod
-extraVolumes: []
-  # - name: example-name
-  #   hostPath:
-  #     path: /path/on/host
-  #     type: DirectoryOrCreate
-
-# Any extra volume mounts to define for the containers
-extraVolumeMounts: []
-#   - name: example-name
-#     mountPath: /path/in/container
-
-
-git:
-  enabled: false
-
-  image:
-    repository: k8sathome/git-crypt
-    tag: 2020.09.28
-    pullPolicy: IfNotPresent
-
-  ## Specify the command that runs in the git-sync container to pull in configuration.
-  # command: []
-
-  # Committer settings
-  user:
-    name: ""
-    email: ""
-
-  repo: ""
-  secret: git-creds
-  syncPath: /config
-  keyPath: /root/.ssh
+  config:
+    enabled: false
+    emptyDir: false
+    ## 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: ""

charts/home-assistant/.helmignore

@@ -19,5 +19,6 @@
 .project
 .idea/
 *.tmproj
+.vscode/
 # OWNERS file for Kubernetes
-OWNERS
+OWNERS

charts/home-assistant/CHANGELOG.md

@@ -4,6 +4,17 @@ 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).
 
+## [4.0.0]
+
+### Changed
+
+- Bumped bitnami/mariadb to 9.1.2 in chart deps
+
+### Removed
+
+- Appdaemon sidecar was removed and replaced by it's own chart at [charts/appdaemon](https://github.com/k8s-at-home/charts/tree/master/charts/appdaemon)
+- Configurator sidecar was removed in favor of the `code-server` sidecar. One configure sidecar to rule them all!
+
 ## [3.1.0]
 
 ### Changed
@@ -37,6 +48,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:
 
+[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
 
 [3.0.0]: https://github.com/k8s-at-home/charts/tree/home-assistant-3.0.0/charts/home-assistant

charts/home-assistant/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.118.3
 description: Home Assistant
 name: home-assistant
-version: 3.1.0
+version: 4.0.0
 keywords:
 - home-assistant
 - hass
@@ -21,14 +21,14 @@ maintainers:
   email: phil@hellmi.de
 dependencies:
 - name: postgresql
-  version: 10.1.1
+  version: 10.1.3
   repository: https://charts.bitnami.com/bitnami
   condition: postgresql.enabled
 - name: mariadb
-  version: 9.0.1
+  version: 9.1.2
   repository: https://charts.bitnami.com/bitnami
   condition: mariadb.enabled
 - name: influxdb
-  version: 1.0.0
+  version: 1.1.2
   repository: https://charts.bitnami.com/bitnami
   condition: influxdb.enabled

charts/home-assistant/README.md

@@ -103,37 +103,6 @@ The following tables lists the configurable parameters of the Home Assistant cha
 | `hostMounts.type`                               | The type to mount (optional, i.e., `Directory`)                                                                                                                                                                                           | `nil`                                  |
 | `extraEnv`                                      | Extra ENV vars to pass to the home-assistant container                                                                                                                                                                                    | `{}`                                   |
 | `extraEnvSecrets`                               | Extra env vars to pass to the home-assistant container from k8s secrets - see `values.yaml` for an example                                                                                                                                | `{}`                                   |
-| `configurator.enabled`                          | Enable the optional [configuration UI](https://github.com/danielperna84/hass-configurator)                                                                                                                                                | `false`                                |
-| `configurator.image.repository`                 | Image repository                                                                                                                                                                                                                          | `k8s-at-home/hass-configurator-docker` |
-| `configurator.image.tag`                        | Image tag                                                                                                                                                                                                                                 | `0.3.5-x86_64`                         |
-| `configurator.image.pullPolicy`                 | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                         |
-| `configurator.hassApiUrl`                       | Home Assistant API URL (e.g. 'http://home-assistant:8123/api/') - will auto-configure to proper URL if not set                                                                                                                            | ``                                     |
-| `configurator.hassApiPassword`                  | Home Assistant API Password                                                                                                                                                                                                               | ``                                     |
-| `configurator.basepath`                         | Base path of the home assistant configuration files                                                                                                                                                                                       | `/config`                              |
-| `configurator.enforceBasepath`                  | If set to true, will prevent navigation to other directories in the configurator UI                                                                                                                                                       | `true`                                 |
-| `configurator.username`                         | If this and password (below) are set, will require basic auth to access the configurator UI                                                                                                                                               | ``                                     |
-| `configurator.password`                         | If this and username (above) are set, will require basic auth to access the configurator UI. password is in the format of a sha256 hash (e.g. "test" would be "{sha256}9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08") | ``                                     |
-| `configurator.extraEnv`                         | Extra ENV vars to pass to the configuration UI                                                                                                                                                                                            | `{}`                                   |
-| `configurator.ingress.enabled`                  | Enables Ingress for the configurator UI                                                                                                                                                                                                   | `false`                                |
-| `configurator.ingress.annotations`              | Ingress annotations for the configurator UI                                                                                                                                                                                               | `{}`                                   |
-| `configurator.ingress.hosts`                    | Ingress accepted hostnames for the configurator UI                                                                                                                                                                                        | `chart-example.local`                  |
-| `configurator.ingress.tls`                      | Ingress TLS configuration for the configurator UI                                                                                                                                                                                         | `[]`                                   |
-| `configurator.strategy.type`                    | hass-configurator Deployment Strategy type                                                                                                                                                                                                | ``                                     |
-| `configurator.tolerations`                      | Toleration labels for pod assignment for the configurator UI                                                                                                                                                                              | `[]`                                   |
-| `configurator.nodeSelector`                     | Node labels for pod assignment for the configurator UI                                                                                                                                                                                    | `{}`                                   |
-| `configurator.schedulerName`                    | Use an alternate scheduler, e.g. "stork" for the configurator UI                                                                                                                                                                          | ``                                     |
-| `configurator.podAnnotations`                   | Affinity settings for pod assignment for the configurator UI                                                                                                                                                                              | `{}`                                   |
-| `configurator.resources`                        | CPU/Memory resource requests/limits for the configurator UI                                                                                                                                                                               | `{}`                                   |
-| `configurator.securityContext`                  | Security context to be added to hass-configurator pods for the configurator UI                                                                                                                                                            | `{}`                                   |
-| `configurator.service.type`                     | Kubernetes service type for the configurator UI                                                                                                                                                                                           | `ClusterIP`                            |
-| `configurator.service.port`                     | Kubernetes port where the configurator UI is exposed                                                                                                                                                                                      | `3218`                                 |
-| `configurator.service.nodePort`                 | nodePort to listen on for the configurator UI                                                                                                                                                                                             | ``                                     |
-| `configurator.service.annotations`              | Service annotations for the configurator UI                                                                                                                                                                                               | `{}`                                   |
-| `configurator.service.labels`                   | Service labels to use for the configurator UI                                                                                                                                                                                             | `{}`                                   |
-| `configurator.service.clusterIP`                | Cluster IP for the configurator UI                                                                                                                                                                                                        | ``                                     |
-| `configurator.service.externalIPs`              | External IPs for the configurator UI                                                                                                                                                                                                      | `[]`                                   |
-| `configurator.service.loadBalancerIP`           | Loadbalancer IP for the configurator UI                                                                                                                                                                                                   | ``                                     |
-| `configurator.service.loadBalancerSourceRanges` | Loadbalancer client IP restriction range for the configurator UI                                                                                                                                                                          | `[]`                                   |
 | `vscode.enabled`                                | Enable the optional [VS Code Server Sidecar](https://github.com/cdr/code-server)                                                                                                                                                          | `false`                                |
 | `vscode.image.repository`                       | Image repository                                                                                                                                                                                                                          | `codercom/code-server`                 |
 | `vscode.image.tag`                              | Image tag                                                                                                                                                                                                                                 | `3.7.2`                                |
@@ -142,7 +111,7 @@ The following tables lists the configurable parameters of the Home Assistant cha
 | `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.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`                  |
@@ -158,28 +127,6 @@ The following tables lists the configurable parameters of the Home Assistant cha
 | `vscode.service.externalIPs`                    | External IPs for the VS Code UI                                                                                                                                                                                                           | `[]`                                   |
 | `vscode.service.loadBalancerIP`                 | Loadbalancer IP for the VS Code UI                                                                                                                                                                                                        | ``                                     |
 | `vscode.service.loadBalancerSourceRanges`       | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                   |
-| `appdaemon.enabled`                             | Enable the optional [Appdaemon Sidecar](https://appdaemon.readthedocs.io/en/latest/)                                                                                                                                                      | `false`                                |
-| `appdaemon.image.repository`                    | Image repository                                                                                                                                                                                                                          | `acockburn/appdaemon`                  |
-| `appdaemon.image.tag`                           | Image tag                                                                                                                                                                                                                                 | `3.0.5`                                |
-| `appdaemon.image.pullPolicy`                    | Image pull policy                                                                                                                                                                                                                         | `IfNotPresent`                         |
-| `appdaemon.haToken`                             | Home Assistant API token - you need to generate it in your Home Assistant profile and then copy here                                                                                                                                      | ``                                     |
-| `appdaemon.extraEnv`                            | Extra ENV vars to pass to the AppDaemon container                                                                                                                                                                                         | `{}`                                   |
-| `appdaemon.configSubPath`                       | An optional subPath for the AppDaemon container's config volume mount                                                                                                                                                                     | `appdaemon`                            |
-| `appdaemon.ingress.enabled`                     | Enables Ingress for the AppDaemon UI                                                                                                                                                                                                      | `false`                                |
-| `appdaemon.ingress.annotations`                 | Ingress annotations for the AppDaemon UI                                                                                                                                                                                                  | `{}`                                   |
-| `appdaemon.ingress.hosts`                       | Ingress accepted hostnames for the AppDaemonUI                                                                                                                                                                                            | `appdaemon.local`                      |
-| `appdaemon.ingress.tls`                         | Ingress TLS configuration for the AppDaemon UI                                                                                                                                                                                            | `[]`                                   |
-| `appdaemon.resources`                           | CPU/Memory resource requests/limits for the AppDaemon                                                                                                                                                                                     | `{}`                                   |
-| `appdaemon.securityContext`                     | Security context to be added to hass-appdaemon container                                                                                                                                                                                  | `{}`                                   |
-| `appdaemon.service.type`                        | Kubernetes service type for the AppDaemon UI                                                                                                                                                                                              | `ClusterIP`                            |
-| `appdaemon.service.port`                        | Kubernetes port where the AppDaemon UI is exposed                                                                                                                                                                                         | `5050`                                 |
-| `appdaemon.service.nodePort`                    | nodePort to listen on for the AppDaemon UI                                                                                                                                                                                                | ``                                     |
-| `appdaemon.service.annotations`                 | Service annotations for the AppDaemon UI                                                                                                                                                                                                  | `{}`                                   |
-| `appdaemon.service.labels`                      | Service labels to use for the AppDaemon UI                                                                                                                                                                                                | `{}`                                   |
-| `appdaemon.service.clusterIP`                   | Cluster IP for the AppDaemon UI                                                                                                                                                                                                           | ``                                     |
-| `appdaemon.service.externalIPs`                 | External IPs for the AppDaemon UI                                                                                                                                                                                                         | `[]`                                   |
-| `appdaemon.service.loadBalancerIP`              | Loadbalancer IP for the AppDaemon UI                                                                                                                                                                                                      | ``                                     |
-| `appdaemon.service.loadBalancerSourceRanges`    | Loadbalancer client IP restriction range for the VS Code UI                                                                                                                                                                               | `[]`                                   |
 | `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`                                |
@@ -219,18 +166,10 @@ Read through the [values.yaml](values.yaml) file. It has several commented out s
 
 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:
 
-### Configurator UI
-
-[Home Assistant Configurator UI](https://github.com/danielperna84/hass-configurator) 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.
-
 ### 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.
 
-### AppDaemon
-[AppDaemon](https://www.home-assistant.io/docs/ecosystem/appdaemon/) is added as an optional sidecar container to Home Assistant with access to the home assistant configuration `/config/appdaemon`. This allows downloading apps with [HACS](https://github.com/hacs/integration)
-[Home Assistant Configurator UI](https://github.com/danielperna84/hass-configurator) 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.
-
 ## 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:

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

@@ -1,39 +0,0 @@
-{{- if and (.Values.appdaemon.enabled) (.Values.appdaemon.ingress.enabled) }}
-{{- $fullName := include "home-assistant.fullname" . -}}
-{{- $servicePort := .Values.appdaemon.service.port -}}
-{{- $ingressPath := .Values.appdaemon.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}-appdaemon
-  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.appdaemon.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.appdaemon.ingress.tls }}
-  tls:
-  {{- range .Values.appdaemon.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.appdaemon.ingress.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $servicePort }}
-  {{- end }}
-{{- end }}

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

@@ -1,39 +0,0 @@
-{{- if and (.Values.configurator.enabled) (.Values.configurator.ingress.enabled) }}
-{{- $fullName := include "home-assistant.fullname" . -}}
-{{- $servicePort := .Values.configurator.service.port -}}
-{{- $ingressPath := .Values.configurator.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}-configurator
-  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.configurator.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.configurator.ingress.tls }}
-  tls:
-  {{- range .Values.configurator.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.configurator.ingress.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $servicePort }}
-  {{- end }}
-{{- end }}

charts/home-assistant/templates/deployment.yaml

@@ -188,90 +188,6 @@ spec:
             privileged: true
             allowPrivilegeEscalation: true
           {{- end }}
-        {{- if .Values.configurator.enabled }}
-        - name: configurator
-          image: "{{ .Values.configurator.image.repository }}:{{ .Values.configurator.image.tag }}"
-          imagePullPolicy: {{ .Values.configurator.image.pullPolicy }}
-          ports:
-            - name: configurator
-              containerPort: {{ .Values.configurator.service.port }}
-              protocol: TCP
-          env:
-            {{- if .Values.configurator.hassApiPassword }}
-            - name: HC_HASS_API_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "home-assistant.fullname" . }}-configurator
-                  key: hass-api-password
-            {{- end }}
-            {{- if and (.Values.configurator.username) (.Values.configurator.password) }}
-            - name: HC_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "home-assistant.fullname" . }}-configurator
-                  key: username
-            - name: HC_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "home-assistant.fullname" . }}-configurator
-                  key: password
-            {{- end }}
-            {{- if .Values.configurator.hassApiUrl }}
-            - name: HC_HASS_API
-              value: "{{ .Values.configurator.hassApiUrl }}"
-            {{- else }}
-            - name: HC_HASS_API
-              value: "http://127.0.0.1:8123/api/"
-            {{- end }}
-            {{- if .Values.configurator.basepath }}
-            - name: HC_BASEPATH
-              value: "{{ .Values.configurator.basepath }}"
-            {{- end }}
-            {{- if .Values.configurator.enforceBasepath }}
-            - name: HC_ENFORCE_BASEPATH
-              value: "{{ .Values.configurator.enforceBasepath }}"
-            {{- end }}
-            {{- if .Values.git.enabled }}
-            - name: HC_GIT
-              value: "true"
-            {{ 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.configurator.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.configurator.resources | indent 12 }}
-        {{- end }}
         {{- if .Values.vscode.enabled }}
         - name: vscode
           image: "{{ .Values.vscode.image.repository }}:{{ .Values.vscode.image.tag }}"
@@ -330,65 +246,6 @@ spec:
           resources:
 {{ toYaml .Values.vscode.resources | indent 12 }}
         {{- end }}
-        {{- if .Values.appdaemon.enabled }}
-        - name: appdaemon
-          image: "{{ .Values.appdaemon.image.repository }}:{{ .Values.appdaemon.image.tag }}"
-          imagePullPolicy: {{ .Values.appdaemon.image.pullPolicy }}
-          ports:
-            - name: appdaemon
-              containerPort: {{ .Values.appdaemon.service.port }}
-              protocol: TCP
-          env:
-            - name: HA_URL
-              value: "http://localhost:{{ .Values.service.port }}"
-            {{- if .Values.appdaemon.ingress.enabled }}
-            - name: DASH_URL
-              #value: http{{ if .Values.appdaemon.ingress.tls }}s{{ end }}://{{ index .Values.appdaemon.ingress.hosts 0 }}
-              value: http://0.0.0.0:{{ .Values.appdaemon.service.port }}
-            {{- end }}
-            {{- if .Values.appdaemon.haToken }}
-            - name: TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "home-assistant.fullname" . }}-appdaemon
-                  key: token
-            {{- 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: /ha-conf
-            name: config
-            subPath: {{ default "" .Values.persistence.configSubPath }}
-          - mountPath: /conf
-            subPath: {{ default "appdaemon" .Values.appdaemon.configSubPath }}
-            name: config
-          {{- 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.appdaemon.resources | indent 12 }}
-        {{- end }}
       volumes:
       - name: config
       {{- if .Values.persistence.enabled }}

charts/home-assistant/templates/secret.yaml

@@ -1,27 +1,3 @@
-{{- if .Values.configurator.enabled }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "home-assistant.fullname" . }}-configurator
-  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 }}
-type: Opaque
-data:
-  {{- if .Values.configurator.hassApiPassword }}
-  hass-api-password: {{ .Values.configurator.hassApiPassword | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.configurator.username }}
-  username: {{ .Values.configurator.username | b64enc | quote }}
-  {{- end }}
-  {{- if .Values.configurator.password }}
-  password: {{ .Values.configurator.password | b64enc | quote }}
-  {{- end }}
-{{- end }}
-
 {{- if .Values.vscode.enabled }}
 ---
 apiVersion: v1
@@ -39,21 +15,3 @@ data:
   password: {{ .Values.vscode.password | b64enc | quote }}
   {{- end }}
 {{- end }}
-
-{{- if .Values.appdaemon.enabled }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "home-assistant.fullname" . }}-appdaemon
-  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 }}
-type: Opaque
-data:
-  {{- if .Values.appdaemon.haToken }}
-  token: {{ .Values.appdaemon.haToken | b64enc | quote }}
-  {{- end }}
-{{- end }}

charts/home-assistant/templates/service.yaml

@@ -48,15 +48,6 @@ spec:
 {{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
       nodePort: {{.Values.service.nodePort}}
 {{ end }}
-{{- if .Values.configurator.enabled }}
-    - name: configurator
-      port: {{ .Values.configurator.service.port }}
-      protocol: TCP
-      targetPort: 3218
-{{ if (and (eq .Values.configurator.service.type "NodePort") (not (empty .Values.configurator.service.nodePort))) }}
-      nodePort: {{.Values.configurator.service.nodePort}}
-{{ end }}
-{{- end }}
 {{- if .Values.vscode.enabled }}
     - name: vscode
       port: {{ .Values.vscode.service.port }}
@@ -66,15 +57,6 @@ spec:
       nodePort: {{.Values.vscode.service.nodePort}}
 {{ end }}
 {{- end }}
-{{- if .Values.appdaemon.enabled }}
-    - name: appdaemon
-      port: {{ .Values.appdaemon.service.port }}
-      protocol: TCP
-      targetPort: 5050
-{{ if (and (eq .Values.appdaemon.service.type "NodePort") (not (empty .Values.appdaemon.service.nodePort))) }}
-      nodePort: {{.Values.appdaemon.service.nodePort}}
-{{ end }}
-{{- end }}
 {{- if .Values.service.additionalPorts }}
     {{- .Values.service.additionalPorts | toYaml | indent 4 }}
 {{- end }}

charts/home-assistant/values.yaml

@@ -30,6 +30,7 @@ probes:
     scheme: HTTP
     failureThreshold: 30
     periodSeconds: 10
+
 service:
   type: ClusterIP
   port: 8123
@@ -157,63 +158,6 @@ hostMounts: []
   # - name: zha
   #   hostPath: /dev/serial/by-id/usb-Silicon_Labs_HubZ_Smart_Home_Controller_6120245D-if01-port0
 
-configurator:
-  enabled: false
-
-  ## hass-configurator container image
-  ##
-  image:
-    repository: causticlab/hass-configurator-docker
-    tag: 0.3.5-x86_64
-    pullPolicy: IfNotPresent
-
-  ## URL for the home assistant API endpoint
-  # hassApiUrl: http://home-assistant:8123/api/
-  ## home assistant API password
-  # hassApiPassword:
-  ## path where the home assistant configuration is stored
-  basepath: /config
-  ## don't allow switching out of the base path
-  enforceBasepath: true
-  ## username for basic auth for accessing the configurator
-  # username:
-  ## password (sha256-hash) for basic auth for accessing the configurator
-  ## For example "test" would be "{sha256}9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
-  # password:
-
-  ## Additional hass-configurator container environment variable
-  ## For instance to add a http_proxy
-  ##
-  extraEnv: {}
-
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - home-assistant.local
-    tls: []
-    #  - secretName: home-assistant-tls
-    #    hosts:
-    #      - home-assistant.local
-
-  service:
-    type: ClusterIP
-    port: 3218
-    annotations: {}
-    labels: {}
-    clusterIP: ""
-    ## List of IP addresses at which the hass-configurator service is available
-    ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-    ##
-    externalIPs: []
-    loadBalancerIP: ""
-    loadBalancerSourceRanges: []
-    # externalTrafficPolicy: Local
-    # nodePort: 30000
-
 ## Add support for Prometheus
 # settings has to be enabled in configuration.yaml
 # https://www.home-assistant.io/components/prometheus/
@@ -300,55 +244,37 @@ vscode:
     loadBalancerSourceRanges: []
     # nodePort: 30000
 
-appdaemon:
-  enabled: false
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
 
-  ## code-server container image
-  ##
-  image:
-    repository: acockburn/appdaemon
-    tag: 3.0.5
-    pullPolicy: IfNotPresent
+nodeSelector: {}
 
-  ## Home Assistant API token
-  # haToken:
+tolerations: []
 
-  ## Additional hass-vscode container environment variable
-  ## For instance to add a http_proxy
-  ##
-  extraEnv: {}
+affinity: {}
 
-  # If you use an existingClaim for the config volume then it is sometimes useful to specify a subPath
-  # within the volume to mount instead of mounting the root.
-  # This allows several charts to share a common volume. For example for configurations.
-  # configSubPath: configs/hass/appdaemon
+podAnnotations: {}
 
-  ingress:
-    enabled: false
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    path: /
-    hosts:
-      - appdaemon.local
-    tls: []
-    #  - secretName: appdaemon-tls
-    #    hosts:
-    #      - appdaemon.local
+# Any extra volumes to define for the pod
+extraVolumes: []
+  # - name: example-name
+  #   hostPath:
+  #     path: /path/on/host
+  #     type: DirectoryOrCreate
 
-  service:
-    type: ClusterIP
-    port: 5050
-    annotations: {}
-    labels: {}
-    clusterIP: ""
-    ## List of IP addresses at which the hass-appdaemon service is available
-    ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-    ##
-    externalIPs: []
-    loadBalancerIP: ""
-    loadBalancerSourceRanges: []
-    # nodePort: 30000
+# Any extra volume mounts to define for the containers
+extraVolumeMounts: []
+#   - name: example-name
+#     mountPath: /path/in/container
 
 # Enabled mariadb
 # ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
@@ -387,36 +313,3 @@ influxdb:
     enabled: false
     # storageClass: ""
     # size: 8Gi
-
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-# Any extra volumes to define for the pod
-extraVolumes: []
-  # - name: example-name
-  #   hostPath:
-  #     path: /path/on/host
-  #     type: DirectoryOrCreate
-
-# Any extra volume mounts to define for the containers
-extraVolumeMounts: []
-#   - name: example-name
-#     mountPath: /path/in/container

charts/lychee/.helmignore

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

charts/lychee/Chart.yaml

@@ -0,0 +1,21 @@
+apiVersion: v2
+appVersion: 4.0.8
+description: Lychee is a free photo-management tool, which runs on your server or web-space
+name: lychee
+version: 1.0.1
+keywords:
+  - lychee
+  - photo
+  - pictures
+home: https://github.com/k8s-at-home/charts/tree/master/charts/lychee
+icon: https://github.com/LycheeOrg/Lychee/blob/master/Banner.png?raw=true
+sources:
+  - https://github.com/LycheeOrg/Lychee
+  - https://hub.docker.com/r/lycheeorg/lychee
+maintainers:
+  - name: auricom
+    email: k8s-at-home@xpander.eml.cc
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0

charts/lychee/OWNERS

@@ -0,0 +1,4 @@
+approvers:
+- auricom
+reviewers:
+- auricom

charts/lychee/README.md

@@ -0,0 +1,67 @@
+# Lychee
+
+This is a helm chart for [Lychee](https://github.com/LycheeOrg/Lychee).
+
+**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/lychee
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/lychee
+```
+
+## 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/lychee/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 lychee \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/lychee
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install lychee k8s-at-home/lychee --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 1.0.1 -> 2.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

charts/lychee/ci/ct-values.yaml

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

charts/lychee/templates/NOTES.txt

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

charts/lychee/templates/common.yaml

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

charts/lychee/values.yaml

@@ -0,0 +1,70 @@
+# Default values for Lychee.
+
+image:
+  repository: lycheeorg/lychee-laravel
+  pullPolicy: IfNotPresent
+  tag: v4.0.8
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 80
+
+env: {}
+  # PHP_TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
+
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
+    mountPath: /conf
+    ## 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: ""
+
+  uploads:
+    enabled: false
+    emptyDir: false
+    mountPath: /uploads
+    ## 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: ""
+
+  sym:
+    enabled: false
+    emptyDir: false
+    mountPath: /sym
+    ## 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: ""

charts/monica/Chart.yaml

@@ -0,0 +1,23 @@
+apiVersion: v2
+appVersion: v2.19.1
+description: A Personal Relationship Management tool to help you organize your social life
+name: monica
+version: 1.2.0
+keywords:
+  - crm
+home: https://www.monicahq.com/
+icon: https://pbs.twimg.com/profile_images/951820722191720450/mtCNuIXX.jpg
+sources:
+  - https://github.com/monicahq/monica
+  - https://hub.docker.com/_/monica
+maintainers:
+  - name: billimek
+    email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0
+  - name: mariadb
+    version: 9.1.4
+    repository: https://charts.bitnami.com/bitnami
+    condition: mariadb.enabled

charts/monica/OWNERS

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

charts/monica/README.md

@@ -0,0 +1,68 @@
+# Monica
+
+This is a helm chart for [Monica](https://github.com/monicahq/monica).
+
+**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)**
+
+This chart supports many different environment variables. See the [Monica Documentation](https://raw.githubusercontent.com/monicahq/monica/master/.env.example) for more information.
+## TL;DR;
+
+```shell
+$ helm repo add k8s-at-home https://k8s-at-home.com/charts/
+$ helm install k8s-at-home/moica
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/monica
+```
+
+## 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/monica/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 monica \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/monica
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install monica k8s-at-home/monica --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/monica/ci/ct-values.yaml

@@ -0,0 +1,17 @@
+env:
+  APP_ENV: production
+  APP_KEY: pG335ncsoY7z18CLdpXOp0JXGYKMtFa1
+  APP_URL: https://crm.k8s-at-home.com
+  DB_HOST: monica-mariadb
+  DB_DATABASE: monica
+  DB_USERNAME: monica
+  DB_PASSWORD: monicapass
+
+ingress:
+  enabled: true
+
+fullnameOverride: monica
+
+mariadb:
+  enabled: true
+  fullnameOverride: monica-mariadb

charts/monica/templates/NOTES.txt

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

charts/monica/templates/common.yaml

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

charts/monica/values.yaml

@@ -0,0 +1,45 @@
+# Default values for Monica.
+
+image:
+  repository: monica
+  pullPolicy: IfNotPresent
+  tag: 2.19.1-apache
+
+strategy:
+  type: Recreate
+
+service:
+  port:
+    port: 80
+
+env: {}
+  # See the Monica documentation for all available options for environment variables: https://raw.githubusercontent.com/monicahq/monica/master/.env.example
+  # APP_ENV: production
+  # Generate a different APP_KEY with `pwgen -s 32 1`
+  # APP_KEY: pG335ncsoY7z18CLdpXOp0JXGYKMtFa1
+  # APP_URL: https://crm.k8s-at-home.com
+  # DB_HOST: monica-mariadb
+  # DB_DATABASE: monica
+  # DB_USERNAME: monica
+  # DB_PASSWORD: monicapass
+
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
+    mountPath: /var/www/html/storage
+
+# Enabled mariadb
+# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/mariadb
+mariadb:
+  enabled: false
+  architecture: standalone
+  auth:
+    database: monica
+    username: monica
+    password: monicapass
+    rootPassword: monicarootpass
+  primary:
+    persistence:
+      enabled: false
+      # storageClass: ""

charts/navidrome/.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/
+.vscode/
+*.tmproj
+# OWNERS file for Kubernetes
+OWNERS

charts/navidrome/Chart.yaml

@@ -0,0 +1,21 @@
+apiVersion: v2
+appVersion: 0.39.0
+description: Navidrome is an open source web-based music collection server and streamer
+name: navidrome
+version: 1.0.1
+keywords:
+  - navidrome
+  - music
+  - streaming
+home: https://github.com/k8s-at-home/charts/tree/master/charts/navidrome
+icon: https://github.com/deluan/navidrome/blob/master/ui/src/icons/android-icon-72x72.png?raw=true
+sources:
+  - https://github.com/deluan/navidrome
+  - https://hub.docker.com/r/deluan/navidrome
+maintainers:
+  - name: auricom
+    email: k8s-at-home@xpander.eml.cc
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: 1.7.0

charts/navidrome/OWNERS

@@ -0,0 +1,4 @@
+approvers:
+- auricom
+reviewers:
+- auricom

charts/navidrome/README.md

@@ -0,0 +1,67 @@
+# Navidrome
+
+This is a helm chart for [Navidrome](https://github.com/deluan/navidrome).
+
+**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/navidrome
+```
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/navidrome
+```
+
+## 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/navidrome/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 navidrome \
+  --set env.TZ="America/New_York" \
+    k8s-at-home/navidrome
+```
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
+```console
+helm install navidrome k8s-at-home/navidrome --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 1.0.1 -> 2.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.

charts/navidrome/ci/ct-values.yaml

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

charts/navidrome/templates/NOTES.txt

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

charts/navidrome/templates/common.yaml

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