diff --git a/slides/ctr-bootcamp.yml b/slides/ctr-bootcamp.yml index f602591c..d4ad0301 100644 --- a/slides/ctr-bootcamp.yml +++ b/slides/ctr-bootcamp.yml @@ -19,8 +19,7 @@ content: - logistics.md - containers/intro.md - shared/about-slides.md -- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md - #- containers/Docker_Overview.md 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 diff --git a/slides/k8s-adv-1.yml b/slides/k8s-adv-1.yml index bcbdc51b..de27384d 100644 --- a/slides/k8s-adv-1.yml +++ b/slides/k8s-adv-1.yml @@ -21,8 +21,7 @@ content: - logistics.md - k8s/intro.md - shared/about-slides.md -#- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md #- shared/prereqs.md #- shared/webssh.md diff --git a/slides/k8s-adv-2.yml b/slides/k8s-adv-2.yml index db3f7686..fce0feb7 100644 --- a/slides/k8s-adv-2.yml +++ b/slides/k8s-adv-2.yml @@ -21,8 +21,7 @@ content: - logistics.md - k8s/intro.md - shared/about-slides.md -#- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md #- shared/prereqs.md #- shared/webssh.md diff --git a/slides/k8s-adv-3.yml b/slides/k8s-adv-3.yml index 147dc665..2db0d1dc 100644 --- a/slides/k8s-adv-3.yml +++ b/slides/k8s-adv-3.yml @@ -20,8 +20,7 @@ content: - logistics.md - k8s/intro.md - shared/about-slides.md -#- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md #- shared/prereqs.md #- shared/webssh.md diff --git a/slides/k8s-adv-4.yml b/slides/k8s-adv-4.yml index 9c268ed1..f358f151 100644 --- a/slides/k8s-adv-4.yml +++ b/slides/k8s-adv-4.yml @@ -21,8 +21,7 @@ content: - logistics.md - k8s/intro.md - shared/about-slides.md -#- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md #- shared/prereqs.md #- shared/webssh.md diff --git a/slides/k8s-bootcamp.yml b/slides/k8s-bootcamp.yml index 5624eed4..e5af9e1e 100644 --- a/slides/k8s-bootcamp.yml +++ b/slides/k8s-bootcamp.yml @@ -20,8 +20,7 @@ content: - logistics.md - k8s/intro.md - shared/about-slides.md -- shared/chat-room-im.md -#- shared/chat-room-zoom.md +- shared/chat-room-zoom-webinar.md - shared/toc.md - - shared/prereqs.md 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: 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é 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 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 - 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 diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index 994b8c11..55b8748b 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 -- @@ -44,18 +40,29 @@ --- +## 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 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! + +--- + ## 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) 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* 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 ...)