diff --git a/slides/intro-selfpaced.yml b/slides/intro-selfpaced.yml deleted file mode 100644 index 5ebc32c5..00000000 --- a/slides/intro-selfpaced.yml +++ /dev/null @@ -1,63 +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/ - -exclude: -- in-person - -chapters: -- shared/title.md -# - shared/logistics.md -- containers/intro.md -- shared/about-slides.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/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/Ecosystem.md - - containers/Orchestration_Overview.md - - shared/thankyou.md - - containers/links.md diff --git a/slides/intro-fullday.yml b/slides/intro.yml similarity index 91% rename from slides/intro-fullday.yml rename to slides/intro.yml index b137fb59..fd525848 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro.yml @@ -1,9 +1,11 @@ title: | - Introduction - to Containers + Docker + & + Containers -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" +#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" #chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)" +chat: FIXME gitrepo: github.com/jpetazzo/container.training @@ -14,13 +16,13 @@ exclude: chapters: - shared/title.md -- logistics.md +#- logistics.md - containers/intro.md - shared/about-slides.md - shared/toc.md - - containers/Docker_Overview.md #- containers/Docker_History.md - - containers/Training_Environment.md + #- containers/Training_Environment.md - containers/Installing_Docker.md - containers/First_Containers.md - containers/Background_Containers.md diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml deleted file mode 100644 index 35574248..00000000 --- a/slides/kube-fullday.yml +++ /dev/null @@ -1,89 +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/ - -exclude: -- self-paced - -chapters: -- shared/title.md -- logistics.md -- k8s/intro.md -- shared/about-slides.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/kubectlrun.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/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/dryrun.md - - k8s/rollout.md - #- k8s/healthchecks.md - #- k8s/healthchecks-more.md - #- k8s/record.md -- - - k8s/namespaces.md - - k8s/ingress.md - #- k8s/kustomize.md - #- k8s/helm.md - #- k8s/create-chart.md - #- k8s/netpol.md - #- k8s/authn-authz.md - #- k8s/csr-api.md - #- k8s/openid-connect.md - #- k8s/podsecuritypolicy.md - - k8s/volumes.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/links.md - - shared/thankyou.md diff --git a/slides/kube-halfday.yml b/slides/kube-halfday.yml deleted file mode 100644 index 4a4856b2..00000000 --- a/slides/kube-halfday.yml +++ /dev/null @@ -1,68 +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/ - -exclude: -- self-paced - -chapters: -- shared/title.md -#- logistics.md -# Bridget-specific; others use logistics.md -- logistics-bridget.md -- k8s/intro.md -- shared/about-slides.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-k8s.md -- - k8s/kubectlrun.md - - k8s/deploymentslideshow.md - - k8s/kubectlexpose.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/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.md - - k8s/create-chart.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-twodays.yml b/slides/kube-twodays.yml deleted file mode 100644 index eb976900..00000000 --- a/slides/kube-twodays.yml +++ /dev/null @@ -1,93 +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/ - -exclude: -- self-paced - -chapters: -- shared/title.md -- logistics.md -- k8s/intro.md -- shared/about-slides.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/kubectlrun.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/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/dryrun.md - - k8s/rollout.md - - k8s/healthchecks.md - - k8s/healthchecks-more.md - - k8s/record.md -- - - k8s/namespaces.md - - k8s/ingress.md - - k8s/kustomize.md - - k8s/helm.md - - k8s/create-chart.md -- - - k8s/netpol.md - - k8s/authn-authz.md - #- k8s/csr-api.md - #- k8s/openid-connect.md - #- k8s/podsecuritypolicy.md -- - - k8s/volumes.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/links.md - - shared/thankyou.md diff --git a/slides/kube-selfpaced.yml b/slides/kube.yml similarity index 69% rename from slides/kube-selfpaced.yml rename to slides/kube.yml index 9a21f941..4651e3b4 100644 --- a/slides/kube-selfpaced.yml +++ b/slides/kube.yml @@ -1,32 +1,25 @@ title: | - Deploying and Scaling Microservices - with Docker and Kubernetes + Kubernetes + & + Orchestration -chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)" +#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: -- in-person +- self-paced chapters: - shared/title.md -#- logistics.md -- k8s/intro.md -- shared/about-slides.md -- shared/toc.md -- +- # DAY 1 - 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 @@ -39,58 +32,54 @@ chapters: - k8s/kubenet.md - k8s/kubectlexpose.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/setup-k8s.md - k8s/dashboard.md #- k8s/kubectlscale.md - k8s/scalingdockercoins.md - shared/hastyconclusions.md - k8s/daemonset.md - - k8s/dryrun.md - + - k8s/dryrun.md - k8s/rollout.md - k8s/healthchecks.md - k8s/healthchecks-more.md - k8s/record.md -- +- # DAY 2 - k8s/namespaces.md + - k8s/localkubeconfig.md + - k8s/accessinternal.md + - k8s/kubectlproxy.md - k8s/ingress.md - - k8s/kustomize.md - - k8s/helm.md - - k8s/create-chart.md -- - - k8s/netpol.md - - k8s/authn-authz.md -- - - k8s/csr-api.md - - k8s/openid-connect.md - - k8s/podsecuritypolicy.md -- - - k8s/volumes.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/volumes.md + - k8s/configuration.md +- + - k8s/resource-limits.md + - k8s/metrics-server.md + - k8s/cluster-sizing.md + - k8s/horizontal-pod-autoscaler.md +- # DAY 3 + - k8s/netpol.md + - k8s/authn-authz.md +- + - k8s/kustomize.md + - k8s/helm.md + - k8s/create-chart.md + - k8s/create-more-charts.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/links.md - - shared/thankyou.md + - k8s/statefulsets.md + - k8s/local-persistent-volumes.md + - k8s/portworx.md +- # CONCLUSION + - k8s/lastwords-admin.md diff --git a/slides/shared/title.md b/slides/shared/title.md index 4ab52435..d0d346bd 100644 --- a/slides/shared/title.md +++ b/slides/shared/title.md @@ -10,12 +10,3 @@ 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@@** -]