From 9b5b43cb6a923ba9f3d3cb14e423ba640a8fa629 Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Sat, 15 Mar 2025 17:17:43 +0100 Subject: [PATCH 1/3] Fix webconsole Ingress --- charts/ibm-mq/templates/service-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ibm-mq/templates/service-ingress.yaml b/charts/ibm-mq/templates/service-ingress.yaml index db2da45..d45f9a4 100644 --- a/charts/ibm-mq/templates/service-ingress.yaml +++ b/charts/ibm-mq/templates/service-ingress.yaml @@ -48,7 +48,7 @@ spec: pathType: Prefix backend: service: - name: {{ include "ibm-mq.fullname" . }}-web + name: {{ include "ibm-mq.fullname" . }} port: number: 9443 {{- if .Values.route.ingress.webconsole.tls.enable }} From 8b82941960135a16845dc394b91c4692f3f126ba Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Sat, 15 Mar 2025 17:28:33 +0100 Subject: [PATCH 2/3] Use port name instead of port number in Ingress --- charts/ibm-mq/templates/service-ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ibm-mq/templates/service-ingress.yaml b/charts/ibm-mq/templates/service-ingress.yaml index d45f9a4..72e64e4 100644 --- a/charts/ibm-mq/templates/service-ingress.yaml +++ b/charts/ibm-mq/templates/service-ingress.yaml @@ -30,7 +30,7 @@ spec: service: name: {{ include "ibm-mq.fullname" . }} port: - number: 9443 + name: console-https ingressClassName: nginx rules: {{- if .Values.route.ingress.webconsole.hostname }} @@ -50,7 +50,7 @@ spec: service: name: {{ include "ibm-mq.fullname" . }} port: - number: 9443 + name: console-https {{- if .Values.route.ingress.webconsole.tls.enable }} tls: {{- if .Values.route.ingress.webconsole.hostname}} From cb004b220c87138fe887bbf9faf668e6a1f9c4ff Mon Sep 17 00:00:00 2001 From: Alexandre Garnier Date: Sat, 15 Mar 2025 17:34:03 +0100 Subject: [PATCH 3/3] Fix indentation consistency in Ingress --- charts/ibm-mq/templates/service-ingress.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/ibm-mq/templates/service-ingress.yaml b/charts/ibm-mq/templates/service-ingress.yaml index 72e64e4..b3937f6 100644 --- a/charts/ibm-mq/templates/service-ingress.yaml +++ b/charts/ibm-mq/templates/service-ingress.yaml @@ -37,9 +37,9 @@ spec: - host: {{ .Values.route.ingress.webconsole.hostname }} http: {{- else }} - - http: + - http: {{- end }} - paths: + paths: {{- if .Values.route.ingress.webconsole.path }} - path: {{ .Values.route.ingress.webconsole.path }} {{- else }} @@ -53,10 +53,10 @@ spec: name: console-https {{- if .Values.route.ingress.webconsole.tls.enable }} tls: - {{- if .Values.route.ingress.webconsole.hostname}} + {{- if .Values.route.ingress.webconsole.hostname }} - hosts: - - {{ .Values.route.ingress.webconsole.hostname }} - {{- if .Values.route.ingress.webconsole.tls.secret}} + - {{ .Values.route.ingress.webconsole.hostname }} + {{- if .Values.route.ingress.webconsole.tls.secret }} secretName: {{ .Values.route.ingress.webconsole.tls.secret }} {{- end }} {{- else }}