From 39e5d27effa2a0e7722fb93ce4dade8394528043 Mon Sep 17 00:00:00 2001
From: Paolo Brasolin <paolo.brasolin@eurac.edu>
Date: Sat, 26 Feb 2022 20:23:52 +0100
Subject: [PATCH] feat: #be streamline k8s resource naming

---
 backend/kustomize/base/database-deployment.yaml  | 14 +++++++-------
 backend/kustomize/base/database-pvc.yaml         |  2 +-
 backend/kustomize/base/database-service.yaml     |  4 ++--
 backend/kustomize/base/kustomization.yaml        | 12 ++++++++++++
 backend/kustomize/base/webserver-deployment.yaml |  9 ++++-----
 backend/kustomize/base/webserver-ingress.yaml    |  4 ++--
 backend/kustomize/base/webserver-service.yaml    |  4 ++--
 7 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 backend/kustomize/base/kustomization.yaml

diff --git a/backend/kustomize/base/database-deployment.yaml b/backend/kustomize/base/database-deployment.yaml
index ca026da..7c4afc6 100644
--- a/backend/kustomize/base/database-deployment.yaml
+++ b/backend/kustomize/base/database-deployment.yaml
@@ -1,23 +1,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: oetzi-database
+  name: database
 spec:
   selector:
     matchLabels:
-      app: oetzi-database
+      component: database
   template:
     metadata:
       labels:
-        app: oetzi-database
+        component: database
     spec:
       containers:
-        - name: oetzi-database
+        - name: database
           image: postgres:14-alpine
           ports:
             - containerPort: 5432
           volumeMounts:
-            - name: pg-data
+            - name: pgdata
               mountPath: /var/lib/postgresql/data
           env:
             - name: POSTGRES_DB
@@ -28,6 +28,6 @@ spec:
               value: db_pass
           resources: {}
       volumes:
-        - name: pg-data
+        - name: pgdata
           persistentVolumeClaim:
-            claimName: pg-data-pvc
+            claimName: database-pvc
diff --git a/backend/kustomize/base/database-pvc.yaml b/backend/kustomize/base/database-pvc.yaml
index 48d19e0..3cb3b0a 100644
--- a/backend/kustomize/base/database-pvc.yaml
+++ b/backend/kustomize/base/database-pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pg-data-pvc
+  name: database-pvc
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/backend/kustomize/base/database-service.yaml b/backend/kustomize/base/database-service.yaml
index b876c8d..2a3afc9 100644
--- a/backend/kustomize/base/database-service.yaml
+++ b/backend/kustomize/base/database-service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: oetzi-database
+  name: database
 spec:
   selector:
-    app: oetzi-database
+    component: database
   ports:
     - port: 5432
       targetPort: 5432
diff --git a/backend/kustomize/base/kustomization.yaml b/backend/kustomize/base/kustomization.yaml
new file mode 100644
index 0000000..2859e3f
--- /dev/null
+++ b/backend/kustomize/base/kustomization.yaml
@@ -0,0 +1,12 @@
+kind: Kustomization
+resources:
+  - database-deployment.yaml
+  - database-pvc.yaml
+  - database-service.yaml
+  - webserver-deployment.yaml
+  - webserver-ingress.yaml
+  - webserver-service.yaml
+# namespace: kommul-dev
+namePrefix: oetzi-
+commonLabels:
+  app: oetzi
diff --git a/backend/kustomize/base/webserver-deployment.yaml b/backend/kustomize/base/webserver-deployment.yaml
index bac52a2..e8c8a5a 100644
--- a/backend/kustomize/base/webserver-deployment.yaml
+++ b/backend/kustomize/base/webserver-deployment.yaml
@@ -1,19 +1,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: oetzi-webserver
+  name: webserver
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: oetzi-webserver
+      component: webserver
   template:
     metadata:
       labels:
-        app: oetzi-webserver
+        component: webserver
     spec:
       containers:
-        - name: oetzi-webserver
+        - name: webserver
           # NOTE: use `minikube image load oetzi:latest` to push into container runtime
           image: oetzi:latest
           # NOTE: Never is useful only for locla testing in order to load image from cache
@@ -28,4 +28,3 @@ spec:
               value: "80"
             - name: DATABASE_URL
               value: postgres://db_user:db_pass@oetzi-database/db_name
-
diff --git a/backend/kustomize/base/webserver-ingress.yaml b/backend/kustomize/base/webserver-ingress.yaml
index f48ddf1..9e7fb10 100644
--- a/backend/kustomize/base/webserver-ingress.yaml
+++ b/backend/kustomize/base/webserver-ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: oetzi
+  name: ingress
 spec:
   rules:
     - host: oetzi.eurac
@@ -11,6 +11,6 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: oetzi-webserver
+                name: webserver
                 port:
                   name: http
diff --git a/backend/kustomize/base/webserver-service.yaml b/backend/kustomize/base/webserver-service.yaml
index 69ed8a6..b5705ab 100644
--- a/backend/kustomize/base/webserver-service.yaml
+++ b/backend/kustomize/base/webserver-service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: oetzi-webserver
+  name: webserver
 spec:
   selector:
-    app: oetzi-webserver
+    component: webserver
   ports:
     - name: http
       port: 8080
-- 
GitLab