Merge pull request #148 from jpetazzo/master

bring branch up to date

prepare-vms/lib/commands.sh

@@ -132,7 +132,7 @@ _cmd_kube() {
     sudo apt-key add - &&
     echo deb http://apt.kubernetes.io/ kubernetes-xenial main |
     sudo tee /etc/apt/sources.list.d/kubernetes.list"
-    pssh "
+    pssh --timeout 200 "
     sudo apt-get update -q &&
     sudo apt-get install -qy kubelet kubeadm kubectl
     kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl"

slides/intro/Advanced_Dockerfiles.md

@@ -94,8 +94,6 @@ RUN apt-get update && apt-get install -y wget && apt-get clean
 
 It is also possible to break a command onto multiple lines:
 
-It is possible to execute multiple commands in a single step:
-
 ```dockerfile
 RUN apt-get update \
  && apt-get install -y wget \

slides/intro/Copying_Files_During_Build.md

@@ -93,7 +93,7 @@ Success!
 * Older Dockerfiles also have the `ADD` instruction.
   <br/>It is similar but can automatically extract archives.
 
-* If we really wanted to compile C code in a compiler, we would:
+* If we really wanted to compile C code in a container, we would:
 
   * Place it in a different directory, with the `WORKDIR` instruction.
 

slides/kube/dashboard.md

@@ -87,6 +87,17 @@ The goo.gl URL expands to:
 
 ## Connecting to the dashboard
 
+.exercise[
+
+- Check which port the dashboard is on:
+  ```bash
+  kubectl -n kube-system get svc socat
+  ```
+
+]
+
+You'll want the `3xxxx` port.
+
 
 .exercise[
 
@@ -164,7 +175,7 @@ The dashboard will then ask you which authentication you want to use.
 
 ## Editing the `kubernetes-dashboard` service
 
-- If we look at the YAML that we loaded just before, we'll get a hint
+- If we look at the [YAML](https://goo.gl/Qamqab) that we loaded before, we'll get a hint
 
 --
 
@@ -183,6 +194,8 @@ The dashboard will then ask you which authentication you want to use.
 
 - Check the port that was assigned with `kubectl -n kube-system get services`
 
+- Connect to https://oneofournodes:3xxxx/ (yes, https)
+
 ]
 
 ---

slides/kube/versions-k8s.md

@@ -1,7 +1,7 @@
 ## Versions installed
 
-- Kubernetes 1.9.3
-- Docker Engine 18.02.0-ce
+- Kubernetes 1.9.4
+- Docker Engine 18.03.0-ce-rc3
 - Docker Compose 1.18.0