From 50716a55f2eb528e913ab60428371ecb9a01eb49 Mon Sep 17 00:00:00 2001
From: Vassiliy Yegorov <vasyakrg@gmail.com>
Date: Thu, 20 May 2021 14:52:35 +0700
Subject: [PATCH] fix passes

---
 App/kubernetes/deploy.yaml  | 68 +++++++++++++++++++++++--------------
 App/kubernetes/secrets.yaml |  8 ++---
 App/kubernetes/service.yaml |  9 ++---
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/App/kubernetes/deploy.yaml b/App/kubernetes/deploy.yaml
index a9f6d17..74eb471 100644
--- a/App/kubernetes/deploy.yaml
+++ b/App/kubernetes/deploy.yaml
@@ -25,6 +25,24 @@ spec:
           imagePullPolicy: Always
           ports:
           - containerPort: 80
+          env:
+          - name: MARIADB_HOST
+            value: app-mariadb-service
+          - name: MARIADB_USER
+            valueFrom:
+              secretKeyRef:
+                name: myapp-mariadb-secret
+                key: mariadb-user
+          - name: MARIADB_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: myapp-mariadb-secret
+                key: mariadb-password
+          - name: MARIADB_DATABASE
+            valueFrom:
+              secretKeyRef:
+                name: myapp-mariadb-secret
+                key: mariadb-dbname
 ---
 
 apiVersion: apps/v1
@@ -32,55 +50,53 @@ kind: Deployment
 metadata:
   namespace: myapp
   labels:
-    app: myapp-psql
-  name: myapp-psql
+    app: myapp-mariadb
+  name: myapp-mariadb
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: myapp-psql
+      app: myapp-mariadb
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: myapp-psql
+        app: myapp-mariadb
     spec:
-      hostname: myapp-psql-pod
+      hostname: myapp-mariadb-pod
       restartPolicy: Always
       containers:
         - name: myapp-db
-          image: postgres:12-alpine
-          imagePullPolicy: IfNotPresent
+          image: vasyakrg/php-db
+          imagePullPolicy: Always
           env:
-          - name: POSTGRES_USER
+          - name: MARIADB_ROOT_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: myapp-psql-secret
-                key: postgress-user
-          - name: POSTGRES_PASSWORD
+                name: myapp-mariadb-secret
+                key: mariadb-password
+          - name: MARIADB_USER
             valueFrom:
               secretKeyRef:
-                name: myapp-psql-secret
-                key: postgress-password
-          - name: POSTGRES_DB
+                name: myapp-mariadb-secret
+                key: mariadb-user
+          - name: MARIADB_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: myapp-psql-secret
-                key: postgress-dbname
+                name: myapp-mariadb-secret
+                key: mariadb-password
+          - name: MARIADB_DATABASE
+            valueFrom:
+              secretKeyRef:
+                name: myapp-mariadb-secret
+                key: mariadb-dbname
           volumeMounts:
-            - name: vol-myapp-postgres
-              mountPath: /var/lib/postgresql/data
+            - name: vol-myapp-mariadb
+              mountPath: /var/lib/mysql
               subPath: data
-            - name: pgsql-tmpfs
-              mountPath: /run
-            - name: pgsql-tmpfs
-              mountPath: /tmp
 
       volumes:
-        - name: vol-myapp-postgres
+        - name: vol-myapp-mariadb
           persistentVolumeClaim:
             claimName: myapp-db-pvc
-        - name: pgsql-tmpfs
-          emptyDir:
-            medium: Memory
diff --git a/App/kubernetes/secrets.yaml b/App/kubernetes/secrets.yaml
index 793ea34..8ec09de 100644
--- a/App/kubernetes/secrets.yaml
+++ b/App/kubernetes/secrets.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: myapp-psql-secret
+  name: myapp-mariadb-secret
   namespace: myapp
 data:
-  postgress-user: cmVzdHVzZXI=
-  postgress-password: dkVIQ1ZuN0NndXdGd0ViZXQySEMxQQ==
-  postgress-dbname: cmVzdGRi
+  mariadb-user: cmVzdHVzZXI=
+  mariadb-password: dkVIQ1ZuN0NndXdGd0ViZXQySEMxQQ==
+  mariadb-dbname: cmVzdGRi
 ---
diff --git a/App/kubernetes/service.yaml b/App/kubernetes/service.yaml
index ee50e3d..326e4af 100644
--- a/App/kubernetes/service.yaml
+++ b/App/kubernetes/service.yaml
@@ -15,12 +15,13 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: app-postgress-service
+  namespace: myapp
+  name: app-mariadb-service
 spec:
   type: NodePort
   ports:
-    - name: myapp-postgress-port
-      port: 5432
+    - name: myapp-mariadb-port
+      port: 3306
   selector:
-    app: myapp-psql
+    app: myapp-mariadb
 ---