From 92a246105114ccf63e9d513e3e59fd5b9a6e2e25 Mon Sep 17 00:00:00 2001
From: Laurent Paumier <laurent.paumier@fnac.net>
Date: Fri, 20 Jan 2023 14:31:47 +0100
Subject: [PATCH 1/2] fix service ports

---
 k8s/auth-service-deployment.yaml      |  6 +++---
 k8s/cloud-gateway-deployment.yaml     |  6 +++---
 k8s/config-maps.yaml                  |  9 ++++-----
 k8s/config-server-deployment.yaml     |  4 ++--
 k8s/mysql-deployment.yaml             | 10 +++++-----
 k8s/order-service-deployment.yaml     |  6 +++---
 k8s/payment-service-deployment.yaml   |  6 +++---
 k8s/product-service-deployment.yaml   |  7 +++----
 k8s/redis-deployment.yaml             |  4 ++--
 k8s/service-registry-statefulset.yaml |  5 +++--
 k8s/zipkin-deployment.yaml            |  5 ++---
 11 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/k8s/auth-service-deployment.yaml b/k8s/auth-service-deployment.yaml
index eddce75..961507d 100644
--- a/k8s/auth-service-deployment.yaml
+++ b/k8s/auth-service-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,7 +48,6 @@ spec:
                   key: hostname
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -56,5 +56,5 @@ spec:
   selector:
     app: auth-service-app
   ports:
-    - port: 80
-      targetPort: 7777
\ No newline at end of file
+    - port: 7777
+      targetPort: 7777
diff --git a/k8s/cloud-gateway-deployment.yaml b/k8s/cloud-gateway-deployment.yaml
index 56b3504..e8307ed 100644
--- a/k8s/cloud-gateway-deployment.yaml
+++ b/k8s/cloud-gateway-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -42,7 +43,6 @@ spec:
                   key: eureka_service_address
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -52,5 +52,5 @@ spec:
   selector:
     app: cloud-gateway-app
   ports:
-    - port: 80
-      targetPort: 9090
\ No newline at end of file
+    - port: 9090
+      targetPort: 9090
diff --git a/k8s/config-maps.yaml b/k8s/config-maps.yaml
index 74a1a04..b79ba58 100644
--- a/k8s/config-maps.yaml
+++ b/k8s/config-maps.yaml
@@ -1,24 +1,23 @@
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config-cm
 data:
-  config_url: "config-server-svc"
+  config_url: "http://config-server-svc:9296"
 
 ---
-
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: eureka-cm
 data:
-  eureka_service_address: "http://eureka-0.eureka:8761/eureka"
+  eureka_service_address: "http://eureka:8761/eureka"
 
 ---
-
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: mysql-cm
 data:
-  hostname: "mysql-0.mysql"
+  hostname: "mysql"
diff --git a/k8s/config-server-deployment.yaml b/k8s/config-server-deployment.yaml
index a840dcb..d3e3be4 100644
--- a/k8s/config-server-deployment.yaml
+++ b/k8s/config-server-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -41,7 +42,6 @@ spec:
                   key: eureka_service_address
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -50,5 +50,5 @@ spec:
   selector:
     app: config-server-app
   ports:
-    - port: 80
+    - port: 9296
       targetPort: 9296
diff --git a/k8s/mysql-deployment.yaml b/k8s/mysql-deployment.yaml
index f26d94f..3fb305b 100644
--- a/k8s/mysql-deployment.yaml
+++ b/k8s/mysql-deployment.yaml
@@ -1,3 +1,4 @@
+---
 # Persistent Volume
 apiVersion: v1
 kind: PersistentVolume
@@ -13,8 +14,8 @@ spec:
     #    path: "/mnt/data"  # - for Unix/Linux
     path: "/run/desktop/mnt/host/c/temp/testfiles"
     type: DirectoryOrCreate
----
 
+---
 # Persistent Volume Claim
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -28,8 +29,8 @@ spec:
   accessModes:
     - ReadWriteOnce
 
-# StatefulSet - MySql
 ---
