refactor

Author: moondev

Diff for: Jenkinsfile

@@ -23,4 +23,5 @@ node {
     stage "Deploy"
 
         sh "sed 's#127.0.0.1:30400/hello-kenzan:latest#'$BUILDIMG'#' applications/hello-kenzan/k8s/deployment.yaml | kubectl apply -f -"
+        sh "kubectl rollout status deployment/hello-kenzan"
 }

Diff for: README.md

@@ -13,124 +13,19 @@ Begin the tutorial `npm start`
 
 ## Manual tutorial version
 
-## Part 1
+## Part 4
 
 
-### Part 1
+### Part 4
 
 ### Step1
 
-Start up the cluster with minikibe
+Bootstrap etcd operator on the cluster
 
-`minikube start --memory 6000 --cpus 2 --kubernetes-version v1.6.0`
+`scripts/etcd.sh`
 
 ### Step2
 
-Enable addons
+Setup etcd directory for kubescale
 
-`minikube addons enable heapster; minikube addons enable ingress`
-
-### Step3
-
-Wait 20 seconds and view minikube dashboard
-
-`sleep 20; minikube service kubernetes-dashboard --namespace kube-system`
-
-### Step4
-
-Deploy the public nginx image from DockerHub
-
-`kubectl run nginx --image nginx --port 80`
-
-### Step5
-
-Create a service for deployment
-
-`kubectl expose deployment nginx --type NodePort --port 80`
-
-### Step6
-
-Launch browser to test service
-
-`minikube service nginx`
-
-### Step7
-
-Install registry
-
-`kubectl apply -f manifests/registry.yml`
-
-### Step8
-
-Wait for registry to deploy
-
-`kubectl rollout status deployments/registry`
-
-### Step9
-
-View registry UI
-
-`minikube service registry-ui`
-
-### Step10
-
-Edit the contents of applications/hello-kenzan/index.html
-
-`nano applications/hello-kenzan/index.html`
-
-### Step11
-
-We will now build the image with a special name that is pointing at our cluster registry.
-
-`docker build -t 127.0.0.1:30400/hello-kenzan:latest -f applications/hello-kenzan/Dockerfile applications/hello-kenzan`
-
-### Step12
-
-Before we can push our image we need to set up a temporary proxy. This is a container that listens on 127.0.0.1:30400 and forwads to our cluster. By default the docker client can only push to non https via localhost.
-
-`docker run -d -e "REGIP=`minikube ip`" --name socat-registry -p 30400:5000 chadmoon/socat:latest bash -c "socat TCP4-LISTEN:5000,fork,reuseaddr TCP4:`minikube ip`:30400"`
-
-### Step13
-
-We can now push our image.
-
-`docker push 127.0.0.1:30400/hello-kenzan:latest`
-
-### Step14
-
-Stop the registry proxy
-
-`docker stop socat-registry; docker rm socat-registry`
-
-### Step15
-
-Now that our image is on the cluster we can deploy the manifests
-
-`kubectl apply -f applications/hello-kenzan/k8s/deployment.yaml`
-
-### Step16
-
-View the app
-
-`minikube service hello-kenzan`## Part 2
-
-
-### Part 2
-
-### Step1
-
-Install Jenkins
-
-`kubectl apply -f manifests/jenkins.yml; kubectl rollout status deployment/jenkins`
-
-### Step2
-
-Get Jenkins admin password
-
-`kubectl exec -it `kubectl get pods --selector=app=jenkins --output=jsonpath={.items..metadata.name}` cat /root/.jenkins/secrets/initialAdminPassword`
-
-### Step3
-
-Configure Jenkins, default settings. Create a new job with type pipeline. Choose "Jenkinsfile from SCM" with target repo as https://github.com/kenzanlabs/kubernetes-ci-cd.git. Run the job.
-
-`minikube service jenkins`
+`scripts/kubescale.sh`

Diff for: applications/kubescale/Dockerfile

@@ -0,0 +1,23 @@
+FROM node:6
+
+RUN mkdir /app
+
+COPY . /app
+
+WORKDIR /app
+
+RUN apt-get update
+
+RUN apt-get install -y apache2
+
+RUN npm install -g loadtest
+
+RUN npm install -g nodemon
+
+RUN npm install
+
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+
+RUN chmod +x ./kubectl; mv ./kubectl /usr/local/bin/kubectl
+
+CMD ["nodemon", "index.js"]

