add app, add nfs operator

App/docker/.env.axample

@@ -0,0 +1,3 @@
+MARIADB_USER=restuser
+MARIADB_PASSWORD=
+MARIADB_DATABASE=restdb

App/docker/db/Dockerfile

@@ -0,0 +1,2 @@
+FROM mariadb:10.6.0-focal
+COPY users.sql /docker-entrypoint-initdb.d/

App/docker/db/build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t vasyakrg/php-db . && docker push vasyakrg/php-db

App/docker/db/users.sql

@@ -0,0 +1,72 @@
+-- phpMyAdmin SQL Dump
+-- version 4.8.5
+-- https://www.phpmyadmin.net/
+--
+-- Хост: 127.0.0.1:3306
+-- Время создания: Дек 09 2019 г., 21:42
+-- Версия сервера: 10.3.13-MariaDB
+-- Версия PHP: 7.1.22
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- База данных: `test`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `users`
+--
+
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `last_name` varchar(50) NOT NULL,
+  `pos` varchar(50) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Дамп данных таблицы `users`
+--
+
+INSERT INTO `users` (`id`, `name`, `last_name`, `pos`) VALUES
+(1, 'Иван', 'Иванов', 'Менеджер'),
+(2, 'Петр', 'Петров', 'Сисадмин'),
+(3, 'Сара', 'Конор', 'Бухгалтер'),
+(4, 'Федор', 'Федоров', 'Архитектор'),
+(5, 'Алексей', 'Алексеев', 'Оператор'),
+(6, 'Марина', 'Маринина', 'Менеджер'),
+(7, 'Михаил', 'Михайлов', 'Директор'),
+(8, 'Владислав', 'Валдаев', 'Водитель'),
+(9, 'Валентина', 'Иванова', 'Художник'),
+(10, 'Владислав', 'Валдаев', 'Водитель');
+
+--
+-- Индексы сохранённых таблиц
+--
+
+--
+-- Индексы таблицы `users`
+--
+ALTER TABLE `users`
+  ADD PRIMARY KEY (`id`);
+
+--
+-- AUTO_INCREMENT для сохранённых таблиц
+--
+
+--
+-- AUTO_INCREMENT для таблицы `users`
+--
+ALTER TABLE `users`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=12;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

App/docker/docker-compose.yaml

@@ -1,12 +1,34 @@
 version: '3.7'
 services:
-    app:
-        build: ./php
-        container_name: myapp
-        ports:
-          - 80:80
-        networks:
-            app_net:
+  app:
+    image: vasyakrg/php-app
+    container_name: myapp
+    environment:
+      MARIADB_HOST: db
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_DATABASE: ${MARIADB_DATABASE}
+    ports:
+      - 80:80
+    networks:
+        app_net:
+  db:
+    image: vasyakrg/php-db
+    container_name: db
+    environment:
+      MARIADB_ROOT_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_USER: ${MARIADB_USER}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
+      MARIADB_DATABASE: ${MARIADB_DATABASE}
+    volumes:
+      - db_volume:/var/lib/mysql
+    ports:
+      - 3306:3306
+    networks:
+        app_net:
+
+volumes:
+  db_volume:
 
 networks:
   app_net:

App/docker/php/Dockerfile

@@ -1,12 +1,15 @@
 FROM php:7.4-apache-buster
 MAINTAINER vasyakrg <vasyakrg@gmail.com>
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
         curl \
         wget \
         git \
