From 9f049951ab7fd22214e55609ae036c8af0136cf1 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Mon, 27 Apr 2020 20:46:06 +0200 Subject: [PATCH 01/11] Remove experimental status on kubeadm HA --- slides/k8s/setup-k8s.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index 91740afa..b0fe878e 100644 --- a/slides/k8s/setup-k8s.md +++ b/slides/k8s/setup-k8s.md @@ -32,11 +32,7 @@ - Doesn't set up the overlay network -- Doesn't set up multi-master (no high availability) - --- - - (At least ... not yet! Though it's [experimental in 1.12](https://kubernetes.io/docs/setup/independent/high-availability/).) +- [Some extra steps](https://kubernetes.io/docs/setup/independent/high-availability/) to support HA control plane -- From f4f2d83fa46935ff838f928b1f214489d68cb85e Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Mon, 27 Apr 2020 20:55:23 +0200 Subject: [PATCH 02/11] separate managed options from deployment --- slides/k8s/setup-k8s.md | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index 91740afa..44447cdf 100644 --- a/slides/k8s/setup-k8s.md +++ b/slides/k8s/setup-k8s.md @@ -44,18 +44,19 @@ --- +## Managed options + +- On Azure: [AKS](https://azure.microsoft.com/services/kubernetes-service/) + +- On Google Cloud: [GKE](https://cloud.google.com/kubernetes-engine/) + +- On AWS: [EKS](https://aws.amazon.com/eks/), + [eksctl](https://eksctl.io/) + +--- + ## Other deployment options -- [AKS](https://azure.microsoft.com/services/kubernetes-service/): - managed Kubernetes on Azure - -- [GKE](https://cloud.google.com/kubernetes-engine/): - managed Kubernetes on Google Cloud - -- [EKS](https://aws.amazon.com/eks/), - [eksctl](https://eksctl.io/): - managed Kubernetes on AWS - - [kops](https://github.com/kubernetes/kops): customizable deployments on AWS, Digital Ocean, GCE (beta), vSphere (alpha) From eb0d9bed2aa3a9626132bb4f2791fc504b9de33c Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 28 Apr 2020 06:18:59 -0500 Subject: [PATCH 03/11] Update descriptions --- slides/k8s/portworx.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/k8s/portworx.md b/slides/k8s/portworx.md index b4bac164..796d29e5 100644 --- a/slides/k8s/portworx.md +++ b/slides/k8s/portworx.md @@ -682,7 +682,7 @@ were inspired by [Portworx examples on Katacoda](https://katacoda.com/portworx/s ??? :EN:- Using highly available persistent volumes -:EN:- Example: highly available Postgres +:EN:- Example: deploying a database that can withstand node outages :FR:- Utilisation de volumes à haute disponibilité -:FR:- Exemple : déployer un serveur PostgreSQL haute dispo +:FR:- Exemple : déployer une base de données survivant à la défaillance d'un nœud From 2ba35e1f8d5814e383d336d66cffb6d36723faf9 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 28 Apr 2020 14:20:22 -0500 Subject: [PATCH 04/11] typo --- slides/k8s/healthchecks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/k8s/healthchecks.md b/slides/k8s/healthchecks.md index ad31ab77..e0031783 100644 --- a/slides/k8s/healthchecks.md +++ b/slides/k8s/healthchecks.md @@ -286,4 +286,4 @@ If the Redis process becomes unresponsive, it will be killed. ??? :EN:- Using healthchecks to improve availability -:FR:- Utiliser des *healthchecks* pour amémliorer la disponibilité +:FR:- Utiliser des *healthchecks* pour améliorer la disponibilité From 0c8b20f6b6dc38167747370c1234ddcbbe8a1ef4 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 28 Apr 2020 14:21:31 -0500 Subject: [PATCH 05/11] typo --- slides/k8s/volumes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/k8s/volumes.md b/slides/k8s/volumes.md index 0e644bad..2870877b 100644 --- a/slides/k8s/volumes.md +++ b/slides/k8s/volumes.md @@ -474,4 +474,4 @@ spec: :EN:- When and how to use Init Containers :FR:- Partager des données grâce aux volumes -:FR:- Quand et comment utilise un *Init Container* +:FR:- Quand et comment utiliser un *Init Container* From 6f806ed20026661e53aed13016218d102d5c2936 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 28 Apr 2020 14:23:52 -0500 Subject: [PATCH 06/11] typo --- slides/k8s/helm-intro.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/slides/k8s/helm-intro.md b/slides/k8s/helm-intro.md index 6e200148..e98cd8a9 100644 --- a/slides/k8s/helm-intro.md +++ b/slides/k8s/helm-intro.md @@ -427,6 +427,3 @@ All unspecified values will take the default values defined in the chart. :FR:- Fonctionnement général de Helm :FR:- Installer des composants via Helm :FR:- Helm 2, Helm 3, et le *Helm Hub* - - -:FR:- Comment From 1de539bff83544d45535b68e08e051a0c5a9a51d Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Wed, 29 Apr 2020 22:26:19 +0200 Subject: [PATCH 07/11] healthcheck: fix rng manifest filename --- slides/k8s/healthchecks-more.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/k8s/healthchecks-more.md b/slides/k8s/healthchecks-more.md index 8e6b51b2..16ea8cf1 100644 --- a/slides/k8s/healthchecks-more.md +++ b/slides/k8s/healthchecks-more.md @@ -154,9 +154,9 @@ It will use the default success threshold (1 successful attempt = alive). .exercise[ -- Edit `rng-daemonset.yaml` and add the liveness probe +- Edit `rng-deployment.yaml` and add the liveness probe ```bash - vim rng-daemonset.yaml + vim rng-deployment.yaml ``` - Load the YAML for all the resources of DockerCoins: From d3c931e602aab2e5f637a8f459e345964f5f4ca2 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 30 Apr 2020 15:42:41 -0500 Subject: [PATCH 08/11] Add separate instructions for Zoom webinar --- slides/intro-fullday.yml | 3 +- slides/intro-selfpaced.yml | 3 +- slides/intro-twodays.yml | 3 +- slides/kadm-fullday.yml | 3 +- slides/kadm-twodays.yml | 3 +- slides/kube-fullday.yml | 3 +- slides/kube-halfday.yml | 3 +- slides/kube-selfpaced.yml | 3 +- slides/kube-twodays.yml | 3 +- ...room-zoom.md => chat-room-zoom-meeting.md} | 0 slides/shared/chat-room-zoom-webinar.md | 37 +++++++++++++++++++ slides/swarm-fullday.yml | 3 +- slides/swarm-halfday.yml | 3 +- slides/swarm-selfpaced.yml | 3 +- 14 files changed, 61 insertions(+), 12 deletions(-) rename slides/shared/{chat-room-zoom.md => chat-room-zoom-meeting.md} (100%) create mode 100644 slides/shared/chat-room-zoom-webinar.md diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index ba8b8cba..7662786d 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -20,7 +20,8 @@ content: - containers/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - #- containers/Docker_Overview.md diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml index 12316bf9..96c2b837 100644 --- a/slides/intro-selfpaced.yml +++ b/slides/intro-selfpaced.yml @@ -20,7 +20,8 @@ content: - containers/intro.md - shared/about-slides.md #- shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - containers/Docker_Overview.md - containers/Docker_History.md diff --git a/slides/intro-twodays.yml b/slides/intro-twodays.yml index ecebcdb1..e0a15e33 100644 --- a/slides/intro-twodays.yml +++ b/slides/intro-twodays.yml @@ -20,7 +20,8 @@ content: - containers/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - # DAY 1 - containers/Docker_Overview.md diff --git a/slides/kadm-fullday.yml b/slides/kadm-fullday.yml index d6fd87db..4e99906c 100644 --- a/slides/kadm-fullday.yml +++ b/slides/kadm-fullday.yml @@ -22,7 +22,8 @@ content: - k8s/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - k8s/prereqs-admin.md diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml index 053c6f43..699a8eb3 100644 --- a/slides/kadm-twodays.yml +++ b/slides/kadm-twodays.yml @@ -22,7 +22,8 @@ content: - k8s/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md # DAY 1 - - k8s/prereqs-admin.md diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml index 4315f930..a4eb6917 100644 --- a/slides/kube-fullday.yml +++ b/slides/kube-fullday.yml @@ -21,7 +21,8 @@ content: - k8s/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml index f498ea00..0752d87b 100644 --- a/slides/kube-halfday.yml +++ b/slides/kube-halfday.yml @@ -23,7 +23,8 @@ content: - k8s/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md #- shared/webssh.md diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml index faabfd3d..9eec5b79 100644 --- a/slides/kube-selfpaced.yml +++ b/slides/kube-selfpaced.yml @@ -21,7 +21,8 @@ content: - k8s/intro.md - shared/about-slides.md #- shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md diff --git a/slides/kube-twodays.yml b/slides/kube-twodays.yml index d4c461e7..a3e9a824 100644 --- a/slides/kube-twodays.yml +++ b/slides/kube-twodays.yml @@ -21,7 +21,8 @@ content: - k8s/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md diff --git a/slides/shared/chat-room-zoom.md b/slides/shared/chat-room-zoom-meeting.md similarity index 100% rename from slides/shared/chat-room-zoom.md rename to slides/shared/chat-room-zoom-meeting.md diff --git a/slides/shared/chat-room-zoom-webinar.md b/slides/shared/chat-room-zoom-webinar.md new file mode 100644 index 00000000..7ce2c950 --- /dev/null +++ b/slides/shared/chat-room-zoom-webinar.md @@ -0,0 +1,37 @@ +## Use the chat! + +- We have set up a chat room on @@CHAT@@ + + (clicking the link above will take you to the chat room) + +- Don't hesitate to use it to ask questions, or get help, or share feedback + +- We will *not* use the Zoom chat room for Q&A + + (we've tried it in past training sessions, and participants preferred @@CHAT@@) + +- Feel free to ask questions at any time + +- Sometimes we will wait a bit to answer ... + + ... but don't worry, we'll make sure to address all your questions! + +--- + +## Use non-verbal communication cues + +- ... wait, what?!? + +-- + +- In the chat room, you are welcome (even encouraged!) to use emojis! + +- Some of our favorites: + + .emoji[🤔✔️👍🏻👍🏼👍🏽👍🏾👍🏿⚠️🛑] + +- During the session, we'll often ask audience participation questions + +- Feel free to answer in the chat room, any way you like! + + (short message, emoji reaction ...) diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml index 5d9646eb..76800ca6 100644 --- a/slides/swarm-fullday.yml +++ b/slides/swarm-fullday.yml @@ -25,7 +25,8 @@ content: - swarm/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md - shared/connecting.md diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml index 87953485..a1c1a086 100644 --- a/slides/swarm-halfday.yml +++ b/slides/swarm-halfday.yml @@ -25,7 +25,8 @@ content: - swarm/intro.md - shared/about-slides.md - shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md - shared/connecting.md diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml index fc415531..43ad7b44 100644 --- a/slides/swarm-selfpaced.yml +++ b/slides/swarm-selfpaced.yml @@ -20,7 +20,8 @@ content: - swarm/intro.md - shared/about-slides.md #- shared/chat-room-im.md -#- shared/chat-room-zoom.md +#- shared/chat-room-zoom-meeting.md +#- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md - shared/connecting.md From 7302d3533fde2cbff201d4e1e0cb1d5d72241f3b Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 30 Apr 2020 15:45:12 -0500 Subject: [PATCH 09/11] Use built-in dockercoins manifest instead of separate kubercoins repo --- slides/k8s/kubercoins.md | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/slides/k8s/kubercoins.md b/slides/k8s/kubercoins.md index ea0ef31f..4cbcc57e 100644 --- a/slides/k8s/kubercoins.md +++ b/slides/k8s/kubercoins.md @@ -31,23 +31,17 @@ --- -## Cloning some repos +## Cloning the repository -- We will need two repositories: +- We will need to clone the training repository - - the first one has the "DockerCoins" demo app +- It has the DockerCoins demo app ... - - the second one has these slides, some scripts, more manifests ... +- ... as well as these slides, some scripts, more manifests .exercise[ -- Clone the kubercoins repository on `node1`: - ```bash - git clone https://github.com/jpetazzo/kubercoins - ``` - - -- Clone the container.training repository as well: +- Clone the repository on `node1`: ```bash git clone https://@@GITREPO@@ ``` @@ -62,9 +56,9 @@ Without further ado, let's start this application! .exercise[ -- Apply all the manifests from the kubercoins repository: +- Apply the manifest for dockercoins: ```bash - kubectl apply -f kubercoins/ + kubectl apply -f ~/container.training/k8s/dockercoins.yaml ``` ] @@ -247,4 +241,3 @@ graph will appear. :EN:- Deploying a sample app with YAML manifests :FR:- Lancer une application de démo avec du YAML - From 0b10d3d40df68f7356d18d0d6090d4c91136d957 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Thu, 30 Apr 2020 15:50:24 -0500 Subject: [PATCH 10/11] Add a bunch of other managed offerings --- slides/k8s/setup-k8s.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index a0ec4401..55b8748b 100644 --- a/slides/k8s/setup-k8s.md +++ b/slides/k8s/setup-k8s.md @@ -42,12 +42,22 @@ ## Managed options +- On AWS: [EKS](https://aws.amazon.com/eks/), + [eksctl](https://eksctl.io/) + - On Azure: [AKS](https://azure.microsoft.com/services/kubernetes-service/) +- On DigitalOcean: [DOK](https://www.digitalocean.com/products/kubernetes/) + - On Google Cloud: [GKE](https://cloud.google.com/kubernetes-engine/) -- On AWS: [EKS](https://aws.amazon.com/eks/), - [eksctl](https://eksctl.io/) +- On Linode: [LKE](https://www.linode.com/products/kubernetes/) + +- On OVHcloud: [Managed Kubernetes Service](https://www.ovhcloud.com/en/public-cloud/kubernetes/) + +- On Scaleway: [Kapsule](https://www.scaleway.com/en/kubernetes-kapsule/) + +- and much more! --- From 690a1eb75c4250ba007a14eed9cf362c2bd695aa Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 1 May 2020 15:37:57 -0500 Subject: [PATCH 11/11] Move Ardan Live --- slides/index.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/index.yaml b/slides/index.yaml index f73be801..9d68f82e 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -1,4 +1,4 @@ -- date: [2020-06-16, 2020-06-18] +- date: [2020-06-09, 2020-06-11] country: www city: streaming event: Ardan Live