From 701489687f24c164b8939d422a2916103a57962e Mon Sep 17 00:00:00 2001 From: Hannes Bohring Date: Fri, 29 Nov 2024 13:57:58 +0100 Subject: [PATCH 1/5] adds ingressClassName to ingress definition --- omero-server/templates/ingress.yaml | 3 +++ omero-server/values.yaml | 3 ++- omero-web/templates/ingress.yaml | 3 +++ omero-web/values.yaml | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/omero-server/templates/ingress.yaml b/omero-server/templates/ingress.yaml index 2a8a06a..1a94fdf 100644 --- a/omero-server/templates/ingress.yaml +++ b/omero-server/templates/ingress.yaml @@ -21,6 +21,9 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: +{{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} +{{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/omero-server/values.yaml b/omero-server/values.yaml index d1793c0..b5c542c 100644 --- a/omero-server/values.yaml +++ b/omero-server/values.yaml @@ -66,9 +66,10 @@ service: enabled: true clientTimeout: 3600 -# Only used for omero websockets +# Only used for omero websockets (wegsockets needs to be activated) ingress: enabled: false + # className: "nginx" annotations: {} # kubernetes.io/ingress.class: nginx diff --git a/omero-web/templates/ingress.yaml b/omero-web/templates/ingress.yaml index c57eb35..2a21870 100644 --- a/omero-web/templates/ingress.yaml +++ b/omero-web/templates/ingress.yaml @@ -16,6 +16,9 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: +{{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} +{{- end }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/omero-web/values.yaml b/omero-web/values.yaml index 94752b8..08680a8 100644 --- a/omero-web/values.yaml +++ b/omero-web/values.yaml @@ -36,6 +36,7 @@ service: ingress: enabled: false + # className: "nginx" annotations: {} # kubernetes.io/ingress.class: nginx From f08ce199846ba15d9a0a5309f48a10cae95975b2 Mon Sep 17 00:00:00 2001 From: Hannes Bohring <111497663+iceowlbeer@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:20:00 +0200 Subject: [PATCH 2/5] Update omero-server/templates/ingress.yaml Co-authored-by: Simon Li --- omero-server/templates/ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero-server/templates/ingress.yaml b/omero-server/templates/ingress.yaml index 1a94fdf..9589cea 100644 --- a/omero-server/templates/ingress.yaml +++ b/omero-server/templates/ingress.yaml @@ -21,8 +21,8 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: -{{- if .Values.ingress.className }} - ingressClassName: {{ .Values.ingress.className }} +{{- with .Values.ingress.className }} + ingressClassName: {{ . }} {{- end }} {{- if .Values.ingress.tls }} tls: From 2934071f017d3a17ed867836e141f7b328e2f0b3 Mon Sep 17 00:00:00 2001 From: Hannes Bohring <111497663+iceowlbeer@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:20:21 +0200 Subject: [PATCH 3/5] Update omero-server/values.yaml Co-authored-by: Simon Li --- omero-server/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero-server/values.yaml b/omero-server/values.yaml index b5c542c..f03080a 100644 --- a/omero-server/values.yaml +++ b/omero-server/values.yaml @@ -66,7 +66,7 @@ service: enabled: true clientTimeout: 3600 -# Only used for omero websockets (wegsockets needs to be activated) +# Only used for omero websockets (not activated by default) ingress: enabled: false # className: "nginx" From ac44e44b1f6d2caf2d0c8cc29bc26ca392d7a77c Mon Sep 17 00:00:00 2001 From: Hannes Bohring <111497663+iceowlbeer@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:20:30 +0200 Subject: [PATCH 4/5] Update omero-web/templates/ingress.yaml Co-authored-by: Simon Li --- omero-web/templates/ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero-web/templates/ingress.yaml b/omero-web/templates/ingress.yaml index 2a21870..0b54279 100644 --- a/omero-web/templates/ingress.yaml +++ b/omero-web/templates/ingress.yaml @@ -16,8 +16,8 @@ metadata: {{ toYaml . | indent 4 }} {{- end }} spec: -{{- if .Values.ingress.className }} - ingressClassName: {{ .Values.ingress.className }} +{{- with .Values.ingress.className }} + ingressClassName: {{ . }} {{- end }} {{- if .Values.ingress.tls }} tls: From b2557aa779a82f19c765d5ddf19b36a1e0925d63 Mon Sep 17 00:00:00 2001 From: Hannes Bohring <111497663+iceowlbeer@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:24:37 +0200 Subject: [PATCH 5/5] Bumps chart version --- omero-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero-server/Chart.yaml b/omero-server/Chart.yaml index f18c366..8633892 100644 --- a/omero-server/Chart.yaml +++ b/omero-server/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v1 appVersion: 5.6.16-1 description: OMERO.server name: omero-server -version: 0.4.11 +version: 0.4.12 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg