updates to the yaml files

Author: mjhea0

deploy.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+
+echo "Creating the volume..."
+
+kubectl apply -f ./kubernetes/persistent-volume.yml
+kubectl apply -f ./kubernetes/persistent-volume-claim.yml
+
+
+echo "Creating the database credentials..."
+
+kubectl apply -f ./kubernetes/secret.yml
+
+
+echo "Creating the Postgres deployment and service..."
+
+kubectl create -f ./kubernetes/postgres-deployment.yml
+kubectl create -f ./kubernetes/postgres-service.yml
+
+
+
+echo "Creating the flask deployment and service..."
+
+kubectl create -f ./kubernetes/flask-deployment.yml
+kubectl create -f ./kubernetes/flask-service.yml
+
+
+echo "Adding the ingress..."
+
+minikube addons enable ingress
+kubectl apply -f ./kubernetes/minikube-ingress.yml
+
+
+echo "Creating the vue deployment and service..."
+
+kubectl create -f ./kubernetes/vue-deployment.yml
+kubectl create -f ./kubernetes/vue-service.yml

kubernetes/flask-service.yml

@@ -10,4 +10,4 @@ spec:
     port: 5000
     targetPort: 5000
   selector:
-    service: flask
+    app: flask

kubernetes/persistent-volume-claim.yml

@@ -1,5 +1,5 @@
-kind: PersistentVolumeClaim
 apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: postgres-pvc
   labels:

kubernetes/persistent-volume.yml

@@ -1,5 +1,5 @@
-kind: PersistentVolume
 apiVersion: v1
+kind: PersistentVolume
 metadata:
   name: postgres-pv
   labels:

kubernetes/vue-deployment.yml

@@ -7,7 +7,7 @@ spec:
   template:
     metadata:
       labels:
-        run: vue
+        app: vue
     spec:
       containers:
       - name: vue

kubernetes/vue-service.yml

@@ -10,4 +10,4 @@ spec:
     port: 8080
     targetPort: 8080
   selector:
-    service: vue
+    app: vue

services/server/entrypoint.sh

@@ -1,14 +1,11 @@
 #!/bin/sh
 
-# echo "Waiting for postgres..."
+echo "Waiting for postgres..."
 
 while ! nc -z postgres 5432; do
   sleep 0.1
 done
 
-# echo "PostgreSQL started"
+echo "PostgreSQL started"
 
-python manage.py recreate_db
-python manage.py seed_db
-python manage.py run --host 0.0.0.0
-# gunicorn -b 0.0.0.0:5000 manage:app
+gunicorn -b 0.0.0.0:5000 manage:app

services/server/project/api/books.py

@@ -1,3 +1,5 @@
+import os
+
 from flask import Blueprint, jsonify, request
 
 from project.api.models import Book
@@ -9,7 +11,10 @@
 
 @books_blueprint.route('/books', methods=['GET', 'POST'])
 def all_books():
-    response_object = {'status': 'success'}
+    response_object = {
+        'status': 'success',
+        'container_id': os.uname()[1]
+    }
     if request.method == 'POST':
         post_data = request.get_json()
         title = post_data.get('title')
@@ -27,13 +32,17 @@ def all_books():
 def ping():
     return jsonify({
         'status': 'success',
-        'message': 'pong!'
+        'message': 'pong!',
+        'container_id': os.uname()[1]
     })
 
 
 @books_blueprint.route('/books/<book_id>', methods=['PUT', 'DELETE'])
 def single_book(book_id):
-    response_object = {'status': 'success'}
+    response_object = {
+      'status': 'success',
+      'container_id': os.uname()[1]
+    }
     book = Book.query.filter_by(id=book_id).first()
     if request.method == 'PUT':
         post_data = request.get_json()