Add containerPlacementStrategy, default random.

helm · Jan 3, 2018 · 0c188a6 · 0c188a6
1 parent e0aed98
commit 0c188a6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/stable/concourse/README.md b/stable/concourse/README.md
@@ -85,6 +85,7 @@ The following tables lists the configurable parameters of the Concourse chart an
 | `concourse.oldResourceGracePeriod` | How long to cache the result of a get step after a newer version of the resource is found | `5m` |
 | `concourse.resourceCacheCleanupInterval` | The interval on which to check for and release old caches of resource versions | `30s` |
 | `concourse.baggageclaimDriver` | The filesystem driver used by baggageclaim | `naive` |
+| `concourse.containerPlacementStrategy` | The selection strategy for placing containers onto workers | `random` |
 | `concourse.externalURL` | URL used to reach any ATC from the outside world | `nil` |
 | `concourse.dockerRegistry` | An URL pointing to the Docker registry to use to fetch Docker images | `nil` |
 | `concourse.insecureDockerRegistry` | Docker registry(ies) (comma separated) to allow connecting to even if not secure | `nil` |

diff --git a/stable/concourse/templates/configmap.yaml b/stable/concourse/templates/configmap.yaml
@@ -20,6 +20,7 @@ data:
   concourse-resource-cache-cleanup-interval: {{ .Values.concourse.resourceCacheCleanupInterval | quote }}
   concourse-external-url: {{ default "" .Values.concourse.externalURL | quote }}
   concourse-baggageclaim-driver: {{ .Values.concourse.baggageclaimDriver | quote }}
+  container-placement-strategy: {{ .Values.concourse.containerPlacementStrategy | quote }}
   garden-docker-registry: {{ default "" .Values.concourse.dockerRegistry | quote }}
   garden-insecure-docker-registry: {{ default "" .Values.concourse.insecureDockerRegistry | quote }}
   github-auth-organization: {{ default "" .Values.concourse.githubAuthOrganization | quote }}

diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml
@@ -302,6 +302,11 @@ spec:
             - name: CONCOURSE_PROMETHEUS_BIND_PORT
               value: {{ .Values.web.metrics.prometheus.port | quote }}
             {{- end }}
+            - name: CONCOURSE_CONTAINER_PLACEMENT_STRATEGY
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "concourse.concourse.fullname" . }}
+                  key: container-placement-strategy
           ports:
             - name: atc
               containerPort: {{ .Values.concourse.atcPort }}

diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml
@@ -184,6 +184,12 @@ concourse:
   ##
   baggageclaimDriver: naive
 
+  ## The selection strategy for placing containers onto workers, as of Concourse 3.7 this can be
+  ## "volume-locality" or "random". Random can better spread load across workers, see
+  ## https://github.com/concourse/atc/pull/219 for background.
+  ##
+  containerPlacementStrategy: random
+
   ## An URL pointing to the Docker registry to use to fetch Docker images.
   ## If unset, this will default to the Docker default
   ##