diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh index 7b33e5fc..6e7a6f68 100644 --- a/prepare-vms/lib/commands.sh +++ b/prepare-vms/lib/commands.sh @@ -177,7 +177,9 @@ _cmd_kubetest() { # Feel free to make that better ♥ pssh " set -e + [ -f /tmp/node ] if grep -q node1 /tmp/node; then + which kubectl for NODE in \$(awk /\ node/\ {print\ \\\$2} /etc/hosts); do echo \$NODE ; kubectl get nodes | grep -w \$NODE | grep -w Ready done diff --git a/slides/index.html b/slides/index.html index 5be5b578..e6692aa9 100644 --- a/slides/index.html +++ b/slides/index.html @@ -64,7 +64,7 @@ - + - + @@ -82,6 +82,17 @@ thing for now (stay tuned...) + + + + + + + + + diff --git a/slides/intro/Container_Network_Model.md b/slides/intro/Container_Network_Model.md index 760fcfe6..851c8d33 100644 --- a/slides/intro/Container_Network_Model.md +++ b/slides/intro/Container_Network_Model.md @@ -434,7 +434,7 @@ When creating a network, extra options can be provided. * `--internal` disables outbound traffic (the network won't have a default gateway). -* `--gateway` indicates which address to use for the gateway (when utbound traffic is allowed). +* `--gateway` indicates which address to use for the gateway (when outbound traffic is allowed). * `--subnet` (in CIDR notation) indicates the subnet to use. diff --git a/slides/intro/intro.md b/slides/intro/intro.md index bfe3870a..16a4e0c8 100644 --- a/slides/intro/intro.md +++ b/slides/intro/intro.md @@ -1,7 +1,8 @@ ## A brief introduction -- This was initially written to support in-person, - instructor-led workshops and tutorials +- This was initially written to support in-person, instructor-led workshops and tutorials + +- These materials are maintained by [Jérôme Petazzoni](https://twitter.com/jpetazzo) and [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) - You can also follow along on your own, at your own pace diff --git a/slides/kube/intro.md b/slides/kube/intro.md index 41f5b2de..a0090371 100644 --- a/slides/kube/intro.md +++ b/slides/kube/intro.md @@ -1,7 +1,9 @@ ## A brief introduction -- This was initially written to support in-person, +- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person, instructor-led workshops and tutorials + +- Credit is also due to [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) — thank you! - You can also follow along on your own, at your own pace diff --git a/slides/swarm/intro.md b/slides/swarm/intro.md index 868c7b1c..6db88c16 100644 --- a/slides/swarm/intro.md +++ b/slides/swarm/intro.md @@ -1,7 +1,9 @@ ## A brief introduction -- This was initially written to support in-person, +- This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person, instructor-led workshops and tutorials + +- Over time, [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) also helped to improve these materials — thank you! - You can also follow along on your own, at your own pace
Container Training
Coming soon at a conference near you
Coming soon near you
March 14, 2018: Boosterconf — Kubernetes 101 
April 11-12, 2018: Introduction aux conteneurs (in French)  +
April 13, 2018: Introduction à l'orchestration (in French)  +
Past workshops