-        && apt-get update && rm -rf /var/lib/apt/lists/*
+        libpq-dev \
+        && docker-php-ext-install mysqli pdo_pgsql pdo_mysql \
+        && apt-get update \
+        && rm -rf /var/lib/apt/lists/*
 
 RUN rm /etc/apache2/sites-enabled/*
 COPY myapp.conf /etc/apache2/sites-available/myapp.conf

App/docker/php/myapp/config.php

@@ -0,0 +1,12 @@
+<?php
+
+$host=$_ENV['MARIADB_HOST'];
+$db=$_ENV['MARIADB_DATABASE'];
+$login=$_ENV['MARIADB_USER'];
+$password=$_ENV['MARIADB_PASSWORD'];
+
+try {
+	$pdo = new PDO("mysql:dbname=$db; host=$host", $login, $password);
+} catch (PDOException $e) {
+	die($e->getMessage());
+}

App/docker/php/myapp/func.php

@@ -0,0 +1,47 @@
+<?php
+include 'config.php';
+
+$name = $_POST['name'];
+$last_name = $_POST['last_name'];
+$pos = $_POST['pos'];
+
+// Create
+
+if (isset($_POST['submit'])) {
+	$sql = ("INSERT INTO `users`(`name`, `last_name`, `pos`) VALUES(?,?,?)");
+	$query = $pdo->prepare($sql);
+	$query->execute([$name, $last_name, $pos]);
+	$success = '<div class="alert alert-success alert-dismissible fade show" role="alert">
+  <strong>Данные успешно отправлены!</strong> Вы можете закрыть это сообщение.
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>';
+	
+}
+
+// Read
+
+$sql = $pdo->prepare("SELECT * FROM `users`");
+$sql->execute();
+$result = $sql->fetchAll();
+
+// Update
+$edit_name = $_POST['edit_name'];
+$edit_last_name = $_POST['edit_last_name'];
+$edit_pos = $_POST['edit_pos'];
+$get_id = $_GET['id'];
+if (isset($_POST['edit-submit'])) {
+	$sqll = "UPDATE users SET name=?, last_name=?, pos=? WHERE id=?";
+	$querys = $pdo->prepare($sqll);
+	$querys->execute([$edit_name, $edit_last_name, $edit_pos, $get_id]);
+	header('Location: '. $_SERVER['HTTP_REFERER']);
+}
+
+// DELETE
+if (isset($_POST['delete_submit'])) {
+	$sql = "DELETE FROM users WHERE id=?";
+	$query = $pdo->prepare($sql);
+	$query->execute([$get_id]);
+	header('Location: '. $_SERVER['HTTP_REFERER']);
+}

App/docker/php/myapp/index.php

@@ -1,8 +1,83 @@
-<html>
- <head>
-  <title>Тестируем PHP</title>
- </head>
- <body>
- <?php echo '<p>Привет, мир!</p>'; ?>
- </body>
-</html>
+<?php
+include 'func.php';
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>CRUD приложение на PHP</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
+	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.css">
+</head>
+<body>
+	<div class="container">
+		<div class="row">
+			<div class="col mt-1">
+				<?=$success ?>
+				<button class="btn btn-success mb-1" data-toggle="modal" data-target="#Modal"><i class="fa fa-user-plus"></i></button>
+				<table class="table shadow ">
+					<thead class="thead-dark">
+						<tr>
+							<th>№</th>
+							<th>Имя</th>
+							<th>Фамилия</th>
+							<th>Должность</th>
+							<th>Действие</th>
+						</tr>
+						<?php foreach ($result as $value) { ?>
+						<tr>
+							<td><?=$value['id'] ?></td>
+							<td><?=$value['name'] ?></td>
+							<td><?=$value['last_name'] ?></td>
+							<td><?=$value['pos'] ?></td>
+							<td>
+								<a href="?edit=<?=$value['id'] ?>" class="btn btn-success btn-sm" data-toggle="modal" data-target="#editModal<?=$value['id'] ?>"><i class="fa fa-edit"></i></a> 
+								<a href="?delete=<?=$value['id'] ?>" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#deleteModal<?=$value['id'] ?>"><i class="fa fa-trash"></i></a>
+								<?php require 'modal.php'; ?>
+							</td>
+						</tr> <?php } ?>
+					</thead>
+				</table>
+			</div>
+		</div>
+	</div>
+	<!-- Modal -->
+	<div class="modal fade" tabindex="-1" role="dialog" id="Modal">
+	  <div class="modal-dialog modal-dialog-centered" role="document">
+	    <div class="modal-content shadow">
+	      <div class="modal-header">
+	        <h5 class="modal-title">Добавить пользователя</h5>
+	        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+	          <span aria-hidden="true">&times;</span>
+	        </button>
+	      </div>
+	      <div class="modal-body">
+	        <form action="" method="post">
+	        	<div class="form-group">
+	        		<input type="text" class="form-control" name="name" value="" placeholder="Имя">
+	        	</div>
+	        	<div class="form-group">
+	        		<input type="text" class="form-control" name="last_name" value="" placeholder="Фамилия">
+	        	</div>
+	        	<div class="form-group">
+	        		<input type="text" class="form-control" name="pos" value="" placeholder="Должность">
+	        	</div>
+	      </div>
+	      <div class="modal-footer">
+	        <button type="button" class="btn btn-secondary" data-dismiss="modal">Отмена</button>
+	        <button type="submit" name="submit" class="btn btn-primary">Добавить</button>
+	      </div>
+	  		</form>
+	    </div>
+	  </div>
+	</div>
+
+
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+<script>
+</body>
+</html>

App/docker/php/myapp/modal.php

@@ -0,0 +1,49 @@
+<!-- Modal Edit-->
+<div class="modal fade" id="editModal<?=$value['id'] ?>" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content shadow">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Редактировать запись № <?=$value['id'] ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form action="?id=<?=$value['id'] ?>" method="post">
+        	<div class="form-group">
+        		<input type="text" class="form-control" name="edit_name" value="<?=$value['name'] ?>" placeholder="Имя">
+        	</div>
+        	<div class="form-group">
+        		<input type="text" class="form-control" name="edit_last_name" value="<?=$value['last_name'] ?>" placeholder="Фамилия">
+        	</div>
+        	<div class="form-group">
+        		<input type="text" class="form-control" name="edit_pos" value="<?=$value['pos'] ?>" placeholder="Должность">
+        	</div>
+        	<div class="modal-footer">
+        		<button type="submit" name="edit-submit" class="btn btn-primary">Обновить</button>
+        	</div>
+        </form>	
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- DELETE MODAL -->
+<div class="modal fade" id="deleteModal<?=$value['id'] ?>" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+    <div class="modal-content shadow">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Удалить запись № <?=$value['id'] ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Отмена</button>
+        <form action="?id=<?=$value['id'] ?>" method="post">
+        	<button type="submit" name="delete_submit" class="btn btn-danger">Удалить</button>
+    	</form>
+      </div>
+    </div>
+  </div>
+</div>

App/kubernetes/deploy.yaml

@@ -25,3 +25,62 @@ spec:
           imagePullPolicy: Always
           ports:
           - containerPort: 80
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: myapp
+  labels:
+    app: myapp-psql
+  name: myapp-psql
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: myapp-psql
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: myapp-psql
+    spec:
+      hostname: myapp-psql-pod
+      restartPolicy: Always
+      containers:
+        - name: myapp-db
+          image: postgres:12-alpine
+          imagePullPolicy: IfNotPresent
+          env:
+          - name: POSTGRES_USER
+            valueFrom:
+              secretKeyRef:
+                name: myapp-psql-secret
+                key: postgress-user
+          - name: POSTGRES_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: myapp-psql-secret
+                key: postgress-password
+          - name: POSTGRES_DB
+            valueFrom:
+              secretKeyRef:
+                name: myapp-psql-secret
+                key: postgress-dbname
+          volumeMounts:
+            - name: vol-myapp-postgres
+              mountPath: /var/lib/postgresql/data
+              subPath: data
+            - name: pgsql-tmpfs
+              mountPath: /run
+            - name: pgsql-tmpfs
+              mountPath: /tmp
+
+      volumes:
+        - name: vol-myapp-postgres
+          persistentVolumeClaim:
+            claimName: myapp-db-pvc
+        - name: pgsql-tmpfs
+          emptyDir:
+            medium: Memory

App/kubernetes/secrets.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: myapp-psql-secret
+  namespace: myapp
+data:
+  postgress-user: cmVzdHVzZXI=
+  postgress-password: dkVIQ1ZuN0NndXdGd0ViZXQySEMxQQ==
+  postgress-dbname: cmVzdGRi
+---

App/kubernetes/service.yaml

@@ -11,3 +11,16 @@ spec:
   selector:
     app: myapp
 ---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: app-postgress-service
+spec:
+  type: NodePort
+  ports:
+    - name: myapp-postgress-port
+      port: 5432
+  selector:
+    app: myapp-psql
+---

App/kubernetes/volume.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: myapp-db-pvc
+  namespace: myapp
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: nfs-client
+---