Refactor Kubernetes deployment configuration to use kustomize overlays and update ingress handling

Author: PaulicStudios

.github/workflows/deploy.yml

@@ -68,15 +68,12 @@ jobs:
       - name: Deploy to Kubernetes
         run: |
           if [ "${{ github.ref_name }}" = "main" ]; then
-            INGRESS_HOST="wiki.coregame.de"
+            OVERLAY=main
           elif [ "${{ github.ref_name }}" = "dev" ]; then
-            INGRESS_HOST="dev.wiki.coregame.de"
+            OVERLAY=dev
           else
-            echo "Branch is not main or dev, skipping ingress update."
+            echo "Branch is not main or dev, skipping deployment."
             exit 1
           fi
-          sed -i "s|IMAGE_TAG|${{ env.IMAGE_NAME }}|g" k8s/deployment.yml
-          sed -i "s|INGRESS_HOST|$INGRESS_HOST|g" k8s/ingress.yml
-          kubectl apply -f k8s/deployment.yml
-          kubectl apply -f k8s/service.yml
-          kubectl apply -f k8s/ingress.yml
+          cd k8s/overlays/$OVERLAY
+          kustomize build . | kubectl apply -f -

k8s/deployment.yml

@@ -2,8 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: public-wiki
+  namespace: wiki
 spec:
-  replicas: 1
+  replicas: 3 # default, will be overridden by overlays
   selector:
     matchLabels:
       app: public-wiki
@@ -14,6 +15,6 @@ spec:
     spec:
       containers:
       - name: public-wiki
-        image: IMAGE_TAG
+        image: IMAGE_TAG # will be replaced by kustomize
         ports:
         - containerPort: 3000

k8s/ingress.yml

@@ -2,11 +2,12 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: public-wiki-ingress
+  namespace: wiki
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
   rules:
-  - host: INGRESS_HOST
+  - host: PLACEHOLDER_HOST
     http:
       paths:
       - path: /

k8s/kustomization.yml

@@ -0,0 +1,11 @@
+resources:
+  - namespace.yml
+  - deployment.yml
+  - service.yml
+  - ingress.yml
+
+images:
+  - name: public-wiki
+    newName: IMAGE_TAG
+
+namespace: wiki

k8s/namespace.yml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: wiki

k8s/overlays/dev/kustomization.yml

@@ -0,0 +1,28 @@
+resources:
+  - ../../deployment.yml
+  - ../../service.yml
+  - ../../ingress.yml
+  - ../../namespace.yml
+
+namespace: wiki
+
+patches:
+  - target:
+      kind: Deployment
+      name: public-wiki
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 1
+  - target:
+      kind: Ingress
+      name: public-wiki-ingress
+    patch: |-
+      - op: replace
+        path: /spec/rules/0/host
+        value: dev.wiki.coregame.de
+
+images:
+  - name: IMAGE_TAG
+    newName: ghcr.io/42core-team/wiki
+    newTag: dev

k8s/overlays/main/kustomization.yml

@@ -0,0 +1,28 @@
+resources:
+  - ../../deployment.yml
+  - ../../service.yml
+  - ../../ingress.yml
+  - ../../namespace.yml
+
+namespace: wiki
+
+patches:
+  - target:
+      kind: Deployment
+      name: public-wiki
+    patch: |-
+      - op: replace
+        path: /spec/replicas
+        value: 3
+  - target:
+      kind: Ingress
+      name: public-wiki-ingress
+    patch: |-
+      - op: replace
+        path: /spec/rules/0/host
+        value: wiki.coregame.de
+
+images:
+  - name: IMAGE_TAG
+    newName: ghcr.io/42core-team/wiki
+    newTag: main

k8s/service.yml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: public-wiki
+  namespace: wiki
 spec:
   selector:
     app: public-wiki