From 66ef4b6ba63a1830ccba38eded2d6de9b7f80c5b Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@widen.com>
Date: Sat, 5 Nov 2016 09:25:36 -0500
Subject: [PATCH] Use range when possible

---
 .../templates/alertmanager-deployment.yaml           |  4 ++--
 .../prometheus/templates/alertmanager-ingress.yaml   |  4 +++-
 .../prometheus/templates/server-deployment.yaml      | 12 ++++++++----
 incubator/prometheus/templates/server-ingress.yaml   |  4 +++-
 incubator/prometheus/templates/server-pvc.yaml       |  4 +++-
 incubator/prometheus/values.yaml                     | 12 ++++++------
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/incubator/prometheus/templates/alertmanager-deployment.yaml b/incubator/prometheus/templates/alertmanager-deployment.yaml
index 2ed7cbc79a..c1c1d9efaa 100644
--- a/incubator/prometheus/templates/alertmanager-deployment.yaml
+++ b/incubator/prometheus/templates/alertmanager-deployment.yaml
@@ -18,7 +18,7 @@ spec:
         release: "{{ .Release.Name }}"
     spec:
       containers:
-        - name: {{ template name . }}-{{ .Values.alertmanager.name }}
+        - name: {{ template "name" . }}-{{ .Values.alertmanager.name }}
           image: "{{ .Values.alertmanager.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
@@ -39,7 +39,7 @@ spec:
               mountPath: /etc/config
             - name: storage-volume
               mountPath: {{ default "/data" .Values.alertmanager.storagePath | quote }}
-        - name: {{ template name . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.name }}
+        - name: {{ template "name" . }}-{{ .Values.alertmanager.name }}-{{ .Values.configmapReload.name }}
           image: "{{ .Values.configmapReload.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
diff --git a/incubator/prometheus/templates/alertmanager-ingress.yaml b/incubator/prometheus/templates/alertmanager-ingress.yaml
index 78b1289723..2c08fad431 100644
--- a/incubator/prometheus/templates/alertmanager-ingress.yaml
+++ b/incubator/prometheus/templates/alertmanager-ingress.yaml
@@ -5,7 +5,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-{{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }}
+  {{- range $key, $value := .Values.alertmanager.ingress.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
   labels:
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/incubator/prometheus/templates/server-deployment.yaml b/incubator/prometheus/templates/server-deployment.yaml
index 18ef7afc43..4542a84083 100644
--- a/incubator/prometheus/templates/server-deployment.yaml
+++ b/incubator/prometheus/templates/server-deployment.yaml
@@ -13,14 +13,16 @@ spec:
   template:
     metadata:
       annotations:
-{{ toYaml .Values.server.annotations | indent 8 }}
+      {{- range $key, $value := .Values.server.annotations }}
+        {{ $key }}: {{ $value }}
+      {{- end }}
       labels:
         app: {{ template "fullname" . }}
         component: "{{ .Values.server.name }}"
         release: "{{ .Release.Name }}"
     spec:
       containers:
-        - name: {{ template name . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }}
+        - name: {{ template "name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }}
           image: "{{ .Values.configmapReload.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
@@ -30,7 +32,7 @@ spec:
             - name: config-volume
               mountPath: /etc/config
               readOnly: true
-        - name: {{ template name . }}-{{ .Values.server.name }}
+        - name: {{ template "name" . }}-{{ .Values.server.name }}
           image: "{{ .Values.server.image }}"
           imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
           args:
@@ -39,7 +41,9 @@ spec:
             - --storage.local.path={{ default "/data" .Values.server.storageLocalPath | quote }}
             - --web.console.libraries=/etc/prometheus/console_libraries
             - --web.console.templates=/etc/prometheus/consoles
-{{ toYaml .Values.server.extra_args | indent 12 }}
+          {{- range $key, $value := .Values.server.extraArgs }}
+            - --{{ $key }}={{ $value }}
+          {{- end }}
           ports:
             - containerPort: 9090
           readinessProbe:
diff --git a/incubator/prometheus/templates/server-ingress.yaml b/incubator/prometheus/templates/server-ingress.yaml
index 18fa65245b..3b94d227f5 100644
--- a/incubator/prometheus/templates/server-ingress.yaml
+++ b/incubator/prometheus/templates/server-ingress.yaml
@@ -5,7 +5,9 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   annotations:
-{{ toYaml .Values.server.ingress.annotations | indent 4 }}
+  {{- range $key, $value := .Values.server.ingress.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
   labels:
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/incubator/prometheus/templates/server-pvc.yaml b/incubator/prometheus/templates/server-pvc.yaml
index 9b2f30e38c..9ddf0a88f7 100644
--- a/incubator/prometheus/templates/server-pvc.yaml
+++ b/incubator/prometheus/templates/server-pvc.yaml
@@ -3,7 +3,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
-{{ toYaml .Values.server.persistentVolume.annotations | indent 4 }}
+  {{- range $key, $value := .Values.server.persistentVolume.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
   labels:
     app: {{ template "fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/incubator/prometheus/values.yaml b/incubator/prometheus/values.yaml
index c58b80f8f0..5eb830d008 100644
--- a/incubator/prometheus/values.yaml
+++ b/incubator/prometheus/values.yaml
@@ -105,16 +105,16 @@ configmapReload:
 server:
   ## Server Pod annotations:
   ##
-  # annotations
+  # annotations:
   #   iam.amazonaws.com/role: prometheus
 
   ## Additional Server container arguments
   ##
-  extra_args:
-    - --storage.local.max-chunks-to-persist=524288
-    - --storage.local.memory-chunks=1048576
-    - --storage.local.retention=360h0m0s
-    - --web.external-url=http://prometheus.domain.com
+  extraArgs:
+    storage.local.max-chunks-to-persist: 524288
+    storage.local.memory-chunks: 1048576
+    storage.local.retention: 360h0m0s
+    web.external-url: http://prometheus.domain.com
 
   ## Server service port
   ## Default: 80