[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.2.0
+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:
@@ -42,27 +48,27 @@ spec:
               - 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
@@ -81,10 +87,3 @@ spec:
           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

@@ -11,10 +11,10 @@ metadata:
     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 }}
+  aaisp.username: {{ .Values.aaisp.username | b64enc }}
+  aaisp.password: {{ .Values.aaisp.password | b64enc }}
   {{- if .Values.mqtt.authenticated }}
-  mqtt.username: {{ .Values.mqtt.username | base64 }}
-  mqtt.password: {{ .Values.mqtt.password | base64 }}
+  mqtt.username: {{ .Values.mqtt.username | b64enc }}
+  mqtt.password: {{ .Values.mqtt.password | b64enc }}
   {{- end }}
 {{- end }}

charts/aaisp-to-mqtt/values.yaml

@@ -6,9 +6,9 @@ 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,7 +32,7 @@ mqtt:
   # topicPrefix: aaisp
 
 cronjob:
-  schedule: "*/10 * * *"
+  schedule: "*/10 * * * *"
   successfulJobsHistoryLimit: 3
   failedJobsHistoryLimit: 1
   # startingDeadlineSeconds: 10