From 9c985a38038520820ab1bf1d863604095e84dc21 Mon Sep 17 00:00:00 2001
From: Vojtech Mares <iam@vojtechmares.com>
Date: Tue, 3 Oct 2023 11:44:12 +0200
Subject: [PATCH] refactor(helm): service.port.name,.number instead of
 service.portName,.portNumber

---
 charts/backoffice/templates/deployment.yaml | 4 ++--
 charts/backoffice/templates/ingress.yaml    | 2 +-
 charts/backoffice/templates/service.yaml    | 6 +++---
 charts/backoffice/values.yaml               | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/charts/backoffice/templates/deployment.yaml b/charts/backoffice/templates/deployment.yaml
index daa3bfb..4559562 100644
--- a/charts/backoffice/templates/deployment.yaml
+++ b/charts/backoffice/templates/deployment.yaml
@@ -34,8 +34,8 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: Always
           ports:
-            - name: {{ .Values.service.portName }}
-              containerPort: {{ .Values.service.portNumber }}
+            - name: {{ .Values.service.port.name }}
+              containerPort: {{ .Values.service.port.number }}
               protocol: TCP
           livenessProbe:
             httpGet:
diff --git a/charts/backoffice/templates/ingress.yaml b/charts/backoffice/templates/ingress.yaml
index fa5b95e..ef8bf64 100644
--- a/charts/backoffice/templates/ingress.yaml
+++ b/charts/backoffice/templates/ingress.yaml
@@ -24,5 +24,5 @@ spec:
               service:
                 name: {{ .Release.Name }}
                 port:
-                  name: {{ .Values.service.portName }}
+                  name: {{ .Values.service.port.name }}
 {{- end -}}
diff --git a/charts/backoffice/templates/service.yaml b/charts/backoffice/templates/service.yaml
index 0894cdc..b4a300c 100644
--- a/charts/backoffice/templates/service.yaml
+++ b/charts/backoffice/templates/service.yaml
@@ -6,10 +6,10 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.portNumber }}
-      targetPort: {{ .Values.service.portNumber }}
+    - port: {{ .Values.service.port.number }}
+      targetPort: {{ .Values.service.port.number }}
       protocol: TCP
-      name: {{ .Values.service.portName }}
+      name: {{ .Values.service.port.name }}
 
   selector:
     app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/charts/backoffice/values.yaml b/charts/backoffice/values.yaml
index c1e6a05..f453397 100644
--- a/charts/backoffice/values.yaml
+++ b/charts/backoffice/values.yaml
@@ -16,8 +16,9 @@ ingress:
     # cert-manager.io/issuer: letsencrypt-prod
 
 service:
-  portName: http
-  portNumber: 3000
+  port:
+    name: http
+    number: 3000
 
 pdb:
   minAvailable: 1