fix-redirects.sh: adding forced redirect

Use Replicated Ship to generate the base and overlays
from the kubercoins GitHub repo.

The namespaces chapter has been slightly tweaked so
that we can use it for either Helm or Kustomize demo.

slides/_redirects

@@ -1,4 +1,4 @@
 # Uncomment and/or edit one of the the following lines if necessary.
 #/ /kube-halfday.yml.html 200
 #/ /kube-fullday.yml.html 200
-#/ /kube-twodays.yml.html 200
+/ /kube-twodays.yml.html 200!

slides/k8s/create-chart.md

@@ -0,0 +1,71 @@
+## Creating a chart
+
+- We are going to show a way to create a *very simplified* chart
+
+- In a real chart, *lots of things* would be templatized
+
+  (Resource names, service types, number of replicas...)
+
+.exercise[
+
+- Create a sample chart:
+  ```bash
+  helm create dockercoins
+  ```
+
+- Move away the sample templates and create an empty template directory:
+  ```bash
+  mv dockercoins/templates dockercoins/default-templates
+  mkdir dockercoins/templates
+  ```
+
+]
+
+---
+
+## Exporting the YAML for our application
+
+- The following section assumes that DockerCoins is currently running
+
+.exercise[
+
+- Create one YAML file for each resource that we need:
+  .small[
+  ```bash
+
+	while read kind name; do
+	  kubectl get -o yaml --export $kind $name > dockercoins/templates/$name-$kind.yaml
+	done <<EOF
+	deployment worker
+	deployment hasher
+	daemonset rng
+	deployment webui
+	deployment redis
+	service hasher
+	service rng
+	service webui
+	service redis
+	EOF
+  ```
+  ]
+
+]
+
+---
+
+## Testing our helm chart
+
+.exercise[
+
+- Let's install our helm chart! (`dockercoins` is the path to the chart)
+  ```
+  helm install dockercoins
+  ```
+]
+
+--
+
+- Since the application is already deployed, this will fail:<br>
+`Error: release loitering-otter failed: services "hasher" already exists`
+
+- To avoid naming conflicts, we will deploy the application in another *namespace*

slides/k8s/extending-api.md

@@ -1,4 +1,4 @@
-# Extending the Kubernetes API
+# Extending the Kubernetes API (extra)
 
 There are multiple ways to extend the Kubernetes API.
 

slides/k8s/helm.md

