Merge branch 'teebee' into 'master'

Teebee

See merge request !4

kubernetes/scrumblr/scrumbl-redis.yml

+# redisdeployment.yml
+apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
+kind: Deployment
+metadata:
+  name: combine
+  #namespace: hackathon
+spec:
+  selector:
+    matchLabels:
+      app: combine
+  replicas: 1 # tells deployment to run 2 pods matching the template
+  template:
+    metadata:
+      labels:
+        app: combine
+    spec:
+      containers:
+      - name: scrumbl
+        image: timmit/scrumblr:latest
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+        ports:
+        - containerPort: 8080
+      - name: redis
+        image: redis:latest
+        env:
+        - name: GET_HOSTS_FROM
+          value: dns
+        ports:
+        - containerPort: 6379
+          name: redis
+          protocol: TCP
+
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: combine
+spec:
+  selector:
+    app: combine
+  ports:
+  - protocol: TCP
+    port: 8000
+    targetPort: 8080
+  type: LoadBalancer