Diff for: applications/kubescale/index.js

@@ -0,0 +1,95 @@
+var express = require('express')
+var app = express()
+
+var http = require('http').Server(app);
+var io = require('socket.io')(http);
+var path    = require("path");
+var Etcd = require('node-etcd')
+app.use(express.static('public'))
+var exec = require('child_process').exec;
+
+var bodyParser = require("body-parser");
+
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(bodyParser.json());
+
+//etcd = new Etcd("http://localhost:2379")
+///tmp/test-etcd/etcdctl --endpoints "http://example-etcd-cluster-client-service:2379" mkdir pod-list
+etcd = new Etcd("http://example-etcd-cluster-client-service:2379")
+
+//etcd.mkdir("pods");
+
+watcher = etcd.watcher("pod-list", null, {recursive: true})
+
+watcher.on("change", showVal);
+
+function showVal(val) {
+ pods = etcd.getSync("pod-list",{ recursive: true })
+  io.emit('pods', { pods: pods.body.node.nodes });
+
+}
+
+app.post('/scale', function (req, res) {
+  exec('kubectl scale --replicas=' + req.body.count + ' deployment/set', function(error, stdout, stderr) {
+  res.send("scaled to " + req.body.count);
+});
+})
+
+app.post('/loadtest/concurrent', function (req, res) {
+  //svc = "http://localhost:8001/api/v1/proxy/namespaces/default/services/set:80"
+  svc = "http://set:80/"
+//  exec('loadtest -c ' + req.body.count + ' -n ' + req.body.count + ' http://set', function(error, stdout, stderr) {
+    exec('ab -c ' + req.body.count + ' -n ' + req.body.count + ' ' + svc, function(error, stdout, stderr) {
+  console.log(stdout);
+  res.send(stdout);
+});
+})
+
+app.post('/loadtest/consecutive', function (req, res) {
+  svc = "http://set:80/"
+//  exec('loadtest -c ' + req.body.count + ' -n ' + req.body.count + ' http://set', function(error, stdout, stderr) {
+    exec('ab -c 1 -n ' + req.body.count + ' ' + svc, function(error, stdout, stderr) {
+  console.log(stdout);
+  res.send(stdout);
+});
+})
+
+
+
+app.get('/up/:podId', function (req, res) {
+  etcd.set("pod-list/" + req.params.podId, req.params.podId);
+  res.send('done');
+})
+
+app.get('/down/:podId', function (req, res) {
+  etcd.del("pod-list/" + req.params.podId, req.params.podId);
+  res.send('done');
+})
+
+app.get('/hit/:podId', function (req, res) {
+
+var d = new Date();
+var n = d.getTime();
+
+io.emit('hit', { podId: req.params.podId, time: n });
+console.log('hit!');
+res.send('done')
+})
+
+io.on('connection', function(socket){
+  
+    pods = etcd.getSync("pod-list",{ recursive: true })
+    io.emit('pods', { pods: pods.body.node.nodes });
+});
+
+app.get('/',function(req,res){
+       
+     res.sendFile(path.join(__dirname+'/public/index.html'));
+
+});
+
+
+http.listen(3000, function () {
+  console.log('Example app listening on port 3000!')
+})
+

Diff for: applications/kubescale/k8s/dashboard-ingress.yml

@@ -0,0 +1,15 @@
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: dashboard-ingress
+ namespace: kube-system
+spec:
+ rules:
+   - host: dashboard.127.0.0.1.xip.io
+     http:
+       paths:
+         - path: /
+           backend:
+             serviceName: kubernetes-dashboard
+             servicePort: 80

Diff for: applications/kubescale/k8s/ing.yml

@@ -0,0 +1,46 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ingress-services
+  namespace: kube-system
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
+spec:
+  backend:
+    serviceName: default-http-backend
+    servicePort: 80
+  rules:
+  - host: dashboard.127.0.0.1.xip.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: kubernetes-dashboard
+          servicePort: 80
+
+  - host: grafana.127.0.0.1.xip.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: monitoring-grafana
+          servicePort: 80
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ingress-services
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
+spec:
+  backend:
+    serviceName: default-http-backend
+    servicePort: 80
+  rules:
+  - host: kubescale.127.0.0.1.xip.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: kubescale
+          servicePort: 3000