From 7db31d9be63c52428ef1720aa079c1995c7168fc Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 6 May 2020 12:17:41 +0100
Subject: [PATCH] [aaisp-to-mqtt] Cleanup templates and remove some issues

---
 charts/aaisp-to-mqtt/Chart.yaml             | 2 +-
 charts/aaisp-to-mqtt/templates/cronjob.yaml | 4 ++--
 charts/aaisp-to-mqtt/templates/secrets.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/aaisp-to-mqtt/Chart.yaml b/charts/aaisp-to-mqtt/Chart.yaml
index bf301ad..f3d4ef5 100644
--- a/charts/aaisp-to-mqtt/Chart.yaml
+++ b/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.3
+version: 0.2.4
diff --git a/charts/aaisp-to-mqtt/templates/cronjob.yaml b/charts/aaisp-to-mqtt/templates/cronjob.yaml
index ed70253..3f7e9ce 100644
--- a/charts/aaisp-to-mqtt/templates/cronjob.yaml
+++ b/charts/aaisp-to-mqtt/templates/cronjob.yaml
@@ -44,6 +44,8 @@ spec:
           - 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:
@@ -73,8 +75,6 @@ spec:
             {{- end }}
               - name: MQTT_TOPIC_PREFIX
                 value: {{ default "aaisp" .Values.mqtt.topicPrefix }}
-          resources:
-{{ toYaml .Values.resources | indent 16 }}
     {{- with .Values.nodeSelector }}
           nodeSelector:
 {{ toYaml . | indent 12 }}
diff --git a/charts/aaisp-to-mqtt/templates/secrets.yaml b/charts/aaisp-to-mqtt/templates/secrets.yaml
index 7b50aaa..48376eb 100644
--- a/charts/aaisp-to-mqtt/templates/secrets.yaml
+++ b/charts/aaisp-to-mqtt/templates/secrets.yaml
@@ -1,5 +1,5 @@
-{{- if not (.Values.existingSecretName) }}
 ---
+{{- if not (.Values.existingSecretName) }}
 apiVersion: v1
 kind: Secret
 metadata: