From 9deeddc83aea75dcde00077784ff73e89fffa6cc Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 25 Apr 2019 14:48:11 -0500
Subject: [PATCH] Minor tweaks for kadm content

---
 slides/k8s/architecture.md    | 19 +++++++++++++++++++
 slides/k8s/cluster-upgrade.md |  2 ++
 slides/k8s/cni.md             |  3 ++-
 slides/k8s/dmuc.md            |  8 ++++----
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/slides/k8s/architecture.md b/slides/k8s/architecture.md
index ecd28284..d324447a 100644
--- a/slides/k8s/architecture.md
+++ b/slides/k8s/architecture.md
@@ -165,6 +165,25 @@ What does that mean?
 
 ---
 
+## Let's experiment a bit!
+
+- For the exercises in this section, connect to the first node of the `test` cluster
+
+.exercise[
+
+- SSH to the first node of the test cluster
+
+- Check that the cluster is operational:
+  ```bash
+  kubectl get nodes
+  ```
+
+- All nodes should be `Ready`
+
+]
+
+---
+
 ## Create
 
 - Let's create a simple object
diff --git a/slides/k8s/cluster-upgrade.md b/slides/k8s/cluster-upgrade.md
index a599f58d..57bce466 100644
--- a/slides/k8s/cluster-upgrade.md
+++ b/slides/k8s/cluster-upgrade.md
@@ -18,6 +18,8 @@
 
 .exercise[
 
+- Log into node `test1`
+
 - Check the version of kubectl and of the API server:
   ```bash
   kubectl version
diff --git a/slides/k8s/cni.md b/slides/k8s/cni.md
index e4749234..21ead238 100644
--- a/slides/k8s/cni.md
+++ b/slides/k8s/cni.md
@@ -650,7 +650,8 @@ For critical services, we might want to precisely control the update process.
 
 - We can see informative messages in the output of kube-router:
   ```
-  time="2019-04-07T15:53:56Z" level=info msg="Peer Up" Key=X.X.X.X State=BGP_FSM_OPENCONFIRM Topic=Peer
+  time="2019-04-07T15:53:56Z" level=info msg="Peer Up"
+  Key=X.X.X.X State=BGP_FSM_OPENCONFIRM Topic=Peer
   ```
 
 - We should see the routes of the other clusters show up
diff --git a/slides/k8s/dmuc.md b/slides/k8s/dmuc.md
index b4b2dc46..535dd9be 100644
--- a/slides/k8s/dmuc.md
+++ b/slides/k8s/dmuc.md
@@ -33,7 +33,7 @@
 
 ## Our environment
 
-- We will use the machine indicated as `dmuc`
+- We will use the machine indicated as `dmuc1`
 
   (this stands for "Dessine Moi Un Cluster" or "Draw Me A Sheep",
   <br/>in homage to Saint-Exupery's "The Little Prince")
@@ -54,7 +54,7 @@
 
 .exercise[
 
-- Log into the `dmuc` machine
+- Log into the `dmuc1` machine
 
 - Get root:
   ```bash
@@ -106,7 +106,7 @@
 - Try to start the API server:
   ```bash
   kube-apiserver
-  # It will fail with --etcd-servers must be specified
+  # It will fail with "--etcd-servers must be specified"
   ```
 
 ]
@@ -559,7 +559,7 @@ Success!
 
 Our node should show up.
 
-Its name will be its hostname (it should be `dmuc`).
+Its name will be its hostname (it should be `dmuc1`).
 
 ---