Merge pull request #3 from joshdavidson/feature/2-database-separation

Removing databases from app deployments.

Author: joshdavidson

bookstack/bookstack-deployment.yaml

@@ -21,11 +21,11 @@ spec:
         - name: PGID
           value: "1000"
         - name: DB_HOST
-          value: "bookstack-db"
+          value: "mariadb"
         - name: DB_USER
-          value: "bookstack"
+          value: "root"
         - name: DB_PASS
-          value: "bookstack"
+          value: "password"
         - name: DB_DATABASE
           value: "bookstackapp"
         - name: APP_URL
@@ -42,52 +42,4 @@ spec:
       volumes:
         - name: bookstack
           persistentVolumeClaim:
-            claimName: bookstack
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: bookstack-db
-  name: bookstack-db
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: bookstack-db
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app: bookstack-db
-    spec:
-      containers:
-        - env:
-          - name: PUID
-            value: "1000"
-          - name: PGID
-            value: "1000"
-          - name: MYSQL_ROOT_PASSWORD
-            value: "password"
-          - name: TZ
-            value: "America/New_York"
-          - name: MYSQL_DATABASE
-            value: "bookstackapp"
-          - name: MYSQL_USER
-            value: "bookstack"
-          - name: MYSQL_PASSWORD
-            value: "bookstack"
-          image: linuxserver/mariadb
-          imagePullPolicy: Always
-          name: bookstack-db
-          ports:
-            - containerPort: 3306
-          volumeMounts:
-            - mountPath: /config
-              name: bookstack-db
-      restartPolicy: Always
-      volumes:
-        - name: bookstack-db
-          persistentVolumeClaim:
-            claimName: bookstack-db
+            claimName: bookstack

bookstack/bookstack-pvc.yaml

@@ -9,15 +9,3 @@ spec:
   resources:
     requests:
       storage: 250Mi
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: bookstack-db
-spec:
-  storageClassName: "default"
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 250Mi

bookstack/bookstack-service.yaml

@@ -10,18 +10,4 @@ spec:
     port: 80
     targetPort: 80
   selector:
-    app: bookstack
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: bookstack-db
-  name: bookstack-db
-spec:
-  ports:
-    - name: "3306"
-      port: 3306
-      targetPort: 3306
-  selector:
-    app: bookstack-db
+    app: bookstack

mariadb/mariadb-deployment.yaml

@@ -22,8 +22,14 @@ spec:
         ports:
         - containerPort: 3306
         env:
+          - name: MYSQL_DATABASE
+            value: "mariadb"
           - name: MYSQL_ROOT_PASSWORD
             value: "password"
+          - name: MYSQL_USER
+            value: "mariadb"
+          - name: MYSQL_PASSWORD
+            value: "mariadb"
         volumeMounts:
           - mountPath: /var/lib/mysql
             name: mariadb

mariadb/mariadb-pvc.yaml

@@ -8,4 +8,4 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: 250Mi
+      storage: 5Gi

mariadb/mariadb-service.yaml

@@ -8,6 +8,8 @@ spec:
   ports:
     - name: "3306"
       port: 3306
+      nodePort: 32306
       targetPort: 3306
   selector:
-    app: mariadb
+    app: mariadb
+  type: NodePort

mongo/mongo-deployment.yaml

@@ -19,8 +19,6 @@ spec:
       containers:
         - args:
             - mongod
-            - --oplogSize
-            - "128"
           image: mongo:latest
           imagePullPolicy: Always
           name: mongo

nfs-provisioner/nfs-provisioner-answers.yaml

@@ -13,7 +13,7 @@ persistence:
   enabled: false
   size: "20Gi"
   storageClass: ""
-  hostPath: "/srv/persistent-volumes"
+  hostPath: "/srv/volumes"
 service:
   type: "ClusterIP"
   nfsNodePort: ""

phpservermon/psm-deployment.yaml

@@ -19,11 +19,11 @@ spec:
           - name: PSM_BASE_URL
             value: http://phpservermon.lan/
           - name: PSM_DB_HOST
-            value: phpservermon-db
+            value: mariadb
           - name: PSM_DB_NAME
             value: phpservermon
           - name: PSM_DB_USER
-            value: phpservermon
+            value: root
           - name: PSM_DB_PASS
             value: password
           - name: PSM_DB_PREFIX
@@ -35,46 +35,4 @@ spec:
         name: phpservermon-app
         ports:
         - containerPort: 80
-      restartPolicy: Always
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: phpservermon-db
-  name: phpservermon-db
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: phpservermon-db
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app: phpservermon-db
-    spec:
-      containers:
-        - env:
-            - name: MYSQL_ROOT_PASSWORD
-              value: password
-            - name: MYSQL_DATABASE
-              value: phpservermon
-            - name: MYSQL_USER
-              value: phpservermon
-            - name: MYSQL_PASSWORD
-              value: password
-          image: mariadb:10
-          imagePullPolicy: Always
-          name: phpservermon-db
-          ports:
-            - containerPort: 3306
-          volumeMounts:
-            - mountPath: /var/lib/mysql
-              name: phpservermon-db
-      restartPolicy: Always
-      volumes:
-        - name: phpservermon-db
-          persistentVolumeClaim:
-            claimName: phpservermon-db
+      restartPolicy: Always