From a02c25739b2f28fa36bdc477df96ee74195eee78 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 26 May 2022 12:32:17 +0200 Subject: [PATCH] [bitnami/concourse] Add missing service parameter (#10404) * [bitnami/concourse] Add missing service parameters Signed-off-by: Miguel Ruiz * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers Co-authored-by: Fran Mulero --- bitnami/concourse/Chart.yaml | 2 +- bitnami/concourse/README.md | 6 ++++-- .../concourse/templates/web/gateway-service.yaml | 15 +++++++++------ bitnami/concourse/templates/web/service.yaml | 15 +++++++++------ bitnami/concourse/values.yaml | 14 +++++++++++++- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/bitnami/concourse/Chart.yaml b/bitnami/concourse/Chart.yaml index 13199be36..158ed0876 100644 --- a/bitnami/concourse/Chart.yaml +++ b/bitnami/concourse/Chart.yaml @@ -30,4 +30,4 @@ name: concourse sources: - https://github.com/bitnami/bitnami-docker-concourse - https://github.com/concourse/concourse -version: 1.2.6 +version: 1.3.0 diff --git a/bitnami/concourse/README.md b/bitnami/concourse/README.md index 2e5d37f5b..45e42edfb 100644 --- a/bitnami/concourse/README.md +++ b/bitnami/concourse/README.md @@ -85,7 +85,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | | `image.registry` | image registry | `docker.io` | | `image.repository` | image repository | `bitnami/concourse` | -| `image.tag` | image tag (immutable tags are recommended) | `7.7.1-debian-10-r43` | +| `image.tag` | image tag (immutable tags are recommended) | `7.7.1-debian-10-r54` | | `image.pullPolicy` | image pull policy | `IfNotPresent` | | `image.pullSecrets` | image pull secrets | `[]` | | `secrets.localAuth.enabled` | the use of local authentication (basic auth). | `true` | @@ -320,6 +320,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.web.nodePorts.http` | Node port for HTTP | `""` | | `service.web.nodePorts.https` | Node port for HTTPS | `""` | | `service.web.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | +| `service.web.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | | `service.web.clusterIP` | Concourse web service Cluster IP | `""` | | `service.web.loadBalancerIP` | Concourse web service Load Balancer IP | `""` | | `service.web.loadBalancerSourceRanges` | Concourse web service Load Balancer sources | `[]` | @@ -330,6 +331,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.workerGateway.ports.tsa` | Concourse worker gateway service port | `2222` | | `service.workerGateway.nodePorts.tsa` | Node port for worker gateway service | `""` | | `service.workerGateway.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | +| `service.workerGateway.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | | `service.workerGateway.clusterIP` | Concourse worker gateway service Cluster IP | `""` | | `service.workerGateway.loadBalancerIP` | Concourse worker gateway service Load Balancer IP | `""` | | `service.workerGateway.loadBalancerSourceRanges` | Concourse worker gateway service Load Balancer sources | `[]` | @@ -359,7 +361,7 @@ The command removes all the Kubernetes components associated with the chart and | `volumePermissions.enabled` | Enable init container that changes the owner and group of the persistent volume | `false` | | `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | | `volumePermissions.image.repository` | Init container volume-permissions image repository | `bitnami/bitnami-shell` | -| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `10-debian-10-r424` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag (immutable tags are recommended) | `10-debian-10-r434` | | `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `volumePermissions.image.pullSecrets` | Init container volume-permissions image pull secrets | `[]` | | `volumePermissions.resources.limits` | Init container volume-permissions resource limits | `{}` | diff --git a/bitnami/concourse/templates/web/gateway-service.yaml b/bitnami/concourse/templates/web/gateway-service.yaml index 19b13b7fc..a952c4fd3 100644 --- a/bitnami/concourse/templates/web/gateway-service.yaml +++ b/bitnami/concourse/templates/web/gateway-service.yaml @@ -20,19 +20,22 @@ metadata: {{- end }} spec: type: {{ .Values.service.workerGateway.type }} + {{- if .Values.service.workerGateway.sessionAffinity }} sessionAffinity: {{ .Values.service.workerGateway.sessionAffinity }} + {{- end }} + {{- if .Values.service.workerGateway.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.workerGateway.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} {{- if and .Values.service.workerGateway.clusterIP (eq .Values.service.workerGateway.type "ClusterIP") }} clusterIP: {{ .Values.service.workerGateway.clusterIP }} {{- end }} - {{- if (or (eq .Values.service.workerGateway.type "LoadBalancer") (eq .Values.service.workerGateway.type "NodePort")) }} + {{- if or (eq .Values.service.workerGateway.type "LoadBalancer") (eq .Values.service.workerGateway.type "NodePort") }} externalTrafficPolicy: {{ .Values.service.workerGateway.externalTrafficPolicy | quote }} {{- end }} - {{- if (and (eq .Values.service.workerGateway.type "LoadBalancer") .Values.service.workerGateway.loadBalancerSourceRanges) }} - {{- with .Values.service.workerGateway.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} + {{- if and (eq .Values.service.workerGateway.type "LoadBalancer") (not (empty .Values.service.workerGateway.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.service.workerGateway.loadBalancerSourceRanges }} {{- end }} - {{- end }} - {{- if (and (eq .Values.service.workerGateway.type "LoadBalancer") (not (empty .Values.service.workerGateway.loadBalancerIP))) }} + {{- if and (eq .Values.service.workerGateway.type "LoadBalancer") (not (empty .Values.service.workerGateway.loadBalancerIP)) }} loadBalancerIP: {{ .Values.service.workerGateway.loadBalancerIP }} {{- end }} ports: diff --git a/bitnami/concourse/templates/web/service.yaml b/bitnami/concourse/templates/web/service.yaml index 362ddca22..edaa1ce41 100644 --- a/bitnami/concourse/templates/web/service.yaml +++ b/bitnami/concourse/templates/web/service.yaml @@ -20,19 +20,22 @@ metadata: {{- end }} spec: type: {{ .Values.service.web.type }} + {{- if .Values.service.web.sessionAffinity }} sessionAffinity: {{ .Values.service.web.sessionAffinity }} + {{- end }} + {{- if .Values.service.web.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.web.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} {{- if and .Values.service.web.clusterIP (eq .Values.service.web.type "ClusterIP") }} clusterIP: {{ .Values.service.web.clusterIP }} {{- end }} - {{- if (or (eq .Values.service.web.type "LoadBalancer") (eq .Values.service.web.type "NodePort")) }} + {{- if or (eq .Values.service.web.type "LoadBalancer") (eq .Values.service.web.type "NodePort") }} externalTrafficPolicy: {{ .Values.service.web.externalTrafficPolicy | quote }} {{- end }} - {{- if (and (eq .Values.service.web.type "LoadBalancer") .Values.service.web.loadBalancerSourceRanges) }} - {{- with .Values.service.web.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} + {{- if and (eq .Values.service.web.type "LoadBalancer") (not (empty .Values.service.web.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.service.web.loadBalancerSourceRanges }} {{- end }} - {{- end }} - {{- if (and (eq .Values.service.web.type "LoadBalancer") (not (empty .Values.service.web.loadBalancerIP))) }} + {{- if and (eq .Values.service.web.type "LoadBalancer") (not (empty .Values.service.web.loadBalancerIP)) }} loadBalancerIP: {{ .Values.service.web.loadBalancerIP }} {{- end }} ports: diff --git a/bitnami/concourse/values.yaml b/bitnami/concourse/values.yaml index 7539c9485..52fa5559f 100644 --- a/bitnami/concourse/values.yaml +++ b/bitnami/concourse/values.yaml @@ -994,6 +994,12 @@ service: ## ref: https://kubernetes.io/docs/user-guide/services/ ## sessionAffinity: None + ## @param service.web.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} ## @param service.web.clusterIP Concourse web service Cluster IP ## e.g.: ## clusterIP: None @@ -1041,6 +1047,12 @@ service: ## ref: https://kubernetes.io/docs/user-guide/services/ ## sessionAffinity: None + ## @param service.workerGateway.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} ## @param service.workerGateway.clusterIP Concourse worker gateway service Cluster IP ## e.g.: ## clusterIP: None @@ -1164,7 +1176,7 @@ ingress: ## - host: concourse.local ## http: ## path: / - ## backend: + ## backend: ## service: ## name: concourse-svc ## port: