Merge branch 'master' into 'filepizza'

# Conflicts:
#   kubernetes/filepizza/filepizza-deployment.yml

installation_microk8s.txt

@@ -2,6 +2,10 @@
 
 # on : Install Ubuntu 18.04
 snap install microk8s --classic
+
+cd /snap/bin
+sudo ln -s /snap/bin/microk8s.kubectl kubectl
+
 microk8s.kubectl get all --all-namespaces
 microk8s.kubectl get no
 microk8s.enable dns dashboard

kubernetes/filepizza/delete-pod.sh

+#!/bin/bash
+microk8s.kubectl delete -f filepizza-service.yml
+microk8s.kubectl delete -f filepizza-deployment.yml

kubernetes/filepizza/filepizza-service.yml

+apiVersion: v1
+kind: Service
+metadata:
+  name: filepizza
+  namespace: hackathon
+spec:
+  type: LoadBalancer
+  selector:
+    app: filepizza
+  ports:
+  - protocol: TCP
+    name: "http-filepizza"
+    port: 80 # port exposé sur le cluster Interne
+    targetPort: 80 # port exposé
+    nodePort: 30000
+status:
+  loadBalancer: {}
+  
\ No newline at end of file

kubernetes/filepizza/start-pod.sh

+#!/bin/bash
+microk8s.kubectl create -f filepizza-deployment.yml  
+microk8s.kubectl create -f filepizza-service.yml
\ No newline at end of file

kubernetes/namespace/apply-namespace.sh

+#!/bin/bash
+microk8s.kubectl create -f hackathon-namespace.yml

kubernetes/namespace/hackathon-namespace.yml

+apiVersion: v1
+kind: Namespace
+metadata:
+  name: hackathon
\ No newline at end of file

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