[aaisp-exporter] New Chart

[hg612-exporter] Switch to own container image version
[hg612-exporter] New chart (#29 )
2025-12-16 19:42:15 +00:00 · 2021-12-06 17:46:42 +00:00 · 2021-12-05 09:12:13 +00:00 · 2021-12-05 08:34:04 +00:00 · 2021-12-05 07:47:35 +00:00 · 2021-12-05 07:44:50 +00:00
92 changed files with 2299 additions and 1355 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+
+# EditorConfig helps us maintain consistent formatting on non-source files.
+# Visit https://editorconfig.org/ for details on how to configure your editor to respect these settings.
+
+# This is the terminal .editorconfig in this repository.
+root = true
+
+
+[*]
+indent_style = space
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+
+[*.{yaml,yml}]
+indent_size = 2
--- a/.github/ct.yaml
+++ b/.github/ct.yaml
@@ -0,0 +1,10 @@
+remote: origin
+target-branch: master
+chart-dirs:
+- charts
+excluded-charts:
+chart-repos:
+- bitnami=https://charts.bitnami.com/bitnami
+- k8s-at-home-libraries=https://library-charts.k8s-at-home.com
+- k8s-at-home=https://k8s-at-home.com/charts
+- jetstack=https://charts.jetstack.io
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -0,0 +1,48 @@
+{
+  "enabled": true,
+  "dependencyDashboard": true,
+  "dependencyDashboardTitle": "Renovate Dashboard",
+  "suppressNotifications": ["prIgnoreNotification"],
+  "rebaseWhen": "conflicted",
+  "prConcurrentLimit": 5,
+  "helm-values": {
+    "enabled": false
+  },
+  "helmv3": {
+    "fileMatch": ["charts/.+/Chart\\.yaml$"]
+  },
+  "packageRules": [
+    {
+      "datasources": ["helm"],
+      "commitMessageTopic": "Helm chart {{depName}}",
+      "separateMinorPatch": true
+    },
+    {
+      "datasources": ["docker"],
+      "commitMessageTopic": "Docker image {{depName}}",
+      "separateMinorPatch": true
+    },
+    {
+      "commitMessagePrefix": "[{{{parentDir}}}]",
+      "branchTopic": "{{{parentDir}}}-{{{depNameSanitized}}}-{{{newMajor}}}{{#if isPatch}}.{{{newMinor}}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
+      "updateTypes": ["major"],
+      "bumpVersion": "major",
+      "labels": ["dependency/major"],
+      "excludePackageNames": ["common"],
+    },
+    {
+      "updateTypes": ["minor"],
+      "bumpVersion": "minor",
+      "labels": ["dependency/minor"],
+      "excludePackageNames": ["common"],
+      "groupName": ["external minor dep"],
+    },
+    {
+      "updateTypes": ["patch"],
+      "bumpVersion": "patch",
+      "labels": ["dependency/patch"],
+      "excludePackageNames": ["common"],
+      "groupName": ["external patch dep"],
+    }
+  ]
+}
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -7,21 +7,43 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.6.3
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.1.0
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi

      - name: Run chart-testing (lint)
-        id: lint
-        uses: helm/chart-testing-action@v1.0.0-alpha.3
-        with:
-          command: lint
+        run: ct lint --config .github/ct.yaml

-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-alpha.3
+      - name: Create k3d cluster
+        uses: nolar/setup-k3d-k3s@v1
        with:
-          install_local_path_provisioner: true
-        if: steps.lint.outputs.changed == 'true'
+          version: v1.19
+        if: steps.list-changed.outputs.changed == 'true'
+
+      - name: Remove node taints
+        run: |
+          kubectl taint --all=true nodes node.cloudprovider.kubernetes.io/uninitialized- || true

      - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0-alpha.3
-        with:
-          command: install
+        run: ct install --config .github/ct.yaml
+        if: steps.list-changed.outputs.changed == 'true'
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,28 +10,22 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0

      - name: Configure Git
        run: |
          git config user.name "$GITHUB_ACTOR"
          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

-      # See https://github.com/helm/chart-releaser-action/issues/6
      - name: Install Helm
-        run: |
-          curl -sSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get
-          chmod 700 get_helm.sh
-          ./get_helm.sh
-          helm init --client-only
-
-      - name: Add dependency chart repos
-        run: |
-          helm repo add stable https://kubernetes-charts.storage.googleapis.com/
-          helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0

      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.0.0-alpha.2
+        uses: helm/chart-releaser-action@v1.2.1
        with:
          charts_repo_url: https://nikdoof.github.io/helm-charts
        env:
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+charts/*/charts/*.tgz
+Chart.lock
--- a/README.md
+++ b/README.md
@@ -0,0 +1,32 @@
+# Helm Charts
+
+A small set of custom Helm charts to cover some smaller applications not covered by Stable and other repos.
+
+[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![](https://github.com/nikdoof/helm-charts/workflows/Release%20Charts/badge.svg?branch=master)](https://github.com/nikdoof/helm-charts/actions)
+
+## Usage
+
+[Helm](https://helm.sh) must be installed to use the charts.
+Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
+
+Once Helm is set up properly, add the repo as follows:
+
+```console
+helm repo add nikdoof https://nikdoof.github.io/helm-charts/
+```
+
+You can then run `helm search nikdoof` to see the charts.
+
+## Charts
+
+See [charts folder](./charts) for a complete list.
+
+* [aaisp2mqtt](./charts/aaisp2mqtt) - A tool to pull information from [Andrews & Arnold](https://www.aa.net.uk/) CHAOSv2 API and output to MQTT
+* [idrac6](./charts/idrac6) - A VNC/Web UI container to wrap around the outdated Java/KVM solution in Dell iDRAC6, and make it HTML5.
+* [vsphere-influxdb-go](./charts/vsphere-influxdb-go) - A vSphere statistics exporter that outputs to InfluxDB.
+* [zigbee2mqttassistant](./charts/zigbee2mqttassistant) - A WebUI for Zigbee2MQTT
+
+## License
+
+[MIT License](./LICENSE)
--- a/charts/aaisp-exporter/.helmignore
+++ b/charts/aaisp-exporter/.helmignore
@@ -0,0 +1,26 @@
+# 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
+# helm-docs templates
+*.gotmpl
--- a/charts/aaisp-exporter/Chart.yaml
+++ b/charts/aaisp-exporter/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v2
+appVersion: 0.0.1
+description: A prometheus exporter for the aaisp modem
+name: aaisp-exporter
+version: 0.0.2
+kubeVersion: ">=1.16.0-0"
+keywords:
+- aaisp-exporter
+home: https://github.com/nikdoof/helm-charts/tree/master/charts/aaisp-exporter
+sources:
+- https://github.com/nikdoof/aaisp-exporter-docker
+maintainers:
+- name: nikdoof
+  email: andy@tensixtyone.com
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 4.2.0
--- a/charts/aaisp-exporter/README.md
+++ b/charts/aaisp-exporter/README.md
@@ -0,0 +1,118 @@
+# aaisp-exporter
+
+![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+
+A prometheus exporter for the aaisp modem
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/nikdoof/aaisp-exporter-docker>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.2.0 |
+
+## TL;DR
+
+```console
+helm repo add nikdoof-helm-charts https://nikdoof.github.io/helm-charts/
+helm repo update
+helm install aaisp-exporter nikdoof-helm-charts/aaisp-exporter
+```
+
+## Installing the Chart
+
+To install the chart with the release name `aaisp-exporter`
+
+```console
+helm install aaisp-exporter nikdoof-helm-charts/aaisp-exporter
+```
+
+## Uninstalling the Chart
+
+To uninstall the `aaisp-exporter` deployment
+
+```console
+helm uninstall aaisp-exporter
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install aaisp-exporter \
+  --set modem.host="192.168.1.1"\
+    nikdoof-helm-charts/aaisp-exporter
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install aaisp-exporter nikdoof-helm-charts/aaisp-exporter -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. See more environment variables in the [aaisp-exporter documentation](https://github.com/nikdoof/aaisp-chaos/tree/master/cmd/aaisp_exporter). |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"ghcr.io/nikdoof/aaisp-exporter"` | image repository |
+| image.tag | string | `"0.2.1"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"1m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"30s"` |  |
+| service | object | See values.yaml | Configures service settings for the chart. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
--- a/charts/aaisp-exporter/README.md.gotmpl
+++ b/charts/aaisp-exporter/README.md.gotmpl
@@ -0,0 +1,143 @@
+{{- define "custom.repository.organization" -}}
+nikdoof-helm-charts
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/nikdoof/helm-charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://nikdoof.github.io/helm-charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set modem.host="192.168.1.1"\
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}
--- a/charts/aaisp-exporter/README_CHANGELOG.md.gotmpl
+++ b/charts/aaisp-exporter/README_CHANGELOG.md.gotmpl
@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+{{- end -}}
--- a/charts/aaisp-exporter/README_CONFIG.md.gotmpl
+++ b/charts/aaisp-exporter/README_CONFIG.md.gotmpl
@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}
--- a/charts/aaisp-exporter/ci/test-values.yaml
+++ b/charts/aaisp-exporter/ci/test-values.yaml
@@ -0,0 +1,4 @@
+---
+env:
+  CHAOS_CONTROL_LOGIN: test
+  CHAOS_CONTROL_PASSWORD: test
--- a/charts/aaisp-exporter/templates/NOTES.txt
+++ b/charts/aaisp-exporter/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}
--- a/charts/aaisp-exporter/templates/common.yaml
+++ b/charts/aaisp-exporter/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
--- a/charts/aaisp-exporter/templates/prometheusrules.yaml
+++ b/charts/aaisp-exporter/templates/prometheusrules.yaml
@@ -0,0 +1,27 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: AAISPExporterAbsent
+          annotations:
+            description: AAISP Exporter has disappeared from Prometheus service discovery.
+            summary: AAISP Exporter is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}
--- a/charts/aaisp-exporter/templates/servicemonitor.yaml
+++ b/charts/aaisp-exporter/templates/servicemonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}
--- a/charts/aaisp-exporter/values.yaml
+++ b/charts/aaisp-exporter/values.yaml
@@ -0,0 +1,62 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: ghcr.io/nikdoof/aaisp-exporter
+  # -- image tag
+  tag: 0.2.1
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See more environment variables in the [aaisp-exporter documentation](https://github.com/nikdoof/aaisp-chaos/tree/master/cmd/aaisp_exporter).
+# @default -- See below
+env: {}
+
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
+service:
+  main:
+    ports:
+      http:
+        enabled: false
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: 8080
+
+ingress:
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
+
+metrics:
+  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 1m
+    scrapeTimeout: 30s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: aaispExporterAbsent
+      #   annotations:
+      #     description: aaisp Exporter has disappeared from Prometheus service discovery.
+      #     summary: aaisp Exporter is down.
+      #   expr: |
+      #     absent(up{job=~".*aaispexporter.*"} == 1)
+      #   for: 5m
+      #   labels:
+      #     severity: critical
--- a/charts/aaisp-to-mqtt/Chart.yaml
+++ b/charts/aaisp-to-mqtt/Chart.yaml
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "0.2"
-description: Pulls data from the AAISP CHAOSv2 API into MQTT
-name: aaisp-to-mqtt
-version: 0.1.0
--- a/charts/aaisp-to-mqtt/templates/cronjob.yaml
+++ b/charts/aaisp-to-mqtt/templates/cronjob.yaml
@@ -1,90 +0,0 @@
---
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: {{ include "aaisp-to-mqtt.fullname" . }}-cronjob
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-spec:
-  concurrencyPolicy: {{ .Values.cronjob.concurrencyPolicy }}
-  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
-  jobTemplate:
-    spec:
-      template:
-        metadata:
-          labels:
-            app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-            helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-            app.kubernetes.io/instance: {{ .Release.Name }}
-            app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-        spec:
-          restartPolicy: Never
-          {{- if (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
-          imagePullSecrets:
-          {{- range (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
-            - name: {{ . }}
-          {{- end }}
-          {{- end }}
-          containers:
-          - name: {{ .Chart.Name }}
-            image: "{{ default .Values.image.repository .Values.cronjob.image.repository }}:{{ default .Values.image.tag .Values.cronjob.image.tag }}"
-            imagePullPolicy: {{ default .Values.image.pullPolicy .Values.cronjob.image.pullPolicy }}
-            env:
-              - name: AAISP_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.username              
-              - name: AAISP_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: aaisp.password
-              - name: MQTT_BROKER
-                value: {{ .Values.mqtt.broker }}
-              - name: MQTT_PORT
-                value: {{- default 1883 .Values.mqtt.port }}
-            {{- .Values.mqtt.authenticated }}
-              - name: MQTT_USERNAME
-                valueFrom:
-                  secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.username           
-              - name: MQTT_PASSWORD
-                valueFrom:
-                  secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
-                    key: mqtt.password
-            {{- end }}
-              - name: MQTT_TOPIC_PREFIX
-                value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
-          resources:
-{{ toYaml (default .Values.resources .Values.cronjob.resources) | indent 16 }}
-    {{- with (default .Values.nodeSelector .Values.cronjob.nodeSelector) }}
-          nodeSelector:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with (default .Values.affinity .Values.cronjob.affinity) }}
-          affinity:
-{{ toYaml . | indent 12 }}
-    {{- end }}
-    {{- with (default .Values.tolerations .Values.cronjob.tolerations) }}
-          tolerations:
-{{ toYaml . | indent 12 }}:
-    {{- end }}
-  schedule: {{ .Values.schedule | quote }}
-  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
-  concurrencyPolicy: Forbid
-  {{- if .Values.cronjob.startingDeadlineSeconds }}
-  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
-  {{- end }}
--- a/charts/aaisp-to-mqtt/templates/secrets.yaml
+++ b/charts/aaisp-to-mqtt/templates/secrets.yaml
@@ -1,20 +0,0 @@
-{{- if Not(.Values.cronjob.existingSecretName) }}
---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: aaisp-to-mqtt-secret
-  labels:
-    app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-    helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
-type: Opaque
-data:
-  aaisp.username: {{ .Values.aaisp.username }}
-  aaisp.password: {{ .Values.aaisp.password }}
-  {{- if .Values.mqtt.authenticated }}
-  mqtt.username: {{ .Values.mqtt.username }}
-  mqtt.password: {{ .Values.mqtt.password }}
-  {{- end }}
-{{- end }}
--- a/charts/aaisp-to-mqtt/.helmignore
+++ b/charts/aaisp-to-mqtt/.helmignore
--- a/charts/aaisp2mqtt/Chart.yaml
+++ b/charts/aaisp2mqtt/Chart.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+appVersion: "0.3.1"
+description: Pulls data from the AAISP CHAOSv2 API into MQTT
+name: aaisp2mqtt
+version: 0.3.2
+keywords:
+  - aaisp
+  - mqtt
+home: https://github.com/nikdoof/aaisp2mqtt
+sources:
+  - https://hub.docker.com/r/nikdoof/aaisp2mqtt/
+  - https://github.com/natm/aaisp2mqtt
+maintainers:
+  - name: nikdoof
+    email: andy@tensixtyone.com
--- a/charts/aaisp2mqtt/ci/existingsecret-values.yaml
+++ b/charts/aaisp2mqtt/ci/existingsecret-values.yaml
@@ -0,0 +1,4 @@
+mqtt:
+  broker: localhost
+
+existingSecretName: aaisp2mqtt-secret
--- a/charts/aaisp2mqtt/ci/homeassistant-values.yaml
+++ b/charts/aaisp2mqtt/ci/homeassistant-values.yaml
@@ -0,0 +1,9 @@
+aaisp:
+  username: test1@a
+  password: TesttestTest
+
+mqtt:
+  broker: localhost
+
+homeassistant:
+  enabled: true
--- a/charts/aaisp2mqtt/ci/test-values.yaml
+++ b/charts/aaisp2mqtt/ci/test-values.yaml
@@ -0,0 +1,6 @@
+aaisp:
+  username: test1@a
+  password: TesttestTest
+
+mqtt:
+  broker: localhost
--- a/charts/aaisp-to-mqtt/templates/_helpers.tpl
+++ b/charts/aaisp-to-mqtt/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "aaisp-to-mqtt.name" -}}
+{{- define "aaisp2mqtt.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "aaisp-to-mqtt.fullname" -}}
+{{- define "aaisp2mqtt.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "aaisp-to-mqtt.chart" -}}
+{{- define "aaisp2mqtt.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

 {{/*
 Common labels
 */}}
