From 208b9a870c9d290836b61abe5648c077ad63bba9 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Mon, 17 Jun 2024 10:32:39 +0200 Subject: [PATCH 1/2] [sda-svc] add affinity label to ingress templates Make use of affinity labels to direct the user to the same pod for exposed services when more than two replicas are in use. --- charts/sda-svc/templates/auth-ingress.yaml | 1 + charts/sda-svc/templates/doa-ingress.yaml | 1 + charts/sda-svc/templates/download-ingress.yaml | 1 + charts/sda-svc/templates/s3-inbox-ingress.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/charts/sda-svc/templates/auth-ingress.yaml b/charts/sda-svc/templates/auth-ingress.yaml index 66a9c2225..cf9e7c92c 100644 --- a/charts/sda-svc/templates/auth-ingress.yaml +++ b/charts/sda-svc/templates/auth-ingress.yaml @@ -16,6 +16,7 @@ metadata: {{- if eq "nginx" .Values.global.ingress.ingressClassName }} nginx.ingress.kubernetes.io/rewrite-target: "/" nginx.ingress.kubernetes.io/backend-protocol: "{{ ternary "HTTPS" "HTTP" .Values.global.tls.enabled }}" + nginx.ingress.kubernetes.io/affinity: "cookie" {{- end }} {{- if .Values.global.ingress.clusterIssuer }} cert-manager.io/cluster-issuer: {{ .Values.global.ingress.clusterIssuer | quote }} diff --git a/charts/sda-svc/templates/doa-ingress.yaml b/charts/sda-svc/templates/doa-ingress.yaml index 64d4782c9..8192ea0fb 100644 --- a/charts/sda-svc/templates/doa-ingress.yaml +++ b/charts/sda-svc/templates/doa-ingress.yaml @@ -17,6 +17,7 @@ metadata: {{- if eq "nginx" .Values.global.ingress.ingressClassName }} nginx.ingress.kubernetes.io/rewrite-target: "/" nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" + nginx.ingress.kubernetes.io/affinity: "cookie" {{- end }} {{- if .Values.global.ingress.clusterIssuer }} cert-manager.io/cluster-issuer: {{ .Values.global.ingress.clusterIssuer | quote }} diff --git a/charts/sda-svc/templates/download-ingress.yaml b/charts/sda-svc/templates/download-ingress.yaml index 61e01d06b..e4f4e3338 100644 --- a/charts/sda-svc/templates/download-ingress.yaml +++ b/charts/sda-svc/templates/download-ingress.yaml @@ -16,6 +16,7 @@ metadata: {{- if eq "nginx" .Values.global.ingress.ingressClassName }} nginx.ingress.kubernetes.io/rewrite-target: "/" nginx.ingress.kubernetes.io/backend-protocol: "{{ ternary "HTTPS" "HTTP" .Values.global.tls.enabled }}" + nginx.ingress.kubernetes.io/affinity: "cookie" {{- end }} {{- if .Values.global.ingress.clusterIssuer }} cert-manager.io/cluster-issuer: {{ .Values.global.ingress.clusterIssuer | quote }} diff --git a/charts/sda-svc/templates/s3-inbox-ingress.yaml b/charts/sda-svc/templates/s3-inbox-ingress.yaml index 12b49f717..b8ff2c6d7 100644 --- a/charts/sda-svc/templates/s3-inbox-ingress.yaml +++ b/charts/sda-svc/templates/s3-inbox-ingress.yaml @@ -19,6 +19,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: 2000m nginx.ingress.kubernetes.io/proxy-read-timeout: 300s nginx.ingress.kubernetes.io/proxy-request-buffering: "on" + nginx.ingress.kubernetes.io/affinity: "cookie" {{- end }} {{- if .Values.global.ingress.clusterIssuer }} cert-manager.io/cluster-issuer: {{ .Values.global.ingress.clusterIssuer | quote }} From adebf46364aff5fd462ae731564e057dfea44ee7 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 18 Jun 2024 08:46:41 +0200 Subject: [PATCH 2/2] [sda-svc] bump chart version --- charts/sda-svc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sda-svc/Chart.yaml b/charts/sda-svc/Chart.yaml index ddbb56e52..7f996ddf9 100644 --- a/charts/sda-svc/Chart.yaml +++ b/charts/sda-svc/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: sda-svc -version: 0.26.4 +version: 0.26.5 appVersion: v0.3.77 kubeVersion: '>= 1.26.0' description: Components for Sensitive Data Archive (SDA) installation