merge

slides/k8s/namespaces.md

@@ -81,12 +81,16 @@
 
 ## Creating namespaces
 
-- Creating a namespace is done with the `kubectl create namespace` command:
+- Let's see two identical methods to create a namespace
+
+.exercise[
+
+- We can use `kubectl create namespace`:
   ```bash
   kubectl create namespace blue
   ```
 
-- We can also get fancy and use a very minimal YAML snippet, e.g.:
+- Or we can construct a very minimal YAML snippet:
   ```bash
 	kubectl apply -f- <<EOF
 	apiVersion: v1
@@ -96,7 +100,7 @@
 	EOF
   ```
 
-- The two methods above are identical
+]
 
 - Some tools like Helm will create namespaces automatically when needed
 
@@ -215,6 +219,7 @@
 
 - Clone the kubercoins repository:
   ```bash
+  cd ~
   git clone https://github.com/jpetazzo/kubercoins
   ```
 

slides/k8s/rollout.md

@@ -49,7 +49,6 @@
 
 ---
 
-
 ## Rolling updates in practice
 
 - As of Kubernetes 1.8, we can do rolling updates with:
@@ -64,12 +63,15 @@
 
 ## Building a new version of the `worker` service
 
+.warning[
+Only run these commands if you have built and pushed DockerCoins to a local registry.
+<br/>
+If you are using images from the Docker Hub (`dockercoins/worker:v0.1`), skip this.
+]
+
 .exercise[
 
-- Go to the `stack` directory:
-  ```bash
-  cd ~/container.training/stacks
-  ```
+- Go to the `stacks` directory (`~/container.training/stacks`)
 
 - Edit `dockercoins/worker/worker.py`; update the first `sleep` line to sleep 1 second
 

slides/shared/connecting.md

@@ -14,11 +14,7 @@ done
 ```
 
 ```bash
-if which kubectl; then
-  kubectl get deploy,ds -o name | xargs -rn1 kubectl delete
-  kubectl get all -o name | grep -v service/kubernetes | xargs -rn1 kubectl delete --ignore-not-found=true
-  kubectl -n kube-system get deploy,svc -o name | grep -v dns | xargs -rn1 kubectl -n kube-system delete
-fi
+# FIXME find a way to reset the cluster, maybe?
 ```
 -->