diff --git a/slides/intro-fullday.yml b/slides/1.yml
similarity index 89%
rename from slides/intro-fullday.yml
rename to slides/1.yml
index c70eb8d4..6d741dee 100644
--- a/slides/intro-fullday.yml
+++ b/slides/1.yml
@@ -1,13 +1,11 @@
title: |
- Introduction
- to Containers
+ Docker Intensif
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "[Gitter](https://gitter.im/jpetazzo/training-202010-online)"
gitrepo: github.com/jpetazzo/container.training
-slides: http://container.training/
+slides: https://2020-10-enix.container.training/
#slidenumberprefix: "#SomeHashTag — "
diff --git a/slides/kube-twodays.yml b/slides/2.yml
similarity index 67%
rename from slides/kube-twodays.yml
rename to slides/2.yml
index 6eb7d5ab..c79fdfb8 100644
--- a/slides/kube-twodays.yml
+++ b/slides/2.yml
@@ -1,14 +1,11 @@
title: |
- Deploying and Scaling Microservices
- with Kubernetes
+ Fondamentaux Kubernetes
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "[Gitter](https://gitter.im/jpetazzo/training-202010-online)"
gitrepo: github.com/jpetazzo/container.training
-slides: http://container.training/
+slides: https://2020-10-enix.container.training/
#slidenumberprefix: "#SomeHashTag — "
@@ -35,12 +32,8 @@ content:
- shared/composedown.md
- k8s/concepts-k8s.md
- k8s/kubectlget.md
--
- k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
+-
- shared/declarative.md
- k8s/declarative.md
- k8s/deploymentslideshow.md
@@ -52,63 +45,54 @@ content:
- k8s/ourapponkube.md
#- k8s/exercise-wordsmith.md
-
+ - k8s/labels-annotations.md
+ - k8s/kubectl-logs.md
+ - k8s/logs-cli.md
- k8s/yamldeploy.md
- - k8s/setup-overview.md
- - k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
- - k8s/dashboard.md
#- k8s/kubectlscale.md
- k8s/scalingdockercoins.md
- shared/hastyconclusions.md
- k8s/daemonset.md
- - k8s/dryrun.md
- #- k8s/exercise-yaml.md
-
- - k8s/localkubeconfig.md
- - k8s/accessinternal.md
- #- k8s/kubectlproxy.md
- k8s/rollout.md
- k8s/healthchecks.md
#- k8s/healthchecks-more.md
- - k8s/record.md
+ - k8s/setup-overview.md
+ - k8s/setup-devel.md
+ - k8s/setup-managed.md
+ #- k8s/setup-selfhosted.md
-
- k8s/namespaces.md
+ - k8s/localkubeconfig.md
+ - k8s/accessinternal.md
+ - k8s/kubectlproxy.md
+ - k8s/dashboard.md
- k8s/ingress.md
- #- k8s/ingress-tls.md
- - k8s/kustomize.md
- - k8s/helm-intro.md
- - k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- - k8s/helm-create-better-chart.md
- - k8s/helm-secrets.md
- #- k8s/exercise-helm.md
--
- - k8s/netpol.md
- - k8s/authn-authz.md
- #- k8s/csr-api.md
- #- k8s/openid-connect.md
- #- k8s/podsecuritypolicy.md
-
- k8s/volumes.md
#- k8s/exercise-configmap.md
#- k8s/build-with-docker.md
#- k8s/build-with-kaniko.md
- k8s/configuration.md
- - k8s/logs-centralized.md
- - k8s/prometheus.md
--
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
+ - k8s/batch-jobs.md
+ #- k8s/logs-centralized.md
+ #- k8s/prometheus.md
+ #- k8s/statefulsets.md
+ #- k8s/local-persistent-volumes.md
+ #- k8s/portworx.md
#- k8s/extending-api.md
#- k8s/operators.md
#- k8s/operators-design.md
#- k8s/staticpods.md
#- k8s/owners-and-dependents.md
#- k8s/gitworkflows.md
--
- - k8s/whatsnext.md
- - k8s/lastwords.md
- - k8s/links.md
+ #- k8s/whatsnext.md
+ #- k8s/lastwords.md
- shared/thankyou.md
+ - k8s/links.md
+-
+ - |
+ # (Bonus)
+ - k8s/record.md
+ - k8s/dryrun.md
+ - k8s/ingress-tls.md
diff --git a/slides/3.yml b/slides/3.yml
new file mode 100644
index 00000000..0251f4e0
--- /dev/null
+++ b/slides/3.yml
@@ -0,0 +1,36 @@
+title: |
+ Packaging d'applications
+ pour Kubernetes
+
+chat: "[Gitter](https://gitter.im/jpetazzo/training-202010-online)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://2020-10-enix.container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+#- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+#- shared/chat-room-im.md
+#- shared/chat-room-zoom.md
+- shared/toc.md
+-
+ - shared/prereqs.md
+ - shared/webssh.md
+ - shared/connecting.md
+ - k8s/kustomize.md
+ - k8s/helm-intro.md
+ - k8s/helm-chart-format.md
+ - k8s/helm-create-basic-chart.md
+ - k8s/helm-create-better-chart.md
+ - k8s/helm-secrets.md
+ #- k8s/exercise-helm.md
+ - shared/thankyou.md
+ - k8s/links.md
diff --git a/slides/4.yml b/slides/4.yml
new file mode 100644
index 00000000..f13e158f
--- /dev/null
+++ b/slides/4.yml
@@ -0,0 +1,47 @@
+title: |
+ Kubernetes Avancé
+
+chat: "[Gitter](https://gitter.im/jpetazzo/training-202010-online)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://2020-10-enix.container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-zoom.md
+- shared/toc.md
+-
+ - shared/prereqs.md
+ - shared/webssh.md
+ - shared/connecting.md
+ - k8s/netpol.md
+ - k8s/authn-authz.md
+-
+ - k8s/extending-api.md
+ - k8s/operators.md
+-
+ - k8s/resource-limits.md
+ - k8s/metrics-server.md
+ - k8s/cluster-sizing.md
+ - k8s/horizontal-pod-autoscaler.md
+ - k8s/prometheus.md
+-
+ - k8s/statefulsets.md
+ - k8s/local-persistent-volumes.md
+ - k8s/portworx.md
+ - shared/thankyou.md
+-
+ - |
+ # (Bonus material)
+ - k8s/podsecuritypolicy.md
+ - k8s/operators-design.md
diff --git a/slides/kadm-fullday.yml b/slides/5.yml
similarity index 60%
rename from slides/kadm-fullday.yml
rename to slides/5.yml
index 8ccebabf..02b3bdef 100644
--- a/slides/kadm-fullday.yml
+++ b/slides/5.yml
@@ -1,20 +1,16 @@
title: |
- Kubernetes
- for Admins and Ops
+ Opérer Kubernetes
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "[Gitter](https://gitter.im/jpetazzo/training-202010-online)"
gitrepo: github.com/jpetazzo/container.training
-slides: http://container.training/
+slides: https://2020-10-enix.container.training/
#slidenumberprefix: "#SomeHashTag — "
exclude:
- self-paced
-- static-pods-exercise
content:
- shared/title.md
@@ -25,6 +21,7 @@ content:
#- shared/chat-room-zoom-meeting.md
#- shared/chat-room-zoom-webinar.md
- shared/toc.md
+# DAY 1
-
- k8s/prereqs-admin.md
- k8s/architecture.md
@@ -36,21 +33,16 @@ content:
- k8s/interco.md
-
- k8s/apilb.md
- #- k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
+ - k8s/setup-overview.md
+ - k8s/setup-devel.md
+ - k8s/setup-managed.md
+ - k8s/setup-selfhosted.md
+ - k8s/staticpods.md
- k8s/cluster-upgrade.md
- k8s/cluster-backup.md
- - k8s/staticpods.md
--
#- k8s/cloud-controller-manager.md
- #- k8s/bootstrap.md
- - k8s/control-plane-auth.md
+-
- k8s/podsecuritypolicy.md
- k8s/csr-api.md
- k8s/openid-connect.md
--
- #- k8s/lastwords-admin.md
- - k8s/links.md
- shared/thankyou.md
diff --git a/slides/_redirects b/slides/_redirects
index 65016564..53cd3de6 100644
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -18,3 +18,5 @@
#/next https://www.eventbrite.com/e/livestream-intensive-kubernetes-bootcamp-tickets-103262336428
/next https://skillsmatter.com/courses/700-advanced-kubernetes-concepts-workshop-jerome-petazzoni
/hi5 https://enix.io/fr/services/formation/online/
+
+/ /highfive.html 200!
diff --git a/slides/highfive.html b/slides/highfive.html
new file mode 100644
index 00000000..6e3e3355
--- /dev/null
+++ b/slides/highfive.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml
deleted file mode 100644
index 96c2b837..00000000
--- a/slides/intro-selfpaced.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-title: |
- Introduction
- to Containers
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-
-content:
-- shared/title.md
-# - shared/logistics.md
-- containers/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - containers/Docker_Overview.md
- - containers/Docker_History.md
- - containers/Training_Environment.md
- - containers/Installing_Docker.md
- - containers/First_Containers.md
- - containers/Background_Containers.md
- - containers/Start_And_Attach.md
-- - containers/Initial_Images.md
- - containers/Building_Images_Interactively.md
- - containers/Building_Images_With_Dockerfiles.md
- - containers/Cmd_And_Entrypoint.md
- - containers/Copying_Files_During_Build.md
- - containers/Exercise_Dockerfile_Basic.md
-- - containers/Multi_Stage_Builds.md
- - containers/Publishing_To_Docker_Hub.md
- - containers/Dockerfile_Tips.md
- - containers/Exercise_Dockerfile_Advanced.md
-- - containers/Naming_And_Inspecting.md
- - containers/Labels.md
- - containers/Getting_Inside.md
-- - containers/Container_Networking_Basics.md
- - containers/Network_Drivers.md
- - containers/Container_Network_Model.md
- #- containers/Connecting_Containers_With_Links.md
- - containers/Ambassadors.md
-- - containers/Local_Development_Workflow.md
- - containers/Windows_Containers.md
- - containers/Working_With_Volumes.md
- - containers/Compose_For_Dev_Stacks.md
- - containers/Exercise_Composefile.md
- - containers/Docker_Machine.md
-- - containers/Advanced_Dockerfiles.md
- - containers/Init_Systems.md
- - containers/Application_Configuration.md
- - containers/Logging.md
- - containers/Resource_Limits.md
-- - containers/Namespaces_Cgroups.md
- - containers/Copy_On_Write.md
- #- containers/Containers_From_Scratch.md
-- - containers/Container_Engines.md
- - containers/Pods_Anatomy.md
- - containers/Ecosystem.md
- - containers/Orchestration_Overview.md
- - shared/thankyou.md
- - containers/links.md
diff --git a/slides/intro-twodays.yml b/slides/intro-twodays.yml
deleted file mode 100644
index e0a15e33..00000000
--- a/slides/intro-twodays.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-title: |
- Introduction
- to Containers
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- containers/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- # DAY 1
- - containers/Docker_Overview.md
- #- containers/Docker_History.md
- - containers/Training_Environment.md
- - containers/First_Containers.md
- - containers/Background_Containers.md
- - containers/Initial_Images.md
--
- - containers/Building_Images_Interactively.md
- - containers/Building_Images_With_Dockerfiles.md
- - containers/Cmd_And_Entrypoint.md
- - containers/Copying_Files_During_Build.md
- - containers/Exercise_Dockerfile_Basic.md
--
- - containers/Dockerfile_Tips.md
- - containers/Multi_Stage_Builds.md
- - containers/Publishing_To_Docker_Hub.md
- - containers/Exercise_Dockerfile_Advanced.md
--
- - containers/Naming_And_Inspecting.md
- - containers/Labels.md
- - containers/Start_And_Attach.md
- - containers/Getting_Inside.md
- - containers/Resource_Limits.md
-- # DAY 2
- - containers/Container_Networking_Basics.md
- - containers/Network_Drivers.md
- - containers/Container_Network_Model.md
--
- - containers/Local_Development_Workflow.md
- - containers/Working_With_Volumes.md
- - containers/Compose_For_Dev_Stacks.md
- - containers/Exercise_Composefile.md
--
- - containers/Installing_Docker.md
- - containers/Container_Engines.md
- - containers/Init_Systems.md
- - containers/Advanced_Dockerfiles.md
--
- - containers/Application_Configuration.md
- - containers/Logging.md
- - containers/Orchestration_Overview.md
--
- - shared/thankyou.md
- - containers/links.md
-#-
- #- containers/Docker_Machine.md
- #- containers/Ambassadors.md
- #- containers/Namespaces_Cgroups.md
- #- containers/Copy_On_Write.md
- #- containers/Containers_From_Scratch.md
- #- containers/Pods_Anatomy.md
- #- containers/Ecosystem.md
diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml
deleted file mode 100644
index 62f33dd1..00000000
--- a/slides/kadm-twodays.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-title: |
- Kubernetes
- for administrators
- and operators
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-# DAY 1
-- - k8s/prereqs-admin.md
- - k8s/architecture.md
- - k8s/deploymentslideshow.md
- - k8s/dmuc.md
-- - k8s/multinode.md
- - k8s/cni.md
- - k8s/interco.md
-- - k8s/apilb.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- - k8s/setup-managed.md
- - k8s/setup-selfhosted.md
- - k8s/cluster-upgrade.md
- - k8s/staticpods.md
-- - k8s/cluster-backup.md
- - k8s/cloud-controller-manager.md
- - k8s/healthchecks.md
- - k8s/healthchecks-more.md
-# DAY 2
-- - k8s/kubercoins.md
- - k8s/logs-cli.md
- - k8s/logs-centralized.md
- - k8s/authn-authz.md
- - k8s/csr-api.md
-- - k8s/openid-connect.md
- - k8s/control-plane-auth.md
- ###- k8s/bootstrap.md
- - k8s/netpol.md
- - k8s/podsecuritypolicy.md
-- - k8s/resource-limits.md
- - k8s/metrics-server.md
- - k8s/cluster-sizing.md
- - k8s/horizontal-pod-autoscaler.md
-- - k8s/prometheus.md
- - k8s/extending-api.md
- - k8s/operators.md
- ###- k8s/operators-design.md
-# CONCLUSION
-- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
- - |
- # (All content after this slide is bonus material)
-# EXTRA
-- - k8s/volumes.md
- - k8s/configuration.md
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml
deleted file mode 100644
index e7cd35c9..00000000
--- a/slides/kube-fullday.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-title: |
- Deploying and Scaling Microservices
- with Kubernetes
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- #- k8s/versions-k8s.md
- - shared/sampleapp.md
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
- - k8s/kubectlget.md
--
- - k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/deploymentslideshow.md
- - k8s/kubenet.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- #- k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/exercise-wordsmith.md
--
- - k8s/yamldeploy.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
- #- k8s/dashboard.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- #- k8s/dryrun.md
- #- k8s/exercise-yaml.md
- #- k8s/localkubeconfig.md
- #- k8s/accessinternal.md
- #- k8s/kubectlproxy.md
- - k8s/rollout.md
- #- k8s/healthchecks.md
- #- k8s/healthchecks-more.md
- #- k8s/record.md
--
- - k8s/namespaces.md
- - k8s/ingress.md
- #- k8s/ingress-tls.md
- #- k8s/kustomize.md
- #- k8s/helm-intro.md
- #- k8s/helm-chart-format.md
- #- k8s/helm-create-basic-chart.md
- #- k8s/helm-create-better-chart.md
- #- k8s/helm-secrets.md
- #- k8s/exercise-helm.md
- #- k8s/create-chart.md
- #- k8s/create-more-charts.md
- #- k8s/netpol.md
- #- k8s/authn-authz.md
- #- k8s/csr-api.md
- #- k8s/openid-connect.md
- #- k8s/podsecuritypolicy.md
- - k8s/volumes.md
- #- k8s/exercise-configmap.md
- #- k8s/build-with-docker.md
- #- k8s/build-with-kaniko.md
- - k8s/configuration.md
- #- k8s/logs-centralized.md
- #- k8s/prometheus.md
- #- k8s/statefulsets.md
- #- k8s/local-persistent-volumes.md
- #- k8s/portworx.md
- #- k8s/extending-api.md
- #- k8s/operators.md
- #- k8s/operators-design.md
- #- k8s/staticpods.md
- #- k8s/owners-and-dependents.md
- #- k8s/gitworkflows.md
--
- - k8s/whatsnext.md
- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml
deleted file mode 100644
index 0aaea969..00000000
--- a/slides/kube-halfday.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-title: |
- Kubernetes 101
-
-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
-chat: "In person!"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-#- logistics.md
-# Bridget-specific; others use logistics.md
-- logistics-bridget.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- - k8s/versions-k8s.md
- - shared/sampleapp.md
-# Bridget doesn't go into as much depth with compose
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/kubenet.md
- - k8s/kubectlget.md
- - k8s/setup-overview.md
- #- k8s/setup-devel.md
- #- k8s/setup-managed.md
- #- k8s/setup-selfhosted.md
-- - k8s/kubectl-run.md
- #- k8s/batch-jobs.md
- #- k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/deploymentslideshow.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- #- k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/localkubeconfig.md
- #- k8s/accessinternal.md
- #- k8s/kubectlproxy.md
-- - k8s/dashboard.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- - k8s/rollout.md
- #- k8s/record.md
-- - k8s/logs-cli.md
-# Bridget hasn't added EFK yet
- #- k8s/logs-centralized.md
- - k8s/namespaces.md
- - k8s/helm-intro.md
- #- k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- #- k8s/helm-create-better-chart.md
- #- k8s/helm-secrets.md
- #- k8s/kustomize.md
- #- k8s/netpol.md
- - k8s/whatsnext.md
-# - k8s/links.md
-# Bridget-specific
- - k8s/links-bridget.md
- - shared/thankyou.md
diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml
deleted file mode 100644
index 6315c163..00000000
--- a/slides/kube-selfpaced.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-title: |
- Deploying and Scaling Microservices
- with Docker and Kubernetes
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-
-content:
-- shared/title.md
-#- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
- - shared/prereqs.md
- #- shared/webssh.md
- - shared/connecting.md
- - k8s/versions-k8s.md
- - shared/sampleapp.md
- #- shared/composescale.md
- #- shared/hastyconclusions.md
- - shared/composedown.md
- - k8s/concepts-k8s.md
--
- - k8s/kubectlget.md
- - k8s/kubectl-run.md
- - k8s/batch-jobs.md
- - k8s/labels-annotations.md
- - k8s/kubectl-logs.md
- - k8s/logs-cli.md
- - shared/declarative.md
- - k8s/declarative.md
- - k8s/deploymentslideshow.md
--
- - k8s/kubenet.md
- - k8s/kubectlexpose.md
- - k8s/shippingimages.md
- - k8s/buildshiprun-selfhosted.md
- - k8s/buildshiprun-dockerhub.md
- - k8s/ourapponkube.md
- #- k8s/exercise-wordsmith.md
- - k8s/yamldeploy.md
--
- - k8s/setup-overview.md
- - k8s/setup-devel.md
- - k8s/setup-managed.md
- - k8s/setup-selfhosted.md
- - k8s/dashboard.md
- #- k8s/kubectlscale.md
- - k8s/scalingdockercoins.md
- - shared/hastyconclusions.md
- - k8s/daemonset.md
- - k8s/dryrun.md
- #- k8s/exercise-yaml.md
--
- - k8s/rollout.md
- - k8s/healthchecks.md
- - k8s/healthchecks-more.md
- - k8s/record.md
--
- - k8s/namespaces.md
- - k8s/localkubeconfig.md
- - k8s/accessinternal.md
- - k8s/kubectlproxy.md
--
- - k8s/ingress.md
- - k8s/ingress-tls.md
- - k8s/kustomize.md
- - k8s/helm-intro.md
- - k8s/helm-chart-format.md
- - k8s/helm-create-basic-chart.md
- - k8s/helm-create-better-chart.md
- - k8s/helm-secrets.md
- #- k8s/exercise-helm.md
--
- - k8s/netpol.md
- - k8s/authn-authz.md
- - k8s/podsecuritypolicy.md
- - k8s/csr-api.md
- - k8s/openid-connect.md
- - k8s/control-plane-auth.md
--
- - k8s/volumes.md
- #- k8s/exercise-configmap.md
- - k8s/build-with-docker.md
- - k8s/build-with-kaniko.md
--
- - k8s/configuration.md
- - k8s/statefulsets.md
- - k8s/local-persistent-volumes.md
- - k8s/portworx.md
--
- - k8s/logs-centralized.md
- - k8s/prometheus.md
- - k8s/resource-limits.md
- - k8s/metrics-server.md
- - k8s/cluster-sizing.md
- - k8s/horizontal-pod-autoscaler.md
--
- - k8s/extending-api.md
- - k8s/operators.md
- - k8s/operators-design.md
- - k8s/owners-and-dependents.md
--
- - k8s/dmuc.md
- - k8s/multinode.md
- - k8s/cni.md
- - k8s/apilb.md
- - k8s/staticpods.md
--
- - k8s/cluster-upgrade.md
- - k8s/cluster-backup.md
- - k8s/cloud-controller-manager.md
- - k8s/gitworkflows.md
--
- - k8s/lastwords.md
- - k8s/links.md
- - shared/thankyou.md
diff --git a/slides/logistics-template.md b/slides/logistics-template.md
index 33388a06..e5731de0 100644
--- a/slides/logistics-template.md
+++ b/slides/logistics-template.md
@@ -1,35 +1,15 @@
## Intros
-- This slide should be customized by the tutorial instructor(s).
-
- Hello! We are:
- - .emoji[👩🏻🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
-
- - .emoji[👨🏾🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
-
-
-
-- The workshop will run from ...
-
-- There will be a lunch break at ...
-
- (And coffee breaks!)
+- There will be a break at (approximately) 11:00
- Feel free to interrupt for questions at any time
- *Especially when you see full screen container pictures!*
-
-- Live feedback, questions, help: @@CHAT@@
diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml
deleted file mode 100644
index 76800ca6..00000000
--- a/slides/swarm-fullday.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-title: |
- Container Orchestration
- with Docker and Swarm
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-- snap
-- btp-auto
-- benchmarking
-- elk-manual
-- prom-manual
-
-content:
-- shared/title.md
-- logistics.md
-- swarm/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - shared/prereqs.md
- - shared/connecting.md
- - swarm/versions.md
- - shared/sampleapp.md
- - shared/composescale.md
- - shared/hastyconclusions.md
- - shared/composedown.md
- - swarm/swarmkit.md
- - shared/declarative.md
- - swarm/swarmmode.md
- - swarm/creatingswarm.md
- #- swarm/machine.md
- - swarm/morenodes.md
-- - swarm/firstservice.md
- - swarm/ourapponswarm.md
- - swarm/hostingregistry.md
- - swarm/testingregistry.md
- - swarm/btp-manual.md
- - swarm/swarmready.md
- - swarm/stacks.md
- - swarm/cicd.md
- - swarm/updatingservices.md
- - swarm/rollingupdates.md
- - swarm/healthchecks.md
-- - swarm/operatingswarm.md
- - swarm/netshoot.md
- - swarm/ipsec.md
- - swarm/swarmtools.md
- - swarm/security.md
- - swarm/secrets.md
- - swarm/encryptionatrest.md
- - swarm/leastprivilege.md
- - swarm/apiscope.md
-- - swarm/logging.md
- - swarm/metrics.md
- - swarm/gui.md
- - swarm/stateful.md
- - swarm/extratips.md
- - shared/thankyou.md
- - swarm/links.md
diff --git a/slides/swarm-halfday.yml b/slides/swarm-halfday.yml
deleted file mode 100644
index a1c1a086..00000000
--- a/slides/swarm-halfday.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-title: |
- Container Orchestration
- with Docker and Swarm
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-- snap
-- btp-manual
-- benchmarking
-- elk-manual
-- prom-manual
-
-content:
-- shared/title.md
-- logistics.md
-- swarm/intro.md
-- shared/about-slides.md
-- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - shared/prereqs.md
- - shared/connecting.md
- - swarm/versions.md
- - shared/sampleapp.md
- - shared/composescale.md
- - shared/hastyconclusions.md
- - shared/composedown.md
- - swarm/swarmkit.md
- - shared/declarative.md
- - swarm/swarmmode.md
- - swarm/creatingswarm.md
- #- swarm/machine.md
- - swarm/morenodes.md
-- - swarm/firstservice.md
- - swarm/ourapponswarm.md
- #- swarm/hostingregistry.md
- #- swarm/testingregistry.md
- #- swarm/btp-manual.md
- #- swarm/swarmready.md
- - swarm/stacks.md
- - swarm/cicd.md
- - swarm/updatingservices.md
- #- swarm/rollingupdates.md
- #- swarm/healthchecks.md
-- - swarm/operatingswarm.md
- #- swarm/netshoot.md
- #- swarm/ipsec.md
- #- swarm/swarmtools.md
- - swarm/security.md
- #- swarm/secrets.md
- #- swarm/encryptionatrest.md
- - swarm/leastprivilege.md
- - swarm/apiscope.md
- - swarm/logging.md
- - swarm/metrics.md
- #- swarm/stateful.md
- #- swarm/extratips.md
- - shared/thankyou.md
- - swarm/links.md
diff --git a/slides/swarm-selfpaced.yml b/slides/swarm-selfpaced.yml
deleted file mode 100644
index 43ad7b44..00000000
--- a/slides/swarm-selfpaced.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-title: |
- Container Orchestration
- with Docker and Swarm
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-- btp-auto
-
-content:
-- shared/title.md
-#- shared/logistics.md
-- swarm/intro.md
-- shared/about-slides.md
-#- shared/chat-room-im.md
-#- shared/chat-room-zoom-meeting.md
-#- shared/chat-room-zoom-webinar.md
-- shared/toc.md
-- - shared/prereqs.md
- - shared/connecting.md
- - swarm/versions.md
- - |
- name: part-1
-
- class: title, self-paced
-
- Part 1
- - shared/sampleapp.md
- - shared/composescale.md
- - shared/hastyconclusions.md
- - shared/composedown.md
- - swarm/swarmkit.md
- - shared/declarative.md
- - swarm/swarmmode.md
- - swarm/creatingswarm.md
- #- swarm/machine.md
- - swarm/morenodes.md
-- - swarm/firstservice.md
- - swarm/ourapponswarm.md
- - swarm/hostingregistry.md
- - swarm/testingregistry.md
- - swarm/btp-manual.md
- - swarm/swarmready.md
- - swarm/stacks.md
- - swarm/cicd.md
- - |
- name: part-2
-
- class: title, self-paced
-
- Part 2
-- - swarm/operatingswarm.md
- - swarm/netshoot.md
- - swarm/swarmnbt.md
- - swarm/ipsec.md
- - swarm/updatingservices.md
- - swarm/rollingupdates.md
- - swarm/healthchecks.md
- - swarm/nodeinfo.md
- - swarm/swarmtools.md
-- - swarm/security.md
- - swarm/secrets.md
- - swarm/encryptionatrest.md
- - swarm/leastprivilege.md
- - swarm/apiscope.md
- - swarm/logging.md
- - swarm/metrics.md
- - swarm/stateful.md
- - swarm/extratips.md
- - shared/thankyou.md
- - swarm/links.md
diff --git a/slides/swarm-video.yml b/slides/swarm-video.yml
deleted file mode 100644
index 5e679f85..00000000
--- a/slides/swarm-video.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-title: |
- Container Orchestration
- with Docker and Swarm
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: http://container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- in-person
-- btp-auto
-
-content:
-- shared/title.md
-#- shared/logistics.md
-- swarm/intro.md
-- shared/about-slides.md
-- shared/toc.md
-- - shared/prereqs.md
- - shared/connecting.md
- - swarm/versions.md
- - |
- name: part-1
-
- class: title, self-paced
-
- Part 1
- - shared/sampleapp.md
- - shared/composescale.md
- - shared/hastyconclusions.md
- - shared/composedown.md
- - swarm/swarmkit.md
- - shared/declarative.md
- - swarm/swarmmode.md
- - swarm/creatingswarm.md
- #- swarm/machine.md
- - swarm/morenodes.md
-- - swarm/firstservice.md
- - swarm/ourapponswarm.md
- - swarm/hostingregistry.md
- - swarm/testingregistry.md
- - swarm/btp-manual.md
- - swarm/swarmready.md
- - swarm/stacks.md
- - |
- name: part-2
-
- class: title, self-paced
-
- Part 2
-- - swarm/operatingswarm.md
- #- swarm/netshoot.md
- #- swarm/swarmnbt.md
- - swarm/ipsec.md
- - swarm/updatingservices.md
- - swarm/rollingupdates.md
- #- swarm/healthchecks.md
- - swarm/nodeinfo.md
- - swarm/swarmtools.md
-- - swarm/security.md
- - swarm/secrets.md
- - swarm/encryptionatrest.md
- - swarm/leastprivilege.md
- - swarm/apiscope.md
- #- swarm/logging.md
- #- swarm/metrics.md
- - swarm/stateful.md
- - swarm/extratips.md
- - shared/thankyou.md
- - swarm/links.md