From f304f1eeea60976c02a2c0739316895b459c2991 Mon Sep 17 00:00:00 2001
From: Piotr Icikowski <piotrekicikowski@gmail.com>
Date: Sat, 19 Nov 2022 01:20:45 +0100
Subject: [PATCH] fix(helmChart): rearrange K8s Services configuration

---
 dist/chart/goosymock/templates/NOTES.txt      | 12 ++++-----
 .../goosymock/templates/ingress-admin.yaml    |  2 +-
 .../goosymock/templates/ingress-content.yaml  |  2 +-
 .../goosymock/templates/service-admin.yaml    |  6 ++---
 .../goosymock/templates/service-content.yaml  |  6 ++---
 dist/chart/goosymock/values.yaml              | 25 +++++++++----------
 6 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/dist/chart/goosymock/templates/NOTES.txt b/dist/chart/goosymock/templates/NOTES.txt
index 141c29f..6243ab3 100644
--- a/dist/chart/goosymock/templates/NOTES.txt
+++ b/dist/chart/goosymock/templates/NOTES.txt
@@ -4,10 +4,10 @@ Service installed successfully! Check out the documentation (https://icikowski.g
 
 Ways to access the application:
   1. Admin API:
-     - via {{ .Values.goosyMock.adminApi.service.type }} service:
-       HTTP on port {{ .Values.goosyMock.adminApi.service.port }}
+     - via {{ .Values.service.adminApi.type }} service:
+       HTTP on port {{ .Values.service.adminApi.port }}
        {{- if .Values.goosyMock.adminApi.ssl.enabled }}
-       HTTPS on port {{ .Values.goosyMock.adminApi.service.securedPort }}
+       HTTPS on port {{ .Values.service.adminApi.securedPort }}
        {{- end }}
      {{- if .Values.ingress.adminApi.enabled }}
      - via Ingress:
@@ -18,10 +18,10 @@ Ways to access the application:
      {{- end }}
      {{- end }}
   2. Content Service:
-     - via {{ .Values.goosyMock.contentService.service.type }} service:
-       HTTP on port {{ .Values.goosyMock.contentService.service.port }}
+     - via {{ .Values.service.contentService.type }} service:
+       HTTP on port {{ .Values.service.contentService.port }}
        {{- if .Values.goosyMock.contentService.ssl.enabled }}
-       HTTPS on port {{ .Values.goosyMock.contentService.service.securedPort }}
+       HTTPS on port {{ .Values.service.contentService.securedPort }}
        {{- end }}
      {{- if .Values.ingress.contentService.enabled }}
      - via Ingress:
diff --git a/dist/chart/goosymock/templates/ingress-admin.yaml b/dist/chart/goosymock/templates/ingress-admin.yaml
index 1bb860e..4106cb2 100644
--- a/dist/chart/goosymock/templates/ingress-admin.yaml
+++ b/dist/chart/goosymock/templates/ingress-admin.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.adminApi.enabled -}}
 {{- $fullName := include "goosymock.fullname" . -}}
-{{- $svcPort := .Values.goosyMock.adminApi.service.port -}}
+{{- $svcPort := .Values.service.adminApi.port -}}
 {{- if and .Values.ingress.adminApi.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.adminApi.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.adminApi.annotations "kubernetes.io/ingress.class" .Values.ingress.adminApi.className}}
diff --git a/dist/chart/goosymock/templates/ingress-content.yaml b/dist/chart/goosymock/templates/ingress-content.yaml
index cd46452..e1eea40 100644
--- a/dist/chart/goosymock/templates/ingress-content.yaml
+++ b/dist/chart/goosymock/templates/ingress-content.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.contentService.enabled -}}
 {{- $fullName := include "goosymock.fullname" . -}}
-{{- $svcPort := .Values.goosyMock.contentService.service.port -}}
+{{- $svcPort := .Values.service.contentService.port -}}
 {{- if and .Values.ingress.contentService.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.contentService.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.contentService.annotations "kubernetes.io/ingress.class" .Values.ingress.contentService.className}}
diff --git a/dist/chart/goosymock/templates/service-admin.yaml b/dist/chart/goosymock/templates/service-admin.yaml
index 41549b6..22800a4 100644
--- a/dist/chart/goosymock/templates/service-admin.yaml
+++ b/dist/chart/goosymock/templates/service-admin.yaml
@@ -5,14 +5,14 @@ metadata:
   labels:
     {{- include "goosymock.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.goosyMock.adminApi.service.type }}
+  type: {{ .Values.service.adminApi.type }}
   ports:
-    - port: {{ .Values.goosyMock.adminApi.service.port }}
+    - port: {{ .Values.service.adminApi.port }}
       targetPort: admin-http
       protocol: TCP
       name: http
     {{- if .Values.goosyMock.adminApi.ssl.enabled }}
-    - port: {{ .Values.goosyMock.adminApi.service.securedPort }}
+    - port: {{ .Values.service.adminApi.securedPort }}
       targetPort: admin-https
       protocol: TCP
       name: https
diff --git a/dist/chart/goosymock/templates/service-content.yaml b/dist/chart/goosymock/templates/service-content.yaml
index 15d09f0..7645e8a 100644
--- a/dist/chart/goosymock/templates/service-content.yaml
+++ b/dist/chart/goosymock/templates/service-content.yaml
@@ -5,14 +5,14 @@ metadata:
   labels:
     {{- include "goosymock.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.goosyMock.contentService.service.type }}
+  type: {{ .Values.service.contentService.type }}
   ports:
-    - port: {{ .Values.goosyMock.contentService.service.port }}
+    - port: {{ .Values.service.contentService.port }}
       targetPort: content-http
       protocol: TCP
       name: http
     {{- if .Values.goosyMock.contentService.ssl.enabled }}
-    - port: {{ .Values.goosyMock.contentService.service.securedPort }}
+    - port: {{ .Values.service.contentService.securedPort }}
       targetPort: content-https
       protocol: TCP
       name: https
diff --git a/dist/chart/goosymock/values.yaml b/dist/chart/goosymock/values.yaml
index 607d1b9..d383eb9 100644
--- a/dist/chart/goosymock/values.yaml
+++ b/dist/chart/goosymock/values.yaml
@@ -33,12 +33,6 @@ goosyMock:
       enabled: false
       port: 8444
       secretName: ""
-    
-    # Kubernetes Service configuration
-    service:
-      type: ClusterIP
-      port: 80
-      securedPort: 443
   
   # Content Service configuration
   contentService:
@@ -52,18 +46,23 @@ goosyMock:
       enabled: false
       port: 8443
       secretName: ""
-    
-    # Kubernetes Service configuration
-    service:
-      type: ClusterIP
-      port: 80
-      securedPort: 443
   
   # Health probes configuration
   health:
     port: 8888
 
-# Ingress configuration for Admin API Service and Content Service
+# Kubernetes Service configuration for Admin API Service and Content Service
+service:
+  adminApi:
+    type: ClusterIP
+    port: 80
+    securedPort: 443
+  contentService:
+    type: ClusterIP
+    port: 80
+    securedPort: 443
+
+# Kubernetes Ingress configuration for Admin API Service and Content Service
 ingress:
   adminApi:
     enabled: false