Refactor Kubernetes manifests to include labels for better resource management and update deployment structure

Author: PaulicStudios

.github/workflows/deploy.yml

@@ -76,4 +76,4 @@ jobs:
             exit 1
           fi
           cd k8s/overlays/$OVERLAY
-          kustomize build . | kubectl apply -f -
+          kustomize build . | kubectl apply --prune -l app=public-wiki -f -

k8s/base/deployment.yml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: public-wiki
+  namespace: wiki
+  labels:
+    app: public-wiki
+spec:
+  replicas: 3 # default, will be overridden by overlays
+  selector:
+    matchLabels:
+      app: public-wiki
+  template:
+    metadata:
+      labels:
+        app: public-wiki
+    spec:
+      containers:
+      - name: public-wiki
+        image: IMAGE_TAG # will be replaced by kustomize
+        ports:
+        - containerPort: 3000

k8s/base/ingress.yml

@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: public-wiki-ingress
+  namespace: wiki
+  labels:
+    app: public-wiki
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+spec:
+  rules:
+  - host: PLACEHOLDER_HOST
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: public-wiki
+            port:
+              number: 80

k8s/base/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/base/namespace.yml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: wiki
+  labels:
+    app: public-wiki

k8s/base/service.yml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: public-wiki
+  namespace: wiki
+  labels:
+    app: public-wiki
+spec:
+  selector:
+    app: public-wiki
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 3000

k8s/deployment.yml

@@ -3,6 +3,8 @@ kind: Deployment
 metadata:
   name: public-wiki
   namespace: wiki
+  labels:
+    app: public-wiki
 spec:
   replicas: 3 # default, will be overridden by overlays
   selector:

k8s/ingress.yml

@@ -3,6 +3,8 @@ kind: Ingress
 metadata:
   name: public-wiki-ingress
   namespace: wiki
+  labels:
+    app: public-wiki
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:

k8s/kustomization.yml

@@ -3,7 +3,6 @@ resources:
   - deployment.yml
   - service.yml
   - ingress.yml
-
 images:
   - name: public-wiki
     newName: IMAGE_TAG

k8s/namespace.yml

@@ -2,3 +2,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: wiki
+  labels:
+    app: public-wiki