[stable/concourse] #12431 concourse 5.1 params (#12436)

* [stable/concourse]: Update flags for 5.1 - Add flag: peer-address - remove flag: peer-ip - remove flag: peer-url - remove flag: baggageclaim-reap-interval Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Sameer Vohra <svohra@pivotal.io> * [stable/concourse]: Remove redundant worker peerIp Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Sameer Vohra <svohra@pivotal.io> * add worker container/volume sweeper max in flight Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Sameer Vohra <svohra@pivotal.io> * add vault shared path Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Sameer Vohra <svohra@pivotal.io> * add extra oauth and oidc params Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Sameer Vohra <svohra@pivotal.io> * Update worker-statefulset.yaml - quote max in flight volume/container values Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Bishoy Youssef <byoussef@pivotal.io> * [stable/concourse] latest concourse params: - Adds concourse.web.peerAddress - Removes concourse.web.tsa.peerAddress Signed-off-by: Bishoy Youssef <byoussef@pivotal.io> Co-authored-by: Bishoy Youssef <byoussef@pivotal.io> * bump chart version Signed-off-by: Bishoy Youssef <byoussef@pivotal.io>
2026-08-23 22:37:45 +00:00 · 2019-04-22 09:11:56 -07:00
parent 393de1b729
commit 2ab3b11ccc
4 changed files with 67 additions and 39 deletions
@@ -1,5 +1,5 @@
 name: concourse
-version: 5.1.2
+version: 5.2.2
 appVersion: 5.0.1
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
@@ -136,17 +136,6 @@ spec:
              value: {{ .Values.concourse.web.externalUrl | quote }}
            {{- end }}
            {{- end }}
-            {{- if .Values.concourse.web.peerUrl }}
-            - name: CONCOURSE_PEER_URL
-              value: {{ .Values.concourse.web.peerUrl | quote }}
-            {{- else }}
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: CONCOURSE_PEER_URL
-              value: "http://$(POD_IP):$(CONCOURSE_BIND_PORT)"
-            {{- end }}
            {{- if .Values.concourse.web.encryption.enabled }}
            - name: CONCOURSE_ENCRYPTION_KEY
              valueFrom:
@@ -357,6 +346,10 @@ spec:
              value: {{ .Values.concourse.web.vault.url | quote }}
            - name: CONCOURSE_VAULT_PATH_PREFIX
              value: {{ .Values.concourse.web.vault.pathPrefix | quote }}
+            {{- if.Values.concourse.web.vault.sharedPath }}
+            - name: CONCOURSE_VAULT_SHARED_PATH
+              value: {{ .Values.concourse.web.vault.sharedPath | quote }}
+            {{- end }}
            - name: CONCOURSE_VAULT_AUTH_BACKEND
              value: {{ .Values.concourse.web.vault.authBackend | quote }}
            {{- if .Values.concourse.web.vault.useCaCert }}
@@ -814,6 +807,14 @@ spec:
            - name: CONCOURSE_OAUTH_SKIP_SSL_VALIDATION
              value: {{ .Values.concourse.web.auth.oauth.skipSslValidation | quote }}
            {{- end }}
+            {{- if .Values.concourse.web.auth.oauth.userNameKey }}
+            - name: CONCOURSE_OAUTH_USER_NAME_KEY
+              value: {{ .Values.concourse.web.auth.oauth.userNameKey | quote }}
+            {{- end }}
+            {{- if .Values.concourse.web.auth.oauth.userIdKey }}
+            - name: CONCOURSE_OAUTH_USER_ID_KEY
+              value: {{ .Values.concourse.web.auth.oauth.userIdKey | quote }}
+            {{- end }}
            {{- end }}
            {{- if .Values.concourse.web.auth.oidc.enabled }}
            {{- if .Values.concourse.web.auth.oidc.displayName }}
@@ -854,6 +855,21 @@ spec:
            - name: CONCOURSE_OIDC_SKIP_SSL_VALIDATION
              value: {{ .Values.concourse.web.auth.oidc.skipSslValidation | quote }}
            {{- end }}
+            {{- if .Values.concourse.web.auth.oidc.userNameKey }}
+            - name: CONCOURSE_OIDC_USER_NAME_KEY
+              value: {{ .Values.concourse.web.auth.oidc.userNameKey | quote }}
+            {{- end }}
+            {{- end }}
+            {{- if .Values.concourse.web.peerAddress }}
+            - name: CONCOURSE_PEER_ADDRESS
+              value: {{ .Values.concourse.web.peerAddress | quote }}
+            {{- else }}
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: CONCOURSE_PEER_ADDRESS
+              value: "$(POD_IP)"
            {{- end }}
            {{- if .Values.concourse.web.tsa.logLevel }}
            - name: CONCOURSE_TSA_LOG_LEVEL
@@ -873,10 +889,6 @@ spec:
            - name: CONCOURSE_TSA_DEBUG_BIND_PORT
              value: {{ .Values.concourse.web.tsa.debugBindPort | quote }}
            {{- end }}
