[idrac6] Remove default env values (#28)

* Remove default env values

* Fix lint issues

.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

.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

.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"],
+    }
+  ]
+}

.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'

.github/workflows/release.yaml

@@ -10,29 +10,23 @@ 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:
-          CR_TOKEN: "${{ secrets.CR_TOKEN }}"
+          CR_TOKEN: "${{ secrets.CR_TOKEN }}"

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
+* [calibre-web](./charts/calibre-web) - Web app for browsing, reading and downloading eBooks stored in a Calibre database
+* [deluge](./charts/deluge) - Deluge torrent client
+
+
+## License
+
+[MIT License](./LICENSE)

charts/aaisp-to-mqtt/Chart.yaml

@@ -2,4 +2,14 @@ apiVersion: v1
 appVersion: "0.2"
 description: Pulls data from the AAISP CHAOSv2 API into MQTT
 name: aaisp-to-mqtt
-version: 0.2.4
+version: 0.2.5
+keywords:
+  - aaisp
+  - mqtt
+home: https://github.com/nikdoof/aaisp-to-mqtt
+sources:
+  - https://hub.docker.com/r/nikdoof/aaisp-to-mqtt/
+  - https://github.com/natm/aaisp-to-mqtt
+maintainers:
+  - name: nikdoof
+    email: andy@tensixtyone.com

charts/aaisp-to-mqtt/ci/existingsecret-values.yaml

@@ -0,0 +1,4 @@
+mqtt:
+  broker: localhost
+
+existingSecretName: aaisp-to-mqtt-secret

charts/aaisp-to-mqtt/ci/test-values.yaml

@@ -0,0 +1,6 @@
+aaisp:
+  username: test1@a
+  password: TesttestTest
+
+mqtt:
+  broker: localhost

charts/aaisp2mqtt/.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/

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

charts/aaisp2mqtt/ci/existingsecret-values.yaml

@@ -0,0 +1,4 @@
+mqtt:
+  broker: localhost
+
+existingSecretName: aaisp2mqtt-secret

charts/aaisp2mqtt/ci/homeassistant-values.yaml

@@ -0,0 +1,9 @@
+aaisp:
+  username: test1@a
+  password: TesttestTest
+
+mqtt:
+  broker: localhost
+
+homeassistant:
+  enabled: true

charts/aaisp2mqtt/ci/test-values.yaml

@@ -0,0 +1,6 @@
+aaisp:
+  username: test1@a
+  password: TesttestTest
+
+mqtt:
+  broker: localhost

charts/aaisp2mqtt/templates/_helpers.tpl

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

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 }}

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 }}

charts/aaisp2mqtt/values.yaml

@@ -0,0 +1,61 @@
+# Default values for aaisp2mqtt.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nikdoof/aaisp2mqtt
+  tag: 0.3.1
+  pullPolicy: IfNotPresent
+  # imagePullSecrets: []
+
+nameOverride: ""
+fullnameOverride: ""
+
+## Use a pre-existing secret for login information
+##
+# existingSecretName: existing-secret
+
+## Connection details
+##
+aaisp: {}
+  # username: user1@a
+  # password: password
+
+mqtt:
+  # broker: localhost
+  port: 1883
+  authenticated: false
+  # username: kube
+  # password: kube
+  # topicPrefix: aaisp
+
+homeassistant:
+  enabled: false
+  # discoveryPrefix: homeassistant
+
+cronjob:
+  schedule: "*/10 * * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  # startingDeadlineSeconds: 10
+  concurrencyPolicy: Allow
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

charts/calibre-web/Chart.yaml

@@ -2,15 +2,14 @@ apiVersion: v1
 appVersion: 0.6.6-ls58
 description: A simple web viewer for Calibre libraries
 name: calibre-web
-version: 1.1.2
+version: 1.1.3
 keywords:
   - calibre-web
   - calibre
-home: https://github.com/nikdoof/home-k8s-flux/tree/master/charts/calibre-web
+home: https://github.com/janeczku/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

charts/calibre-web/README.md

