diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index ef2d546855..6043b5562d 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: concourse -version: 6.4.1 +version: 6.5.0 appVersion: 5.3.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 f34d087a43..9dabd71adc 100644 --- a/stable/concourse/README.md +++ b/stable/concourse/README.md @@ -155,7 +155,8 @@ The following table lists the configurable parameters of the Concourse chart and | `web.additionalAffinities` | Additional affinities to apply to web pods. E.g: node affinity | `{}` | | `web.additionalVolumeMounts` | VolumeMounts to be added to the web pods | `nil` | | `web.additionalVolumes` | Volumes to be added to the web pods | `nil` | -| `web.annotations`| Concourse Web deployment annotations | `nil` | +| `web.labels`| Additional labels to be added to the web pods | `{}` | +| `web.annotations`| Annotations to be added to the web pods | `{}` | | `web.authSecretsPath` | Specify the mount directory of the web auth secrets | `/concourse-auth` | | `web.credhubSecretsPath` | Specify the mount directory of the web credhub secrets | `/concourse-credhub` | | `web.enabled` | Enable or disable the web component | `true` | @@ -196,6 +197,7 @@ The following table lists the configurable parameters of the Concourse chart and | `worker.additionalAffinities` | Additional affinities to apply to worker pods. E.g: node affinity | `{}` | | `worker.additionalVolumeMounts` | VolumeMounts to be added to the worker pods | `nil` | | `worker.additionalVolumes` | Volumes to be added to the worker pods | `nil` | +| `web.labels`| Additional labels to be added to the worker pods | `{}` | | `worker.annotations` | Annotations to be added to the worker pods | `{}` | | `worker.cleanUpWorkDirOnStart` | Removes any previous state created in `concourse.worker.workDir` | `true` | | `worker.emptyDirSize` | When persistance is disabled this value will be used to limit the emptyDir volume size | `nil` | diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml index dd7b6686c4..7540f19431 100644 --- a/stable/concourse/templates/web-deployment.yaml +++ b/stable/concourse/templates/web-deployment.yaml @@ -18,6 +18,9 @@ spec: labels: app: {{ template "concourse.web.fullname" . }} release: "{{ .Release.Name }}" + {{- with .Values.web.labels }} +{{ toYaml . | trim | indent 8 }} + {{- end }} {{- if .Values.web.annotations }} annotations: {{ toYaml .Values.web.annotations | indent 8 }} diff --git a/stable/concourse/templates/worker-statefulset.yaml b/stable/concourse/templates/worker-statefulset.yaml index 7af3841861..d8afc93b97 100644 --- a/stable/concourse/templates/worker-statefulset.yaml +++ b/stable/concourse/templates/worker-statefulset.yaml @@ -16,6 +16,9 @@ spec: labels: app: {{ template "concourse.worker.fullname" . }} release: "{{ .Release.Name }}" + {{- with .Values.worker.labels }} +{{ toYaml . | trim | indent 8 }} + {{- end }} {{- if .Values.worker.annotations }} annotations: {{ toYaml .Values.worker.annotations | indent 8 }} diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml index 8b8fb7c90d..c3a93e7758 100644 --- a/stable/concourse/values.yaml +++ b/stable/concourse/values.yaml @@ -1312,6 +1312,16 @@ web: ## additionalAffinities: + ## Additional Labels to be added to the web pods. + ## + ## Example: + ## key1: "value1" + ## key2: "value2" + ## + ## Ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + labels: {} + ## Annotations for the web nodes. ## ## Example: @@ -1520,6 +1530,16 @@ worker: ## additionalVolumeMounts: [] + ## Additional Labels to be added to the worker pods. + ## + ## Example: + ## key1: "value1" + ## key2: "value2" + ## + ## Ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ + ## + labels: {} + ## Annotations to be added to the worker pods. ## ## Example: