Finalize content

slides/kube.yml

@@ -5,7 +5,7 @@ title: |
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
 #chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "`#kubernetes-training-august-17-21` on Slack"
 
 gitrepo: github.com/jpetazzo/container.training
 
@@ -36,8 +36,8 @@ content:
   - shared/composedown.md
   - k8s/concepts-k8s.md
   - k8s/kubectlget.md
-  - k8s/kubectl-run.md
 -
+  - k8s/kubectl-run.md
   - shared/declarative.md
   - k8s/declarative.md
   - k8s/deploymentslideshow.md
@@ -52,7 +52,6 @@ content:
   - k8s/labels-annotations.md
   - k8s/kubectl-logs.md
   - k8s/logs-cli.md
-  - k8s/batch-jobs.md
   - k8s/yamldeploy.md
   #- k8s/kubectlscale.md
   - k8s/scalingdockercoins.md
@@ -65,10 +64,8 @@ content:
   #- k8s/healthchecks-more.md
   - k8s/setup-overview.md
   - k8s/setup-devel.md
-  - |
-    # (Extra content)
-  - k8s/setup-managed.md
-  - k8s/setup-selfhosted.md
+  #- k8s/setup-managed.md
+  #- k8s/setup-selfhosted.md
 - # DAY 3
   - k8s/namespaces.md
   - k8s/localkubeconfig.md
@@ -87,27 +84,18 @@ content:
 - # DAY 4
   - k8s/netpol.md
   - k8s/authn-authz.md
+  #- k8s/podsecuritypolicy.md
+  #- k8s/csr-api.md
+  #- k8s/openid-connect.md
 -
-  - k8s/podsecuritypolicy.md
-  - k8s/csr-api.md
-  - k8s/openid-connect.md
-- # DAY 5
-  - 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
-- # DAY 6
   - k8s/resource-limits.md
   - k8s/metrics-server.md
   - k8s/cluster-sizing.md
   - k8s/horizontal-pod-autoscaler.md
   #- k8s/logs-centralized.md
   #- k8s/prometheus.md
--
+- # DAY 5
+  - k8s/batch-jobs.md
   - k8s/statefulsets.md
   - k8s/local-persistent-volumes.md
   - k8s/portworx.md
@@ -121,3 +109,12 @@ content:
   - k8s/lastwords.md
   - k8s/links.md
   - shared/thankyou.md
+#- # PACKAGING
+#  - 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

slides/logistics-template.md

@@ -1,32 +1,12 @@
 ## Intros
 
-- This slide should be customized by the tutorial instructor(s).
+- Hello! I'm Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo))
 
-- Hello! We are:
+- The training will run the whole week from 9:30am to 1:30pm
 
-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
+- There will be a short break (\~5 min) every hour
 
-   - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda)
-
- <!-- .dummy[
-
-   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
-
-   - .emoji[🚁] Alexandre ([@alexbuisine](https://twitter.com/alexbuisine), Enix SAS)
-
-   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Enix SAS)
-
-   - .emoji[⛵] Jérémy ([@jeremygarrouste](twitter.com/jeremygarrouste), Inpiwee)
-
-   - .emoji[🎧] Romain ([@rdegez](https://twitter.com/rdegez), Enix SAS)
-
-] -->
-
-- The workshop will run from ...
-
-- There will be a lunch break at ...
-
-  (And coffee breaks!)
+- There will be a longer break (\~20 min) in the middle
 
 - Feel free to interrupt for questions at any time
 

slides/shared/chat-room-im.md

@@ -1,10 +1,10 @@
 ## Chat room
 
-- We've set up a chat room that we will monitor during the workshop
+- A chat room has been set up for the duration of the training
 
 - Don't hesitate to use it to ask questions, or get help, or share feedback
 
-- The chat room will also be available after the workshop
+  (we'll keep an eye on it during the training!)
 
 - Join the chat room: @@CHAT@@