-{{- define "aaisp-to-mqtt.labels" -}}
-app.kubernetes.io/name: {{ include "aaisp-to-mqtt.name" . }}
-helm.sh/chart: {{ include "aaisp-to-mqtt.chart" . }}
+{{- define "aaisp2mqtt.labels" -}}
+app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
+helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
@@ -47,9 +47,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "aaisp-to-mqtt.serviceAccountName" -}}
+{{- define "aaisp2mqtt.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "aaisp-to-mqtt.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "aaisp2mqtt.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
    {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
--- a/charts/aaisp2mqtt/templates/cronjob.yaml
+++ b/charts/aaisp2mqtt/templates/cronjob.yaml
@@ -0,0 +1,97 @@
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: {{ include "aaisp2mqtt.fullname" . }}-cronjob
+  {{- if .Values.deploymentAnnotations }}
+  annotations:
+    {{- range $key, $value := .Values.deploymentAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
+    helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
+spec:
+  schedule: {{ .Values.cronjob.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
+  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
+  concurrencyPolicy: {{ .Values.cronjob.concurrencyPolicy }}
+  {{- if .Values.cronjob.startingDeadlineSeconds }}
+  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
+  {{- end }}
+  jobTemplate:
+    spec:
+      backoffLimit: 0
+      template:
+        metadata:
+          labels:
+            app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
+            helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
+            app.kubernetes.io/instance: {{ .Release.Name }}
+            app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
+        spec:
+          restartPolicy: Never
+          {{- if .Values.image.pullSecrets }}
+          imagePullSecrets:
+          {{- range .Values.image.pullSecrets }}
+            - name: {{ . }}
+          {{- end }}
+          {{- end }}
+          containers:
+          - name: {{ .Chart.Name }}
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            resources:
+{{ toYaml .Values.resources | indent 16 }}
+            env:
+              - name: AAISP_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
+                    key: aaisp.username
+              - name: AAISP_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
+                    key: aaisp.password
+              - name: MQTT_BROKER
+                value: {{ .Values.mqtt.broker }}
+              - name: MQTT_PORT
+                value: "{{ default 1883 .Values.mqtt.port }}"
+            {{- if .Values.mqtt.authenticated }}
+              - name: MQTT_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
+                    key: mqtt.username
+              - name: MQTT_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "aaisp2mqtt-secret" .Values.existingSecretName }}
+                    key: mqtt.password
+            {{- end }}
+              - name: MQTT_TOPIC_PREFIX
+                value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
+            {{- if .Values.homeassistant.enabled }}
+              - name: HOMEASSISTANT_ENABLED
+                value: '{{ .Values.homeassistant.enabled }}'
+              {{- if .Values.homeassistant.discoveryPrefix }}
+              - name: HOMEASSISTANT_DISCOVERY_PREFIX
+                value: {{ .Values.homeassistant.discoveryPrefix }}
+              {{- end }}
+            {{- end }}
+    {{- with .Values.nodeSelector }}
+          nodeSelector:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+          affinity:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+          tolerations:
+{{ toYaml . | indent 12 }}:
+    {{- end }}
--- a/charts/aaisp2mqtt/templates/secrets.yaml
+++ b/charts/aaisp2mqtt/templates/secrets.yaml
@@ -0,0 +1,20 @@
+---
+{{- if not (.Values.existingSecretName) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: aaisp2mqtt-secret
+  labels:
+    app.kubernetes.io/name: {{ include "aaisp2mqtt.name" . }}
+    helm.sh/chart: {{ include "aaisp2mqtt.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "aaisp2mqtt.name" . }}
+type: Opaque
+data:
+  aaisp.username: {{ .Values.aaisp.username | b64enc }}
+  aaisp.password: {{ .Values.aaisp.password | b64enc }}
+  {{- if .Values.mqtt.authenticated }}
+  mqtt.username: {{ .Values.mqtt.username | b64enc }}
+  mqtt.password: {{ .Values.mqtt.password | b64enc }}
+  {{- end }}
+{{- end }}
--- a/charts/aaisp-to-mqtt/values.yaml
+++ b/charts/aaisp-to-mqtt/values.yaml
@@ -1,15 +1,15 @@
-# Default values for aaisp-to-mqtt.
+# Default values for aaisp2mqtt.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

 replicaCount: 1

 image:
-  repository: nikdoof/aaisp-to-mqtt
-  tag: latest
+  repository: nikdoof/aaisp2mqtt
+  tag: 0.3.1
  pullPolicy: IfNotPresent
+  # imagePullSecrets: []

-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""

@@ -19,7 +19,7 @@ fullnameOverride: ""

 ## Connection details
 ##
-aaisp:
+aaisp: {}
  # username: user1@a
  # password: password

@@ -31,16 +31,16 @@ mqtt:
  # password: kube
  # topicPrefix: aaisp

+homeassistant:
+  enabled: false
+  # discoveryPrefix: homeassistant
+
 cronjob:
-  schedule: "*/10 * * *"
+  schedule: "*/10 * * * *"
  successfulJobsHistoryLimit: 3
  failedJobsHistoryLimit: 1
  # startingDeadlineSeconds: 10
-  # imagePullSecrets: []
-  # resources: {}
-  # nodeSelector: {}
-  # tolerations: []
-  # affinity: {}
+  concurrencyPolicy: Allow

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
--- a/charts/calibre-web/Chart.yaml
+++ b/charts/calibre-web/Chart.yaml
@@ -1,16 +0,0 @@
-apiVersion: v1
-appVersion: 0.6.6-ls58
-description: A simple web viewer for Calibre libraries
-name: calibre-web
-version: 1.1.1
-keywords:
-  - calibre-web
-  - calibre
-home: https://github.com/nikdoof/home-k8s-flux/tree/master/charts/calibre-web
-icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/calibre-web-icon.png
-sources:
-  - https://hub.docker.com/r/linuxserver/calibre-web/
-  - https://github.com/janeczku/calibre-web
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com
--- a/charts/calibre-web/OWNERS
+++ b/charts/calibre-web/OWNERS
@@ -1,4 +0,0 @@
-approvers:
- nikdoof
-reviewers:
- nikdoof
--- a/charts/calibre-web/README.md
+++ b/charts/calibre-web/README.md
@@ -1,104 +0,0 @@
-# calibre-web
-
-This is a helm chart for [calibre-web](https://calibre-web.com/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/calibre-web/). This Chart is heavily based on the format used by [billimek](https://github.com/billimek/) for his collection of media related [charts](https://github.com/billimek/billimek-charts/).
-
-## TL;DR;
-
-```shell
-$ helm install ./calibre-web
-```
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-helm install --name my-release ./calibre-web
-```
-
-## 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
-
-The following tables lists the configurable parameters of the Sentry 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/).| `v2.1.39-ls32`|
-| `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
-| `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` |
-  `dockerMods`               | Enable "Docker Mods" for the Calibre-Web container | `nil` |
-| `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.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `persistence.config.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.config.accessMode`  | Persistence access mode | `ReadWriteOnce` |
-| `persistence.config.skipuninstall`  | Do not delete the pvc upon helm uninstall | `false` |
-| `persistence.books.enabled`      | Use persistent volume to store books | `true` |
-| `persistence.books.size`         | Size of persistent volume claim | `1Gi` |
-| `persistence.books.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.books.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `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 to the container | `[]` |
-| `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  | `{}` |
-
-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" \
-    ./calibre-web
-```
-
-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 ./calibre-web
-```
-
---
-**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`.
-
---
-
-Read through the [values.yaml](https://github.com/nikdoof/home-k8s-flux/blob/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.
--- a/charts/calibre-web/templates/books-pvc.yaml
+++ b/charts/calibre-web/templates/books-pvc.yaml
@@ -1,28 +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:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-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 -}}
--- a/charts/calibre-web/templates/config-pvc.yaml
+++ b/charts/calibre-web/templates/config-pvc.yaml
@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "calibre-web.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
--- a/charts/calibre-web/templates/deployment.yaml
+++ b/charts/calibre-web/templates/deployment.yaml
@@ -1,117 +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:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "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 }}"
-            {{- if .values.dockerMods }}
-            - name: DOCKER_MODS
-              value: {{ .Values.dockerMods }}
-            {{- end }}
-          volumeMounts:
-            - mountPath: /config
-              name: config
-              {{- if .Values.persistence.config.subPath }}
-              subPath: "{{ .Values.persistence.config.subPath }}"
-              {{- end }}
-            - 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 }}
--- a/charts/calibre-web/templates/service.yaml
+++ b/charts/calibre-web/templates/service.yaml
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "calibre-web.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    
--- a/charts/calibre-web/values.yaml
+++ b/charts/calibre-web/values.yaml
@@ -1,140 +0,0 @@
-# Default values for calibre-web.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: linuxserver/calibre-web
-  tag: 0.6.6-ls58
-  pullPolicy: IfNotPresent
-
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
-
-## Configure docker_mods for this container. For x86 systems you can uncomment the following
-## and enable ebook conversion tools in calbire-web
-##
-# dockerMods: linuxserver/calibre-web:calibre
-
-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
-
-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
-
-persistence:
-  config:
-    enabled: true
-    ## calibre-web configuration data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    ## If subPath is set mount a sub folder of a volume instead of the root of the volume.
-    ## This is especially handy for volume plugins that don't natively support sub mounting (like glusterfs).
-    ##
-    subPath: ""
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  books:
-    enabled: true
-    ## Directory where movies are persisted
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    ## 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: {}
--- a/charts/deluge/Chart.yaml
+++ b/charts/deluge/Chart.yaml
@@ -1,17 +0,0 @@
-apiVersion: v1
-description: Deluge is a Python BitTorrent client based on libtorrent
-name: deluge
-version: 1.1.0
-keywords:
-  - deluge
-  - libtorrent
-home: https://github.com/nikdoof/helm-charts/charts/deluge
-sources:
-  - https://hub.docker.com/r/linuxserver/deluge/
-  - https://github.com/janeczku/deluge
-dependencies: []
-maintainers:
-  - name: nikdoof
-    email: andy@tensixtyone.com
-icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/deluge-icon.png
-appVersion: 2.0.3-2201906121747ubuntu18.04.1-ls57
--- a/charts/deluge/OWNERS
+++ b/charts/deluge/OWNERS
@@ -1,4 +0,0 @@
-approvers:
- nikdoof
-reviewers:
- nikdoof
--- a/charts/deluge/README.md
+++ b/charts/deluge/README.md
@@ -1,108 +0,0 @@
-# deluge
-
-This is a helm chart for [deluge](https://deluge.com/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/deluge/). This Chart is heavily based on the format used by [billimek](https://github.com/billimek/) for his collection of media related [charts](https://github.com/billimek/billimek-charts/).
-
-## TL;DR;
-
-```shell
-$ helm install ./deluge
-```
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-```console
-helm install --name my-release ./deluge
-```
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` deployment:
-
-```console
-helm delete my-release --purge
-```
-
-The command removes all the Kubernetes components associated with the chart and deletes the release.
-
-## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                  | Description                         | Default                                                 |
-|----------------------------|-------------------------------------|---------------------------------------------------------|
-| `image.repository`         | Image repository | `linuxserver/deluge` |
-| `image.tag`                | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/deluge/tags/).| `2.0.3-2201906121747ubuntu18.04.1-ls57`|
-| `image.pullPolicy`         | Image pull policy | `IfNotPresent` |
-| `strategyType`             | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
-| `timezone`                 | Timezone the deluge instance should run as, e.g. 'America/New_York' | `UTC` |
-| `puid`                     | process userID the deluge instance should run as | `1001` |
-| `pgid`                     | process groupID the deluge instance should run as | `1001` |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment  | `60` |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment     | `5`  |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment       | `10` |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment | `60` |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment    | `5`  |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment      | `10` |
-| `webUiService.type`          | Kubernetes service type for the deluge GUI | `ClusterIP` |
-| `webUiService.port`          | Kubernetes port where the deluge GUI is exposed| `8112` |
-| `webUiService.annotations`   | Service annotations for the deluge GUI | `{}` |
-| `webUiService.labels`        | Custom labels | `{}` |
-| `webUiService.loadBalancerIP` | Loadbalance IP for the deluge GUI | `{}` |
-| `webUiService.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported)      | None
-| `btService.type`          | Kubernetes service type for the deluge Bittorrent ports | `NodePort` |
-| `btService.annotations`   | Service annotations for the deluge Bittorrent ports | `{}` |
-| `btService.labels`        | Custom labels | `{}` |
-| `btService.loadBalancerIP` | Loadbalance IP for the deluge Bittorrent ports | `{}` |
-| `btService.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported)      | None
-| `ingress.enabled`              | Enables Ingress | `false` |
-| `ingress.annotations`          | Ingress annotations | `{}` |
-| `ingress.labels`               | Custom labels                       | `{}`
-| `ingress.path`                 | Ingress path | `/` |
-| `ingress.hosts`                | Ingress accepted hostnames | `chart-example.local` |
-| `ingress.tls`                  | Ingress TLS configuration | `[]` |
-| `persistence.config.enabled`      | Use persistent volume to store configuration data | `true` |
-| `persistence.config.size`         | Size of persistent volume claim | `1Gi` |
-| `persistence.config.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.config.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `persistence.config.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.config.accessMode`  | Persistence access mode | `ReadWriteOnce` |
-| `persistence.config.skipuninstall`  | Do not delete the pvc upon helm uninstall | `false` |
-| `persistence.downloads.enabled`      | Use persistent volume to store downloads | `true` |
-| `persistence.downloads.size`         | Size of persistent volume claim | `1Gi` |
-| `persistence.downloads.existingClaim`| Use an existing PVC to persist data | `nil` |
-| `persistence.downloads.subPath`  | Mount a sub directory of the persistent volume if set | `""` |
-| `persistence.downloads.storageClass` | Type of persistent volume claim | `-` |
-| `persistence.downloads.accessMode`  | Persistence access mode | `ReadWriteOnce` |
-| `persistence.downloads.skipuninstall`  | Do not delete the pvc upon helm uninstall | `false` |
-| `persistence.extraExistingClaimMounts` | Optionally add multiple existing claims to the container | `[]` |
-| `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  | `{}` |
-
-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" \
-    ./deluge
-```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
-```console
-helm install --name my-release -f values.yaml ./deluge
-```
-
---
-**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`.
-
---
-
-Read through the [values.yaml](https://github.com/nikdoof/home-k8s-flux/blob/master/charts/deluge/values.yaml) file. It has several commented out suggested values.
--- a/charts/deluge/templates/bttcp-service.yaml
+++ b/charts/deluge/templates/bttcp-service.yaml
@@ -1,60 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "deluge.fullname" . }}-bttcp
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.btservice.labels }}
-{{ toYaml .Values.btservice.labels | indent 4 }}
-{{- end }}
-{{- with .Values.btservice.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.btservice.type "ClusterIP") (empty .Values.btservice.type)) }}
-  type: ClusterIP
-  {{- if .Values.btservice.clusterIP }}
-  clusterIP: {{ .Values.btservice.clusterIP }}
-  {{end}}
-{{- else if eq .Values.btservice.type "LoadBalancer" }}
-  type: {{ .Values.btservice.type }}
-  {{- if .Values.btservice.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.btservice.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.btservice.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.btservice.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.btservice.type }}
-{{- end }}
-{{- if .Values.btservice.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.btservice.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.btservice.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.btservice.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: daemon
-      port: 58846
-      protocol: TCP
-      targetPort: daemon
-{{ if (eq .Values.btservice.type "NodePort") }}
-      nodePort: 58846
-{{ end }}
-    - name: bt-tcp
-      port: 58946
-      protocol: TCP
-      targetPort: bt-tcp
-{{ if (eq .Values.btservice.type "NodePort") }}
-      nodePort: 58946
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    
--- a/charts/deluge/templates/btudp-service.yaml
+++ b/charts/deluge/templates/btudp-service.yaml
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "deluge.fullname" . }}-btudp
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.btservice.labels }}
-{{ toYaml .Values.btservice.labels | indent 4 }}
-{{- end }}
-{{- with .Values.btservice.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.btservice.type "ClusterIP") (empty .Values.btservice.type)) }}
-  type: ClusterIP
-  {{- if .Values.btservice.clusterIP }}
-  clusterIP: {{ .Values.btservice.clusterIP }}
-  {{end}}
-{{- else if eq .Values.btservice.type "LoadBalancer" }}
-  type: {{ .Values.btservice.type }}
-  {{- if .Values.btservice.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.btservice.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.btservice.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.btservice.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.btservice.type }}
-{{- end }}
-{{- if .Values.btservice.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.btservice.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.btservice.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.btservice.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: bt-udp
-      port: 58946
-      protocol: UDP 
-      targetPort: bt-udp
-{{ if (eq .Values.btservice.type "NodePort") }}
-      nodePort: 58946
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    
--- a/charts/deluge/templates/config-pvc.yaml
+++ b/charts/deluge/templates/config-pvc.yaml
@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "deluge.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
--- a/charts/deluge/templates/deployment.yaml
+++ b/charts/deluge/templates/deployment.yaml
@@ -1,126 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "deluge.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "deluge.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "deluge.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: 8112
-              protocol: TCP
-            - name: daemon
-              containerPort: 58846
-              protocol: TCP
-            - name: bt-tcp
-              containerPort: 58946
-              protocol: TCP
-            - name: bt-udp
-              containerPort: 58946
-              protocol: UDP
-          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 }}"
-            {{- if .values.dockerMods }}
-            - name: DOCKER_MODS
-              value: {{ .Values.dockerMods }}
-            {{- end }}
-          volumeMounts:
-            - mountPath: /config
-              name: config
-              {{- if .Values.persistence.config.subPath }}
-              subPath: "{{ .Values.persistence.config.subPath }}"
-              {{- end }}
-            - mountPath: /downloads
-              name: downloads
-            {{- if .Values.persistence.downloads.subPath }}
-              subPath: {{ .Values.persistence.downloads.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 "deluge.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-      - name: downloads
-      {{- if .Values.persistence.downloads.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.downloads.existingClaim }}{{ .Values.persistence.downloads.existingClaim }}{{- else }}{{ template "deluge.fullname" . }}-downloads{{- 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 }}
--- a/charts/deluge/templates/downloads-pvc.yaml
+++ b/charts/deluge/templates/downloads-pvc.yaml
@@ -1,28 +0,0 @@
-{{- if and .Values.persistence.downloads.enabled (not .Values.persistence.downloads.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "deluge.fullname" . }}-downloads
-  {{- if .Values.persistence.downloads.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.downloads.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.downloads.size | quote }}
-{{- if .Values.persistence.downloads.storageClass }}
-{{- if (eq "-" .Values.persistence.downloads.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.downloads.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}
--- a/charts/deluge/templates/ingress.yaml
+++ b/charts/deluge/templates/ingress.yaml
@@ -1,38 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "deluge.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.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: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}-webui
-              servicePort: http
-  {{- end }}
-{{- end }}
--- a/charts/deluge/templates/webui-service.yaml
+++ b/charts/deluge/templates/webui-service.yaml
@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "deluge.fullname" . }}-webui
-  labels:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    helm.sh/chart: {{ include "deluge.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.webuiservice.labels }}
-{{ toYaml .Values.webuiservice.labels | indent 4 }}
-{{- end }}
-{{- with .Values.webuiservice.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.webuiservice.type "ClusterIP") (empty .Values.webuiservice.type)) }}
-  type: ClusterIP
-  {{- if .Values.webuiservice.clusterIP }}
-  clusterIP: {{ .Values.webuiservice.clusterIP }}
-  {{end}}
-{{- else if eq .Values.webuiservice.type "LoadBalancer" }}
-  type: {{ .Values.webuiservice.type }}
-  {{- if .Values.webuiservice.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.webuiservice.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.webuiservice.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.webuiservice.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.webuiservice.type }}
-{{- end }}
-{{- if .Values.webuiservice.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.webuiservice.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.webuiservice.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.webuiservice.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.webuiservice.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.webuiservice.type "NodePort") (not (empty .Values.webuiservice.nodePort))) }}
-      nodePort: {{.Values.webuiservice.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "deluge.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    
--- a/charts/deluge/values.yaml
+++ b/charts/deluge/values.yaml
@@ -1,159 +0,0 @@
-# Default values for deluge.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-image:
-  repository: linuxserver/deluge
-  tag: 2.0.3-2201906121747ubuntu18.04.1-ls57
-  pullPolicy: IfNotPresent
-
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
-
-## Configure docker_mods for this container. (https://github.com/linuxserver/docker-mods)
-##
-# dockerMods: linuxserver/deluge:ssh
-
-webuiservice:
-  type: ClusterIP
-  port: 8112
-  ## 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
-
-btservice:
-  type: NodePort
-  ## 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
-
-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
-
-persistence:
-  config:
-    enabled: true
-    ## deluge configuration data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    ## If subPath is set mount a sub folder of a volume instead of the root of the volume.
-    ## This is especially handy for volume plugins that don't natively support sub mounting (like glusterfs).
-    ##
-    subPath: ""
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  downloads:
-    enabled: true
-    ## Directory where movies are persisted
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
-    ## 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: {}
--- a/charts/hg612-exporter/.helmignore
+++ b/charts/hg612-exporter/.helmignore
@@ -0,0 +1,26 @@
+# 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
+# helm-docs templates
+*.gotmpl
--- a/charts/hg612-exporter/Chart.yaml
+++ b/charts/hg612-exporter/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v2
+appVersion: 0.0.1
+description: A prometheus exporter for the HG612 modem
+name: hg612-exporter
+version: 0.0.2
+kubeVersion: ">=1.16.0-0"
+keywords:
+- hg612-exporter
+home: https://github.com/nikdoof/helm-charts/tree/master/charts/hg612-exporter
+sources:
+- https://github.com/nikdoof/hg612-exporter-docker
+maintainers:
+- name: nikdoof
+  email: andy@tensixtyone.com
+dependencies:
+- name: common
+  repository: https://library-charts.k8s-at-home.com
+  version: 4.2.0
--- a/charts/hg612-exporter/README.md
+++ b/charts/hg612-exporter/README.md
@@ -0,0 +1,122 @@
+# hg612-exporter
+
+![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+
+A prometheus exporter for the HG612 modem
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/nikdoof/hg612-exporter-docker>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.2.0 |
+
+## TL;DR
+
+```console
+helm repo add nikdoof-helm-charts https://nikdoof.github.io/helm-charts/
+helm repo update
+helm install hg612-exporter nikdoof-helm-charts/hg612-exporter
+```
+
+## Installing the Chart
+
+To install the chart with the release name `hg612-exporter`
+
+```console
+helm install hg612-exporter nikdoof-helm-charts/hg612-exporter
+```
+
+## Uninstalling the Chart
+
+To uninstall the `hg612-exporter` deployment
+
+```console
+helm uninstall hg612-exporter
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install hg612-exporter \
+  --set modem.host="192.168.1.1"\
+    nikdoof-helm-charts/hg612-exporter
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install hg612-exporter nikdoof-helm-charts/hg612-exporter -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. See more environment variables in the [hg612-exporter documentation](https://hg612-exporter.org/docs). |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"nikdoof/hg612-exporter"` | image repository |
+| image.tag | string | `"latest"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| metrics.enabled | bool | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. |
+| metrics.prometheusRule | object | See values.yaml | Enable and configure Prometheus Rules for the chart under this key. |
+| metrics.prometheusRule.rules | list | See prometheusrules.yaml | Configure additionial rules for the chart under this key. |
+| metrics.serviceMonitor.interval | string | `"1m"` |  |
+| metrics.serviceMonitor.labels | object | `{}` |  |
+| metrics.serviceMonitor.scrapeTimeout | string | `"30s"` |  |
+| modem | object | See below | Modem configuration details |
+| modem.host | string | `nil` | DNS name or IP of the HG612 modem. |
+| modem.identifier | object | `{"":null}` | Identifier to use in Prometheus for this modem. |
+| modem.interval | int | `10` | How often to collect statistics from the modem. |
+| service | object | See values.yaml | Configures service settings for the chart. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
--- a/charts/hg612-exporter/README.md.gotmpl
+++ b/charts/hg612-exporter/README.md.gotmpl
@@ -0,0 +1,143 @@
+{{- define "custom.repository.organization" -}}
+nikdoof-helm-charts
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/nikdoof/helm-charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://nikdoof.github.io/helm-charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set modem.host="192.168.1.1"\
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}
--- a/charts/hg612-exporter/README_CHANGELOG.md.gotmpl
+++ b/charts/hg612-exporter/README_CHANGELOG.md.gotmpl
@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.0]
+
+#### Added
+
+- Initial version
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+{{- end -}}
--- a/charts/hg612-exporter/README_CONFIG.md.gotmpl
+++ b/charts/hg612-exporter/README_CONFIG.md.gotmpl
@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}
--- a/charts/hg612-exporter/ci/test-values.yaml
+++ b/charts/hg612-exporter/ci/test-values.yaml
@@ -0,0 +1,4 @@
+---
+modem:
+  host: test
+  identifier: test
--- a/charts/hg612-exporter/templates/NOTES.txt
+++ b/charts/hg612-exporter/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}
--- a/charts/hg612-exporter/templates/common.yaml
+++ b/charts/hg612-exporter/templates/common.yaml
@@ -0,0 +1,15 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "hg612-exporter.harcodedValues" -}}
+command: ./app
+args:
+  - "--host={{ .Values.modem.host }}"
+  - "--identifier={{ .Values.modem.identifier }}"
+  - "--interval={{.Values.modem.interval }}"
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "hg612-exporter.harcodedValues" . | fromYaml) -}}
+
+{{/* Render the templates */}}
+{{ include "common.all" . }}
--- a/charts/hg612-exporter/templates/prometheusrules.yaml
+++ b/charts/hg612-exporter/templates/prometheusrules.yaml
@@ -0,0 +1,27 @@
+{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.prometheusRule.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  groups:
+    - name: {{ include "common.names.fullname" . }}
+      rules:
+        - alert: HG612ExporterAbsent
+          annotations:
+            description: HG612 Exporter has disappeared from Prometheus service discovery.
+            summary: HG612 Exporter is down.
+          expr: |
+            absent(up{job=~".*{{ include "common.names.fullname" . }}.*"} == 1)
+          for: 5m
+          labels:
+            severity: critical
+        {{- with .Values.metrics.prometheusRule.rules }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}
--- a/charts/hg612-exporter/templates/servicemonitor.yaml
+++ b/charts/hg612-exporter/templates/servicemonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.names.fullname" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "common.labels.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+      path: /metrics
+{{- end }}
--- a/charts/hg612-exporter/values.yaml
+++ b/charts/hg612-exporter/values.yaml
@@ -0,0 +1,72 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: nikdoof/hg612-exporter
+  # -- image tag
+  tag: 0.0.1
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See more environment variables in the [hg612-exporter documentation](https://hg612-exporter.org/docs).
+# @default -- See below
+env: {}
+
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
+service:
+  main:
+    ports:
+      http:
+        enabled: false
+      metrics:
+        enabled: true
+        protocol: TCP
+        port: 8080
+
+ingress:
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
+
+# -- Modem configuration details
+# @default -- See below
+modem:
+  # -- DNS name or IP of the HG612 modem.
+  host:
+  # -- Identifier to use in Prometheus for this modem.
+  identifier:
+  # -- How often to collect statistics from the modem.
+  interval: 10
+
+metrics:
+  # -- Enable and configure a Prometheus serviceMonitor for the chart under this key.
+  # @default -- See values.yaml
+  enabled: false
+  serviceMonitor:
+    interval: 1m
+    scrapeTimeout: 30s
+    labels: {}
+  # -- Enable and configure Prometheus Rules for the chart under this key.
+  # @default -- See values.yaml
+  prometheusRule:
+    enabled: false
+    labels: {}
+    # -- Configure additionial rules for the chart under this key.
+    # @default -- See prometheusrules.yaml
+    rules: []
+      # - alert: HG612ExporterAbsent
+      #   annotations:
+      #     description: HG612 Exporter has disappeared from Prometheus service discovery.
+      #     summary: HG612 Exporter is down.
+      #   expr: |
+      #     absent(up{job=~".*hg612exporter.*"} == 1)
+      #   for: 5m
+      #   labels:
+      #     severity: critical
--- a/charts/calibre-web/.helmignore
+++ b/charts/calibre-web/.helmignore
--- a/charts/idrac6/Chart.yaml
+++ b/charts/idrac6/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v2
+appVersion: "0.5.0"
+description: iDRAC 6 web interface and VNC proxy
+name: idrac6
+version: 1.0.1
+kubeVersion: ">=1.16.0-0"
+keywords:
+  - idrac6
+home: https://github.com/nikdoof/helm-charts/tree/master/charts/idrac6/
+sources:
+  - https://github.com/DomiStyle/docker-idrac6
+maintainers:
+  - name: nikdoof
+    email: andy@tensixtyone.com
+dependencies:
+  - name: common
+    repository: https://library-charts.k8s-at-home.com
+    version: 4.2.0
--- a/charts/idrac6/README.md
+++ b/charts/idrac6/README.md
@@ -0,0 +1,132 @@
+# idrac6
+
+![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+
+iDRAC 6 web interface and VNC proxy
+
+**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)**
+
+## Source Code
+
+* <https://github.com/DomiStyle/docker-idrac6>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.2.0 |
+
+## TL;DR
+
+```console
+helm repo add nikdoof-helm-charts https://nikdoof.github.io/helm-charts/
+helm repo update
+helm install idrac6 nikdoof-helm-charts/idrac6
+```
+
+## Installing the Chart
+
+To install the chart with the release name `idrac6`
+
+```console
+helm install idrac6 nikdoof-helm-charts/idrac6
+```
+
+## Uninstalling the Chart
+
+To uninstall the `idrac6` deployment
+
+```console
+helm uninstall idrac6
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install idrac6 \
+  --set env.IDRAC_HOST="idrac"\
+    nikdoof-helm-charts/idrac6
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install idrac6 nikdoof-helm-charts/idrac6 -f values.yaml
+```
+
+## Custom configuration
+
+N/A
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. See more environment variables in the [idrac6 documentation](https://github.com/DomiStyle/docker-idrac6). |
+| env.IDRAC_KEYCODE_HACK | string | `"false"` | Enable keycode hack |
+| env.IDRAC_PORT | int | `443` | iDRAC hostname to connect to -- iDRAC Username to use -- iDRAC password to use -- iDRAC HTTP port |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"domistyle/idrac6"` | image repository |
+| image.tag | string | `"v0.5"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
+| persistence.app | object | See values.yaml | allows caching of the required JARs in persistent storage, and allows for quicker connections. |
+| persistence.screenshots | object | See values.yaml | Screenshots took from the iDRAC client. |
+| persistence.vmedia | object | See values.yaml | Virtual media that can be connected to the iDRAC. |
+| service | object | See values.yaml | Configures service settings for the chart. |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.1]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Remove default Env values to allow for better overriding with secrets.
+
+#### Removed
+
+- N/A
+
+### [1.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Switched to the [k8s-at-home](https://docs.k8s-at-home.com/) common chart as a base.
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
--- a/charts/idrac6/README.md.gotmpl
+++ b/charts/idrac6/README.md.gotmpl
@@ -0,0 +1,143 @@
+{{- define "custom.repository.organization" -}}
+nikdoof-helm-charts
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/nikdoof/helm-charts
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://nikdoof.github.io/helm-charts/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**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)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.IDRAC_HOST="idrac"\
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- Open an [issue](https://github.com/nikdoof/helm-charts/issues/new/choose)
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}
--- a/charts/idrac6/README_CHANGELOG.md.gotmpl
+++ b/charts/idrac6/README_CHANGELOG.md.gotmpl
@@ -0,0 +1,41 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+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).
+
+### [1.0.1]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Remove default Env values to allow for better overriding with secrets.
+
+#### Removed
+
+- N/A
+
+### [1.0.0]
+
+#### Added
+
+- N/A
+
+#### Changed
+
+- Switched to the [k8s-at-home](https://docs.k8s-at-home.com/) common chart as a base.
+
+#### Removed
+
+- N/A
+
+[1.0.0]: #100
+{{- end -}}
--- a/charts/idrac6/README_CONFIG.md.gotmpl
+++ b/charts/idrac6/README_CONFIG.md.gotmpl
@@ -0,0 +1,9 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+
+N/A
+{{- end -}}
--- a/charts/idrac6/ci/test-values.yaml
+++ b/charts/idrac6/ci/test-values.yaml
@@ -0,0 +1,3 @@
+---
+env:
+  IDRAC_HOST: test
--- a/charts/idrac6/templates/NOTES.txt
+++ b/charts/idrac6/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "common.notes.defaultNotes" . -}}
--- a/charts/idrac6/templates/common.yaml
+++ b/charts/idrac6/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
--- a/charts/idrac6/values.yaml
+++ b/charts/idrac6/values.yaml
@@ -0,0 +1,63 @@
+#
+# IMPORTANT NOTE
+#
+# This chart inherits from our common library chart. You can check the default values/options here:
+# https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml
+#
+
+image:
+  # -- image repository
+  repository: domistyle/idrac6
+  # -- image tag
+  tag: v0.5
+  # -- image pull policy
+  pullPolicy: IfNotPresent
+
+# -- environment variables. See more environment variables in the [idrac6 documentation](https://github.com/DomiStyle/docker-idrac6).
+# @default -- See below
+env:
+  # -- iDRAC hostname to connect to
+  # IDRAC_HOST:
+  # -- iDRAC Username to use
+  # IDRAC_USER: root
+  # -- iDRAC password to use
+  # IDRAC_PASSWORD: calvin
+  # -- iDRAC HTTP port
+  IDRAC_PORT: 443
+  # -- Enable keycode hack
+  IDRAC_KEYCODE_HACK: 'false'
+
+# -- Configures service settings for the chart.
+# @default -- See values.yaml
+service:
+  main:
+    ports:
+      http:
+        port: 5800
+      vnc:
+        port: 5900
+
+ingress:
+  # -- Enable and configure ingress settings for the chart under this key.
+  # @default -- See values.yaml
+  main:
+    enabled: false
+
+# -- Configure persistence settings for the chart under this key.
+# @default -- See values.yaml
+persistence:
+  # -- allows caching of the required JARs in persistent storage, and allows for quicker connections.
+  # @default -- See values.yaml
+  app:
+    enabled: false
+    mountPath: /app
+  # -- Virtual media that can be connected to the iDRAC.
+  # @default -- See values.yaml
+  vmedia:
+    enabled: false
+    mountPath: /vmedia
+  # -- Screenshots took from the iDRAC client.
+  # @default -- See values.yaml
+  screenshots:
+    enabled: false
+    mountPath: /screenshots
--- a/charts/vsphere-influxdb-go/.helmignore
+++ b/charts/vsphere-influxdb-go/.helmignore
@@ -19,5 +19,4 @@
 .project
 .idea/
 *.tmproj
-# OWNERS file for Kubernetes
-OWNERS
+.vscode/
--- a/charts/vsphere-influxdb-go/Chart.yaml
+++ b/charts/vsphere-influxdb-go/Chart.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+appVersion: "0.8.5"
+description: Collect VMware vCenter and ESXi performance metrics and send them to InfluxDB
+name: vsphere-influxdb-go
+version: 0.2.2
+keywords:
+  - vsphere
+  - influxdb
+  - esx
+home: https://github.com/Oxalide/vsphere-influxdb-go
+sources:
+  - https://hub.docker.com/r/nikdoof/vsphere-influxdb-go/
+  - https://github.com/janeczku/calibre-web
+maintainers:
+  - name: nikdoof
+    email: andy@tensixtyone.com
--- a/charts/vsphere-influxdb-go/ci/test-values.yaml
+++ b/charts/vsphere-influxdb-go/ci/test-values.yaml
@@ -0,0 +1,7 @@
+vsphere:
+  hostname: vcenter
+  username: test
+  password: test
+
+influxdb:
+  hostname: test
--- a/charts/vsphere-influxdb-go/templates/_helpers.tpl
+++ b/charts/vsphere-influxdb-go/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "deluge.name" -}}
+{{- define "vsphere-influxdb-go.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "deluge.fullname" -}}
+{{- define "vsphere-influxdb-go.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,30 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "deluge.chart" -}}
+{{- define "vsphere-influxdb-go.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "vsphere-influxdb-go.labels" -}}
+app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
+helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "vsphere-influxdb-go.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "vsphere-influxdb-go.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
--- a/charts/vsphere-influxdb-go/templates/configmap.yaml
+++ b/charts/vsphere-influxdb-go/templates/configmap.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: vsphere-influxdb-go-config
+  labels:
+    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
+    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
+data:
+  config.json: |-
+{{ toJson .Values.config | indent 4}}
--- a/charts/vsphere-influxdb-go/templates/cronjob.yaml
+++ b/charts/vsphere-influxdb-go/templates/cronjob.yaml
@@ -0,0 +1,98 @@
+---
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+  name: {{ include "vsphere-influxdb-go.fullname" . }}-cronjob
+  {{- if .Values.deploymentAnnotations }}
+  annotations:
+    {{- range $key, $value := .Values.deploymentAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
+    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
+spec:
+  schedule: {{ .Values.cronjob.schedule | quote }}
+  successfulJobsHistoryLimit: {{ .Values.cronjob.successfulJobsHistoryLimit }}
+  failedJobsHistoryLimit: {{ .Values.cronjob.failedJobsHistoryLimit }}
+  concurrencyPolicy: Forbid
+  {{- if .Values.cronjob.startingDeadlineSeconds }}
+  startingDeadlineSeconds: {{ .Values.cronjob.startingDeadlineSeconds }}
+  {{- end }}
+  jobTemplate:
+    spec:
+      backoffLimit: 0
+      template:
+        metadata:
+          labels:
+            app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
+            helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
+            app.kubernetes.io/instance: {{ .Release.Name }}
+            app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
+        spec:
+          restartPolicy: Never
+          {{- if .Values.image.pullSecrets }}
+          imagePullSecrets:
+          {{- range .Values.image.pullSecrets }}
+            - name: {{ . }}
+          {{- end }}
+          {{- end }}
+          containers:
+          - name: {{ .Chart.Name }}
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+            command: ["/vsphere-influxdb-go", "-config=/config/config.json"]
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            resources:
+{{ toYaml .Values.resources | indent 16 }}
+            env:
+              - name: VSPHERE_HOSTNAME
+                value: {{ .Values.vsphere.hostname }}
+              - name: VSPHERE_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
+                    key: vsphere.username              
+              - name: VSPHERE_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
+                    key: vsphere.password
+              - name: INFLUX_HOSTNAME
+                value: {{ .Values.influxdb.hostname }}
+              - name: INFLUX_DATABASE
+                value: {{ .Values.influxdb.database }}
+            {{- if .Values.influxdb.authenticated }}
+              - name: INFLUX_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
+                    key: influxdb.username           
+              - name: INFLUX_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ default "vsphere-influxdb-go-secret" .Values.existingSecretName }}
+                    key: influxdb.password
+            {{- end }}
+            volumeMounts:
+              - name: config-volume
+                mountPath: /config
+          volumes:
+            - name: config-volume
+              configMap:
+                name: vsphere-influxdb-go-config
+
+    {{- with .Values.nodeSelector }}
+          nodeSelector:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+          affinity:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+          tolerations:
+{{ toYaml . | indent 12 }}:
+    {{- end }}
--- a/charts/vsphere-influxdb-go/templates/secrets.yaml
+++ b/charts/vsphere-influxdb-go/templates/secrets.yaml
@@ -0,0 +1,20 @@
+---
+{{- if not (.Values.existingSecretName) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: vsphere-influxdb-go-secret
+  labels:
+    app.kubernetes.io/name: {{ include "vsphere-influxdb-go.name" . }}
+    helm.sh/chart: {{ include "vsphere-influxdb-go.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "vsphere-influxdb-go.name" . }}
+type: Opaque
+data:
+  vsphere.username: {{ .Values.vsphere.username | b64enc }}
+  vsphere.password: {{ .Values.vsphere.password | b64enc }}
+  {{- if .Values.influxdb.authenticated }}
+  influxdb.username: {{ .Values.influxdb.username | b64enc }}
+  influxdb.password: {{ .Values.influxdb.password | b64enc }}
+  {{- end }}
+{{- end }}
--- a/charts/vsphere-influxdb-go/values.yaml
+++ b/charts/vsphere-influxdb-go/values.yaml
@@ -0,0 +1,155 @@
+# Default values for vsphere-influxdb-go.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nikdoof/vsphere-influxdb-go
+  tag: latest
+  pullPolicy: IfNotPresent
+  # imagePullSecrets: []
+
+nameOverride: ""
+fullnameOverride: ""
+
+## Use a pre-existing secret for login information
+##
+# existingSecretName: existing-secret
+
+## Connection details
+##
+vsphere:
+  hostname:
+  username:
+  password:
+
+influxdb:
+  hostname: http://influxdb:8086
+  authenticated: false
+  # username:
+  # password:
+  database: vmware_performance
+
+cronjob:
+  schedule: "* * * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  # startingDeadlineSeconds: 10
+
+## Configuration data that is wrote to vsphere-influxdb-go
+## If you need additional metrics then this is where you can
+## add them.
+##
+config:
+  Domain: ""
+  RemoveHostDomainName: false
+  Interval: 60
+  VCenters: []
+  InfluxDB: []
+  Metrics:
+  - ObjectType:
+    - VirtualMachine
+    - HostSystem
+    Definition:
+    - Metric: cpu.usage.average
+      Instances: "*"
+    - Metric: cpu.usage.maximum
+      Instances: "*"
+    - Metric: cpu.usagemhz.average
+      Instances: "*"
+    - Metric: cpu.usagemhz.maximum
+      Instances: "*"
+    - Metric: cpu.wait.summation
+      Instances: "*"
+    - Metric: cpu.system.summation
+      Instances: "*"
+    - Metric: cpu.ready.summation
+      Instances: "*"
+    - Metric: mem.usage.average
+      Instances: "*"
+    - Metric: mem.usage.maximum
+      Instances: "*"
+    - Metric: mem.consumed.average
+      Instances: "*"
+    - Metric: mem.consumed.maximum
+      Instances: "*"
+    - Metric: mem.active.average
+      Instances: "*"
+    - Metric: mem.active.maximum
+      Instances: "*"
+    - Metric: mem.vmmemctl.average
+      Instances: "*"
+    - Metric: mem.vmmemctl.maximum
+      Instances: "*"
+    - Metric: mem.totalCapacity.average
+      Instances: "*"
+    - Metric: net.packetsRx.summation
+      Instances: "*"
+    - Metric: net.packetsTx.summation
+      Instances: "*"
+    - Metric: net.throughput.usage.average
+      Instances: "*"
+    - Metric: net.received.average
+      Instances: "*"
+    - Metric: net.transmitted.average
+      Instances: "*"
+    - Metric: net.throughput.usage.nfs.average
+      Instances: "*"
+    - Metric: datastore.numberReadAveraged.average
+      Instances: "*"
+    - Metric: datastore.numberWriteAveraged.average
+      Instances: "*"
+    - Metric: datastore.read.average
+      Instances: "*"
+    - Metric: datastore.write.average
+      Instances: "*"
+    - Metric: datastore.totalReadLatency.average
+      Instances: "*"
+    - Metric: datastore.totalWriteLatency.average
+      Instances: "*"
+    - Metric: mem.capacity.provisioned.average
+      Instances: "*"
+    - Metric: cpu.corecount.provisioned.average
+      Instances: "*"
+  - ObjectType:
+    - VirtualMachine
+    Definition:
+    - Metric: datastore.datastoreVMObservedLatency.latest
+      Instances: "*"
+  - ObjectType:
+    - HostSystem
+    Definition:
+    - Metric: disk.maxTotalLatency.latest
+      Instances: ''
+    - Metric: disk.numberReadAveraged.average
+      Instances: "*"
+    - Metric: disk.numberWriteAveraged.average
+      Instances: "*"
+    - Metric: net.throughput.contention.summation
+      Instances: "*"
+  - ObjectType:
+    - Datastore
+    Definition:
+    - Metric: disk.capacity.latest
+      Instances: "*"
+    - Metric: disk.used.latest
+      Instances: "*"
+
+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: {}
--- a/charts/zigbee2mqttassistant/.helmignore
+++ b/charts/zigbee2mqttassistant/.helmignore
@@ -0,0 +1,22 @@
+# 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/
--- a/charts/zigbee2mqttassistant/Chart.yaml
+++ b/charts/zigbee2mqttassistant/Chart.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+appVersion: "0.3.178"
+description: A web GUI for Zigbee2Mqtt
+name: zigbee2mqttassistant
+version: 0.1.1
+keywords:
+  - zigbee
+  - mqtt
+  - homeassistant
+home: https://github.com/yllibed/Zigbee2MqttAssistant
+sources:
+  - https://hub.docker.com/r/carldebilly/zigbee2mqttassistant
+maintainers:
+  - name: nikdoof
+    email: andy@tensixtyone.com
--- a/charts/zigbee2mqttassistant/ci/default-values.yaml
+++ b/charts/zigbee2mqttassistant/ci/default-values.yaml
@@ -0,0 +1,3 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local
--- a/charts/zigbee2mqttassistant/ci/mqtt-existing.yaml
+++ b/charts/zigbee2mqttassistant/ci/mqtt-existing.yaml
@@ -0,0 +1,4 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local
+  existingSecretName: test
--- a/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml
+++ b/charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml
@@ -0,0 +1,5 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local
+  username: test
+  password: test2
--- a/charts/zigbee2mqttassistant/templates/NOTES.txt
+++ b/charts/zigbee2mqttassistant/templates/NOTES.txt
@@ -1,19 +1,21 @@
 1. Get the application URL by running these commands:
 {{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "calibre-web.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "zigbee2mqttassistant.fullname" . }})
  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
  echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "calibre-web.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "calibre-web.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "zigbee2mqttassistant.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "zigbee2mqttassistant.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:8083 to use your application"
-  kubectl port-forward $POD_NAME 8083:80
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "zigbee2mqttassistant.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:80
 {{- end }}
--- a/charts/zigbee2mqttassistant/templates/_helpers.tpl
+++ b/charts/zigbee2mqttassistant/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "calibre-web.name" -}}
+{{- define "zigbee2mqttassistant.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "calibre-web.fullname" -}}
+{{- define "zigbee2mqttassistant.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,30 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "calibre-web.chart" -}}
+{{- define "zigbee2mqttassistant.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "zigbee2mqttassistant.labels" -}}
+app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
+helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "zigbee2mqttassistant.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "zigbee2mqttassistant.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
--- a/charts/zigbee2mqttassistant/templates/deployment.yaml
+++ b/charts/zigbee2mqttassistant/templates/deployment.yaml
@@ -0,0 +1,73 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "zigbee2mqttassistant.fullname" . }}
+  labels:
+{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          #livenessProbe:
+          #  httpGet:
+          #    path: /
+          #    port: http
+          #readinessProbe:
+          #  httpGet:
+          #    path: /
+          #    port: http
+          env:
+            - name: TZ
+              value: {{ .Values.TZ }}
+            - name: Z2MA_SETTINGS__MQTTSERVER
+              value: {{ .Values.z2ma.broker }}
+            {{- if and (.Values.z2ma.username) (.Values.z2ma.password) }}
+            - name: Z2MA_SETTINGS__MQTTUSERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }}
+                  key: username
+            - name: Z2MA_SETTINGS__MQTTPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default "zigbee2mqttassistant-secret" .Values.z2ma.existingSecretName }}
+                  key: password
+            {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
--- a/charts/zigbee2mqttassistant/templates/ingress.yaml
+++ b/charts/zigbee2mqttassistant/templates/ingress.yaml
@@ -1,19 +1,20 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "calibre-web.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
+{{- $fullName := include "zigbee2mqttassistant.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
  name: {{ $fullName }}
  labels:
-    app.kubernetes.io/name: {{ include "calibre-web.name" . }}
-    helm.sh/chart: {{ include "calibre-web.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- with .Values.ingress.annotations }}
+{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
+  {{- with .Values.ingress.annotations }}
  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 {{- if .Values.ingress.tls }}
  tls:
@@ -27,12 +28,14 @@ spec:
 {{- end }}
  rules:
  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
+    - host: {{ .host | quote }}
      http:
        paths:
-          - path: {{ $ingressPath }}
+        {{- range .paths }}
+          - path: {{ . }}
            backend:
              serviceName: {{ $fullName }}
-              servicePort: http
+              servicePort: {{ $svcPort }}
+        {{- end }}
  {{- end }}
 {{- end }}
--- a/charts/zigbee2mqttassistant/templates/secrets.yaml
+++ b/charts/zigbee2mqttassistant/templates/secrets.yaml
@@ -0,0 +1,15 @@
+{{- if and (and (not (.Values.existingSecretName)) (.Values.z2ma.username)) (.Values.z2ma.password) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "zigbee2mqttassistant.name" . }}-secret
+  labels:
+    app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
+    helm.sh/chart: {{ include "zigbee2mqttassistant.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ include "zigbee2mqttassistant.name" . }}
+type: Opaque
+data:
+  username: {{ .Values.z2ma.username | b64enc }}
+  password: {{ .Values.z2ma.password | b64enc }}
+{{- end }}
--- a/charts/zigbee2mqttassistant/templates/service.yaml
+++ b/charts/zigbee2mqttassistant/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "zigbee2mqttassistant.fullname" . }}
+  labels:
+{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app.kubernetes.io/name: {{ include "zigbee2mqttassistant.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
--- a/charts/zigbee2mqttassistant/values.yaml
+++ b/charts/zigbee2mqttassistant/values.yaml
@@ -0,0 +1,77 @@
+# Default values for zigbee2mqttassistant.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: carldebilly/zigbee2mqttassistant
+  tag: 0.3.178
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+TZ: UTC
+
+## Z2MA Settings (more details: https://github.com/yllibed/Zigbee2MqttAssistant/blob/master/README.md)
+z2ma: {}
+  # broker: mqtt.svc.cluster.local
+
+  ## You can provide your MQTT username and password and a secret will be created...
+  ##
+  # username: user
+  # password: pass
+
+  ## ... or you can provide a existing secret to pull these values from
+  ##
+  # existingSecretName: mqtt-secret
+
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 8800
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
Author	SHA1	Message	Date
Andrew Williams	fcb4215a5a	[aaisp-exporter] New Chart	2021-12-06 17:46:42 +00:00
Andrew Williams	c454a5e074	[hg612-exporter] Switch to own container image version	2021-12-05 09:12:13 +00:00
Andrew Williams	47da657ac8	[hg612-exporter] New chart (#29 ) * [hg612-export] New chart * Remove default from identifier * Correct maintainer * Fix chart params	2021-12-05 08:34:04 +00:00
Andrew Williams	dd6d80ce25	Remove deluge, update README	2021-12-05 07:47:35 +00:00
Andrew Williams	d76080b813	Remove old charts	2021-12-05 07:44:50 +00:00
Andrew Williams	f05a2baf85	[idrac6] Remove default env values (#28 ) * Remove default env values * Fix lint issues	2021-12-05 06:31:57 +00:00
Andrew Williams	e259457f30	Switch iDRAC6 chart to k8s-at-home common chart (#27 ) * Switch iDRAC6 chart to k8s-at-home common chart base * Add test values and CT updates * Update build workflows * Switch to k3d * Try and work out testing issue * Try hard specifying the config * Move ct to github folder * Remove timeout * Correct config file path	2021-12-04 20:17:00 +00:00
Andrew Williams	bc3c1fa17b	Remove NFS provisioner chart (#15 ) Use https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner instead.	2021-12-04 18:52:53 +00:00
Andrew Williams	57fa6e21b1	[vsphere-influxdb-go] Fix default config, remove domain	2021-07-13 10:57:24 +01:00
Andrew Williams	cc9c5c6652	Add docker deps to Renovate	2021-07-02 16:44:56 +01:00
renovate[bot]	f99101d00b	[zigbee2mqttassistant] Update to v0.3.178 (#19 ) * Update carldebilly/zigbee2mqttassistant Docker tag to v0.3.178 * [zigbee2mqttassistant] Bump chart version * Fix secret name Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Andrew Williams <andy@tensixtyone.com>	2021-07-02 16:38:23 +01:00
renovate[bot]	1548f606e7	Update external minor dep (#24 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2021-07-02 16:15:21 +01:00
Andrew Williams	f33c104b1f	Update renovate config	2021-07-02 16:14:07 +01:00
Andrew Williams	1007982a78	[vsphere-influxdb-go] Fix default configmap (#23 )	2021-07-02 14:09:40 +01:00
renovate[bot]	bea73339d5	Update helm/chart-releaser-action action to v1.2.1 (#20 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2021-07-02 09:24:41 +01:00
renovate[bot]	644cf70b31	Add renovate.json (#18 ) Co-authored-by: Renovate Bot <bot@renovateapp.com>	2021-07-02 09:23:27 +01:00
Andrew Williams	d929f18571	[idrac6] Use secrets for iDRAC login details (#16 )	2021-05-21 12:31:30 +01:00
Andrew Williams	ff5fb746ad	Add 'idrac6' chart (#14 ) * Add idrac6 chart * Add test values	2021-05-21 11:39:37 +01:00
Andrew Williams	6aec140b79	[nfs-client-provisioner] Remove depreciation tag (#13 ) * [nfs-client-provisioner] Remove depreciation tag * [nfs-client-provisioner] Add maintainers	2021-01-01 16:18:57 +00:00
Andrew Williams	2bb2c4a7d3	Update release.yaml	2021-01-01 13:47:48 +00:00
Andrew Williams	a29c9d7cff	[nfs-client-provisioner] Import from helm/stable repo (#11 ) * Import nfs-client-provisioner from helm/stable repo * Update chart testing * Correct testing	2021-01-01 13:46:14 +00:00
Andrew Williams	343a41b2e7	[aaisp2mqtt] Bump default version (#10 )	2020-10-01 07:20:40 +01:00
Andrew Williams	c38645c597	[aaisp2mqtt] Fix concurrency for the cronjob (#9 ) * [aaisp2mqtt] Fix cronjob concurrency * [aaisp2mqtt] Bump chart version	2020-08-30 07:16:57 +01:00
Andrew Williams	c38382eb5f	Merge pull request #7 from nikdoof/zigbee2mqttassistant New Module - zigbee2mqttassistant	2020-05-24 11:07:36 +01:00
Andrew Williams	083e8bd0e6	[zigbee2mqttassistant] Correct lint issues	2020-05-22 21:55:33 +01:00
Andrew Williams	4fcba6be6c	Merge pull request #6 from nikdoof/aaisp2mqtt Add aaisp2mqtt	2020-05-16 16:54:25 +01:00
Andrew Williams	9fa7c5254d	Add aaisp2mqtt	2020-05-16 16:45:13 +01:00
Andrew Williams	1c8b3a7a94	New Module - zigbee2mqttassistant	2020-05-16 16:26:07 +01:00
Andrew Williams	f67ffc9a81	Merge pull request #5 from nikdoof/config-improvements vsphere-influxdb-go: Improve configuration	2020-05-08 10:53:34 +01:00
Andrew Williams	5e16f5a805	[vsphere-influxdb-go] Build config.json from values	2020-05-08 10:43:58 +01:00
Andrew Williams	8b67ed8628	Merge pull request #4 from nikdoof/vsphere-influxdb-go-testing Add Chart Testing and fixes for Deluge	2020-05-07 21:55:29 +01:00
Andrew Williams	0da018df2f	Deluge fixes for #3	2020-05-07 21:47:48 +01:00
Andrew Williams	4dc7b0f9f2	Bump versions	2020-05-07 21:20:04 +01:00
Andrew Williams	4f8a41ab16	Fix all lint issues	2020-05-07 21:17:52 +01:00
Andrew Williams	10a68e25b9	Add missing newlines	2020-05-07 21:04:29 +01:00
Andrew Williams	c1461dd083	Update Chart.yaml files	2020-05-07 21:02:53 +01:00
Andrew Williams	338beeead8	Add chart testing	2020-05-07 20:46:16 +01:00
Andrew Williams	365626339a	Update documentation	2020-05-07 19:55:03 +01:00
Andrew Williams	9a55b3f92c	Merge pull request #1 from nikdoof/deluge-dockermods-fix [deluge] Fix DockerMods	2020-05-07 17:13:36 +01:00
Andrew Williams	9701be4c26	Merge pull request #2 from nikdoof/calibre-web-fixes [calibre-web] Fix DockerMods value	2020-05-07 16:46:25 +01:00
Andrew Williams	67b78606aa	[deluge] Add missing CR at the end of Chart.yaml	2020-05-07 16:42:38 +01:00
Andrew Williams	c912051b78	[calibre-web] Fix DockerMods value	2020-05-07 16:39:01 +01:00
Andrew Williams	c9e3c402ad	[deluge] Fix DockerMods	2020-05-07 16:38:26 +01:00
Andrew Williams	b26a4822da	Revert lint testing changes	2020-05-07 16:33:35 +01:00
Andrew Williams	1f8d744ce0	Enable chart testing for master pushes	2020-05-07 16:31:40 +01:00
Andrew Williams	a8b6847b24	[vsphere-go-influxdb] New chart	2020-05-06 12:30:19 +01:00
Andrew Williams	7db31d9be6	[aaisp-to-mqtt] Cleanup templates and remove some issues	2020-05-06 12:17:41 +01:00
Andrew Williams	f110d08221	[aaisp-to-mqtt] Upgrade to 0.2.3	2020-05-06 08:20:16 +01:00
Andrew Williams	e6392a803f	[aaisp-to-mqtt] Cleanup resources	2020-05-04 14:24:40 +01:00
Andrew Williams	9984fc2666	[aaisp-to-mqtt] Fix Base64 Function	2020-05-04 12:49:40 +01:00
Andrew Williams	fa6e0d1134	[aaisp-to-mqtt] Cleanup	2020-05-04 12:44:05 +01:00
Andrew Williams	84b43fede8	[aaisp-to-mqtt] Fix authenticated MQTT	2020-05-04 12:26:03 +01:00
Andrew Williams	2f75be1606	[aaisp-to-mqtt] Fix secrets	2020-05-04 12:20:50 +01:00
				`@@ -0,0 +1 @@`
				`{{- include "common.notes.defaultNotes" . -}}`