UI runs fine on k8s

openshift · Oct 13, 2019 · e47c51f · e47c51f
1 parent 6999177
commit e47c51f
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 28 deletions.
diff --git a/src/Dockerfile → Dockerfile b/src/Dockerfile → Dockerfile
diff --git a/src/app.py → app.py b/src/app.py → 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
@@ -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/...manifests/voting-ui-service-manifest.yaml → k8s/service.yaml b/...manifests/voting-ui-service-manifest.yaml → 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 → requirements.txt b/src/requirements.txt → requirements.txt
diff --git a/src/static/stylesheets/style.css → static/stylesheets/style.css b/src/static/stylesheets/style.css → static/stylesheets/style.css
diff --git a/src/templates/index.html → templates/index.html b/src/templates/index.html → templates/index.html
diff --git a/src/templates/result/app.js → templates/result/app.js b/src/templates/result/app.js → templates/result/app.js
diff --git a/src/templates/result/index.html → templates/result/index.html b/src/templates/result/index.html → templates/result/index.html
diff --git a/src/templates/result/socket.io.js → templates/result/socket.io.js b/src/templates/result/socket.io.js → templates/result/socket.io.js
diff --git a/src/templates/result/stylesheets/style.css → templates/result/stylesheets/style.css b/src/templates/result/stylesheets/style.css → templates/result/stylesheets/style.css
diff --git a/yaml-manifests/voting-ui-deployment-manifest.yaml b/yaml-manifests/voting-ui-deployment-manifest.yaml