Merge branch 'kenzanlabs-master'

Author: mschmidt712

README.md

@@ -5,10 +5,9 @@ RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY package.json /usr/src/app/
-COPY gulpfile.js /usr/src/app/
+COPY package.json gulpfile.js yarn.lock /usr/src/app/
 
-RUN npm install
+RUN yarn --pure-lockfile
 
 # Bundle app source
 COPY . /usr/src/app

applications/crossword/README.md

@@ -1,32 +1,16 @@
 ## Kr8ssword Puzzle Kubernetes CI / CD , Microservices Example
-## NOTE: For full functionality please ensure the part2/server setup has been completed.
 
 # setup
-Go through part1. Ensure that:
- - europa is up and running
+From the root directory of the repository, use 'npm run part1' to setup the minikube cluster.
 
-### Update k8s/deployment.yaml to replace MINIKUBEIP with your minikube ip
-    host: kr8sswordz.MINIKUBEIP.xip.io
-
-## Manual steps to build and deploy
-### Build and Push to Europa
-    docker build -t `minikube ip`:30912/kr8sswordz:1.0.0 .
-    docker push `minikube ip`:30912/kr8sswordz:1.0.0
-
-### Make europa Repo public
-Note: Replace MINIKUBEIP with your minikube ip
-
-1) Go to http://europa.MINIKUBEIP.xip.io/repositories/kr8sswordz
-2) Go to repository settings 
-3) Select Public
-
-### Deploy to kubernetes
-    kubectl apply -f k8s/deployment.yaml
-        
-## Automated script
-    ./build.sh
+### Building
+    Use or review <root>/scripts/kr8sswordz-pages.sh for build/deployment steps 
 
 ## Load application
+Run 'minikube service kr8sswordz'
+
+or
+
 Change MINIKUBEIP to your minikube ip and load the application below
 
     http://kr8sswordz.MINIKUBEIP.xip.io/ 

applications/crossword/bash.sh

@@ -1,6 +1,6 @@
 import * as actions from './actionTypes';
 import constants from '../constants';
-const baseUrl = `http://services.kr8sswordz.${constants.minikubeIp}.xip.io/puzzle/v1`;
+const baseUrl = `http://puzzle.${constants.minikubeIp}.xip.io/puzzle/v1`;
 const arrowDisplayTime = 1000;
 
 export function getPuzzleDataSuccess (json) {

applications/crossword/build.sh

@@ -1,13 +1,13 @@
-FROM node:7
+FROM node:boron
 
 # Create app directory
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY package.json /usr/src/app/
+COPY package.json yarn.lock /usr/src/app/
 
-RUN npm install
+RUN yarn --pure-lockfile
 
 # Bundle app source
 COPY . /usr/src/app

applications/kr8sswordz-pages/Dockerfile

@@ -14,13 +14,13 @@ node {
 
     stage "Build"
 
-        sh "docker build -t ${imageName} applications/monitor"
+        sh "docker build -t ${imageName} applications/monitor-scale"
 
     stage "Push"
 
         sh "docker push ${imageName}"
 
     stage "Deploy"
 
-        sh "sed 's#127.0.0.1:30400/monitor-scale:latest#'$BUILDIMG'#' applications/monitor/k8s/monitor-scale.yaml | kubectl apply -f -"
+        sh "sed 's#127.0.0.1:30400/monitor-scale:latest#'$BUILDIMG'#' applications/monitor-scale/k8s/deployment.yaml | kubectl apply -f -"
 }

applications/kr8sswordz-pages/README.md

@@ -0,0 +1,10 @@
+=== monitor-scale server ===
+This appication provides an API to track when servers go up and down, caching that data and sending the list of crossword servers to the frontend using websockets.  Additionally, this API provides an endpoint to scale the crossword deployment.
+
+## Kr8sswordz Monitor-Scale Kubernetes CI / CD , Microservices Example
+
+# setup
+From the root directory of the repository, use 'npm run part1' to setup the minikube cluster.
+
+### Building
+    Use or review <root>/scripts/monitor-scale.sh for build/deployment steps 

applications/kr8sswordz-pages/build.sh

@@ -13,9 +13,6 @@ app.use(express.static('public'))
 
 var bodyParser = require("body-parser");
 
-//var servicesHost = process.env.SERVICES_SERVICE_HOST;
-//var servicesPort = process.env.SERVICES_SERVICE_PORT;
-
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 app.use(cors());
@@ -33,12 +30,12 @@ watcher.on("change", function(val) {
 app.post('/scale', function (req, res) {
   var scale = req.body.count;
   console.log('Count requested is: %s', scale);
-  var url = "http://127.0.0.1:2345/apis/extensions/v1beta1/namespaces/default/deployments/services/scale";
+  var url = "http://127.0.0.1:2345/apis/extensions/v1beta1/namespaces/default/deployments/puzzle/scale";
   var putBody = {
     kind:"Scale",
     apiVersion:"extensions/v1beta1",
     metadata: { 
-      name:"services",
+      name:"puzzle",
       namespace:"default"
     },
     spec: {
@@ -61,7 +58,7 @@ app.post('/loadtest/concurrent', function (req, res) {
 
   var count = req.body.count;
   console.log('Count requested is: %s', count);
-  var url = "http://services:3000/puzzle/v1/crossword";
+  var url = "http://puzzle:3000/puzzle/v1/crossword";
   var myUrls = [];
   for (var i = 0; i < req.body.count; i++) {
     myUrls.push(url);
@@ -83,16 +80,23 @@ app.post('/loadtest/concurrent', function (req, res) {
 app.post('/loadtest/consecutive', function (req, res) {
 
   var count = req.body.count;
-  var url = "http://services:3000/puzzle/v1/crossword";
+  var url = "http://puzzle:3000/puzzle/v1/crossword";
+  var callArray = [];
+
   for (var i = 0; i < req.body.count; i++) {
-    request(url, function(error, response, html) {
-      if (response && response.hasOwnProperty("statusCode")) {
-        console.log(response.statusCode);
-      } else {
-        console.log("Error:" + error);
-      }
+    
+    callArray.push(function (cb) {
+      setTimeout(function () {
+        request(url, function(error, response, html) {
+          cb(null, response && response.statusCode);
+        });
+      }, 100);
     });
   }
+  async.series(callArray, function (err, results) {
+    var finalCount = results && results.length;
+    console.log(`${finalCount} requests sent.`)
+  });
   res.send('consecutive done');
 });
 

applications/kr8sswordz-pages/src/actions/puzzleActions.js

@@ -1,15 +1,12 @@
 {
-  "name": "monitor",
+  "name": "monitor-scale",
   "version": "1.0.0",
   "description": "A service for updating the cache and emitting websocket events back to the frontend",
   "main": "index.js",
   "scripts": {
-    "debug": "node --inspect index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/kenzanlabs/kubernetes-ci-cd.git"
+    "start": "node ."
   },
+  "repository": "git+https://github.com/kenzanlabs/kubernetes-ci-cd.git",
   "keywords": [
     "monitor",
     "cache",