From 9ae52bbce3e03756608b49e766425b6485757a52 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 26 May 2022 16:10:35 +0200 Subject: [PATCH] [bitnami/discourse] Add missing service parameter (#10405) * [bitnami/discourse] 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/discourse/Chart.yaml | 2 +- bitnami/discourse/README.md | 3 ++- bitnami/discourse/templates/service.yaml | 17 ++++++++++------- bitnami/discourse/values.yaml | 8 +++++++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/bitnami/discourse/Chart.yaml b/bitnami/discourse/Chart.yaml index d72b9d4e54..cfcd04d57b 100644 --- a/bitnami/discourse/Chart.yaml +++ b/bitnami/discourse/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/bitnami/bitnami-docker-discourse - https://github.com/spinnaker - https://www.discourse.org/ -version: 7.2.4 +version: 7.3.0 diff --git a/bitnami/discourse/README.md b/bitnami/discourse/README.md index 5299138493..850b42223c 100644 --- a/bitnami/discourse/README.md +++ b/bitnami/discourse/README.md @@ -85,7 +85,7 @@ The command removes all the Kubernetes components associated with the chart and | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | --------------------- | | `image.registry` | Discourse image registry | `docker.io` | | `image.repository` | Discourse image repository | `bitnami/discourse` | -| `image.tag` | Discourse image tag | `2.8.3-debian-10-r27` | +| `image.tag` | Discourse image tag | `2.8.3-debian-10-r36` | | `image.pullPolicy` | Discourse image pull policy | `IfNotPresent` | | `image.pullSecrets` | Discourse image pull secrets | `[]` | | `image.debug` | Enable image debug mode | `false` | @@ -225,6 +225,7 @@ The command removes all the Kubernetes components associated with the chart and | `service.ports.http` | Discourse service HTTP port | `80` | | `service.nodePorts.http` | Node port for HTTP | `""` | | `service.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` | +| `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | | `service.clusterIP` | Discourse service Cluster IP | `""` | | `service.loadBalancerIP` | Discourse service Load Balancer IP | `""` | | `service.loadBalancerSourceRanges` | Discourse service Load Balancer sources | `[]` | diff --git a/bitnami/discourse/templates/service.yaml b/bitnami/discourse/templates/service.yaml index 6a5f0e8a22..acec57bd6d 100644 --- a/bitnami/discourse/templates/service.yaml +++ b/bitnami/discourse/templates/service.yaml @@ -18,21 +18,24 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} - sessionAffinity: {{ .Values.service.sessionAffinity }} {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }} clusterIP: {{ .Values.service.clusterIP }} {{- end }} - {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }} + {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }} externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} {{- end }} - {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges) }} - {{- with .Values.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.service.loadBalancerSourceRanges }} {{- end }} - {{- end }} - {{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} + {{- if .Values.service.sessionAffinity }} + sessionAffinity: {{ .Values.service.sessionAffinity }} + {{- end }} + {{- if .Values.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} ports: - name: http port: {{ .Values.service.ports.http }} diff --git a/bitnami/discourse/values.yaml b/bitnami/discourse/values.yaml index 7033ea3c4f..dac0b8afe0 100644 --- a/bitnami/discourse/values.yaml +++ b/bitnami/discourse/values.yaml @@ -507,6 +507,12 @@ service: ## ref: https://kubernetes.io/docs/user-guide/services/ ## sessionAffinity: None + ## @param service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} ## @param service.clusterIP Discourse service Cluster IP ## e.g.: ## clusterIP: None @@ -631,7 +637,7 @@ ingress: ## - host: example.local ## http: ## path: / - ## backend: + ## backend: ## service: ## name: example-svc ## port: