From 2e2f1379d965cdc563a7f700a2332b90eda88e0f Mon Sep 17 00:00:00 2001
From: Timo Notheisen <65653426+tnotheis@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:16:36 +0100
Subject: [PATCH] Helm Chart: use port 8080 everywhere (#445)

---
 helm/charts/adminui/templates/deployment.yaml        | 6 +++---
 helm/charts/adminui/templates/service.yaml           | 4 ++--
 helm/charts/consumerapi/templates/backendconfig.yaml | 2 +-
 helm/charts/consumerapi/templates/deployment.yaml    | 6 +++---
 helm/charts/consumerapi/templates/httproute.yaml     | 2 +-
 helm/charts/consumerapi/templates/ingress.yaml       | 2 +-
 helm/charts/consumerapi/templates/service.yaml       | 4 ++--
 helm/values.yaml                                     | 2 --
 8 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/helm/charts/adminui/templates/deployment.yaml b/helm/charts/adminui/templates/deployment.yaml
index bfc8bbb658..d4cf74c794 100644
--- a/helm/charts/adminui/templates/deployment.yaml
+++ b/helm/charts/adminui/templates/deployment.yaml
@@ -57,12 +57,12 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           livenessProbe:
             httpGet:
               path: /
-              port: 80
+              port: 8080
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -70,7 +70,7 @@ spec:
           readinessProbe:
             httpGet:
               path: /
-              port: 80
+              port: 8080
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
diff --git a/helm/charts/adminui/templates/service.yaml b/helm/charts/adminui/templates/service.yaml
index bacc69d8d2..25ac18ec29 100644
--- a/helm/charts/adminui/templates/service.yaml
+++ b/helm/charts/adminui/templates/service.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: 80
-      targetPort: {{ .Values.service.port }}
+    - port: 8080
+      targetPort: 8080
   selector:
     app: {{ include "global.name" . }}
diff --git a/helm/charts/consumerapi/templates/backendconfig.yaml b/helm/charts/consumerapi/templates/backendconfig.yaml
index 9b41575930..fdc8046cfb 100644
--- a/helm/charts/consumerapi/templates/backendconfig.yaml
+++ b/helm/charts/consumerapi/templates/backendconfig.yaml
@@ -13,5 +13,5 @@ spec:
     unhealthyThreshold: {{ .Values.backendConfig.healthCheck.unhealthyThreshold }}
     type: HTTP
     requestPath: /health
-    port: 80
+    port: 8080
 {{- end }}
diff --git a/helm/charts/consumerapi/templates/deployment.yaml b/helm/charts/consumerapi/templates/deployment.yaml
index 84e3f743e5..d3148813dd 100644
--- a/helm/charts/consumerapi/templates/deployment.yaml
+++ b/helm/charts/consumerapi/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           volumeMounts:
             - name: settings-override
@@ -84,7 +84,7 @@ spec:
           livenessProbe:
             httpGet:
               path: /health
-              port: 80
+              port: 8080
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -92,7 +92,7 @@ spec:
           readinessProbe:
             httpGet:
               path: /health
-              port: 80
+              port: 8080
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
diff --git a/helm/charts/consumerapi/templates/httproute.yaml b/helm/charts/consumerapi/templates/httproute.yaml
index 11057e5062..98397644fa 100644
--- a/helm/charts/consumerapi/templates/httproute.yaml
+++ b/helm/charts/consumerapi/templates/httproute.yaml
@@ -21,5 +21,5 @@ spec:
             value: /
       backendRefs:
         - name: {{ include "global.name" . }}
-          port: 80
+          port: 8080
 {{- end }}
diff --git a/helm/charts/consumerapi/templates/ingress.yaml b/helm/charts/consumerapi/templates/ingress.yaml
index 6c81bfc446..e4829cd986 100644
--- a/helm/charts/consumerapi/templates/ingress.yaml
+++ b/helm/charts/consumerapi/templates/ingress.yaml
@@ -22,5 +22,5 @@ spec:
               service:
                 name: {{ include "global.name" . }}
                 port:
-                  number: 80   
+                  number: 8080   
 {{- end }}
diff --git a/helm/charts/consumerapi/templates/service.yaml b/helm/charts/consumerapi/templates/service.yaml
index 21a7c78f6d..9ae17c7c0d 100644
--- a/helm/charts/consumerapi/templates/service.yaml
+++ b/helm/charts/consumerapi/templates/service.yaml
@@ -19,7 +19,7 @@ spec:
   loadBalancerIP: {{ .Values.service.loadBalancer.ip }}
   {{- end }}
   ports:
-    - port: 80
-      targetPort: {{ .Values.service.port }}
+    - port: 8080
+      targetPort: 8080
   selector:
     app: {{ include "global.name" . }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 5f155ea2db..989f8e4df2 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -44,7 +44,6 @@ consumerapi:
 
   service:
     type: "ClusterIP"
-    port: 8080
     loadBalancer:
       # ip - the static ip address the LoadBalancer should use
       ip: ""
@@ -119,7 +118,6 @@ adminui:
 
   service:
     type: "ClusterIP"
-    port: 8080
 
   image:
     repository: "ghcr.io/nmshd/backbone-admin-ui"