fix-redirects.sh: adding forced redirect

Warning: do not merge this branch to your content, otherwise you
will get the ENIX logo in the top right of all your decks

slides/_redirects

@@ -0,0 +1 @@
+/ /weka.yml.html 200!

slides/k8s/ingress.md

@@ -344,7 +344,7 @@ This is normal: we haven't provided any ingress rule yet.
 
 - To make our lives easier, we will use [nip.io](http://nip.io)
 
-- Check out `http://cheddar.A.B.C.D.mip.io`
+- Check out `http://cheddar.A.B.C.D.nip.io`
 
   (replacing A.B.C.D with the IP address of `node1`)
 

slides/k8s/whatsnext.md

@@ -20,6 +20,43 @@ And *then* it is time to look at orchestration!
 
 ---
 
+
+## Options for our first production cluster
+
+- Get a managed cluster from a major cloud provider (AKS, EKS, GKE...)
+
+  (price: $, difficulty: medium)
+
+- Hire someone to deploy it for us
+
+  (price: $$, difficulty: easy)
+
+- Do it ourselves
+
+  (price: $-$$$, dificulty: hard)
+
+---
+
+## One big cluster vs. multiple small ones
+
+- Yes, it is possible to have prod+dev in a single cluster
+
+  (and implement good isolation and security with RBAC, network policies...)
+
+- But it is not a good idea to do that for our first deployment
+
+- Start with a production cluster + at least a test cluster
+
+- Implement and check RBAC and isolation on the test cluster
+
+  (e.g. deploy multiple test versions side-by-side)
+
+- Make sure that all our devs have usable dev clusters
+
+  (wether it's a local minikube or a full-blown multi-node cluster)
+
+---
+
 ## Namespaces
 
 - Namespaces let you run multiple identical stacks side by side
@@ -62,15 +99,19 @@ And *then* it is time to look at orchestration!
 
 ## Stateful services (second take)
 
-- If you really want to host stateful services on Kubernetes, you can look into:
+- If we want to host stateful services on Kubernetes, we can use:
 
-  - volumes (to carry persistent data)
+  - a storage provider
 
-  - storage plugins
+  - persistent volumes, persistent volume claims
 
-  - persistent volume claims (to ask for specific volume characteristics)
+  - stateful sets
 
-  - stateful sets (pods that are *not* ephemeral)
+- Good questions to ask:
+
+  - what's the *operational cost* of running this service ourselves?
+
+  - what do we gain by deploying this stateful service on Kubernetes?
 
 ---
 
@@ -123,8 +164,6 @@ And *then* it is time to look at orchestration!
 
   (but is being [deprecated](https://github.com/kubernetes/heapster/blob/master/docs/deprecation.md) starting with Kubernetes 1.11)
 
-
-
 ---
 
 ## Managing the configuration of our applications

slides/override.css

@@ -0,0 +1,17 @@
+.remark-slide-content {
+    background-repeat: no-repeat;
+    background-position: 99% 1%;
+    background-size: 8%;
+    background-image: url(https://enix.io/static/img/logos/logo-domain-cropped.png);
+}
+
+div.extra-details {
+  background-image: url("images/extra-details.png"), url(https://enix.io/static/img/logos/logo-domain-cropped.png);
+  background-position: 0.5% 1%, 99% 1%;
+  background-size: 4%, 8%;
+}
+
+.remark-slide-content:not(.pic) div.remark-slide-number {
+	top: 16px;
+	right: 112px
+}

slides/shared/title.md

@@ -11,11 +11,5 @@ class: title, in-person
 @@TITLE@@<br/></br>
 
 .footnote[
-**Be kind to the WiFi!**<br/>
-<!-- *Use the 5G network.* -->
-*Don't use your hotspot.*<br/>
-*Don't stream videos or download big files during the workshop.*<br/>
-*Thank you!*
-
 **Slides: @@SLIDES@@**
 ]

slides/weka.yml

@@ -0,0 +1,97 @@
+title: |
+  Containers,
+  Docker,
+  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://weka.container.training/
+
+exclude:
+- self-paced
+
+chapters:
+- shared/title.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/toc.md
+- - containers/Training_Environment.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/Multi_Stage_Builds.md
+  - containers/Dockerfile_Tips.md
+  - containers/Naming_And_Inspecting.md
+  - containers/Labels.md
+- - containers/Container_Networking_Basics.md
+  - containers/Network_Drivers.md
+  - containers/Container_Network_Model.md
+  - containers/Ambassadors.md
+- - containers/Working_With_Volumes.md
+  - containers/Advanced_Dockerfiles.md
+  - containers/Application_Configuration.md
+  - containers/Logging.md
+- - containers/Resource_Limits.md
+  - containers/Container_Engines.md
+  - containers/Ecosystem.md
+  - containers/Orchestration_Overview.md
+- - containers/Namespaces_Cgroups.md
+  - containers/Copy_On_Write.md
+- - |
+    # Running complex applications
+
+    - We are now going to run a demo app made of multiple containers
+
+    - We will identify bottlenecks in this app
+
+    - We will scale out the app using a Kubernetes cluster
+
+      (and learn Kubernetes in the process)
+  
+    - From now on, demos and labs are identified with these gray boxes
+
+    .exercise[
+    - You should run this command:
+      ```bash
+      echo Hello world
+      ```
+
+    ]
+
+  - shared/sampleapp.md
+  - shared/composescale.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/kubectlexpose.md
+  - k8s/ourapponkube.md
+- - k8s/dashboard.md
+  - k8s/kubectlscale.md
+  - k8s/daemonset.md
+  - k8s/rollout.md
+  - k8s/healthchecks.md
+- - k8s/logs-cli.md
+  - k8s/logs-centralized.md
+  - k8s/helm.md
+  - k8s/namespaces.md
+- - k8s/netpol.md
+  - k8s/authn-authz.md
+  - k8s/ingress.md
+- - k8s/volumes.md
+  - k8s/configuration.md
+  - k8s/statefulsets.md
+  - k8s/portworx.md
+- - k8s/whatsnext.md
+  - k8s/links.md
+  - shared/thankyou.md

slides/workshop.html

@@ -4,6 +4,7 @@
     <title>@@TITLE@@</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="workshop.css">
+    <link rel="stylesheet" href="override.css">
   </head>
   <body>
     <!--