@@ -176,77 +176,3 @@ The chart's metadata includes an URL to the project's home page.
   ```
 
 ]
-
----
-
-## Creating a chart
-
-- We are going to show a way to create a *very simplified* chart
-
-- In a real chart, *lots of things* would be templatized
-
-  (Resource names, service types, number of replicas...)
-
-.exercise[
-
-- Create a sample chart:
-  ```bash
-  helm create dockercoins
-  ```
-
-- Move away the sample templates and create an empty template directory:
-  ```bash
-  mv dockercoins/templates dockercoins/default-templates
-  mkdir dockercoins/templates
-  ```
-
-]
-
----
-
-## Exporting the YAML for our application
-
-- The following section assumes that DockerCoins is currently running
-
-.exercise[
-
-- Create one YAML file for each resource that we need:
-  .small[
-  ```bash
-
-	while read kind name; do
-	  kubectl get -o yaml --export $kind $name > dockercoins/templates/$name-$kind.yaml
-	done <<EOF
-	deployment worker
-	deployment hasher
-	daemonset rng
-	deployment webui
-	deployment redis
-	service hasher
-	service rng
-	service webui
-	service redis
-	EOF
-  ```
-  ]
-
-]
-
----
-
-## Testing our helm chart
-
-.exercise[
-
-- Let's install our helm chart! (`dockercoins` is the path to the chart)
-  ```
-  helm install dockercoins
-  ```
-]
-
---
-
-- Since the application is already deployed, this will fail:<br>
-`Error: release loitering-otter failed: services "hasher" already exists`
-
-- To avoid naming conflicts, we will deploy the application in another *namespace*

slides/k8s/kustomize.md

@@ -0,0 +1,148 @@
+# Kustomize
+
+- Kustomize lets us transform YAML files representing Kubernetes resources
+
+- The original YAML files are valid resource files
+
+  (e.g. they can be loaded with `kubectl apply -f`)
+
+- They are left untouched by Kustomize
+
+- Kustomize lets us define *overlays* that extend or change the resource files
+
+---
+
+## Differences with Helm
+
+- Helm Charts use placeholders `{{ like.this }}`
+
+- Kustomize "bases" are standard Kubernetes YAML
+
+- It is possible to use an existing set of YAML as a Kustomize base
+
+- As a result, writing a Helm Chart is more work ...
+
+- ... But Helm Charts are also more powerful; e.g. they can:
+
+  - use flags to conditionally include resources or blocks
+
+  - check if a given Kubernetes API group is supported
+
+  - [and much more](https://helm.sh/docs/chart_template_guide/)
+
+---
+
+## Kustomize concepts
+
+- Kustomize needs a `kustomization.yaml` file
+
+- That file can be a *base* or a *variant*
+
+- If it's a *base*:
+
+  - it lists YAML resource files to use
+
+- If it's a *variant* (or *overlay*):
+
+  - it refers to (at least) one *base*
+
+  - and some *patches*
+
+---
+
+## An easy way to get started with Kustomize
+
+- We are going to use [Replicated Ship](https://www.replicated.com/ship/) to experiment with Kustomize
+
+- The [Replicated Ship CLI](https://github.com/replicatedhq/ship/releases) has been installed on our clusters
+
+- Replicated Ship has multiple workflows; here is what we will do:
+
+  - initialize a Kustomize overlay from a remote GitHub repository
+
+  - customize some values using the web UI provided by Ship
+
+  - look at the resulting files and apply them to the cluster
+
+---
+
+## Getting started with Ship
+
+- We need to run `ship init` in a new directory
+
+- `ship init` requires an URL to a remote repository containing Kubernetes YAML
+
+- It will clone that repository and start a web UI
+
+- Later, it can watch that repository and/or update from it
+
+- We will use the [jpetazzo/kubercoins](https://github.com/jpetazzo/kubeercoins) repository
+
+  (it contains all the DockerCoins resources as YAML files)
+
+---
+
+## `ship init`
+
+.exercise[
+
+- Change to a new directory:
+  ```bash
+  mkdir ~/kubercoins
+  cd ~/kubercoins
+  ```
+
+- Run `ship init` with the kubercoins repository:
+  ```bash
+  ship init https://github.com/jpetazzo/kubercoins
+  ```
+
+]
+
+---
+
+## Access the web UI
+
+- `ship init` tells us to connect on `localhost:8800`
+
+- We need to replace `localhost` with the address of our node
+
+  (since we run on a remote machine)
+
+- Follow the steps in the web UI, and change one parameter
+
+  (e.g. set the number of replicas in the worker Deployment)
+
+- Complete the web workflow, and go back to the CLI
+
+---
+
+## Inspect the results
+
+- Look at the content of our directory
+
+- `base` contains the kubercoins repository + a `kustomization.yaml` file
+
+- `overlays/ship` contains the Kustomize overlay referencing the base + our patch(es)
+
+- `rendered.yaml` is a YAML bundle containing the patched application
+
+- `.ship` contains a state file used by Ship
+
+---
+
+## Using the results
+
+- We can `kubectl apply -f rendered.yaml`
+
+  (on any version of Kubernetes)
+
+- Starting with Kubernetes 1.14, we can apply the overlay directly with:
+  ```bash
+  kubectl apply -k overlays/ship
+  ```
+
+- But let's not do that for now!
+
+- We will create a new copy of DockerCoins in another namespace
+

slides/k8s/namespaces.md

@@ -155,7 +155,7 @@
 
 ## Using our new namespace
 
-- Let's check that we are in our new namespace, then deploy the DockerCoins chart
+- Let's check that we are in our new namespace, then deploy a new copy of Dockercoins
 
 .exercise[
 
@@ -164,6 +164,16 @@
   kubectl get all
   ```
 
