[aaisp-to-mqtt] Cleanup resources

charts/aaisp-to-mqtt/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "0.2"
 description: Pulls data from the AAISP CHAOSv2 API into MQTT
 name: aaisp-to-mqtt
-version: 0.1.2
+version: 0.2.2

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

@@ -15,10 +15,16 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
 spec:
-  concurrencyPolicy: {{ .Values.cronjob.concurrencyPolicy }}
+  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:
@@ -28,63 +34,56 @@ spec:
             app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
         spec:
           restartPolicy: Never
-          {{- if (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
+          {{- if .Values.image.pullSecrets }}
           imagePullSecrets:
-          {{- range (default .Values.image.pullSecrets .Values.cronjob.image.pullSecrets) }}
+          {{- range .Values.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 }}"
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-            imagePullPolicy: {{ default .Values.image.pullPolicy .Values.cronjob.image.pullPolicy }}
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
             env:
               - name: AAISP_USERNAME
                 valueFrom:
                   secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
+                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
                     key: aaisp.username              
               - name: AAISP_PASSWORD
                 valueFrom:
                   secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
+                    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 }}
+                value: "{{ default 1883 .Values.mqtt.port }}"
             {{- if .Values.mqtt.authenticated }}
               - name: MQTT_USERNAME
                 valueFrom:
                   secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
+                    name: {{ default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
                     key: mqtt.username           
               - name: MQTT_PASSWORD
                 valueFrom:
                   secretKeyRef:
-                    name: {{- default "aaisp-to-mqtt-secret" .Values.existingSecretName }}
+                    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 }}
+{{ toYaml .Values.resources | indent 16 }}
-    {{- with (default .Values.nodeSelector .Values.cronjob.nodeSelector) }}
+    {{- with .Values.nodeSelector }}
           nodeSelector:
 {{ toYaml . | indent 12 }}
     {{- end }}
-    {{- with (default .Values.affinity .Values.cronjob.affinity) }}
+    {{- with .Values.affinity }}
           affinity:
 {{ toYaml . | indent 12 }}
     {{- end }}
-    {{- with (default .Values.tolerations .Values.cronjob.tolerations) }}
+    {{- 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

@@ -1,4 +1,4 @@
-{{- if not .Values.cronjob.existingSecretName }}
+{{- if not (.Values.existingSecretName) }}
 ---
 apiVersion: v1
 kind: Secret
@@ -11,10 +11,10 @@ metadata:
     app.kubernetes.io/managed-by: {{ include "aaisp-to-mqtt.name" . }}
 type: Opaque
 data:
-  aaisp.username: {{ .Values.aaisp.username }}
+  aaisp.username: {{ .Values.aaisp.username | b64enc }}
-  aaisp.password: {{ .Values.aaisp.password }}
+  aaisp.password: {{ .Values.aaisp.password | b64enc }}
   {{- if .Values.mqtt.authenticated }}
-  mqtt.username: {{ .Values.mqtt.username }}
+  mqtt.username: {{ .Values.mqtt.username | b64enc }}
-  mqtt.password: {{ .Values.mqtt.password }}
+  mqtt.password: {{ .Values.mqtt.password | b64enc }}
   {{- end }}
 {{- end }}

charts/aaisp-to-mqtt/values.yaml

@@ -6,10 +6,10 @@ replicaCount: 1
 
 image:
   repository: nikdoof/aaisp-to-mqtt
-  tag: latest
+  tag: 0.2.2
   pullPolicy: IfNotPresent
+  # imagePullSecrets: []
 
-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
@@ -19,7 +19,7 @@ fullnameOverride: ""
 
 ## Connection details
 ##
-aaisp:
+aaisp: {}
   # username: user1@a
   # password: password
 
@@ -32,15 +32,10 @@ mqtt:
   # topicPrefix: aaisp
 
 cronjob:
-  schedule: "*/10 * * *"
+  schedule: "*/10 * * * *"
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 1
   # startingDeadlineSeconds: 10
-  # imagePullSecrets: []
-  # resources: {}
-  # nodeSelector: {}
-  # tolerations: []
-  # affinity: {}
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious