From 43d4514bc6ab00285affdeeb69ee52793f076cc8 Mon Sep 17 00:00:00 2001
From: Christopher Hase <Christopher.Hase@telekom.de>
Date: Mon, 14 Apr 2025 13:23:02 +0200
Subject: [PATCH] add http-server part 8.5

---
 README.md             |  5 +--
 backend-ingress.yaml  | 22 -------------
 deployment.yaml       | 77 +++++++++++++++++++++++++++++++++++++++++++
 frontend-ingress.yaml | 24 --------------
 frontend/index.html   |  2 +-
 service.yaml          | 15 ---------
 6 files changed, 81 insertions(+), 64 deletions(-)
 delete mode 100644 backend-ingress.yaml
 delete mode 100644 frontend-ingress.yaml
 delete mode 100644 service.yaml

diff --git a/README.md b/README.md
index dc4e0b6..6db6456 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,10 @@ It is also possible to configure the intervall of days between the sending of ho
 The app can be deployed by running:
 
 ```bash
-$     kubectl apply -f ingress.yaml 
-$     kubectl apply -f service.yaml 
 $     kubectl apply -f deployment.yaml 
 ```
 
+This will start the deployment of the app in the pod, the service and an ingress for the HTTP frontend server and an ingress for the backend server.
 When a pod with the app is initally started, one email will be sent to the configured receiver.
 
 ## Backend Server
@@ -32,10 +31,12 @@ The backend server is running inside the pod on the address http://localhost:809
 An E-Mail with an I-Ching horoscope (provided by the library app) will be sent to the configured email address.
 
 The backend server can be tested from inside the pod by calling 'curl -X POST http://localhost:8090/iching/api/command' from the console.
+The backend server has a separate ingress, so API requests can get forwarded to the backend. Also the backend does not need 'rewrite target'.
 
 ## HTTP Server
 
 The frontend server is running inside the pod on the address http://localhost:8080/iching. It provides an HTML homepage with a button. Upon pressing the button, the backend server will be called (to send an E-Mail).
+The frontend server has a separate ingress from the backend server, since the frontend server needs the 'rewrite target' annotation: So the Frontend is not running in the root folder but using the sub-path 'iching'.
 
 <!--## Testing
 The Jest unit tests can be run with
diff --git a/backend-ingress.yaml b/backend-ingress.yaml
deleted file mode 100644
index e1d0239..0000000
--- a/backend-ingress.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: iching-backend-ingress
-  namespace: argocd
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: 192-168-197-2.c-one-infra.de
-      http:
-        paths:
-          - path: /iching/api(/|$)(.*)
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: iching-service
-                port:
-                  number: 81
-  tls:
-    - hosts:
-        - 192-168-197-2.c-one-infra.de
-      secretName: argocd-net-tls
\ No newline at end of file
diff --git a/deployment.yaml b/deployment.yaml
index 9e01f83..e75a70c 100644
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -1,3 +1,5 @@
+# --- DEPLOYMENT --------------------------------------------
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -17,3 +19,78 @@ spec:
         name: iching-broker
         imagePullPolicy: Always
  
+---
+
+# --- SERVICE -----------------------------------------------
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: iching-service
+  namespace: argocd
+spec:
+  selector:
+    app: iching-broker
+  ports:
+    - name: frontend
+      port: 80
+      targetPort: 8080
+    - name: backend
+      port: 81
+      targetPort: 8090
+
+---
+
+# --- INGRESS: Frontend -------------------------------------
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: iching-frontend-ingress
+  namespace: argocd
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: 192-168-197-2.c-one-infra.de
+      http:
+        paths:
+          - path: /iching(/|$)(.*)
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: iching-service
+                port:
+                  number: 80
+  tls:
+    - hosts:
+        - 192-168-197-2.c-one-infra.de
+      secretName: argocd-net-tls
+
+---
+
+# --- INGRESS: Backend ---------------------------------------
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: iching-backend-ingress
+  namespace: argocd
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: 192-168-197-2.c-one-infra.de
+      http:
+        paths:
+          - path: /iching/api(/|$)(.*)
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: iching-service
+                port:
+                  number: 81
+  tls:
+    - hosts:
+        - 192-168-197-2.c-one-infra.de
+      secretName: argocd-net-tls
diff --git a/frontend-ingress.yaml b/frontend-ingress.yaml
deleted file mode 100644
index f18b0a4..0000000
--- a/frontend-ingress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: iching-frontend-ingress
-  namespace: argocd
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-spec:
-  ingressClassName: nginx
-  rules:
-    - host: 192-168-197-2.c-one-infra.de
-      http:
-        paths:
-          - path: /iching(/|$)(.*)
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: iching-service
-                port:
-                  number: 80
-  tls:
-    - hosts:
-        - 192-168-197-2.c-one-infra.de
-      secretName: argocd-net-tls
\ No newline at end of file
diff --git a/frontend/index.html b/frontend/index.html
index 010d51a..e3a618b 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -56,7 +56,7 @@
     <h1>🧘 My I-Ging Horoscope</h1>
     <p>Click on the Button to receive your personal Horoscope. 100% accuracy guaranteed!</p>
     <button id="myButton">✨ Receive Horoscope ✨</button>
-    <div class="footer">With Love & Chance from the Cosmos 💫</div>
+    <div class="footer">With Love & Fortune from the Cosmos 💫</div>
   </div>
 
   <script type="module" src="./event.mjs"></script>
diff --git a/service.yaml b/service.yaml
deleted file mode 100644
index db42575..0000000
--- a/service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: iching-service
-  namespace: argocd
-spec:
-  selector:
-    app: iching-broker
-  ports:
-    - name: frontend
-      port: 80
-      targetPort: 8080
-    - name: backend
-      port: 81
-      targetPort: 8090
\ No newline at end of file