Skip to content

Commit

Permalink
[stable/concourse] allow specifying sidecar containers (helm#11507)
Browse files Browse the repository at this point in the history
Signed-off-by: Bishoy Youssef <[email protected]>
Co-authored-by: Ciro S. Costa <[email protected]>
  • Loading branch information
2 people authored and k8s-ci-robot committed Feb 26, 2019
1 parent 2811cbe commit 8a35ac6
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion stable/concourse/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: concourse
version: 3.7.5
version: 3.8.0
appVersion: 4.2.2
description: Concourse is a simple and scalable CI system.
icon: https://avatars1.githubusercontent.com/u/7809479
Expand Down
2 changes: 2 additions & 0 deletions stable/concourse/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ The following table lists the configurable parameters of the Concourse chart and
| `web.service.loadBalancerSourceRanges` | Concourse Web Service Load Balancer Source IP ranges | `nil` |
| `web.service.tsaNodePort` | Sets the nodePort for tsa when using `NodePort` | `nil` |
| `web.service.type` | Concourse Web service type | `ClusterIP` |
| `web.sidecarContainers` | Array of extra containers to run alongside the Concourse web container | `nil` |
| `web.syslogSecretsPath` | Specify the mount directory of the web syslog secrets | `/concourse-syslog` |
| `web.tolerations` | Tolerations for the web nodes | `[]` |
| `web.vaultSecretsPath` | Specify the mount directory of the web vault secrets | `/concourse-vault` |
Expand All @@ -115,6 +116,7 @@ The following table lists the configurable parameters of the Concourse chart and
| `worker.fatalErrors` | Newline delimited strings which, when logged, should trigger a restart of the worker | *See [values.yaml](values.yaml)* |
| `worker.updateStrategy` | `OnDelete` or `RollingUpdate` (requires Kubernetes >= 1.7) | `RollingUpdate` |
| `worker.podManagementPolicy` | `OrderedReady` or `Parallel` (requires Kubernetes >= 1.7) | `Parallel` |
| `worker.sidecarContainers` | Array of extra containers to run alongside the Concourse worker container | `nil` |
| `worker.hardAntiAffinity` | Should the workers be forced (as opposed to preferred) to be on different nodes? | `false` |
| `worker.emptyDirSize` | When persistance is disabled this value will be used to limit the emptyDir volume size | `nil` |
| `persistence.enabled` | Enable Concourse persistence using Persistent Volume Claims | `true` |
Expand Down
3 changes: 3 additions & 0 deletions stable/concourse/templates/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ spec:
{{- end }}
{{- end }}
containers:
{{- if .Values.web.sidecarContainers }}
{{- toYaml .Values.web.sidecarContainers | nindent 8 }}
{{- end }}
- name: {{ template "concourse.web.fullname" . }}
{{- if .Values.imageDigest }}
image: "{{ .Values.image }}@{{ .Values.imageDigest }}"
Expand Down
3 changes: 3 additions & 0 deletions stable/concourse/templates/worker-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
{{- end }}
terminationGracePeriodSeconds: {{ .Values.worker.terminationGracePeriodSeconds }}
containers:
{{- if .Values.worker.sidecarContainers }}
{{- toYaml .Values.worker.sidecarContainers | nindent 8 }}
{{- end }}
- name: {{ template "concourse.worker.fullname" . }}
{{- if .Values.imageDigest }}
image: "{{ .Values.image }}@{{ .Values.imageDigest }}"
Expand Down
20 changes: 20 additions & 0 deletions stable/concourse/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,16 @@ web:
##
replicas: 1

## Array of extra containers to run alongside the Concourse Web
## container.
##
## Example:
## - name: myapp-container
## image: busybox
## command: ['sh', '-c', 'echo Hello && sleep 3600']
##
sidecarContainers:

## Configures the liveness probe used to determine if the Web component is up.
## ps.: if you're upgrading Concourse from one version to another, the probe will
## probably fail for some time before migrations are finished - in such situations,
Expand Down Expand Up @@ -1281,6 +1291,16 @@ worker:
##
replicas: 2

## Array of extra containers to run alongside the Concourse worker
## container.
##
## Example:
## - name: myapp-container
## image: busybox
## command: ['sh', '-c', 'echo Hello && sleep 3600']
##
sidecarContainers:

## Minimum number of workers available after an eviction
## Ref: https://kubernetes.io/docs/admin/disruptions/
##
Expand Down

0 comments on commit 8a35ac6

Please sign in to comment.