Merge branch 'master' into septembre2018

k8s/kaniko-build.yaml

@@ -19,7 +19,7 @@ spec:
     image: gcr.io/kaniko-project/executor:latest
     args:
       - "--context=/workspace/dockercoins/rng"
-      - "--skip-tls-verify"
+      - "--insecure"
       - "--destination=registry:5000/rng-kaniko:latest"
     volumeMounts:
     - name: workspace

slides/k8s/portworx.md

@@ -295,7 +295,7 @@ It should show as `portworx-replicated (default)`.
 
 - With a `volumeClaimTemplate` requesting a 1 GB volume
 
-- That volume will be mounted to `/var/lib/postgresql`
+- That volume will be mounted to `/var/lib/postgresql/data`
 
 - There is another little detail: we enable the `stork` scheduler
 
@@ -328,7 +328,7 @@ spec:
       - name: postgres
         image: postgres:10.5
         volumeMounts:
-        - mountPath: /var/lib/postgresql
+        - mountPath: /var/lib/postgresql/data
           name: postgres
   volumeClaimTemplates:
   - metadata:

slides/k8s/prometheus.md

@@ -38,7 +38,7 @@
 
 - An exporter serves metrics over HTTP, in plain text
 
-- This is was the *node exporter* looks like:
+- This is what the *node exporter* looks like:
 
   http://demo.robustperception.io:9100/metrics
 

slides/swarm/metrics.md

@@ -949,7 +949,7 @@ class: prom
 
 ## It's all about the `/metrics`
 
-- This is was the *node exporter* looks like:
+- This is what the *node exporter* looks like:
 
   http://demo.robustperception.io:9100/metrics