From ed55c7236601aa03e65ce720fb78cec1cb7704f8 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Fri, 25 Oct 2019 12:44:12 -0500
Subject: [PATCH] Free up most of day 3

---
 slides/2.yml | 21 +++++++++++----------
 slides/3.yml | 19 +++++--------------
 slides/4.yml | 16 ++++++++++------
 slides/5.yml |  9 +++------
 4 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/slides/2.yml b/slides/2.yml
index b59ecbdb..6c975108 100644
--- a/slides/2.yml
+++ b/slides/2.yml
@@ -1,6 +1,6 @@
 title: |
   Day 2
-  Getting started with Kubernetes
+  Kubernetes fundamentals
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
 chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
@@ -21,8 +21,6 @@ chapters:
   - 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
@@ -35,18 +33,21 @@ chapters:
   - k8s/kubenet.md
   - k8s/kubectlexpose.md
   - k8s/shippingimages.md
-  #- k8s/buildshiprun-selfhosted.md
   - k8s/buildshiprun-dockerhub.md
   - k8s/ourapponkube.md
 -
-  - k8s/dashboard.md
-  #- k8s/kubectlscale.md
+  #- k8s/dashboard.md
   - k8s/scalingdockercoins.md
   - shared/hastyconclusions.md
   - k8s/daemonset.md
--
-  - k8s/dryrun.md
   - k8s/rollout.md
+-
+  #- k8s/dryrun.md
   - k8s/healthchecks.md
-  - k8s/healthchecks-more.md
-  - k8s/record.md
+  #- k8s/healthchecks-more.md
+  #- k8s/record.md
+  - k8s/namespaces.md
+  #- k8s/kubectlproxy.md
+  - k8s/localkubeconfig.md
+  - k8s/accessinternal.md
+  - k8s/ingress.md
diff --git a/slides/3.yml b/slides/3.yml
index daecbd46..51f991a1 100644
--- a/slides/3.yml
+++ b/slides/3.yml
@@ -1,6 +1,6 @@
 title: |
   Day 3
-  More Kubernetes
+  Developing Cloud Native Apps
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
 chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
@@ -16,18 +16,9 @@ chapters:
 - shared/title.md
 - shared/toc.md
 -
-  - k8s/namespaces.md
-  - k8s/kubectlproxy.md
-  - k8s/localkubeconfig.md
-  - k8s/accessinternal.md
--
-  - k8s/netpol.md
-  - k8s/authn-authz.md
--
-  - k8s/ingress.md
   - k8s/volumes.md
   - k8s/configuration.md
--
-  - k8s/statefulsets.md
-  - k8s/local-persistent-volumes.md
-  - k8s/portworx.md
+  - k8s/kustomize.md
+  - k8s/helm.md
+  - k8s/create-chart.md
+  #- k8s/create-more-charts.md
diff --git a/slides/4.yml b/slides/4.yml
index 114318ef..8cf4d6d4 100644
--- a/slides/4.yml
+++ b/slides/4.yml
@@ -15,17 +15,21 @@ exclude:
 chapters:
 - shared/title.md
 - shared/toc.md
--
-  - k8s/kustomize.md
-  - k8s/helm.md
-  - k8s/create-chart.md
-  - k8s/create-more-charts.md
 -
   - k8s/resource-limits.md
   - k8s/metrics-server.md
   - k8s/cluster-sizing.md
   - k8s/horizontal-pod-autoscaler.md
 -
+  - k8s/netpol.md
+  - k8s/authn-authz.md
+-
+  - k8s/statefulsets.md
+  - k8s/local-persistent-volumes.md
+  - k8s/portworx.md
+-
+  - k8s/logs-centralized.md
+  - k8s/prometheus.md
   - k8s/extending-api.md
   - k8s/operators.md
-  - k8s/operators-design.md
+  #- k8s/operators-design.md
diff --git a/slides/5.yml b/slides/5.yml
index 4fedb412..1bb577f9 100644
--- a/slides/5.yml
+++ b/slides/5.yml
@@ -25,14 +25,11 @@ chapters:
   - k8s/cni.md
 -
   - k8s/apilb.md
-  - k8s/setup-managed.md
-  - k8s/setup-selfhosted.md
+  #- k8s/setup-managed.md
+  #- k8s/setup-selfhosted.md
   - k8s/cluster-upgrade.md
-  - k8s/staticpods.md
--
   - k8s/cluster-backup.md
-  - k8s/logs-centralized.md
-  - k8s/prometheus.md
+  - k8s/staticpods.md
 -
   - k8s/control-plane-auth.md
   - k8s/csr-api.md