From 571c25ae347be5b790428e67b489346d91dd94e6 Mon Sep 17 00:00:00 2001
From: Vassiliy Yegorov <vasyakrg@gmail.com>
Date: Fri, 21 May 2021 13:36:46 +0700
Subject: [PATCH] fix db

---
 App/kubernetes/deploy.yaml  |   4 +-
 App/kubernetes/ingress.yaml | 127 +++++++++++++++++++++++++++++++++++-
 App/kubernetes/service.yaml |  27 --------
 3 files changed, 128 insertions(+), 30 deletions(-)
 delete mode 100644 App/kubernetes/service.yaml

diff --git a/App/kubernetes/deploy.yaml b/App/kubernetes/deploy.yaml
index 74eb471..c5eb44f 100644
--- a/App/kubernetes/deploy.yaml
+++ b/App/kubernetes/deploy.yaml
@@ -76,6 +76,8 @@ spec:
               secretKeyRef:
                 name: myapp-mariadb-secret
                 key: mariadb-password
+          - name: MARIADB_ROOT_HOST
+            value: "%"
           - name: MARIADB_USER
             valueFrom:
               secretKeyRef:
@@ -94,7 +96,7 @@ spec:
           volumeMounts:
             - name: vol-myapp-mariadb
               mountPath: /var/lib/mysql
-              subPath: data
+              subPath: mysql
 
       volumes:
         - name: vol-myapp-mariadb
diff --git a/App/kubernetes/ingress.yaml b/App/kubernetes/ingress.yaml
index 2a3f0a6..4a8612d 100644
--- a/App/kubernetes/ingress.yaml
+++ b/App/kubernetes/ingress.yaml
@@ -1,11 +1,37 @@
+# App
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: myapp
+  name: app-service
+spec:
+  ports:
+    - name: app-port
+      port: 80
+  selector:
+    app: myapp
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: myapp
+  name: app-mariadb-service
+spec:
+  type: NodePort
+  ports:
+    - name: myapp-mariadb-port
+      port: 3306
+  selector:
+    app: myapp-mariadb
+---
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   namespace: myapp
   annotations:
     cert-manager.io/cluster-issuer: orc-letsencrypt-issuer
-    nginx.ingress.kubernetes.io/proxy-body-size: 200m
-    nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
   name: k8s-app
 spec:
   rules:
@@ -23,3 +49,100 @@ spec:
   - hosts:
       - app.k8s-nsk.tk
     secretName: app-k8s-nsk-tls
+
+---
+
+# Alternative with external traefik connected
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: app-service
+#   namespace: myapp
+# spec:
+#   ports:
+#     - name: app-port
+#       port: 80
+#   selector:
+#     app: myapp
+# ---
+
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: app-service
+#   namespace: myapp
+# spec:
+#   selector:
+#     app: myapp
+#   type: NodePort
+#   ports:
+#     - protocol: TCP
+#       port: 80
+#       targetPort: 80
+#       nodePort: 31080
+# ---
+
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: app-endpoint
+#   namespace: myapp
+#   annotations:
+#     traefik.ingress.kubernetes.io/service.serversscheme: "http"
+#     traefik.ingress.kubernetes.io/service.passhostheader: "true"
+# spec:
+#   type: ClusterIP
+#   clusterIP: None
+#   ports:
+#     - protocol: TCP
+#       port: 80
+#       targetPort: 80
+
+# ---
+
+# kind: Endpoints
+# apiVersion: v1
+# metadata:
+#   name: app-endpoint
+#   namespace: myapp
+# subsets:
+# - addresses:
+#     - ip: 192.168.9.201
+#   ports:
+#     - port: 31080
+# - addresses:
+#     - ip: 192.168.9.202
+#   ports:
+#     - port: 31080
+# - addresses:
+#     - ip: 192.168.9.203
+#   ports:
+#     - port: 31080
+# ---
+
+# apiVersion: networking.k8s.io/v1
+# kind: Ingress
+# metadata:
+#   labels:
+#     baremetal-ingress: traefik-nsk
+#   annotations:
+#     kubernetes.io/ingress.class: traefik-lb
+#     external-dns.alpha.kubernetes.io/hostname: app.k8s-nsk.tk
+#     traefik.ingress.kubernetes.io/router.entrypoints: https
+#     traefik.ingress.kubernetes.io/router.tls: "true"
+#     traefik.ingress.kubernetes.io/router.tls.certresolver: letsEncrypt
+#   name: app-ingress
+#   namespace: myapp
+# spec:
+#   rules:
+#   - host: app.k8s-nsk.tk
+#     http:
+#       paths:
+#       - pathType: Prefix
+#         path: "/"
+#         backend:
+#           service:
+#             name: app-endpoint
+#             port:
+#               number: 80
+# ---
diff --git a/App/kubernetes/service.yaml b/App/kubernetes/service.yaml
deleted file mode 100644
index 326e4af..0000000
--- a/App/kubernetes/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-# App
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: myapp
-  name: app-service
-spec:
-  ports:
-    - name: app-port
-      port: 80
-  selector:
-    app: myapp
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: myapp
-  name: app-mariadb-service
-spec:
-  type: NodePort
-  ports:
-    - name: myapp-mariadb-port
-      port: 3306
-  selector:
-    app: myapp-mariadb
----