Merge branch '5-kubernetes-join-containers-into-same-pod' into 'master'

Resolve "Kubernetes join containers into same pod"

Closes #5

See merge request daniel/personal-website!6

build/k3s.yaml

@@ -18,22 +18,6 @@ spec:
     - port: 80
   selector:
     app: portfolio
-    tier: website
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mysql
-  namespace: portfolio
-  labels:
-    app: portfolio
-spec:
-  ports:
-    - port: 3306
-  selector:
-    app: portfolio
-    tier: mysql
 
 ---
 apiVersion: v1
@@ -62,13 +46,11 @@ spec:
   selector:
     matchLabels:
       app: portfolio
-      tier: website
   template:
     metadata:
       namespace: portfolio
       labels:
         app: portfolio
-        tier: website
     spec:
       containers:
         - image: website-image
@@ -81,38 +63,6 @@ spec:
             - name: env
               mountPath: /app/.env
               subPath: .env.production
-      volumes:
-        - name: env
-          configMap:
-            name: env-cm
-      imagePullSecrets:
-        - name: chaoticlogic-registry-login
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mysql
-  namespace: portfolio
-  labels:
-    app: portfolio
-spec:
-  selector:
-    matchLabels:
-      app: portfolio
-      tier: mysql
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      namespace: portfolio
-      labels:
-        app: portfolio
-        tier: mysql
-    spec:
-      containers:
         - image: mysql:5
           name: mysql
           env:
@@ -128,12 +78,18 @@ spec:
             - name: mysql-persistent-storage
               mountPath: /var/lib/mysql
       volumes:
+        - name: env
+          configMap:
+            name: env-cm
         - name: mysql-persistent-storage
           persistentVolumeClaim:
             claimName: mysql-pvc
+      imagePullSecrets:
+        - name: chaoticlogic-registry-login
       nodeSelector:
         on-master: "true"
         beta.kubernetes.io/arch: amd64
+
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute