From 51208ebd534b8431fa2b541055d3e61483789db2 Mon Sep 17 00:00:00 2001
From: dzsak <sisakadam@gmail.com>
Date: Mon, 5 Feb 2024 14:06:00 +0100
Subject: [PATCH] Set default port reference name

---
 charts/common/templates/_container.yaml          |  2 +-
 charts/onechart/templates/service.yaml           |  4 ++--
 charts/onechart/tests/deployment_ports_test.yaml | 13 +++++++++++++
 charts/onechart/tests/service_ports_test.yaml    | 13 +++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/charts/common/templates/_container.yaml b/charts/common/templates/_container.yaml
index f0649f4b..14184e1c 100644
--- a/charts/common/templates/_container.yaml
+++ b/charts/common/templates/_container.yaml
@@ -17,7 +17,7 @@ ports:
     protocol: TCP
   {{- else }}
   {{- range .Values.ports }}
-  - name: {{ .name }}
+  - name: {{ if .name }}{{ .name }}{{ else if .containerPort }}{{ printf "tcp-%g" .containerPort}}{{ end }}
     containerPort: {{ .containerPort }}
     protocol: TCP
   {{- end }}
diff --git a/charts/onechart/templates/service.yaml b/charts/onechart/templates/service.yaml
index aeb9cf34..38ff20e8 100644
--- a/charts/onechart/templates/service.yaml
+++ b/charts/onechart/templates/service.yaml
@@ -64,12 +64,12 @@ spec:
       {{- end }}
     {{- else }}
     {{- range .Values.ports }}
-    - name: {{ .name }}
+    - name: {{ if .name }}{{ .name }}{{ else if .svcPort }}{{ printf "tcp-%g" .svcPort }}{{ end }}
       port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}
       {{- if .nodePort }}
       nodePort: {{ .nodePort }}
       {{- end }}
-      targetPort: {{ .name }}
+      targetPort: {{ if .name }}{{ .name }}{{ else if .containerPort }}{{ printf "tcp-%g" .containerPort}}{{ end }}
       protocol: TCP
     {{- end }}
     {{- end }}
diff --git a/charts/onechart/tests/deployment_ports_test.yaml b/charts/onechart/tests/deployment_ports_test.yaml
index d4b4197e..033e268a 100644
--- a/charts/onechart/tests/deployment_ports_test.yaml
+++ b/charts/onechart/tests/deployment_ports_test.yaml
@@ -27,6 +27,19 @@ tests:
             - name: passive-2
               containerPort: 3002
               protocol: TCP
+  - it: Should set port definition if name is not set
+    set:
+      ports:
+        - containerPort: 21
+    asserts:
+      - template: deployment.yaml
+        documentIndex: 0
+        equal:
+          path: spec.template.spec.containers[0].ports
+          value:
+            - name: tcp-21
+              containerPort: 21
+              protocol: TCP
   - it: Should set default port
     asserts:
       - template: deployment.yaml
diff --git a/charts/onechart/tests/service_ports_test.yaml b/charts/onechart/tests/service_ports_test.yaml
index 1fca29ac..0b382377 100644
--- a/charts/onechart/tests/service_ports_test.yaml
+++ b/charts/onechart/tests/service_ports_test.yaml
@@ -55,6 +55,19 @@ tests:
               port: 3002
               targetPort: passive-2
               protocol: TCP
+  - it: Should set port definition if name is not set
+    set:
+      ports:
+        - svcPort: 445
+          containerPort: 21
+    asserts:
+      - equal:
+          path: spec.ports
+          value:
+            - name: tcp-445
+              port: 445
+              targetPort: tcp-21
+              protocol: TCP
   - it: Should set default port
     asserts:
       - equal: