Revert "[stable/concourse] Moves prometheus annotation to deployment (#9536)" (#10624)

This reverts commit ff86c681bb.

The change was still being discussed when this got merged.

Signed-off-by: Ciro S. Costa <cscosta@pivotal.io>

stable/concourse/Chart.yaml

@@ -1,5 +1,5 @@
 name: concourse
-version: 3.5.0
+version: 3.5.1
 appVersion: 4.2.2
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479

stable/concourse/templates/web-deployment.yaml

@@ -15,13 +15,7 @@ spec:
         app: {{ template "concourse.web.fullname" . }}
         release: "{{ .Release.Name }}"
       annotations:
-        {{- 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 }}
+{{ toYaml .Values.web.annotations | indent 8 }}
     spec:
     {{- with .Values.web.nodeSelector }}
       nodeSelector:

stable/concourse/templates/web-svc.yaml

@@ -8,7 +8,13 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-{{ toYaml .Values.web.service.annotations | indent 4 }}
+    {{- 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 }}
 spec:
   type: {{ .Values.web.service.type }}
   {{ if .Values.web.service.loadBalancerSourceRanges }}