From 86686350e54994cfa75a5fe1d6d0bd7f532c1f8a Mon Sep 17 00:00:00 2001
From: Steffen Illium <steffen.illium@gmail.com>
Date: Fri, 26 Apr 2024 11:57:14 +0200
Subject: [PATCH] file rename and linkage

---
 .../{nextcloud-ingress.yaml => ingress.yaml}  |  4 ++--
 apps/nextcloud/base/kustomization.yaml        |  8 ++++----
 ...extcloud-namespace.yaml => namespace.yaml} |  0
 apps/nextcloud/base/nextcloud-app-pvc.yaml    | 13 ------------
 apps/nextcloud/base/nextcloud-db-pvc.yaml     | 12 -----------
 apps/nextcloud/base/nextcloud.yaml            | 20 ++++++++++---------
 ...-secret-sealed.yaml => secret-sealed.yaml} |  0
 ...extcloud-app-service.yaml => service.yaml} |  6 +++---
 8 files changed, 20 insertions(+), 43 deletions(-)
 rename apps/nextcloud/base/{nextcloud-ingress.yaml => ingress.yaml} (82%)
 rename apps/nextcloud/base/{nextcloud-namespace.yaml => namespace.yaml} (100%)
 delete mode 100644 apps/nextcloud/base/nextcloud-app-pvc.yaml
 delete mode 100644 apps/nextcloud/base/nextcloud-db-pvc.yaml
 rename apps/nextcloud/base/{nextcloud-secret-sealed.yaml => secret-sealed.yaml} (100%)
 rename apps/nextcloud/base/{nextcloud-app-service.yaml => service.yaml} (57%)

diff --git a/apps/nextcloud/base/nextcloud-ingress.yaml b/apps/nextcloud/base/ingress.yaml
similarity index 82%
rename from apps/nextcloud/base/nextcloud-ingress.yaml
rename to apps/nextcloud/base/ingress.yaml
index 3d76fea..74ea4a5 100644
--- a/apps/nextcloud/base/nextcloud-ingress.yaml
+++ b/apps/nextcloud/base/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: nextcloud-ingress
+  name: nextcloud
   namespace: nextcloud
 spec:
   entryPoints:
@@ -12,5 +12,5 @@ spec:
   - match: Host(`newcloud.steffenillium.de`)
     kind: Rule
     services:
-    - name: nextcloud-service
+    - name: nextcloud
       port: 80
diff --git a/apps/nextcloud/base/kustomization.yaml b/apps/nextcloud/base/kustomization.yaml
index 4482b37..efa37cc 100644
--- a/apps/nextcloud/base/kustomization.yaml
+++ b/apps/nextcloud/base/kustomization.yaml
@@ -6,8 +6,8 @@ namespace: nextcloud
 resources:
 - nextcloud.yaml
 # - nextcloud-app-pvc.yaml
-- nextcloud-app-service.yaml
+- service.yaml
 # - nextcloud-db-pvc
-- nextcloud-ingress.yaml
-- nextcloud-secret-sealed.yaml
-- nextcloud-namespace.yaml
+- ingress.yaml
+- secret-sealed.yaml
+- namespace.yaml
diff --git a/apps/nextcloud/base/nextcloud-namespace.yaml b/apps/nextcloud/base/namespace.yaml
similarity index 100%
rename from apps/nextcloud/base/nextcloud-namespace.yaml
rename to apps/nextcloud/base/namespace.yaml
diff --git a/apps/nextcloud/base/nextcloud-app-pvc.yaml b/apps/nextcloud/base/nextcloud-app-pvc.yaml
deleted file mode 100644
index 93a6c68..0000000
--- a/apps/nextcloud/base/nextcloud-app-pvc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  labels:
-    app: nextcloud-app-pvc
-  name: nextcloud-app-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 150Gi
-status: {}
diff --git a/apps/nextcloud/base/nextcloud-db-pvc.yaml b/apps/nextcloud/base/nextcloud-db-pvc.yaml
deleted file mode 100644
index 1675f45..0000000
--- a/apps/nextcloud/base/nextcloud-db-pvc.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  labels:
-    app: nextcloud-db-pvc
-  name: nextcloud-db-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
diff --git a/apps/nextcloud/base/nextcloud.yaml b/apps/nextcloud/base/nextcloud.yaml
index c67f6e1..04d7428 100644
--- a/apps/nextcloud/base/nextcloud.yaml
+++ b/apps/nextcloud/base/nextcloud.yaml
@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: nextcloud-app
-  name: nextcloud-app
+    app: nextcloud
+  name: nextcloud
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: nextcloud-app
+      app: nextcloud
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: nextcloud-app
+        app: nextcloud
     spec:
       containers:
         - image: mariadb
-          name: nextcloud-db
+          name: mariadb
           args:
             - --transaction-isolation=READ-COMMITTED
             - --binlog-format=ROW
@@ -46,7 +46,8 @@ spec:
               cpu: "0.2"
               memory: "2Gi"
           ports:
-            - containerPort: 3306
+            - name: mariadb
+              containerPort: 3306
               protocol: TCP
           volumeMounts:
             - mountPath: /var/lib/mysql
@@ -59,10 +60,11 @@ spec:
               cpu: "0.1"
               memory: "2Gi"
           ports:
-            - containerPort: 6379
+            - name: redis
+              containerPort: 6379
               protocol: TCP
         - image: nextcloud
-          name: nextcloud-app
+          name: nextcloud
           env:
             - name: MYSQL_DATABASE
               value: nextcloud
@@ -82,7 +84,7 @@ spec:
                   name: nextcloud-secret
                   key: MYSQL_PASSWORD
           ports:
-            - name: http
+            - name: nextcloud
               containerPort: 80
               protocol: TCP
           resources: {}
diff --git a/apps/nextcloud/base/nextcloud-secret-sealed.yaml b/apps/nextcloud/base/secret-sealed.yaml
similarity index 100%
rename from apps/nextcloud/base/nextcloud-secret-sealed.yaml
rename to apps/nextcloud/base/secret-sealed.yaml
diff --git a/apps/nextcloud/base/nextcloud-app-service.yaml b/apps/nextcloud/base/service.yaml
similarity index 57%
rename from apps/nextcloud/base/nextcloud-app-service.yaml
rename to apps/nextcloud/base/service.yaml
index 950cd71..d328549 100644
--- a/apps/nextcloud/base/nextcloud-app-service.yaml
+++ b/apps/nextcloud/base/service.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: nextcloud-service
+  name: nextcloud
 spec:
   ports:
     - name: http
       port: 80
-      targetPort: http
+      targetPort: nextcloud
   selector:
-    app: nextcloud-app
+    app: nextcloud