commit 1256637d8781647464fd65529abba20c80fc73fc
author efiacor <fiachra.corcoran@est.tech> Wed May 11 19:39:10 2022 +0100
committer Fiachra Corcoran <fiachra.corcoran@est.tech> Sun May 15 18:48:13 2022 +0000
tree 95ef0e1db7aa047d537d6376e440b672f35e2b48
parent 12b4f95a8e210cf6e7ed9b7e8d9241cba80b900b

[SDC] Fix non ssl NodePort

Use single NodePort when needTLS = true

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I094edc8069ace49fdaa0e3fb56796530b748c72e
Issue-ID: OOM-2957

kubernetes/sdc/components/sdc-fe/templates/service.yaml

diff --git a/kubernetes/sdc/components/sdc-fe/templates/service.yaml b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
index 968a09c..30c3d11 100644
--- a/kubernetes/sdc/components/sdc-fe/templates/service.yaml
+++ b/kubernetes/sdc/components/sdc-fe/templates/service.yaml
@@ -39,17 +39,15 @@
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.internalPort }}
-      name: {{ .Values.service.portName }}
-      targetPort: {{ .Values.service.internalPort }}
-    {{ if (include "common.needTLS" .) }}
-    - port:  {{ .Values.service.internalPort2 }}
-      targetPort: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName }}s
-      {{ if eq .Values.service.type "NodePort" -}}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-      {{ end }}
-    {{ end }}
+    {{if eq .Values.service.type "NodePort" -}}
+    - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      name: {{ .Values.service.portName  }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+    {{- else -}}
+    - port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.externalPort2 .Values.service.externalPort }}
+      targetPort: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort2 .Values.service.internalPort }}
+      name: {{ .Values.service.portName }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
+    {{- end}}
   selector:
     app: {{ include "common.name" . }}
     release: {{ include "common.release" . }}

kubernetes/sdc/components/sdc-fe/values.yaml

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 6267da9..e86ae4c 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -114,9 +114,10 @@
   portName: http
   internalPort: 8181
   externalPort: 8181
-  nodePort2: "07"
   internalPort2: 9443
   externalPort2: 9443
+  nodePort: "07"
+
 
 ingress:
   enabled: false