From f23272d1542b75a44f207722a8847fb2e6ab22ec Mon Sep 17 00:00:00 2001
From: Bridget Kromhout <bridget@kromhout.org>
Date: Sun, 30 Sep 2018 20:23:21 -0400
Subject: [PATCH 1/3] Clarify kubens

---
 slides/k8s/namespaces.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/slides/k8s/namespaces.md b/slides/k8s/namespaces.md
index f4c949a8..e84d18a3 100644
--- a/slides/k8s/namespaces.md
+++ b/slides/k8s/namespaces.md
@@ -205,7 +205,9 @@ Note: it might take a minute or two for the app to be up and running.
   kubectl config set-context --current --namespace=foo
   ```
 
-- We can also use a little helper tool called `kubens`:
+- We can also use a little helper tool called `kubens`.
+
+  (These examples are for illustration, and are not functional.)
 
   ```bash
   # Switch to namespace foo

From 4a447c7bf5a0b28798e7e1196e9dd5f75682c56b Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 1 Nov 2018 13:43:37 -0500
Subject: [PATCH 2/3] Clarify further kubens vs kns

---
 slides/k8s/namespaces.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/slides/k8s/namespaces.md b/slides/k8s/namespaces.md
index e84d18a3..55d2b8b5 100644
--- a/slides/k8s/namespaces.md
+++ b/slides/k8s/namespaces.md
@@ -205,9 +205,7 @@ Note: it might take a minute or two for the app to be up and running.
   kubectl config set-context --current --namespace=foo
   ```
 
-- We can also use a little helper tool called `kubens`.
-
-  (These examples are for illustration, and are not functional.)
+- We can also use a little helper tool called `kubens`:
 
   ```bash
   # Switch to namespace foo
@@ -216,6 +214,10 @@ Note: it might take a minute or two for the app to be up and running.
   kubens -
   ```
 
+- On our clusters, `kubens` is called `kns` instead
+
+  (so that it's even fewer keystrokes to switch namespaces)
+
 ---
 
 ##  `kubens` and `kubectx`

From efb72c293826155bcc3ba917a85ee76b1b1c9333 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 8 Nov 2018 20:42:02 -0600
Subject: [PATCH 3/3] Bump all the versions

Bump:
- stern
- Ubuntu

Also, each place where there is a 'bumpable' version, I added
a ##VERSION## marker, easily greppable.
---
 prepare-vms/lib/commands.sh  | 3 ++-
 prepare-vms/lib/infra/aws.sh | 3 ++-
 slides/k8s/logs-cli.md       | 4 +++-
 slides/k8s/setup-k8s.md      | 4 +++-
 slides/k8s/versions-k8s.md   | 5 +++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh
index 02a959dd..0a39c31e 100644
--- a/prepare-vms/lib/commands.sh
+++ b/prepare-vms/lib/commands.sh
@@ -170,7 +170,8 @@ EOF"
     # Install stern
     pssh "
     if [ ! -x /usr/local/bin/stern ]; then
-        sudo curl -L -o /usr/local/bin/stern https://github.com/wercker/stern/releases/download/1.8.0/stern_linux_amd64 &&
+        ##VERSION##
+        sudo curl -L -o /usr/local/bin/stern https://github.com/wercker/stern/releases/download/1.10.0/stern_linux_amd64 &&
         sudo chmod +x /usr/local/bin/stern &&
         stern --completion bash | sudo tee /etc/bash_completion.d/stern
     fi"
diff --git a/prepare-vms/lib/infra/aws.sh b/prepare-vms/lib/infra/aws.sh
index 59d3bfe0..bb4ac084 100644
--- a/prepare-vms/lib/infra/aws.sh
+++ b/prepare-vms/lib/infra/aws.sh
@@ -201,5 +201,6 @@ aws_tag_instances() {
 }
 
 aws_get_ami() {
-    find_ubuntu_ami -r $AWS_DEFAULT_REGION -a amd64 -v 16.04 -t hvm:ebs -N -q
+    ##VERSION##
+    find_ubuntu_ami -r $AWS_DEFAULT_REGION -a amd64 -v 18.04 -t hvm:ebs -N -q
 }
diff --git a/slides/k8s/logs-cli.md b/slides/k8s/logs-cli.md
index 3d540304..315df4fb 100644
--- a/slides/k8s/logs-cli.md
+++ b/slides/k8s/logs-cli.md
@@ -62,10 +62,12 @@ Exactly what we need!
 - 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
+       https://github.com/wercker/stern/releases/download/1.10.0/stern_linux_amd64
   sudo chmod +x /usr/local/bin/stern
   ```
 
+<!-- ##VERSION## -->
+
 ---
 
 ## Using Stern
diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md
index 171a9801..c81ac1a4 100644
--- a/slides/k8s/setup-k8s.md
+++ b/slides/k8s/setup-k8s.md
@@ -4,7 +4,9 @@
 
 --
 
-- We used `kubeadm` on freshly installed VM instances running Ubuntu 16.04 LTS
+<!-- ##VERSION## -->
+
+- We used `kubeadm` on freshly installed VM instances running Ubuntu 18.04 LTS
 
     1. Install Docker
 
diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md
index 1607f07e..962cee7d 100644
--- a/slides/k8s/versions-k8s.md
+++ b/slides/k8s/versions-k8s.md
@@ -1,9 +1,10 @@
 ## Versions installed
 
-- Kubernetes 1.12.0
-- Docker Engine 18.06.1-ce
+- Kubernetes 1.12.2
+- Docker Engine 18.09.0
 - Docker Compose 1.21.1
 
+<!-- ##VERSION## -->
 
 .exercise[