From 5438fca35a8f6013cbc03c78b2765b9c3df6b907 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 5 Mar 2018 14:34:41 -0600 Subject: [PATCH 1/6] Attribute authorship --- slides/intro/intro.md | 2 +- slides/kube/intro.md | 2 +- slides/swarm/intro.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/intro/intro.md b/slides/intro/intro.md index bfe3870a..0574e3b6 100644 --- a/slides/intro/intro.md +++ b/slides/intro/intro.md @@ -1,6 +1,6 @@ ## 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 - 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..7a194d95 100644 --- a/slides/kube/intro.md +++ b/slides/kube/intro.md @@ -1,6 +1,6 @@ ## 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 - 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..1311eff2 100644 --- a/slides/swarm/intro.md +++ b/slides/swarm/intro.md @@ -1,6 +1,6 @@ ## 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 - You can also follow along on your own, at your own pace From 7f72ee1296a17309a3127b550a5f11f864a0d065 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 5 Mar 2018 15:53:42 -0600 Subject: [PATCH 2/6] Credit to multiple contributors --- slides/intro/intro.md | 2 +- slides/kube/intro.md | 2 +- slides/swarm/intro.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/intro/intro.md b/slides/intro/intro.md index 0574e3b6..3d598730 100644 --- a/slides/intro/intro.md +++ b/slides/intro/intro.md @@ -1,7 +1,7 @@ ## A brief introduction - This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person, - instructor-led workshops and tutorials + instructor-led workshops and tutorials; credit is also due to [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 7a194d95..23e804a3 100644 --- a/slides/kube/intro.md +++ b/slides/kube/intro.md @@ -1,7 +1,7 @@ ## A brief introduction - This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person, - instructor-led workshops and tutorials + instructor-led workshops and tutorials; credit is also due to [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/swarm/intro.md b/slides/swarm/intro.md index 1311eff2..9c9f379e 100644 --- a/slides/swarm/intro.md +++ b/slides/swarm/intro.md @@ -1,7 +1,7 @@ ## A brief introduction - This was initially written by [Jérôme Petazzoni](https://twitter.com/jpetazzo) to support in-person, - instructor-led workshops and tutorials + instructor-led workshops and tutorials; credit is also due to [multiple contributors](https://github.com/jpetazzo/container.training/graphs/contributors) - You can also follow along on your own, at your own pace From af0a239bd9422c01d756558bfb1a4a498fe773ba Mon Sep 17 00:00:00 2001 From: Aleksey Tsalolikhin Date: Tue, 6 Mar 2018 09:22:42 -0800 Subject: [PATCH 3/6] Fix tiny typo (missing "o" in "outbound" --- slides/intro/Container_Network_Model.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From a1b107cecb085fb128b3433a5a5e44f4bf302011 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Wed, 7 Mar 2018 15:39:23 -0800 Subject: [PATCH 4/6] Add Paris sessions --- slides/index.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) 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...) + + + + + + + + + From cc4d1fd1c78ac10b8d5272e4cd43b88933736bea Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Wed, 7 Mar 2018 15:47:38 -0800 Subject: [PATCH 5/6] Slight rewording --- slides/intro/intro.md | 5 +++-- slides/kube/intro.md | 4 +++- slides/swarm/intro.md | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/slides/intro/intro.md b/slides/intro/intro.md index 3d598730..16a4e0c8 100644 --- a/slides/intro/intro.md +++ b/slides/intro/intro.md @@ -1,7 +1,8 @@ ## A brief introduction -- 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) +- 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 23e804a3..a0090371 100644 --- a/slides/kube/intro.md +++ b/slides/kube/intro.md @@ -1,7 +1,9 @@ ## A brief introduction - 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) + 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 9c9f379e..6db88c16 100644 --- a/slides/swarm/intro.md +++ b/slides/swarm/intro.md @@ -1,7 +1,9 @@ ## A brief introduction - 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) + 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 From eaf25e5b36b9e2219d9b1378620f8ae8b579d33e Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Wed, 7 Mar 2018 16:17:57 -0800 Subject: [PATCH 6/6] Improve kubetest error reporting The kubetest command used to say [SUCCESS] on completely fresh nodes. Now we check the existence of the /tmp/node file, as well as of the kubectl executable. --- prepare-vms/lib/commands.sh | 2 ++ 1 file changed, 2 insertions(+) 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
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