diff --git a/slides/_redirects b/slides/_redirects index 142cc30f..51cb1dd0 100644 --- a/slides/_redirects +++ b/slides/_redirects @@ -1,4 +1,4 @@ # Uncomment and/or edit one of the the following lines if necessary. #/ /kube-halfday.yml.html 200 #/ /kube-fullday.yml.html 200 -#/ /kube-twodays.yml.html 200 +/ /kube-twodays.yml.html 200 diff --git a/slides/kadm-fullday.yml b/slides/kadm-fullday.yml deleted file mode 100644 index 18d0a334..00000000 --- a/slides/kadm-fullday.yml +++ /dev/null @@ -1,43 +0,0 @@ -title: | - Kubernetes - for Admins and Ops - -#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/ - -exclude: -- self-paced -- static-pods-exercise - -chapters: -- shared/title.md -- logistics.md -- k8s/intro.md -- shared/about-slides.md -- shared/toc.md -- - k8s/prereqs-admin.md - - k8s/architecture.md - - k8s/dmuc.md -- - k8s/multinode.md - - k8s/cni.md - - k8s/apilb.md - - k8s/control-plane-auth.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/bootstrap.md -- - k8s/resource-limits.md - - k8s/metrics-server.md - - k8s/cluster-sizing.md - - k8s/horizontal-pod-autoscaler.md -- - k8s/lastwords-admin.md - - k8s/links.md - - shared/thankyou.md diff --git a/slides/kadm-twodays.yml b/slides/kadm-twodays.yml deleted file mode 100644 index 2c5d4c66..00000000 --- a/slides/kadm-twodays.yml +++ /dev/null @@ -1,69 +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/ - -exclude: -- self-paced - -chapters: -- shared/title.md -- logistics.md -- k8s/intro.md -- shared/about-slides.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/apilb.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-admin.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/logistics.md b/slides/logistics.md index 33388a06..161361e3 100644 --- a/slides/logistics.md +++ b/slides/logistics.md @@ -1,32 +1,14 @@ ## Intros -- This slide should be customized by the tutorial instructor(s). - - Hello! We are: - - .emoji[πŸ‘©πŸ»β€πŸ«] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc) + - .emoji[πŸ‘·πŸ»β€β™€οΈ] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Tiny Shell Script) - - .emoji[πŸ‘¨πŸΎβ€πŸŽ“] Stu Dent ([@...](https://twitter.com/...), University of Wakanda) + - .emoji[🐳] JΓ©rΓ΄me ([@jpetazzo](https://twitter.com/jpetazzo), Ardan Labs) - - -- The workshop will run from ... - -- There will be a lunch break at ... - - (And coffee breaks!) +- There will be a lunch break (and coffee breaks!) - Feel free to interrupt for questions at any time diff --git a/slides/shared/title.md b/slides/shared/title.md index 4ab52435..f7cfca94 100644 --- a/slides/shared/title.md +++ b/slides/shared/title.md @@ -11,11 +11,6 @@ class: title, in-person @@TITLE@@