+# StatefulSet - MySql
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -67,8 +68,8 @@ spec:
           persistentVolumeClaim:
             claimName: mysql-pvc
 
-# Headless Service
 ---
+# Headless Service
 apiVersion: v1
 kind: Service
 metadata:
@@ -80,9 +81,8 @@ spec:
   ports:
     - port: 3306
 
-# Config
 ---
-
+# Config
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/k8s/order-service-deployment.yaml b/k8s/order-service-deployment.yaml
index ab01a8d..810bd19 100644
--- a/k8s/order-service-deployment.yaml
+++ b/k8s/order-service-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,7 +48,6 @@ spec:
                   key: hostname
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -56,5 +56,5 @@ spec:
   selector:
     app: order-service-app
   ports:
-    - port: 80
-      targetPort: 8082
\ No newline at end of file
+    - port: 8082
+      targetPort: 8082
diff --git a/k8s/payment-service-deployment.yaml b/k8s/payment-service-deployment.yaml
index 28baedf..10523c9 100644
--- a/k8s/payment-service-deployment.yaml
+++ b/k8s/payment-service-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -47,7 +48,6 @@ spec:
                   key: hostname
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -56,5 +56,5 @@ spec:
   selector:
     app: payment-service-app
   ports:
-    - port: 80
-      targetPort: 8083
\ No newline at end of file
+    - port: 8083
+      targetPort: 8083
diff --git a/k8s/product-service-deployment.yaml b/k8s/product-service-deployment.yaml
index 4a46be2..d1dd677 100644
--- a/k8s/product-service-deployment.yaml
+++ b/k8s/product-service-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -46,9 +47,7 @@ spec:
                   name: mysql-cm
                   key: hostname
 
-
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -57,5 +56,5 @@ spec:
   selector:
     app: product-service-app
   ports:
-    - port: 80
-      targetPort: 8081
\ No newline at end of file
+    - port: 8081
+      targetPort: 8081
diff --git a/k8s/redis-deployment.yaml b/k8s/redis-deployment.yaml
index 6fa2196..2083b10 100644
--- a/k8s/redis-deployment.yaml
+++ b/k8s/redis-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -23,7 +24,6 @@ spec:
             - containerPort: 6379
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -33,4 +33,4 @@ spec:
     app: redis-app
   ports:
     - port: 6379
-      targetPort: 6379
\ No newline at end of file
+      targetPort: 6379
diff --git a/k8s/service-registry-statefulset.yaml b/k8s/service-registry-statefulset.yaml
index 18df3e6..ad98698 100644
--- a/k8s/service-registry-statefulset.yaml
+++ b/k8s/service-registry-statefulset.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -45,5 +46,5 @@ spec:
   selector:
     app: eureka
   ports:
-    - port: 80
-      targetPort: 8761
\ No newline at end of file
+    - port: 8761
+      targetPort: 8761
diff --git a/k8s/zipkin-deployment.yaml b/k8s/zipkin-deployment.yaml
index 2a8cdb1..9515910 100644
--- a/k8s/zipkin-deployment.yaml
+++ b/k8s/zipkin-deployment.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -16,7 +17,6 @@ spec:
           image: openzipkin/zipkin
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -29,7 +29,6 @@ spec:
       targetPort: 9411
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -40,4 +39,4 @@ spec:
     app: zipkin
   ports:
     - port: 9411
-      targetPort: 9411
\ No newline at end of file
+      targetPort: 9411

From 58506daac1d3857c483575a4cb2514e18dee5826 Mon Sep 17 00:00:00 2001
From: Laurent Paumier <laurent.paumier@fnac.net>
Date: Tue, 24 Jan 2023 13:39:07 +0100
Subject: [PATCH 2/2] fix config server url

---
 k8s/config-maps.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/k8s/config-maps.yaml b/k8s/config-maps.yaml
index b79ba58..15536a7 100644
--- a/k8s/config-maps.yaml
+++ b/k8s/config-maps.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: config-cm
 data:
-  config_url: "http://config-server-svc:9296"
+  config_url: "config-server-svc"
 
 ---
 apiVersion: v1