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 }}