.footnote[ -**Be kind to the WiFi!**
- -*Don't use your hotspot.*
-*Don't stream videos or download big files during the workshop[.](https://www.youtube.com/watch?v=h16zyxiwDLY)*
-*Thank you!* - -**Slides: @@SLIDES@@** +**Slides[:](https://www.youtube.com/watch?v=h16zyxiwDLY) +@@SLIDES@@** ] diff --git a/slides/swarm-fullday.yml b/slides/swarm-fullday.yml deleted file mode 100644 index 8f30665d..00000000 --- a/slides/swarm-fullday.yml +++ /dev/null @@ -1,65 +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/ - -exclude: -- self-paced -- snap -- btp-auto -- benchmarking -- elk-manual -- prom-manual - -chapters: -- shared/title.md -- logistics.md -- swarm/intro.md -- shared/about-slides.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 a80a0733..00000000 --- a/slides/swarm-halfday.yml +++ /dev/null @@ -1,64 +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/ - -exclude: -- self-paced -- snap -- btp-manual -- benchmarking -- elk-manual -- prom-manual - -chapters: -- shared/title.md -- logistics.md -- swarm/intro.md -- shared/about-slides.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 2510eed5..00000000 --- a/slides/swarm-selfpaced.yml +++ /dev/null @@ -1,73 +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/ - -exclude: -- in-person -- btp-auto - -chapters: -- 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 - - 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 0d361a40..00000000 --- a/slides/swarm-video.yml +++ /dev/null @@ -1,72 +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/ - -exclude: -- in-person -- btp-auto - -chapters: -- 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 diff --git a/slides/kube-twodays.yml b/slides/two.yml similarity index 62% rename from slides/kube-twodays.yml rename to slides/two.yml index 09c236d7..6960f500 100644 --- a/slides/kube-twodays.yml +++ b/slides/two.yml @@ -1,14 +1,11 @@ title: | - Deploying and Scaling Microservices - with Kubernetes + Kubernetes Developer Training -#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-20190715-copenhagen)" gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ +slides: http://maersk-2019-07.container.training/ exclude: - self-paced @@ -27,40 +24,39 @@ chapters: #- shared/hastyconclusions.md - shared/composedown.md - k8s/concepts-k8s.md + - k8s/kubectlget.md +- - k8s/kubectlrun.md + - k8s/logs-cli.md - shared/declarative.md - k8s/declarative.md - - k8s/kubenet.md -- - k8s/kubectlget.md - - k8s/setup-k8s.md - - k8s/kubectlrun.md - k8s/deploymentslideshow.md + - k8s/kubenet.md - k8s/kubectlexpose.md -- - k8s/shippingimages.md + - k8s/shippingimages.md #- k8s/buildshiprun-selfhosted.md - k8s/buildshiprun-dockerhub.md - k8s/ourapponkube.md - - k8s/kubectlproxy.md - - k8s/localkubeconfig.md - - k8s/accessinternal.md + #- k8s/kubectlproxy.md + #- k8s/localkubeconfig.md + #- k8s/accessinternal.md +- - k8s/setup-k8s.md - k8s/dashboard.md #- k8s/kubectlscale.md - k8s/scalingdockercoins.md - shared/hastyconclusions.md -- - k8s/daemonset.md - - k8s/rollout.md + - k8s/daemonset.md +- - k8s/rollout.md - k8s/namespaces.md - k8s/kustomize.md - #- k8s/helm.md - #- k8s/create-chart.md - - k8s/healthchecks.md - - k8s/healthchecks-more.md - - k8s/logs-cli.md - - k8s/logs-centralized.md - #- k8s/netpol.md + - k8s/helm.md + - k8s/create-chart.md + - k8s/create-more-charts.md +- - k8s/logs-centralized.md + - k8s/netpol.md - k8s/authn-authz.md - - k8s/csr-api.md - - k8s/openid-connect.md - - k8s/podsecuritypolicy.md + #- k8s/csr-api.md + #- k8s/openid-connect.md + #- k8s/podsecuritypolicy.md - - k8s/ingress.md #- k8s/gitworkflows.md - k8s/prometheus.md @@ -69,9 +65,9 @@ chapters: #- k8s/build-with-kaniko.md - k8s/configuration.md #- k8s/owners-and-dependents.md - - k8s/extending-api.md - - k8s/operators.md - - k8s/operators-design.md + #- k8s/extending-api.md + #- k8s/operators.md + #- k8s/operators-design.md - - k8s/statefulsets.md - k8s/local-persistent-volumes.md - k8s/portworx.md @@ -79,3 +75,7 @@ chapters: - - k8s/whatsnext.md - k8s/links.md - shared/thankyou.md +- - | + # (Extra material) + k8s/healthchecks.md + - k8s/healthchecks-more.md