+]
+
+---
+
+## Deploy DockerCoins with Helm
+
+*Follow these instructions if you previously created a Helm Chart.*
+
+.exercise[
+
 - Deploy DockerCoins:
   ```bash
   helm install dockercoins
@@ -176,9 +186,29 @@ we created our Helm chart before.
 
 ---
 
+## Deploy DockerCoins with Kustomize
+
+*Follow these instructions if you previously created a Kustomize overlay.*
+
+.exercise[
+
+- Deploy DockerCoins:
+  ```bash
+  kubectl apply -f rendered.yaml
+  ```
+
+- Or, with Kubernetes 1.14, you can also do this:
+  ```bash
+  kubectl apply -k overlays/ship
+  ```
+
+]
+
+---
+
 ## Viewing the deployed app
 
-- Let's see if our Helm chart worked correctly!
+- Let's see if this worked correctly!
 
 .exercise[
 

slides/k8s/owners-and-dependents.md

@@ -1,4 +1,4 @@
-# Owners and dependents
+# Owners and dependents (extra)
 
 - Some objects are created by other objects
 

slides/k8s/staticpods.md

@@ -1,4 +1,4 @@
-# Static pods
+# Static pods (extra)
 
 - Hosting the Kubernetes control plane on Kubernetes has advantages:
 

slides/k8s/whatsnext.md

@@ -57,38 +57,6 @@ And *then* it is time to look at orchestration!
 
 ---
 
-## Namespaces
-
-- Namespaces let you run multiple identical stacks side by side
-
-- Two namespaces (e.g. `blue` and `green`) can each have their own `redis` service
-
-- Each of the two `redis` services has its own `ClusterIP`
-
-- CoreDNS creates two entries, mapping to these two `ClusterIP` addresses:
-
-  `redis.blue.svc.cluster.local` and `redis.green.svc.cluster.local`
-
-- Pods in the `blue` namespace get a *search suffix* of `blue.svc.cluster.local`
-
-- As a result, resolving `redis` from a pod in the `blue` namespace yields the "local" `redis`
-
-.warning[This does not provide *isolation*! That would be the job of network policies.]
-
----
-
-## Relevant sections
-
-- [Namespaces](kube-selfpaced.yml.html#toc-namespaces)
-
-- [Network Policies](kube-selfpaced.yml.html#toc-network-policies)
-
-- [Role-Based Access Control](kube-selfpaced.yml.html#toc-authentication-and-authorization)
-
-  (covers permissions model, user and service accounts management ...)
-
----
-
 ## Stateful services (databases etc.)
 
 - As a first step, it is wiser to keep stateful services *outside* of the cluster
@@ -134,77 +102,6 @@ And *then* it is time to look at orchestration!
 
 ---
 
-## HTTP traffic handling
-
-- *Services* are layer 4 constructs
-
-- HTTP is a layer 7 protocol
-
-- It is handled by *ingresses* (a different resource kind)
-
-- *Ingresses* allow:
-
-  - virtual host routing
-  - session stickiness
-  - URI mapping
-  - and much more!
-
-- [This section](kube-selfpaced.yml.html#toc-exposing-http-services-with-ingress-resources) shows how to expose multiple HTTP apps using [Træfik](https://docs.traefik.io/user-guide/kubernetes/)
-
----
-
-## Logging
-
-- Logging is delegated to the container engine
-
-- Logs are exposed through the API
-
-- Logs are also accessible through local files (`/var/log/containers`)
-
-- Log shipping to a central platform is usually done through these files
-
-  (e.g. with an agent bind-mounting the log directory)
-
-- [This section](kube-selfpaced.yml.html#toc-centralized-logging) shows how to do that with [Fluentd](https://docs.fluentd.org/v0.12/articles/kubernetes-fluentd) and the EFK stack
-
----
-
-## Metrics
-
-- The kubelet embeds [cAdvisor](https://github.com/google/cadvisor), which exposes container metrics
-
-  (cAdvisor might be separated in the future for more flexibility)
-
-- It is a good idea to start with [Prometheus](https://prometheus.io/)
-
-  (even if you end up using something else)
-
-- Starting from Kubernetes 1.8, we can use the [Metrics API](https://kubernetes.io/docs/tasks/debug-application-cluster/core-metrics-pipeline/)
-
-- [Heapster](https://github.com/kubernetes/heapster) was a popular add-on
-
-  (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
-
-- Two constructs are particularly useful: secrets and config maps
-
-- They allow to expose arbitrary information to our containers
-
-- **Avoid** storing configuration in container images
-
-  (There are some exceptions to that rule, but it's generally a Bad Idea)
-
-- **Never** store sensitive information in container images
-
-  (It's the container equivalent of the password on a post-it note on your screen)
-
-- [This section](kube-selfpaced.yml.html#toc-managing-configuration) shows how to manage app config with config maps (among others)
-
----
-
 ## Managing stack deployments
 
 - The best deployment tool will vary, depending on:

slides/kube-fullday.yml

@@ -50,6 +50,8 @@ chapters:
   - k8s/logs-cli.md
   - k8s/logs-centralized.md
 #- - k8s/helm.md
+#  - k8s/create-chart.md
+#  - k8s/kustomize.md
 #  - k8s/namespaces.md
 #  - k8s/netpol.md
 #  - k8s/authn-authz.md

slides/kube-halfday.yml

@@ -53,6 +53,8 @@ chapters:
 # Bridget hasn't added EFK yet
   #- k8s/logs-centralized.md
   - k8s/helm.md
+  - k8s/create-chart.md
+  #- k8s/kustomize.md
   - k8s/namespaces.md
   #- k8s/netpol.md
   - k8s/whatsnext.md

slides/kube-selfpaced.yml

@@ -50,6 +50,8 @@ chapters:
   - k8s/logs-cli.md
   - k8s/logs-centralized.md
 - - k8s/helm.md
+  #- k8s/create-chart.md
+  - k8s/kustomize.md
   - k8s/namespaces.md
   - k8s/netpol.md
   - k8s/authn-authz.md

slides/kube-twodays.yml

@@ -1,14 +1,14 @@
 title: |
-  Deploying and Scaling Microservices
-  with Kubernetes
+  Déployer ses applications
+  avec Kubernetes
 
 #chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"
+chat: "[Gitter](https://gitter.im/enix/formation-kubernetes-20190423)"
+#chat: "In person!"
 
 gitrepo: github.com/jpetazzo/container.training
 
-slides: http://container.training/
+slides: http://kube-2019-04.container.training/
 
 exclude:
 - self-paced
@@ -50,20 +50,22 @@ chapters:
   - k8s/logs-cli.md
   - k8s/logs-centralized.md
 - - k8s/helm.md
+  #- k8s/create-chart.md
+  - k8s/kustomize.md
   - k8s/namespaces.md
   - k8s/netpol.md
-  - k8s/authn-authz.md
-- - k8s/ingress.md
+- - k8s/authn-authz.md
+  - k8s/ingress.md
   #- k8s/gitworkflows.md
-  - k8s/prometheus.md
-- - k8s/volumes.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/extending-api.md
 - - k8s/statefulsets.md
   - k8s/portworx.md
+- - k8s/extending-api.md
+  - k8s/owners-and-dependents.md
   - k8s/staticpods.md
 - - k8s/whatsnext.md
   - k8s/links.md

slides/logistics.md

@@ -1,32 +1,15 @@
 ## Intros
 
-- This slide should be customized by the tutorial instructor(s).
 
 - Hello! We are:
 
-   - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc)
-
-   - .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)
+- The workshop will run from 9:15am to 5:30pm
 
-   - .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 lunch break and coffee breaks
 
 - Feel free to interrupt for questions at any time
 

slides/override.css

@@ -0,0 +1,17 @@
+.remark-slide-content:not(.pic) {
+    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:not(.pic) {
+  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,11 @@ 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[.](https://www.youtube.com/watch?v=h16zyxiwDLY)*<br/>
-*Thank you!*
+WiFi : 123_SEBASTOPOL
+<br/>
+Mot de passe : Sebastopol02
 
-**Slides: @@SLIDES@@**
+**Slides
+[:](https://www.youtube.com/watch?v=h16zyxiwDLY)
+@@SLIDES@@**
 ]

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>
     <!--