From bc4ccb78259dfeb32d412d017f5ab7c2db8452d9 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Sun, 5 Feb 2023 14:44:05 +0100 Subject: [COMMON] Fix nodePort creation in _service.tpl In case of non-TLS service the nodePort was not reserved and missed to disable tls for the services (tlsEnabled) Issue-ID: OOM-3094 Signed-off-by: Andreas Geissler Change-Id: I7f5102a499f4b262556787b5db682e28a9ebcf81 --- kubernetes/common/common/templates/_service.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kubernetes/common') diff --git a/kubernetes/common/common/templates/_service.tpl b/kubernetes/common/common/templates/_service.tpl index 7b88af02aa..20d2ebe260 100644 --- a/kubernetes/common/common/templates/_service.tpl +++ b/kubernetes/common/common/templates/_service.tpl @@ -131,9 +131,6 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent {{- else }} name: {{ $port.name }} {{- end }} -{{- if (eq $serviceType "NodePort") }} - nodePort: {{ include "common.nodePortPrefix" (dict "dot" $dot "useNodePortExt" $port.useNodePortExt) }}{{ $port.nodePort }} -{{- end }} {{- else }} - port: {{ default $port.port $port.plain_port }} targetPort: {{ $port.name }} @@ -148,15 +145,18 @@ labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent name: {{ $port.name }} {{- end }} {{- end }} +{{- if (eq $serviceType "NodePort") }} + nodePort: {{ include "common.nodePortPrefix" (dict "dot" $dot "useNodePortExt" $port.useNodePortExt) }}{{ $port.nodePort }} +{{- end }} {{- if (and (and (include "common.needTLS" $dot) $add_plain_port) $port.plain_port) }} {{- if (eq $serviceType "ClusterIP") }} - port: {{ $port.plain_port }} targetPort: {{ $port.name }}-plain -{{- if $port.plain_l4_port_protocol }} +{{- if $port.plain_l4_port_protocol }} protocol: {{ $port.plain_port_l4_protocol }} -{{- else }} +{{- else }} protocol: {{ default "TCP" $port.l4_protocol }} -{{- end }} +{{- end }} {{- if $port.port_protocol }} name: {{ printf "%s-%s" $port.port_protocol $port.name }} {{- else }} -- cgit 1.2.3-korg