From 165fa89b677a06f1e0c50a768331ce1f38ba69c6 Mon Sep 17 00:00:00 2001
From: cmsassot <cmsassot@cadoles.com>
Date: Thu, 4 Apr 2024 08:36:53 +0200
Subject: [PATCH] feat(deploiement): use port name

---
 .../hydra-oidc/resources/hydra-oidc-deployment.yaml      | 1 +
 components/hydra-oidc/resources/hydra-oidc-service.yaml  | 3 ++-
 components/hydra-sql/resources/hydra-sql-deployment.yaml | 1 +
 components/hydra-sql/resources/hydra-sql-service.yaml    | 5 +++--
 .../resources/hydra-dispatcher-deployment.yaml           | 9 +++++----
 .../resources/hydra-dispatcher-service.yaml              | 5 +++--
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
index a6f1222..603e283 100644
--- a/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-deployment.yaml
@@ -79,6 +79,7 @@ spec:
             periodSeconds: 15
           ports:
             - containerPort: 8080
+              name: oidc-http-port
           envFrom:
             - configMapRef:
                 name: hydra-oidc-env
diff --git a/components/hydra-oidc/resources/hydra-oidc-service.yaml b/components/hydra-oidc/resources/hydra-oidc-service.yaml
index 8cc03d1..00cd023 100644
--- a/components/hydra-oidc/resources/hydra-oidc-service.yaml
+++ b/components/hydra-oidc/resources/hydra-oidc-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-oidc
 spec:
   ports:
-    - name: hydra-oidc
+    - name: oidc-http-port
       port: 8080
+      targePort: oidc-http-port
   selector:
     app.kubernetes.io/name: hydra-oidc
 status:
diff --git a/components/hydra-sql/resources/hydra-sql-deployment.yaml b/components/hydra-sql/resources/hydra-sql-deployment.yaml
index 92e47af..8eb07b6 100644
--- a/components/hydra-sql/resources/hydra-sql-deployment.yaml
+++ b/components/hydra-sql/resources/hydra-sql-deployment.yaml
@@ -104,6 +104,7 @@ spec:
             runAsUser: 1000
           ports:
             - containerPort: 8080
+              name: sql-http-port
           volumeMounts:
             - name: sql-login-config
               mountPath: "/app/config/sql_login_configuration/sql_login.yaml"
diff --git a/components/hydra-sql/resources/hydra-sql-service.yaml b/components/hydra-sql/resources/hydra-sql-service.yaml
index b4073c6..e90e3f3 100644
--- a/components/hydra-sql/resources/hydra-sql-service.yaml
+++ b/components/hydra-sql/resources/hydra-sql-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-sql
 spec:
   ports:
-  - name: hydra-sql
-    port: 8080
+    - name: sql-http-port
+      port: 8080
+      targetPort: sql-http-port
   selector:
     app.kubernetes.io/name: hydra-sql
 status:
diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
index 1bbdf80..a6a488f 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-deployment.yaml
@@ -67,14 +67,14 @@ spec:
         readinessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 5
           timeoutSeconds: 5
           periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /health
-            port: 80
+            port: 8080
           initialDelaySeconds: 15
           timeoutSeconds: 5
           periodSeconds: 15
@@ -87,13 +87,14 @@ spec:
         - name: CADDY_HTTPS_PORT
           value: "8443"
         - name: CADDY_HTTP_PORT
-          value: "80"
+          value: "8080"
         - name: CADDY_DATA_FS
           value: "/tmp/caddy"
         - name: CADDY_APP_ROOT_PUBLIC
           value: "/app/public/"
         ports:
-        - containerPort: 80
+        - containerPort: 8080
+          name: disp-http-port
         resources: {}
         securityContext:
           runAsNonRoot: true
diff --git a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
index 1f8a023..3f33afd 100644
--- a/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
+++ b/resources/hydra-dispatcher/resources/hydra-dispatcher-service.yaml
@@ -6,8 +6,9 @@ metadata:
   name: hydra-dispatcher
 spec:
   ports:
-    - name: http
-      port: 80
+  - name: disp-http-port
+    port: 80
+    targetPort: disp-http-port
   selector:
     app.kubernetes.io/name: hydra-dispatcher
 status: