Merge branch 'release/7.13.x'

Author: taylorsilva

Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: concourse
 type: application
-version: 18.0.1
-appVersion: 7.12.1
+version: 18.1.1
+appVersion: 7.13.2
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
 keywords:

README.md

@@ -87,7 +87,7 @@ The following table lists the configurable parameters of the Concourse chart and
 | `imageDigest` | Specific image digest to use in place of a tag. | `nil` |
 | `imagePullPolicy` | Concourse image pull policy | `IfNotPresent` |
 | `imagePullSecrets` | Array of imagePullSecrets in the namespace for pulling images | `[]` |
-| `imageTag` | Concourse image version | `7.12.1` |
+| `imageTag` | Concourse image version | `7.13.2` |
 | `image` | Concourse image | `concourse/concourse` |
 | `nameOverride` | Provide a name in place of `concourse` for `app:` labels | `nil` |
 | `persistence.enabled` | Enable Concourse persistence using Persistent Volume Claims | `true` |

templates/_helpers.tpl

@@ -328,6 +328,10 @@ Return concourse environment variables for worker configuration
 - name: CONCOURSE_CONTAINERD_CNI_PLUGINS_DIR
   value: {{ .Values.concourse.worker.containerd.cniPluginsDir | quote }}
 {{- end }}
+{{- if .Values.concourse.worker.containerd.privilegedMode }}
+- name: CONCOURSE_CONTAINERD_PRIVILEGED_MODE
+  value: {{ .Values.concourse.worker.containerd.privilegedMode | quote }}
+{{- end }}
 {{- if .Values.concourse.worker.baggageclaim.logLevel }}
 - name: CONCOURSE_BAGGAGECLAIM_LOG_LEVEL
   value: {{ .Values.concourse.worker.baggageclaim.logLevel | quote }}
@@ -497,9 +501,5 @@ Return concourse environment variables for postgresql configuration
 - name: CONCOURSE_POSTGRES_DATABASE
   value: {{ .Values.concourse.web.postgres.database | quote }}
 {{- end }}
-{{- if .Values.concourse.web.postgres.binaryParameter }}
-- name: CONCOURSE_POSTGRES_BINARY_PARAMETERS
-  value: {{ .Values.concourse.web.postgres.binaryParameter | quote }}
-{{- end }}
 {{- end -}}
 {{- end -}}

templates/web-deployment.yaml

@@ -846,6 +846,10 @@ spec:
             - name: CONCOURSE_CONTENT_SECURITY_POLICY
               value: {{ .Values.concourse.web.contentSecurityPolicy | quote }}
             {{- end }}
+            {{- if .Values.concourse.web.strictTransportPolicy }}
+            - name: CONCOURSE_STRICT_TRANSPORT_SECURITY
+              value: {{ .Values.concourse.web.strictTransportPolicy | quote }}
+            {{- end }}
             {{- if .Values.concourse.web.gc.interval }}
             - name: CONCOURSE_GC_INTERVAL
               value: {{ .Values.concourse.web.gc.interval | quote }}

templates/worker-prestop-configmap.yaml

@@ -10,6 +10,12 @@ metadata:
 data:
   pre-stop-hook.sh: |
     #!/bin/bash
-    kill -s {{ .Values.concourse.worker.shutdownSignal }} 1
-    while [ -e /proc/1 ]; do sleep 1; done
-
+    while true; do
+      kill -s {{ .Values.concourse.worker.shutdownSignal }} 1
+      for i in {0..60}; do
+        sleep 1
+        if ! [ -e /proc/1 ]; then
+          exit 0
+        fi
+      done
+    done

values.yaml

@@ -21,7 +21,7 @@ image: concourse/concourse
 ##      of `concourse/concourse`.
 ## Ref: https://hub.docker.com/r/concourse/concourse/tags/
 ##
-imageTag: "7.12.1"
+imageTag: "7.13.2"
 
 ## Specific image digest to use in place of a tag.
 ## Ref: https://kubernetes.io/docs/concepts/configuration/overview/#container-images
@@ -307,7 +307,7 @@ concourse:
 
     ## Interval on which to check for new versions of resource types.
     ##
-    resourceCheckingInterval: 1m
+    resourceTypeCheckingInterval: 1m
 
     ## Interval on which to check for new versions of any resources that have
     ## configured a webhook token
@@ -499,11 +499,6 @@ concourse:
       ##
       database: atc
 
-      ## Whether to use the binary_parameter option from the lib/pq driver that
-      ## Concourse uses to connect to PostgreSQL
-      ##
-      binaryParameter: false
-
 
     kubernetes:
       ## Enable the use of Kubernetes Secrets as the credential provider for
@@ -956,6 +951,11 @@ concourse:
     ##
     contentSecurityPolicy:
 
+    ## The value to set for Strict-Transport-Security header. If omitted, the default
+    ## value in the Concourse binary is used.
+    ##
+    strictTransportPolicy:
+
     gc:
       ## Interval on which to perform garbage collection.
       ##
@@ -1850,6 +1850,12 @@ concourse:
       ## Path to CNI network plugins, defaults to /usr/local/concourse/bin
       cniPluginsDir:
 
+      ## How many privileges privileged containers get. Options are 'full'
+      ## (default), 'fuse-only', 'ignore'. 'full' is equivalent to root on host.
+      ## 'ignore' means no extra privileges. 'fuse-only' means enough privileges
+      ## to use fuse-overlayfs.
+      privilegedMode:
+
     ## API endpoint of an externally managed Garden server to use instead of
     ## running the embedded Garden server.
     ##