Merge branch '3-entity-ident-service-mongodb' into 'master'

Resolve "Entity Ident Service - Mongodb"

Closes #3

See merge request kranklyboy/dse-assignment!2

components/entitiy_ident/entity_ident_service/entity_ident.py

@@ -5,31 +5,24 @@ from flask_pymongo import PyMongo
 # make sure mongoDB (container) is running and accessible
 
 # see https://flask-pymongo.readthedocs.io/en/latest/
+from pymongo import MongoClient
 
 app = Flask(__name__)
-#app.config["MONGO_URI"] = "mongodb://localhost:27017/myDatabase"
+app.config["MONGO_URI"] = "mongodb://mongo:27017/entities"
-#mongo = PyMongo(app)
+mongo = PyMongo(app)
-
-#mongo.db.test.insert_one({'_id': 0, 'foo': {'test': 'this'}})
-#mongo.db.test.insert_one({'_id': 1, 'suu': 'sar'})
-
-
-#@app.route("/")
-#def home_page():
-    # test_results = mongo.db.test.find()
-    # results = []
-    # try:
-    #     while True:
-    #         result = test_results.next()
-    #         results.append(result)
-    # except StopIteration:
-    #     pass
-
-    #return str(results)
 
 @app.route("/")
 def index():
-    return str("Test!")
+    test_results = mongo.db.cars.find()
+    results = []
+    try:
+        while True:
+            result = test_results.next()
+            results.append(result)
+    except StopIteration:
+        pass
+
+    return str(results)
 
 #if __name__ == '__main__':
 #    app.run()

deploy-local.sh

@@ -5,8 +5,11 @@ eval $(minikube -p minikube docker-env)
 
 echo "Building images..."
 docker build -t entity-ident components/entitiy_ident/entity_ident_service
+docker build -t mongo components/entitiy_ident/mongo
 
 echo "Creating deployments and services..."
+kubectl create -f kubernetes/mongo-deployment.yaml
+kubectl create -f kubernetes/mongo-service.yaml
 kubectl create -f kubernetes/entity-ident-deployment.yaml
 kubectl create -f kubernetes/entity-ident-service.yaml
 

kubernetes/entity-ident-deployment.yaml

@@ -3,16 +3,18 @@ kind: Deployment
 metadata:
   name: entity-ident
   labels:
-    app: entity-ident
+    app: dse
+    tier: entity-ident
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: entity-ident
+      app: dse
   template:
     metadata:
       labels:
-        app: entity-ident
+        app: dse
+        tier: entity-ident
     spec:
       containers:
         - name: entity-ident

kubernetes/entity-ident-service.yaml

@@ -6,7 +6,8 @@ metadata:
     service: entity-ident
 spec:
   selector:
-    app: entity-ident
+    app: dse
+    tier: entity-ident
   ports:
   - port: 5000
     targetPort: 5000

kubernetes/mongo-deployment.yaml

@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: mongo
+  labels:
+    app: dse
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dse
+      tier: mongo
+  template:
+    metadata:
+      labels:
+        app: dse
+        tier: mongo
+    spec:
+      containers:
+        - name: mongo
+          image: mongo
+          ports:
+            - containerPort: 27017
+          imagePullPolicy: Never

kubernetes/mongo-service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongo
+  labels:
+    service: mongo
+spec:
+  type: ClusterIP
+  selector:
+    app: dse
+  ports:
+  - port: 27017
+    targetPort: 27017

remove-local.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
 echo "Removing deployments and services..."
+kubectl delete -f kubernetes/mongo-deployment.yaml
+kubectl delete -f kubernetes/mongo-service.yaml
 kubectl delete -f kubernetes/entity-ident-deployment.yaml
 kubectl delete -f kubernetes/entity-ident-service.yaml
 kubectl delete -f kubernetes/minikube-ingress.yaml