github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/concourse] Adds additional volumes and volumeMounts to web (#10885)

Browse Source 
Previously, it was not possible to include neither additional volumes
nor volume mounts to the web instance.

This ends up prohibiting and operator of specifying configuration for
team authorized keys, or any other future configuration that might
depend on files on disk.

Signed-off-by: Ciro S. Costa <cscosta@pivotal.io>
This commit is contained in:
Ciro S. Costa
2019-01-25 10:11:49 -08:00
committed by Kubernetes Prow Robot
parent 1f0979ac62
commit 68d82cb304
5 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/concourse/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: concourse
version: 3.6.3
version: 3.7.0
appVersion: 4.2.2
description: Concourse is a simple and scalable CI system.
icon: https://avatars1.githubusercontent.com/u/7809479
stable/concourse/README.md
+21 -19
View File
@@ -71,33 +71,35 @@ The following table lists the configurable parameters of the Concourse chart and
| `imageTag` | Concourse image version | `4.2.2` |
| `imagePullPolicy` | Concourse image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Array of imagePullSecrets in the namespace for pulling images | `[]` |
| `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.authSecretsPath` | Specify the mount directory of the web auth secrets | `/concourse-auth` |
| `web.env` | Configure additional environment variables for the web containers | `[]` |
| `web.ingress.annotations` | Concourse Web Ingress annotations | `{}` |
| `web.ingress.enabled` | Enable Concourse Web Ingress | `false` |
| `web.ingress.hosts` | Concourse Web Ingress Hostnames | `[]` |
| `web.ingress.tls` | Concourse Web Ingress TLS configuration | `[]` |
| `web.keysSecretsPath` | Specify the mount directory of the web keys secrets | `/concourse-keys` |
| `web.livenessProbe` | Liveness Probe settings | `{"failureThreshold":5,"httpGet":{"path":"/api/v1/info","port":"atc"},"initialDelaySeconds":10,"periodSeconds":15,"timeoutSeconds":3}` |
| `web.nameOverride` | Override the Concourse Web components name | `nil` |
| `web.nodeSelector` | Node selector for web nodes | `{}` |
| `web.postgresqlSecrtsPath` | Specify the mount directory of the web postgresql secrets | `/concourse-postgresql` |
| `web.readinessProbe` | Readiness Probe settings | `{"httpGet":{"path":"/api/v1/info","port":"atc"}}` |
| `web.replicas` | Number of Concourse Web replicas | `1` |
| `web.resources` | Concourse Web resource requests and limits | `{requests: {cpu: "100m", memory: "128Mi"}}` |
| `web.readinessProbe` | Readiness Probe settings | `{"httpGet":{"path":"/api/v1/info","port":"atc"}}` |
| `web.livenessProbe` | Liveness Probe settings | `{"failureThreshold":5,"httpGet":{"path":"/api/v1/info","port":"atc"},"initialDelaySeconds":10,"periodSeconds":15,"timeoutSeconds":3}` |
| `web.additionalAffinities` | Additional affinities to apply to web pods. E.g: node affinity | `{}` |
| `web.env` | Configure additional environment variables for the web containers | `[]` |
| `web.annotations`| Concourse Web deployment annotations | `nil` |
| `web.keysSecretsPath` | Specify the mount directory of the web keys secrets | `/concourse-keys` |
| `web.postgresqlSecrtsPath` | Specify the mount directory of the web postgresql secrets | `/concourse-postgresql` |
| `web.vaultSecretsPath` | Specify the mount directory of the web vault secrets | `/concourse-vault` |
| `web.syslogSecretsPath` | Specify the mount directory of the web syslog secrets | `/concourse-syslog` |
| `web.authSecretsPath` | Specify the mount directory of the web auth secrets | `/concourse-auth` |
| `web.tolerations` | Tolerations for the web nodes | `[]` |
| `web.nodeSelector` | Node selector for web nodes | `{}` |
| `web.service.type` | Concourse Web service type | `ClusterIP` |
| `web.service.annotations` | Concourse Web Service annotations | `nil` |
| `web.service.atcNodePort` | Sets the nodePort for atc when using `NodePort` | `nil` |
| `web.service.atcTlsNodePort` | Sets the nodePort for atc tls when using `NodePort` | `nil` |
| `web.service.labels` | Additional concourse web service labels | `nil` |
| `web.service.loadBalancerIP` | The IP to use when web.service.type is LoadBalancer | `nil` |
| `web.service.loadBalancerSourceRanges` | Concourse Web Service Load Balancer Source IP ranges | `nil` |
| `web.service.atcNodePort` | Sets the nodePort for atc when using `NodePort` | `nil` |
| `web.service.atcTlsNodePort` | Sets the nodePort for atc tls when using `NodePort` | `nil` |
| `web.service.tsaNodePort` | Sets the nodePort for tsa when using `NodePort` | `nil` |
| `web.ingress.enabled` | Enable Concourse Web Ingress | `false` |
| `web.ingress.annotations` | Concourse Web Ingress annotations | `{}` |
| `web.ingress.hosts` | Concourse Web Ingress Hostnames | `[]` |
| `web.ingress.tls` | Concourse Web Ingress TLS configuration | `[]` |
| `web.service.type` | Concourse Web service type | `ClusterIP` |
| `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` |
| `worker.nameOverride` | Override the Concourse Worker components name | `nil` |
| `worker.replicas` | Number of Concourse Worker replicas | `2` |
| `worker.minAvailable` | Minimum number of workers available after an eviction | `1` |
stable/concourse/more-config.yaml
+8
View File
@@ -0,0 +1,8 @@
web:
additionalVolumes:
- name: team-authorized-keys
configMap:
name: hush-house-team-authorized-keys
additionalVolumeMounts:
- name: team-authorized-keys
mountPath: /team-authorized-keys/
stable/concourse/templates/web-deployment.yaml
+6
View File
@@ -930,11 +930,17 @@ spec:
- name: auth-keys
mountPath: {{ .Values.web.authSecretsPath | quote }}
readOnly: true
{{- if .Values.web.additionalVolumeMounts }}
{{ toYaml .Values.web.additionalVolumeMounts | indent 12 }}
{{- end }}
affinity:
{{- if .Values.web.additionalAffinities }}
{{ toYaml .Values.web.additionalAffinities | indent 8 }}
{{- end }}
volumes:
{{- if .Values.web.additionalVolumes }}
{{ toYaml .Values.web.additionalVolumes | indent 8 }}
{{- end }}
- name: concourse-keys
secret:
secretName: {{ template "concourse.concourse.fullname" . }}
stable/concourse/values.yaml
+15
View File
@@ -702,6 +702,21 @@ web:
syslogSecretsPath: "/concourse-syslog"
tlsSecretsPath: "/concourse-web-tls"
## Configure additional volumes for the
## web container(s)
##
# additionalVolumes:
# - name: my-team-authorized-keys
# configMap:
# name: my-team-authorized-keys-config
## Configure additional volumeMounts for the
## web container(s)
##
# additionalVolumeMounts:
# - name: my-team-authorized-keys
# mountPath: /my-team-authorized-keys
## Additional affinities to add to the web pods.
##
# additionalAffinities: