Merge branch 'master' into velny-k8s101-2018

slides/k8s/daemonset.md

@@ -344,7 +344,7 @@ to the associated load balancer.
 - Show detailed information about the `rng` replica:
   <br/>(The second command doesn't require you to get the exact name of the replica set)
   ```bash
-  kubectl describe rs rng-yyyy
+  kubectl describe rs rng-yyyyyyyy
   kubectl describe rs -l run=rng
   ```
 

slides/k8s/kubectlexpose.md

@@ -151,7 +151,7 @@ The `-w` option "watches" events happening on the specified resources.
 
 --
 
-Our requests are load balanced across multiple pods.
+Try it a few times! Our requests are load balanced across multiple pods.
 
 ---
 

slides/k8s/logs-cli.md

@@ -59,7 +59,7 @@ Exactly what we need!
 
 - If it is not installed, the easiest method is to download a [binary release](https://github.com/wercker/stern/releases)
 
-- The following commands will install Stern on a Linux Intel 64 bits machine:
+- The following commands will install Stern on a Linux Intel 64 bit machine:
   ```bash
   sudo curl -L -o /usr/local/bin/stern \
        https://github.com/wercker/stern/releases/download/1.8.0/stern_linux_amd64

slides/k8s/ourapponkube.md

@@ -327,4 +327,8 @@ We should now see the `worker`, well, working happily.
 
 --
 
+Yes, this may take a little while to update. *(Narrator: it was DNS.)*
+
+--
+
 *Alright, we're back to where we started, when we were running on a single node!*

slides/k8s/rollout.md

@@ -71,7 +71,7 @@
   cd ~/container.training/stacks
   ```
 
-- Edit `dockercoins/worker/worker.py`, update the `sleep` line to sleep 1 second
+- Edit `dockercoins/worker/worker.py`; update the first `sleep` line to sleep 1 second
 
 - Build a new tag and push it to the registry:
   ```bash

slides/k8s/whatsnext.md

@@ -53,7 +53,7 @@ And *then* it is time to look at orchestration!
 
 - Make sure that all our devs have usable dev clusters
 
-  (wether it's a local minikube or a full-blown multi-node cluster)
+  (whether it's a local minikube or a full-blown multi-node cluster)
 
 ---