k8s additions

Author: mgckind

README.md

@@ -95,7 +95,7 @@ Let's build the front end:
 
 To deploy locally, we need to link to `demo-mysql` and add environmental variables with `-e`:
 
-    docker run --name my-first-app -d -p 8080:8080 --link demo-mysql:remote-mysql -e MYSQL_USER=root -e MYSQL_PASS=<PASSWORD> webapp
+    docker run --name my-first-app -d -p 8080:8080 --link demo-mysql:remote-mysql -e MYSQL_USER=root -e MYSQL_PASS=<PASSWORD> -e MYSQL_SERVER=remote-mysql webapp
 
 Now you can access in your browser at [http://localhost:8080](http://localhost:8080)
 
@@ -139,6 +139,6 @@ In this case you need to expose 8080 to 80 and use the correct image name
     docker run --name my-first-app -d -p 80:8080 --link demo-mysql:remote-mysql -e MYSQL_USER=root -e MYSQL_PASS=<PASSWORD> mgckind/my-demo-app:1.0.0
 
 
-## Deployment -- the less simple way but still easy
+## Deployment on Kubernetes -- the less simple way but still easy
 
-Using [Kubernetes](https://kubernetes.io/), note that GKE and AWS provide Kubernetes cluster as a Service.
+Using [Kubernetes](https://kubernetes.io/), note that GKE and AWS provide Kubernetes cluster as a Service. See [folder](kubernetes/)

kubernetes/demo-app-ing.yaml

@@ -4,13 +4,13 @@ metadata:
  name: demo-app
  annotations:
    #ingress.kubernetes.io/ssl-redirect: "false"
-   kubernetes.io/ingress.class: "nginx"
+   kubernetes.io/ingress.class: "deslabs"
 spec:
   rules:
   - http:
      paths:
      - path: /demo
        backend:
          serviceName: demo-app
-         servicePort: 8080
+         servicePort: 8081
 

kubernetes/mysql.yaml

@@ -1,4 +1,42 @@
 apiVersion: v1
+kind: Secret
+data:
+  passwd: bGluZWE=
+metadata:
+  name: mysql-secret
+  namespace: default
+type: Opaque
+---
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: remote-mysql
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 30Gi
+  accessModes:
+    - ReadWriteMany
+  hostPath:
+    path: /home/matias/kubedata/external/demo_mysql
+
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: remote-mysql
+  namespace: default
+spec: 
+  storageClassName: manual
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 30Gi
+  volumeName: remote-mysql
+
+---
+apiVersion: v1
 kind: Service
 metadata:
   name: remote-mysql
@@ -9,13 +47,14 @@ spec:
   selector:
     app: mysql
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql
 spec:
-  strategy:
-    type: Recreate
+  selector:
+    matchLabels:
+      app: mysql
   template:
     metadata:
       labels:
@@ -34,3 +73,11 @@ spec:
         ports:
         - containerPort: 3306
           name: mysql
+        volumeMounts:
+        - name: mysql-persistent-storage
+          mountPath: /var/lib/mysql
+      volumes:
+      - name: mysql-persistent-storage
+        persistentVolumeClaim:
+          claimName: remote-mysql
+

kubernetes/website.yaml

@@ -5,24 +5,25 @@ metadata:
 spec:
   type: NodePort
   ports:
-    - port: 8080
+    - port: 8081
   selector:
     app: demo-app
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: demo-app
 spec:
-  strategy:
-    type: Recreate
+  selector:
+    matchLabels:
+      app: demo-app
   template:
     metadata:
       labels:
         app: demo-app
     spec:
       containers:
-      - image: mgckind/my-demo-app:kube-1.0
+      - image: mgckind/demo-app-pie:1.1
         imagePullPolicy: IfNotPresent
         name: demo-app
         env:
@@ -33,6 +34,10 @@ spec:
               key: passwd
         - name: MYSQL_USER
           value: "root" ## <---- 
+        - name: MYSQL_SERVER
+          value: "remote-mysql"
+        - name: MYSQL_PORT
+          value: "3306" 
         ports:
-        - containerPort: 8080
+        - containerPort: 8081
           name: demo-app

webpage/Dockerfile

@@ -5,7 +5,7 @@ RUN pip install --no-cache-dir  tornado  gviz_api mysqlclient
 # Create a demo folder
 RUN mkdir demo
 # Copy all the files inside the demo folder
-COPY . /demo
+ADD . /demo
 # Change to /demo at run-time
 WORKDIR /demo
 # Execute this command when running the container, can be override

webpage/main.py

@@ -10,16 +10,16 @@
 
 # Configuration parameters to connect to MYSQL
 CONF={}
-CONF['host'] = 'remote-mysql' #'127.0.0.1' 
-CONF['port'] = int('3306')
+CONF['host'] = os.environ['MYSQL_SERVER'] # 'remote-mysql' #'127.0.0.1' 
+CONF['port'] = int('3306') # 3306
 CONF['user'] = os.environ['MYSQL_USER']
 CONF['passwd'] = os.environ['MYSQL_PASS']
 
 # schema for google pie chart
 schema = {"topic": ("string", "Topic"), "times": ("number", "Times")}
 
-# will run by default on port 8080
-define("port", default=8080, help="run on the given port", type=int)
+# will run by default on port 8081
+define("port", default=8081, help="run on the given port", type=int)
 
 def init_table():
     """
@@ -78,6 +78,7 @@ def get_data():
 
 class MainHandler(tornado.web.RequestHandler):
     def get(self):
+        init_table()
         self.render("main.html", hostname=platform.node())
 
 class GetDataHandler(tornado.web.RequestHandler):