-            {{- if .Values.concourse.web.tsa.peerIp }}
-            - name: CONCOURSE_TSA_PEER_IP
-              value: {{ .Values.concourse.web.tsa.peerIp | quote }}
-            {{- end }}
            - name: CONCOURSE_TSA_HOST_KEY
              value: "{{ .Values.web.keySecretsPath }}/host_key"
            - name: CONCOURSE_TSA_AUTHORIZED_KEYS
@@ -231,14 +231,18 @@ spec:
            - name: CONCOURSE_BAGGAGECLAIM_OVERLAYS_DIR
              value: {{ .Values.concourse.worker.baggageclaim.overlaysDir | quote }}
            {{- end }}
-            {{- if .Values.concourse.worker.baggageclaim.reapInterval }}
-            - name: CONCOURSE_BAGGAGECLAIM_REAP_INTERVAL
-              value: {{ .Values.concourse.worker.baggageclaim.reapInterval | quote }}
-            {{- end }}
            {{- if .Values.concourse.worker.baggageclaim.disableUserNamespaces }}
            - name: CONCOURSE_BAGGAGECLAIM_DISABLE_USER_NAMESPACES
              value: {{ .Values.concourse.worker.baggageclaim.disableUserNamespaces | quote }}
            {{- end }}
+            {{- if .Values.concourse.worker.volumeSweeperMaxInFlight }}
+            - name: CONCOURSE_VOLUME_SWEEPER_MAX_IN_FLIGHT
+              value: {{ .Values.concourse.worker.volumeSweeperMaxInFlight | quote }}
+            {{- end }}
+            {{- if .Values.concourse.worker.containerSweeperMaxInFlight }}
+            - name: CONCOURSE_CONTAINER_SWEEPER_MAX_IN_FLIGHT
+              value: {{ .Values.concourse.worker.containerSweeperMaxInFlight | quote }}
+            {{- end }}
 {{- if .Values.worker.env }}
 {{ toYaml .Values.worker.env | indent 12 }}
 {{- end }}
@@ -100,13 +100,6 @@ concourse:
    ##
    externalUrl:

-    ## URL used to reach this ATC from other ATCs in the cluster.
-    ## By default, this corresponds to `$(POD_IP):$(CONCOURSE_BIND_PORT)`.
-    ##
-    ## Example: http://127.0.0.1:8080
-    ##
-    peerUrl:
-
    encryption:
      ## Enable encryption of pipeline configuration. Encryption keys can be set via secrets
      ## (`encryption-key` and `old-encryption-key` fields).
@@ -189,6 +182,10 @@ concourse:
    ##
    defaultTaskMemoryLimit:

+    ## Network address of this web node, reachable by other web nodes. Used for forwarded worker addresses. (default: $POD_IP)
+    ##
+    peerAddress:
+
    ## Configurations regarding how the web component is able to connect to a postgres
    ## instance.
    ##
@@ -318,6 +315,10 @@ concourse:
      ##
      pathPrefix:

+      ## Path under which to lookup shared credentials.
+      ##
+      sharedPath:
+
      ## if the Vault server is using a self-signed certificate, set this to true,
      ## and provide a value for the cert in secrets (field `vault-ca-cert`).
      ##
@@ -825,6 +826,16 @@ concourse:
        ##
        skipSslValidation:

+        ## The user id key indicates which claim to use to map an external user id to a
+        ## Concourse user id.
+        ##
+        userIdKey: user_id
+
+        ## The user name key indicates which claim to use to map an external user name to a
+        ## Concourse user name.
+        ##
+        userNameKey: user_name
+
      ## Authentication (OIDC)
      oidc:
        enabled: false
@@ -853,6 +864,11 @@ concourse:
        ##
        skipSslValidation:

+        ## The user name key indicates which claim to use to map an external user name to a
+        ## Concourse user name.
+        ##
+        userNameKey: username
+
    tsa:
      ## Minimum level of logs to see. Possible values: debug, info, error.
      ##
@@ -874,10 +890,6 @@ concourse:
      ##
      debugBindPort: 2221

-      ## IP address of this TSA, reachable by the ATCs. Used for forwarded worker addresses.
-      ##
-      peerIp:
-
      ## Path to private key to use for the SSH server.
      ##
      hostKey:
@@ -983,14 +995,18 @@ concourse:
    ##
    bindPort: 7777

-    ## IP used to reach this worker from the ATC nodes.
-    ##
-    peerIp:
-
    ## Minimum level of logs to see. Possible options: debug, info, error.
    ##
    logLevel:

+    ## Maximum number of containers which can be swept in parallel.
+    ##
+    containerSweeperMaxInFlight: 5
+
+    ## Maximum number of volumes which can be swept in parallel.
+    ##
+    volumeSweeperMaxInFlight: 5
+
    tsa:
      ## TSA host to forward the worker through. Can be specified multiple times.
      ##
@@ -1075,10 +1091,6 @@ concourse:
      ##
      overlaysDir:

-      ## Interval on which to reap expired volumes.
-      ##
-      reapInterval:
-
 ## Configuration values for Concourse Web components.
 ## For more information regarding the characteristics of
 ## Concourse Web nodes, see https://concourse-ci.org/concourse-web.html.