@@ -5,7 +5,8 @@ This is a helm chart for [calibre-web](https://calibre-web.com/) leveraging the
 ## TL;DR;
 
 ```shell
-$ helm install ./calibre-web
+$ helm repo add nikdoof https://nikdoof.github.io/helm-charts/
+$ helm install calibre-web
 ```
 
 ## Installing the Chart
@@ -13,7 +14,7 @@ $ helm install ./calibre-web
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release ./calibre-web
+helm install --name my-release calibre-web
 ```
 
 ## Uninstalling the Chart
@@ -101,4 +102,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-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.
+Read through the [values.yaml](https://github.com/nikdoof/helm-charts/tree/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values.

charts/deluge/Chart.yaml

@@ -1,17 +1,16 @@
 apiVersion: v1
 description: Deluge is a Python BitTorrent client based on libtorrent
 name: deluge
-version: 1.1.0
+version: 1.2.0
 keywords:
   - deluge
   - libtorrent
-home: https://github.com/nikdoof/helm-charts/charts/deluge
+home: https://github.com/deluge-torrent/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
+appVersion: 2.0.3-2201906121747ubuntu18.04.1-ls57

charts/deluge/README.md

@@ -5,7 +5,8 @@ This is a helm chart for [deluge](https://deluge.com/) leveraging the [Linuxserv
 ## TL;DR;
 
 ```shell
-$ helm install ./deluge
+$ helm repo add nikdoof https://nikdoof.github.io/helm-charts/
+$ helm install deluge
 ```
 
 ## Installing the Chart
@@ -13,7 +14,7 @@ $ helm install ./deluge
 To install the chart with the release name `my-release`:
 
 ```console
-helm install --name my-release ./deluge
+helm install --name my-release deluge
 ```
 
 ## Uninstalling the Chart
@@ -105,4 +106,4 @@ If you get `Error: rendered manifests contain a resource that already exists. Un
 
 ---
 
-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.
+Read through the [values.yaml](https://github.com/nikdoof/helm-charts/tree/master/charts/deluge/values.yaml) file. It has several commented out suggested values.

charts/deluge/ci/test-values.yaml

@@ -0,0 +1 @@
+---

charts/deluge/templates/bttcp-service.yaml

@@ -1,3 +1,5 @@
+---
+{{ if .Values.btservice.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -40,21 +42,14 @@ spec:
   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
+      nodePort: {{ default 30846 .Values.btservice.nodePort }}
 {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "deluge.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    
+{{ end }}

charts/deluge/templates/btudp-service.yaml

@@ -1,3 +1,5 @@
+---
+{{ if .Values.btservice.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -45,9 +47,9 @@ spec:
       protocol: UDP 
       targetPort: bt-udp
 {{ if (eq .Values.btservice.type "NodePort") }}
-      nodePort: 58946
+      nodePort: {{ default 30846 .Values.btservice.nodePort }}
 {{ end }}
   selector:
     app.kubernetes.io/name: {{ include "deluge.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    
+{{ end }}

charts/deluge/templates/daemon-service.yaml

@@ -0,0 +1,53 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "deluge.fullname" . }}-daemon
+  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.daemonservice.labels }}
+{{ toYaml .Values.daemonservice.labels | indent 4 }}
+{{- end }}
+{{- with .Values.daemonservice.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if (or (eq .Values.daemonservice.type "ClusterIP") (empty .Values.daemonservice.type)) }}
+  type: ClusterIP
+  {{- if .Values.daemonservice.clusterIP }}
+  clusterIP: {{ .Values.daemonservice.clusterIP }}
+  {{end}}
+{{- else if eq .Values.daemonservice.type "LoadBalancer" }}
+  type: {{ .Values.daemonservice.type }}
+  {{- if .Values.daemonservice.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.daemonservice.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.daemonservice.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.daemonservice.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+{{- else }}
+  type: {{ .Values.daemonservice.type }}
+{{- end }}
+{{- if .Values.daemonservice.externalIPs }}
+  externalIPs:
+{{ toYaml .Values.daemonservice.externalIPs | indent 4 }}
+{{- end }}
+  {{- if .Values.daemonservice.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.daemonservice.externalTrafficPolicy }}
+  {{- end }}
+  ports:
+    - name: daemon
+      port: 58846
+      protocol: TCP
+      targetPort: daemon
+{{ if (eq .Values.daemonservice.type "NodePort") }}
+      nodePort: {{ default 30846 .Values.daemonservice.nodePort }}
+{{ end }}
+  selector:
+    app.kubernetes.io/name: {{ include "deluge.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    

charts/deluge/templates/deployment.yaml

@@ -70,7 +70,7 @@ spec:
               value: "{{ .Values.puid }}"
             - name: PGID
               value: "{{ .Values.pgid }}"
-            {{- if .values.dockerMods }}
+            {{- if .Values.dockerMods }}
             - name: DOCKER_MODS
               value: {{ .Values.dockerMods }}
             {{- end }}

charts/deluge/values.yaml

@@ -32,6 +32,7 @@ pgid: 1001
 ##
 # dockerMods: linuxserver/deluge:ssh
 
+## Service for the WebUI port
 webuiservice:
   type: ClusterIP
   port: 8112
@@ -53,8 +54,10 @@ webuiservice:
   ## Set the externalTrafficPolicy in the Service to either Cluster or Local
   # externalTrafficPolicy: Cluster
 
-btservice:
-  type: NodePort
+## Service for the Daemon port
+daemonservice:
+  type: ClusterIP
+  port:
   ## Specify the nodePort value for the LoadBalancer and NodePort service types.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
   ##
@@ -73,6 +76,31 @@ btservice:
   ## Set the externalTrafficPolicy in the Service to either Cluster or Local
   # externalTrafficPolicy: Cluster
 
+## Service for the BT taffic port - ideally these should be a LB due to a high port
+## and also sharing TCP and UDP services on the same port.
+btservice:
+  enabled: false
+  type: LoadBalancer
+  ## 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: {}
+  # annotations:
+  #   metallb.universe.tf/allow-shared-ip: deluge
+  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: {}

charts/idrac6/.helmignore

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

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

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)

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" . }}
+{{ "" }}

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 -}}

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 -}}

charts/idrac6/ci/test-values.yaml

@@ -0,0 +1,3 @@
+---
+env:
+  IDRAC_HOST: test

charts/idrac6/templates/NOTES.txt

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

charts/idrac6/templates/common.yaml

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

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

charts/vsphere-influxdb-go/Chart.yaml

@@ -2,4 +2,15 @@ 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.1.0
+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

charts/vsphere-influxdb-go/ci/test-values.yaml

@@ -0,0 +1,7 @@
+vsphere:
+  hostname: vcenter
+  username: test
+  password: test
+
+influxdb:
+  hostname: test

charts/vsphere-influxdb-go/templates/configmap.yaml

@@ -1,80 +1,5 @@
 ---
 apiVersion: v1
-data:
-  config.json: "{\r\n    \"Domain\": \".lab\",\r\n    \"RemoveHostDomainName\": false,\r\n
-    \   \"Interval\": 60,\r\n    \"VCenters\": [],\r\n    \"InfluxDB\": {\r\n        \"Prefix\":
-    \"vsphere_\",\r\n        \"Hostname\": \"http://influxdb:8086\",\r\n        \"Database\":
-    \"vmware_performance\"\r\n    },\r\n    \"Metrics\": [\r\n        {\r\n            \"ObjectType\":
-    [\r\n                \"VirtualMachine\",\r\n                \"HostSystem\"\r\n
-    \           ],\r\n            \"Definition\": [\r\n                {\r\n                    \"Metric\":
-    \"cpu.usage.average\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"cpu.usage.maximum\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"cpu.usagemhz.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"cpu.usagemhz.maximum\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"cpu.wait.summation\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"cpu.system.summation\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"cpu.ready.summation\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"mem.usage.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"mem.usage.maximum\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"mem.consumed.average\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"mem.consumed.maximum\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"mem.active.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"mem.active.maximum\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"mem.vmmemctl.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"mem.vmmemctl.maximum\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"mem.totalCapacity.average\",\r\n                    \"Instances\": \"*\"\r\n
-    \               },\r\n                {\r\n                    \"Metric\": \"net.packetsRx.summation\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"net.packetsTx.summation\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"net.throughput.usage.average\",\r\n                    \"Instances\": \"*\"\r\n
-    \               },\r\n                {\r\n                    \"Metric\": \"net.received.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"net.transmitted.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"net.throughput.usage.nfs.average\",\r\n                    \"Instances\": \"*\"\r\n
-    \               },\r\n                {\r\n                    \"Metric\": \"datastore.numberReadAveraged.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"datastore.numberWriteAveraged.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"datastore.read.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"datastore.write.average\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"datastore.totalReadLatency.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"datastore.totalWriteLatency.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"mem.capacity.provisioned.average\",\r\n                    \"Instances\": \"*\"\r\n
-    \               },\r\n                {\r\n                    \"Metric\": \"cpu.corecount.provisioned.average\",\r\n
-    \                   \"Instances\": \"*\"\r\n                }\r\n            ]\r\n
-    \       },\r\n        {\r\n            \"ObjectType\": [\r\n                \"VirtualMachine\"\r\n
-    \           ],\r\n            \"Definition\": [\r\n                {\r\n                    \"Metric\":
-    \"datastore.datastoreVMObservedLatency.latest\",\r\n                    \"Instances\":
-    \"*\"\r\n                }\r\n            ]\r\n        },\r\n        {\r\n            \"ObjectType\":
-    [\r\n                \"HostSystem\"\r\n            ],\r\n            \"Definition\":
-    [\r\n                {\r\n                    \"Metric\": \"disk.maxTotalLatency.latest\",\r\n
-    \                   \"Instances\": \"\"\r\n                },\r\n                {\r\n
-    \                   \"Metric\": \"disk.numberReadAveraged.average\",\r\n                    \"Instances\":
-    \"*\"\r\n                },\r\n                {\r\n                    \"Metric\":
-    \"disk.numberWriteAveraged.average\",\r\n                    \"Instances\": \"*\"\r\n
-    \               },\r\n                {\r\n                    \"Metric\": \"net.throughput.contention.summation\",\r\n
-    \                   \"Instances\": \"*\"\r\n                }\r\n            ]\r\n
-    \       },\r\n        {\r\n            \"ObjectType\": [\r\n                \"Datastore\"\r\n
-    \           ],\r\n            \"Definition\": [\r\n                {\r\n                    \"Metric\":
-    \"disk.capacity.latest\",\r\n                    \"Instances\": \"*\"\r\n                },\r\n
-    \               {\r\n                    \"Metric\": \"disk.used.latest\",\r\n
-    \                   \"Instances\": \"*\"\r\n                }\r\n            ]\r\n
-    \       }\r\n    ]\r\n}"
 kind: ConfigMap
 metadata:
   name: vsphere-influxdb-go-config
@@ -83,4 +8,6 @@ metadata:
     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}}

charts/vsphere-influxdb-go/values.yaml

@@ -37,6 +37,105 @@ cronjob:
   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

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/

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

charts/zigbee2mqttassistant/ci/default-values.yaml

@@ -0,0 +1,3 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local

charts/zigbee2mqttassistant/ci/mqtt-existing.yaml

@@ -0,0 +1,4 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local
+  existingSecretName: test

charts/zigbee2mqttassistant/ci/mqtt-userpass-values.yaml

@@ -0,0 +1,5 @@
+---
+z2ma:
+  broker: mqtt.svc.cluster.local
+  username: test
+  password: test2

charts/zigbee2mqttassistant/templates/NOTES.txt

@@ -0,0 +1,21 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- 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 "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 --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 "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 }}

charts/zigbee2mqttassistant/templates/_helpers.tpl

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

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 }}

charts/zigbee2mqttassistant/templates/ingress.yaml

@@ -0,0 +1,41 @@
+{{- if .Values.ingress.enabled -}}
+{{- $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:
+{{ include "zigbee2mqttassistant.labels" . | indent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 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: {{ .host | quote }}
+      http:
+        paths:
+        {{- range .paths }}
+          - path: {{ . }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+        {{- end }}
+  {{- end }}
+{{- end }}

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 }}

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 }}

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: {}