From ff86c681bbf229c0332a24487cd44456a23aec8f Mon Sep 17 00:00:00 2001
From: "Ciro S. Costa" <ciro9758@gmail.com>
Date: Mon, 14 Jan 2019 17:29:25 -0500
Subject: [PATCH] [stable/concourse] Moves prometheus annotation to deployment
 (#9536)

Previously, Prometheus annotations were added to the web service,
which is meant to represent the whole replica set of pods, leaving
no pod-specific labels to the metrics gathered, defeating the
purpose of some of them (that are meant to be container-specific).

By moving them to `deployment`, we're able to collect them per-pod,
instead of per-service.

Signed-off-by: Ciro S. Costa <cscosta@pivotal.io>
---
 stable/concourse/Chart.yaml                    | 2 +-
 stable/concourse/templates/web-deployment.yaml | 8 +++++++-
 stable/concourse/templates/web-svc.yaml        | 8 +-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml
index f5e6304729..d538d5a889 100644
--- a/stable/concourse/Chart.yaml
+++ b/stable/concourse/Chart.yaml
@@ -1,5 +1,5 @@
 name: concourse
-version: 3.4.0
+version: 3.4.1
 appVersion: 4.2.2
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml
index d2b4f87035..c8b04fb148 100644
--- a/stable/concourse/templates/web-deployment.yaml
+++ b/stable/concourse/templates/web-deployment.yaml
@@ -15,7 +15,13 @@ spec:
         app: {{ template "concourse.web.fullname" . }}
         release: "{{ .Release.Name }}"
       annotations:
-{{ toYaml .Values.web.annotations | indent 8 }}
+        {{- if .Values.concourse.web.prometheus.enabled }}
+        prometheus.io/scrape: "true"
+        prometheus.io/port: {{ .Values.concourse.web.prometheus.bindPort | quote }}
+        {{- end }}
+        {{- range $key, $value := .Values.web.annotations }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
     spec:
     {{- with .Values.web.nodeSelector }}
       nodeSelector:
diff --git a/stable/concourse/templates/web-svc.yaml b/stable/concourse/templates/web-svc.yaml
index fb6b8205ab..43d2057926 100644
--- a/stable/concourse/templates/web-svc.yaml
+++ b/stable/concourse/templates/web-svc.yaml
@@ -8,13 +8,7 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    {{- range $key, $value := .Values.web.service.annotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-    {{- if .Values.concourse.web.prometheus.enabled }}
-    prometheus.io/scrape: "true"
-    prometheus.io/port: {{ .Values.concourse.web.prometheus.bindPort | quote }}
-    {{- end }}
+{{ toYaml .Values.web.service.annotations | indent 4 }}
 spec:
   type: {{ .Values.web.service.type }}
   {{ if .Values.web.service.loadBalancerSourceRanges }}