From 78026ff9b80fc7ad60360435265b6961ab385c0c Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Sat, 8 Sep 2018 08:23:54 -0500 Subject: [PATCH] Integrate new content I've dispatched the new content so that the fullday training (actually two days, don't let the file name distract you) is broken down in 8 chapters of approximately equal lengths, where the most complex content is preferably located at the end of the chapter (to allow people to catch up and ask questions during breaks) + 1 chapter with the what's next / links / thank you slides --- slides/kube-fullday.yml | 30 +++++++++++++++++++++--------- slides/kube-selfpaced.yml | 30 +++++++++++++++++++++--------- slides/new-content.yml | 23 ----------------------- 3 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 slides/new-content.yml diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml index 173668d8..6cf1bcc4 100644 --- a/slides/kube-fullday.yml +++ b/slides/kube-fullday.yml @@ -22,27 +22,39 @@ chapters: - - shared/prereqs.md - k8s/versions-k8s.md - shared/sampleapp.md - #- shared/composescale.md + - shared/composescale.md - shared/composedown.md -- - k8s/concepts-k8s.md + - k8s/concepts-k8s.md - shared/declarative.md - k8s/declarative.md - - k8s/kubenet.md +- - k8s/kubenet.md - k8s/kubectlget.md - k8s/setup-k8s.md - k8s/kubectlrun.md -- - k8s/kubectlexpose.md - - k8s/ourapponkube.md + - k8s/kubectlexpose.md +- - k8s/ourapponkube.md - k8s/kubectlproxy.md - k8s/dashboard.md -- - k8s/kubectlscale.md + - k8s/kubectlscale.md - k8s/daemonset.md - - k8s/rollout.md +- - k8s/rollout.md + - k8s/healthchecks.md - k8s/logs-cli.md - k8s/logs-centralized.md - - k8s/helm.md +- - k8s/helm.md - k8s/namespaces.md - k8s/netpol.md - - k8s/whatsnext.md + - k8s/authn-authz.md +- - k8s/ingress.md + - k8s/gitworkflows.md + - k8s/prometheus.md +- - k8s/volumes.md + - k8s/build-with-docker.md + - k8s/build-with-kaniko.md + - k8s/configuration.md +- - k8s/owners-and-dependents.md + - k8s/statefulsets.md + - k8s/portworx.md +- - k8s/whatsnext.md - k8s/links.md - shared/thankyou.md diff --git a/slides/kube-selfpaced.yml b/slides/kube-selfpaced.yml index 00f7f97f..9ff2b594 100644 --- a/slides/kube-selfpaced.yml +++ b/slides/kube-selfpaced.yml @@ -23,25 +23,37 @@ chapters: - shared/sampleapp.md - shared/composescale.md - shared/composedown.md -- - k8s/concepts-k8s.md + - k8s/concepts-k8s.md - shared/declarative.md - k8s/declarative.md - - k8s/kubenet.md +- - k8s/kubenet.md - k8s/kubectlget.md - k8s/setup-k8s.md - k8s/kubectlrun.md -- - k8s/kubectlexpose.md - - k8s/ourapponkube.md + - k8s/kubectlexpose.md +- - k8s/ourapponkube.md - k8s/kubectlproxy.md - k8s/dashboard.md -- - k8s/kubectlscale.md + - k8s/kubectlscale.md - k8s/daemonset.md - - k8s/rollout.md -- - k8s/logs-cli.md +- - k8s/rollout.md + - k8s/healthchecks.md + - k8s/logs-cli.md - k8s/logs-centralized.md - - k8s/helm.md +- - k8s/helm.md - k8s/namespaces.md - k8s/netpol.md - - k8s/whatsnext.md + - k8s/authn-authz.md +- - k8s/ingress.md + - k8s/gitworkflows.md + - k8s/prometheus.md +- - k8s/volumes.md + - k8s/build-with-docker.md + - k8s/build-with-kaniko.md + - k8s/configuration.md +- - k8s/owners-and-dependents.md + - k8s/statefulsets.md + - k8s/portworx.md +- - k8s/whatsnext.md - k8s/links.md - shared/thankyou.md diff --git a/slides/new-content.yml b/slides/new-content.yml deleted file mode 100644 index a8a66293..00000000 --- a/slides/new-content.yml +++ /dev/null @@ -1,23 +0,0 @@ -title: New content september 2018 -chat: "In person!" -gitrepo: github.com/jpetazzo/container.training -slides: http://container.training/ - -exclude: -- self-paced - -chapters: -- shared/toc.md -- - k8s/volumes.md - - k8s/build-with-docker.md - - k8s/build-with-kaniko.md - - k8s/configuration.md - - k8s/owners-and-dependents.md - - k8s/statefulsets.md - - k8s/portworx.md -- - k8s/authn-authz.md - - k8s/ingress.md - - k8s/gitworkflows.md - - k8s/prometheus.md -- - k8s/healthchecks.md -