From e47c51fd1cff0f08dd9d1844222a2a461b7dbcfa Mon Sep 17 00:00:00 2001
From: Sunil Thaha <3005132+sthaha@users.noreply.github.com>
Date: Mon, 14 Oct 2019 00:58:04 +1000
Subject: [PATCH] UI runs fine on k8s

---
 src/Dockerfile => Dockerfile                  |  0
 src/app.py => app.py                          |  4 +--
 k8s/deployment.yaml                           | 27 +++++++++++++++++++
 .../service.yaml                              |  8 +++---
 src/requirements.txt => requirements.txt      |  0
 {src/static => static}/stylesheets/style.css  |  0
 {src/templates => templates}/index.html       |  0
 {src/templates => templates}/result/app.js    |  0
 .../templates => templates}/result/index.html |  0
 .../result/socket.io.js                       |  0
 .../result/stylesheets/style.css              |  0
 .../voting-ui-deployment-manifest.yaml        | 22 ---------------
 12 files changed, 33 insertions(+), 28 deletions(-)
 rename src/Dockerfile => Dockerfile (100%)
 rename src/app.py => app.py (96%)
 create mode 100644 k8s/deployment.yaml
 rename yaml-manifests/voting-ui-service-manifest.yaml => k8s/service.yaml (62%)
 rename src/requirements.txt => requirements.txt (100%)
 rename {src/static => static}/stylesheets/style.css (100%)
 rename {src/templates => templates}/index.html (100%)
 rename {src/templates => templates}/result/app.js (100%)
 rename {src/templates => templates}/result/index.html (100%)
 rename {src/templates => templates}/result/socket.io.js (100%)
 rename {src/templates => templates}/result/stylesheets/style.css (100%)
 delete mode 100644 yaml-manifests/voting-ui-deployment-manifest.yaml

diff --git a/src/Dockerfile b/Dockerfile
similarity index 100%
rename from src/Dockerfile
rename to Dockerfile
diff --git a/src/app.py b/app.py
similarity index 96%
rename from src/app.py
rename to app.py
index 1abcc2e2..518308ec 100755
--- a/src/app.py
+++ b/app.py
@@ -26,7 +26,7 @@ def hello():
         vote = request.form['vote']
         data = json.dumps({'voter_id': voter_id, 'vote': vote})
         requests.post(url=rest_endpoint + "/vote", data=data)
-        
+
     resp = make_response(render_template(
         'index.html',
         option_a=option_a,
@@ -55,4 +55,4 @@ def send_js(path):
 
 
 if __name__ == "__main__":
-    app.run(host='0.0.0.0', port=9090, debug=True)
+    app.run(host='0.0.0.0', port=8080, debug=True)
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
new file mode 100644
index 00000000..3a2f8ddb
--- /dev/null
+++ b/k8s/deployment.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: ui
+  name: ui
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: ui
+  template:
+    metadata:
+      labels:
+        app: ui
+    spec:
+      containers:
+        - image: quay.io/sthaha/voting-ui:latest
+          name: ui
+          ports:
+            - containerPort: 8080
+            - containerPort: 9090
+          env:
+            - name: VOTING_API_SERVICE_HOST
+              value: api
+            - name: VOTING_API_SERVICE_PORT
+              value: "9000"
diff --git a/yaml-manifests/voting-ui-service-manifest.yaml b/k8s/service.yaml
similarity index 62%
rename from yaml-manifests/voting-ui-service-manifest.yaml
rename to k8s/service.yaml
index 2cc2be18..eda4ce7b 100644
--- a/yaml-manifests/voting-ui-service-manifest.yaml
+++ b/k8s/service.yaml
@@ -2,13 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: voting-ui
-  name: voting-ui
+    app: ui
+  name: ui
 spec:
   type: NodePort
   ports:
     - port: 8080
+      targetPort: 8080
       protocol: TCP
-      targetPort: 9090
   selector:
-    app: voting-ui
+    app: ui
diff --git a/src/requirements.txt b/requirements.txt
similarity index 100%
rename from src/requirements.txt
rename to requirements.txt
diff --git a/src/static/stylesheets/style.css b/static/stylesheets/style.css
similarity index 100%
rename from src/static/stylesheets/style.css
rename to static/stylesheets/style.css
diff --git a/src/templates/index.html b/templates/index.html
similarity index 100%
rename from src/templates/index.html
rename to templates/index.html
diff --git a/src/templates/result/app.js b/templates/result/app.js
similarity index 100%
rename from src/templates/result/app.js
rename to templates/result/app.js
diff --git a/src/templates/result/index.html b/templates/result/index.html
similarity index 100%
rename from src/templates/result/index.html
rename to templates/result/index.html
diff --git a/src/templates/result/socket.io.js b/templates/result/socket.io.js
similarity index 100%
rename from src/templates/result/socket.io.js
rename to templates/result/socket.io.js
diff --git a/src/templates/result/stylesheets/style.css b/templates/result/stylesheets/style.css
similarity index 100%
rename from src/templates/result/stylesheets/style.css
rename to templates/result/stylesheets/style.css
diff --git a/yaml-manifests/voting-ui-deployment-manifest.yaml b/yaml-manifests/voting-ui-deployment-manifest.yaml
deleted file mode 100644
index 1c268c0d..00000000
--- a/yaml-manifests/voting-ui-deployment-manifest.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  labels:
-    app: voting-ui
-  name: voting-ui
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: voting-ui
-  template:
-    metadata:
-      labels:
-        app: voting-ui
-    spec:
-      containers:
-        - image: hriships/vote-app:1
-          name: voting-ui
-          ports:
-            - containerPort: 8080