From 64cb62ff1d9af8638f79f76e64f95297047af294 Mon Sep 17 00:00:00 2001 From: matthope Date: Sat, 16 Dec 2017 03:36:58 +1100 Subject: [PATCH] [stable/concourse] Add ability to set annotations on web service. (#2982) --- stable/concourse/Chart.yaml | 2 +- stable/concourse/README.md | 1 + stable/concourse/templates/web-svc.yaml | 6 ++++++ stable/concourse/values.yaml | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 8c35353679..a2ec9f6b04 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 0.10.1 +version: 0.10.2 appVersion: 3.6.0 description: Concourse is a simple and scalable CI system. icon: https://avatars1.githubusercontent.com/u/7809479 diff --git a/stable/concourse/README.md b/stable/concourse/README.md index d66d1d409a..962613a4e2 100644 --- a/stable/concourse/README.md +++ b/stable/concourse/README.md @@ -113,6 +113,7 @@ The following tables lists the configurable parameters of the Concourse chart an | `web.replicas` | Number of Concourse Web replicas | `1` | | `web.resources` | Concourse Web resource requests and limits | `{requests: {cpu: "100m", memory: "128Mi"}}` | | `web.service.type` | Concourse Web service type | `NodePort` | +| `web.service.annotations` | Concourse Web Service annotations | `{}` | | `web.ingress.enabled` | Enable Concourse Web Ingress | `false` | | `web.ingress.annotations` | Concourse Web Ingress annotations | `{}` | | `web.ingress.hosts` | Concourse Web Ingress Hostnames | `[]` | diff --git a/stable/concourse/templates/web-svc.yaml b/stable/concourse/templates/web-svc.yaml index 9c69372714..5d9a232db6 100644 --- a/stable/concourse/templates/web-svc.yaml +++ b/stable/concourse/templates/web-svc.yaml @@ -7,6 +7,12 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" + {{ if .Values.web.service.annotations }} + annotations: + {{- range $key, $value := .Values.web.service.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end }} spec: type: {{ .Values.web.service.type }} ports: diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml index 978c4b7794..71e03d247c 100644 --- a/stable/concourse/values.yaml +++ b/stable/concourse/values.yaml @@ -328,6 +328,12 @@ web: ## type: ClusterIP + ## Annotations to be added to the web service. + ## + # annotations: + # prometheus.io/probe: "true" + # prometheus.io/probe_path: "/" + # If you fix atc nodeport, this parameter set(web.service.atcNodePort) # atcNodePort: 30150 #