[aaisp-to-mqtt] Cleanup

charts/aaisp-to-mqtt/.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/aaisp-to-mqtt/Chart.yaml

@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "0.2"
+description: Pulls data from the AAISP CHAOSv2 API into MQTT
+name: aaisp-to-mqtt
+version: 0.2.0

charts/aaisp-to-mqtt/templates/_helpers.tpl

@@ -0,0 +1,56 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "aaisp-to-mqtt.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 "aaisp-to-mqtt.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 "aaisp-to-mqtt.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" . }}
+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 "aaisp-to-mqtt.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "aaisp-to-mqtt.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}

charts/aaisp-to-mqtt/templates/cronjob.yaml

@@ -0,0 +1,90 @@
+---
+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 .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 }}
+            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 }}
+            {{- if .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 .Values.resources | indent 16 }}
+    {{- with .Values.nodeSelector }}
+          nodeSelector:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+          affinity:
+{{ toYaml . | indent 12 }}
+    {{- end }}
+    {{- with .Values.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 }}

charts/aaisp-to-mqtt/templates/secrets.yaml

@@ -0,0 +1,20 @@
+{{- if not (.Values.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 | base64 }}
+  aaisp.password: {{ .Values.aaisp.password | base64 }}
+  {{- if .Values.mqtt.authenticated }}
+  mqtt.username: {{ .Values.mqtt.username | base64 }}
+  mqtt.password: {{ .Values.mqtt.password | base64 }}
+  {{- end }}
+{{- end }}

charts/aaisp-to-mqtt/values.yaml

@@ -0,0 +1,56 @@
+# Default values for aaisp-to-mqtt.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nikdoof/aaisp-to-mqtt
+  tag: latest
+  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
+
+cronjob:
+  schedule: "*/10 * * *"
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  # startingDeadlineSeconds: 10
+
+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,7 +2,7 @@ apiVersion: v1
 appVersion: 0.6.6-ls58
 description: A simple web viewer for Calibre libraries
 name: calibre-web
-version: 1.0.1
+version: 1.1.1
 keywords:
   - calibre-web
   - calibre

charts/calibre-web/README.md

@@ -39,6 +39,7 @@ The following tables lists the configurable parameters of the Sentry chart and t
 | `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` |

charts/calibre-web/templates/deployment.yaml

@@ -61,8 +61,10 @@ spec:
               value: "{{ .Values.puid }}"
             - name: PGID
               value: "{{ .Values.pgid }}"
+            {{- if .values.dockerMods }}
             - name: DOCKER_MODS
-              value: "linuxserver/calibre-web:calibre"
+              value: {{ .Values.dockerMods }}
+            {{- end }}
           volumeMounts:
             - mountPath: /config
               name: config

charts/calibre-web/values.yaml

@@ -28,6 +28,11 @@ 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

charts/deluge/Chart.yaml

@@ -1,16 +1,17 @@
 apiVersion: v1
-appVersion: 2.0.3-2201906121747ubuntu18.04.1-ls57
 description: Deluge is a Python BitTorrent client based on libtorrent
 name: deluge
-version: 1.0.1
+version: 1.1.0
 keywords:
   - deluge
   - libtorrent
-home: https://github.com/nikdoof/home-k8s-flux/tree/master/charts/deluge
+home: https://github.com/nikdoof/helm-charts/charts/deluge
-icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/deluge-icon.png
 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

charts/deluge/templates/deployment.yaml

@@ -70,6 +70,10 @@ spec:
               value: "{{ .Values.puid }}"
             - name: PGID
               value: "{{ .Values.pgid }}"
+            {{- if .values.dockerMods }}
+            - name: DOCKER_MODS
+              value: {{ .Values.dockerMods }}
+            {{- end }}
           volumeMounts:
             - mountPath: /config
               name: config

charts/deluge/values.yaml

@@ -28,6 +28,10 @@ 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