fix-redirects.sh: adding forced redirect

Update title slide
Merge branch 'master' into kube
2026-02-15 18:19:56 +00:00 · 2020-04-07 16:49:45 -05:00 · 2017-11-19 23:45:38 -08:00 · 2017-11-19 23:34:32 -08:00 · 2017-11-19 23:20:56 -08:00 · 2017-11-19 17:51:23 -08:00
78 changed files with 775 additions and 2723 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@ prepare-vms/ips.pdf
 prepare-vms/settings.yaml
 prepare-vms/tags
 slides/*.yml.html
-slides/autopilot/state.yaml
-node_modules
+slides/nextstep
--- a/CHECKLIST.md
+++ b/CHECKLIST.md
@@ -1,19 +0,0 @@
-This is the checklist that I (Jérôme) use when delivering a workshop.
-
- [ ] Create branch + `_redirects` + push to GitHub + Netlify setup
- [ ] Add branch to index.html
- [ ] Update the slides that says which versions we are using
- [ ] Update the version of Compose and Machine in settings
- [ ] Create chatroom
- [ ] Set chatroom in YML and deploy
- [ ] Put chat room in index.html
- [ ] Walk the room to count seats, check power supplies, lectern, A/V setup
- [ ] How many VMs do we need?
- [ ] Provision VMs
- [ ] Print cards
- [ ] Cut cards
- [ ] Last minute merge from master
- [ ] Check that all looks good
- [ ] DELIVER!
- [ ] Shutdown VMs
- [ ] Update index.html to remove chat link and move session to past things
--- a/19
+++ b/19
@@ -1,12 +1,13 @@
-The code in this repository is licensed under the Apache License
-Version 2.0. You may obtain a copy of this license at:
+Copyright 2015 Jérôme Petazzoni
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

-The instructions and slides in this repository (e.g. the files
-with extension .md and .yml in the "slides" subdirectory) are
-under the Creative Commons Attribution 4.0 International Public
-License. You may obtain a copy of this license at:
-
-    https://creativecommons.org/licenses/by/4.0/legalcode
-
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ because they have a few things in common:
  (and updated) identically between different decks;
 - a [build system](slides/) generating HTML slides from
  Markdown source files;
- a [semi-automated test harness](slides/autopilot/) to check
+- a [semi-automated test harness](slides/autotest.py) to check
  that the exercises and examples provided work properly;
 - a [PhantomJS script](slides/slidechecker.js) to check
  that the slides look good and don't have formatting issues;
@@ -247,17 +247,6 @@ content but you also know to skip during presentation.
 - Last 15-30 minutes is for stateful services, DAB files, and questions.


-### Pre-built images
-
-There are pre-built images for the 4 components of the DockerCoins demo app: `dockercoins/hasher:v0.1`, `dockercoins/rng:v0.1`, `dockercoins/webui:v0.1`, and `dockercoins/worker:v0.1`. They correspond to the code in this repository.
-
-There are also three variants, for demo purposes:
-
- `dockercoins/rng:v0.2` is broken (the server won't even start),
- `dockercoins/webui:v0.2` has bigger font on the Y axis and a green graph (instead of blue),
- `dockercoins/worker:v0.2` is 11x slower than `v0.1`.
-
-
 ## Past events

 Since its inception, this workshop has been delivered dozens of times,
--- a/prepare-vms/README.md
+++ b/prepare-vms/README.md
@@ -4,12 +4,6 @@

 - [Docker](https://docs.docker.com/engine/installation/)
 - [Docker Compose](https://docs.docker.com/compose/install/)
- [Parallel SSH](https://code.google.com/archive/p/parallel-ssh/) (on a Mac: `brew install pssh`) - the configuration scripts require this
-
-And if you want to generate printable cards:
-
- [pyyaml](https://pypi.python.org/pypi/PyYAML) (on a Mac: `brew install pyyaml`)
- [jinja2](https://pypi.python.org/pypi/Jinja2) (on a Mac: `brew install jinja2`)

 ## General Workflow

@@ -41,16 +35,6 @@ The Docker Compose file here is used to build a image with all the dependencies
 - `AWS_SECRET_ACCESS_KEY`
 - `AWS_DEFAULT_REGION`

-If you're not using AWS, set these to placeholder values:
-
-```
-export AWS_ACCESS_KEY_ID="foo"
-export AWS_SECRET_ACCESS_KEY="foo"
-export AWS_DEFAULT_REGION="foo"
-```
-
-If you don't have the `aws` CLI installed, you will get a warning that it's a missing dependency. If you're not using AWS you can ignore this.
-
 ### Update/copy `settings/example.yaml`

 Then pass `settings/YOUR_WORKSHOP_NAME-settings.yaml` as an argument to `./workshopctl deploy`, `./workshopctl cards`, etc.
@@ -64,7 +48,6 @@ workshopctl - the orchestration workshop swiss army knife
 Commands:
 ami          Show the AMI that will be used for deployment
 amis         List Ubuntu AMIs in the current region
-build        Build the Docker image to run this program in a container
 cards        Generate ready-to-print cards for a batch of VMs
 deploy       Install Docker on a bunch of running VMs
 ec2quotas    Check our EC2 quotas (max instances)
@@ -72,7 +55,6 @@ help         Show available commands
 ids          List the instance IDs belonging to a given tag or token
 ips          List the IP addresses of the VMs for a given tag or token
 kube         Setup kubernetes clusters with kubeadm (must be run AFTER deploy)
-kubetest     Check that all notes are reporting as Ready
 list         List available batches in the current region
 opensg       Open the default security group to ALL ingress traffic
 pull_images  Pre-pull a bunch of Docker images
@@ -81,7 +63,6 @@ start        Start a batch of VMs
 status       List instance status for a given batch
 stop         Stop (terminate, shutdown, kill, remove, destroy...) instances
 test         Run tests (pre-flight checks) on a batch of VMs
-wrap         Run this program in a container
 ```

 ### Summary of What `./workshopctl` Does For You
@@ -94,12 +75,12 @@ wrap         Run this program in a container
 - During `start` it will add your default local SSH key to all instances under the `ubuntu` user.
 - During `deploy` it will create the `docker` user with password `training`, which is printing on the cards for students. For now, this is hard coded.

-### Example Steps to Launch a Batch of AWS Instances for a Workshop
+### Example Steps to Launch a Batch of Instances for a Workshop

 - Run `./workshopctl start N` Creates `N` EC2 instances
  - Your local SSH key will be synced to instances under `ubuntu` user
  - AWS instances will be created and tagged based on date, and IP's stored in `prepare-vms/tags/`
- Run `./workshopctl deploy TAG settings/somefile.yaml` to run `lib/postprep.py` via parallel-ssh
+- Run `./workshopctl deploy TAG settings/somefile.yaml` to run `scripts/postprep.rc` via parallel-ssh
  - If it errors or times out, you should be able to rerun
  - Requires good connection to run all the parallel SSH connections, up to 100 parallel (ProTip: create dedicated management instance in same AWS region where you run all these utils from)
 - Run `./workshopctl pull-images TAG` to pre-pull a bunch of Docker images to the instances
@@ -107,67 +88,6 @@ wrap         Run this program in a container
 - *Have a great workshop*
 - Run `./workshopctl stop TAG` to terminate instances.

-### Example Steps to Launch Azure Instances
-
- Install the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest) and authenticate with a valid account
- Customize `azuredeploy.parameters.json`
-  - Required:
-    - Provide the SSH public key you plan to use for instance configuration
-  - Optional:
-    - Choose a name for the workshop (default is "workshop")
-    - Choose the number of instances (default is 3)
-    - Customize the desired instance size (default is Standard_D1_v2)
- - Launch instances with your chosen resource group name and your preferred region; the examples are "workshop" and "eastus":
-```
-az group create --name workshop --location eastus
-az group deployment create --resource-group workshop --template-file azuredeploy.json --parameters @azuredeploy.parameters.json
-```
-
-The `az group deployment create` command can take several minutes and will only say `- Running ..` until it completes, unless you increase the verbosity with `--verbose` or `--debug`.
-
-To display the IPs of the instances you've launched:
-
-```
-az vm list-ip-addresses --resource-group workshop --output table
-```
-
-If you want to put the IPs into `prepare-vms/tags/<tag>/ips.txt` for a tag of "myworkshop":
-
-1) If you haven't yet installed `jq` and/or created your event's tags directory in `prepare-vms`:
-
-```
-brew install jq
-mkdir -p tags/myworkshop
-```
-
-2) And then generate the IP list:
-
-```
-az vm list-ip-addresses --resource-group workshop --output json | jq -r '.[].virtualMachine.network.publicIpAddresses[].ipAddress' > tags/myworkshop/ips.txt
-```
-
-After the workshop is over, remove the instances:
-
-```
-az group delete --resource-group workshop
-```
-
-### Example Steps to Configure Instances from a non-AWS Source
-
- Launch instances via your preferred method. You'll need to get the instance IPs and be able to ssh into them.
- Set placeholder values for [AWS environment variable settings](#required-environment-variables).
- Choose a tag. It could be an event name, datestamp, etc. Ensure you have created a directory for your tag: `prepare-vms/tags/<tag>/`
- If you have not already generated a file with the IPs to be configured:
-  - The file should be named `prepare-vms/tags/<tag>/ips.txt`
-  - Format is one IP per line, no other info needed.
- Ensure the settings file is as desired (especially the number of nodes): `prepare-vms/settings/kube101.yaml`
- For a tag called `myworkshop`, configure instances: `workshopctl deploy myworkshop settings/kube101.yaml`
- Optionally, configure Kubernetes clusters of the size in the settings: `workshopctl kube myworkshop`
- Optionally, test your Kubernetes clusters. They may take a little time to become ready: `workshopctl kubetest myworkshop`
- Generate cards to print and hand out: `workshopctl cards myworkshop settings/kube101.yaml`
- Print the cards file: `prepare-vms/tags/myworkshop/ips.html`
-
-
 ## Other Tools

 ### Deploying your SSH key to all the machines
@@ -177,6 +97,13 @@ az group delete --resource-group workshop
 - Run `pcopykey`.


+### Installing extra packages
+
+- Source `postprep.rc`.
+  (This will install a few extra packages, add entries to
+  /etc/hosts, generate SSH keys, and deploy them on all hosts.)
+
+
 ## Even More Details

 #### Sync of SSH keys
@@ -205,7 +132,7 @@ Instances can be deployed manually using the `deploy` command:

    $ ./workshopctl deploy TAG settings/somefile.yaml

-The `postprep.py` file will be copied via parallel-ssh to all of the VMs and executed.
+The `postprep.rc` file will be copied via parallel-ssh to all of the VMs and executed.

 #### Pre-pull images

@@ -215,10 +142,6 @@ The `postprep.py` file will be copied via parallel-ssh to all of the VMs and exe

    $ ./workshopctl cards TAG settings/somefile.yaml

-If you want to generate both HTML and PDF cards, install [wkhtmltopdf](https://wkhtmltopdf.org/downloads.html); without that installed, only HTML cards will be generated.
-
-If you don't have `wkhtmltopdf` installed, you will get a warning that it is a missing dependency. If you plan to just print the HTML cards, you can ignore this.
-
 #### List tags

    $ ./workshopctl list
--- a/prepare-vms/azuredeploy.json
+++ b/prepare-vms/azuredeploy.json
@@ -1,250 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "workshopName": {
-      "type": "string",
-      "defaultValue": "workshop",
-      "metadata": {
-        "description": "Workshop name."
-      }
-    },
-    "vmPrefix": {
-      "type": "string",
-      "defaultValue": "node",
-      "metadata": {
-        "description": "Prefix for VM names."
-      }
-    },
-    "numberOfInstances": {
-      "type": "int",
-      "defaultValue": 3,
-      "metadata": {
-        "description": "Number of VMs to create."
-      }
-    },
-    "adminUsername": {
-      "type": "string",
-      "defaultValue": "ubuntu",
-      "metadata": {
-        "description": "Admin username for VMs."
-      }
-    },
-    "sshKeyData": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "SSH rsa public key file as a string."
-      }
-    },
-    "imagePublisher": {
-      "type": "string",
-      "defaultValue": "Canonical",
-      "metadata": {
-        "description": "OS image publisher; default Canonical."
-      }
-    },
-    "imageOffer": {
-      "type": "string",
-      "defaultValue": "UbuntuServer",
-      "metadata": {
-        "description": "The name of the image offer. The default is Ubuntu"
-      }
-    },
-    "imageSKU": {
-      "type": "string",
-      "defaultValue": "16.04-LTS",
-      "metadata": {
-        "description": "Version of the image. The default is 16.04-LTS"
-      }
-    },
-    "vmSize": {
-      "type": "string",
-      "defaultValue": "Standard_D1_v2",
-      "metadata": {
-        "description": "VM Size."
-      }
-    }
-  },
-  "variables": {
-    "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
-    "subnet1Ref": "[concat(variables('vnetID'),'/subnets/',variables('subnet1Name'))]",
-    "vmName": "[parameters('vmPrefix')]",
-    "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
-    "publicIPAddressName": "PublicIP",
-    "publicIPAddressType": "Dynamic",
-    "virtualNetworkName": "MyVNET",
-    "netSecurityGroup": "MyNSG",
-    "addressPrefix": "10.0.0.0/16",
-    "subnet1Name": "subnet-1",
-    "subnet1Prefix": "10.0.0.0/24",
-    "nicName": "myVMNic"
-  },
-  "resources": [
-    {
-      "apiVersion": "2017-11-01",
-      "type": "Microsoft.Network/publicIPAddresses",
-      "name": "[concat(variables('publicIPAddressName'),copyIndex(1))]",
-      "location": "[resourceGroup().location]",
-      "copy": {
-        "name": "publicIPLoop",
-        "count": "[parameters('numberOfInstances')]"
-      },
-      "properties": {
-        "publicIPAllocationMethod": "[variables('publicIPAddressType')]"
-      },
-      "tags": {
-        "workshop": "[parameters('workshopName')]"
-      }
-    },
-    {
-      "apiVersion": "2017-11-01",
-      "type": "Microsoft.Network/virtualNetworks",
-      "name": "[variables('virtualNetworkName')]",
-      "location": "[resourceGroup().location]",
-      "dependsOn": [
-        "[concat('Microsoft.Network/networkSecurityGroups/', variables('netSecurityGroup'))]"
-      ],
-      "properties": {
-        "addressSpace": {
-          "addressPrefixes": [
-            "[variables('addressPrefix')]"
-          ]
-        },
-        "subnets": [
-          {
-            "name": "[variables('subnet1Name')]",
-            "properties": {
-              "addressPrefix": "[variables('subnet1Prefix')]",
-              "networkSecurityGroup": {
-                "id": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('netSecurityGroup'))]"
-              }
-            }
-          }
-        ]
-      },
-      "tags": {
-        "workshop": "[parameters('workshopName')]"
-      }
-    },
-    {
-      "apiVersion": "2017-11-01",
-      "type": "Microsoft.Network/networkInterfaces",
-      "name": "[concat(variables('nicName'),copyIndex(1))]",
-      "location": "[resourceGroup().location]",
-      "copy": {
-        "name": "nicLoop",
-        "count": "[parameters('numberOfInstances')]"
-      },
-      "dependsOn": [
-        "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'),copyIndex(1))]",
-        "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
-      ],
-      "properties": {
-        "ipConfigurations": [
-          {
-            "name": "ipconfig1",
-            "properties": {
-              "privateIPAllocationMethod": "Dynamic",
-              "publicIPAddress": {
-                "id": "[resourceId('Microsoft.Network/publicIPAddresses', concat(variables('publicIPAddressName'), copyIndex(1)))]"
-              },
-              "subnet": {
-                "id": "[variables('subnet1Ref')]"
-              }
-            }
-          }
-        ]
-      },
-      "tags": {
-        "workshop": "[parameters('workshopName')]"
-      }
-    },
-    {
-      "apiVersion": "2017-12-01",
-      "type": "Microsoft.Compute/virtualMachines",
-      "name": "[concat(variables('vmName'),copyIndex(1))]",
-      "location": "[resourceGroup().location]",
-      "copy": {
-        "name": "vmLoop",
-        "count": "[parameters('numberOfInstances')]"
-      },
-      "dependsOn": [
-        "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'), copyIndex(1))]"
-      ],
-      "properties": {
-        "hardwareProfile": {
-          "vmSize": "[parameters('vmSize')]"
-        },
-        "osProfile": {
-          "computerName": "[concat(variables('vmName'),copyIndex(1))]",
-          "adminUsername": "[parameters('adminUsername')]",
-          "linuxConfiguration": {
-            "disablePasswordAuthentication": true,
-            "ssh": {
-              "publicKeys": [
-                {
-                  "path": "[variables('sshKeyPath')]",
-                  "keyData": "[parameters('sshKeyData')]"
-                }
-              ]
-            }
-          }
-        },
-        "storageProfile": {
-          "osDisk": {
-            "createOption": "FromImage"
-          },
-          "imageReference": {
-            "publisher": "[parameters('imagePublisher')]",
-            "offer": "[parameters('imageOffer')]",
-            "sku": "[parameters('imageSKU')]",
-            "version": "latest"
-          }
-        },
-        "networkProfile": {
-          "networkInterfaces": [
-            {
-              "id": "[resourceId('Microsoft.Network/networkInterfaces', concat(variables('nicName'),copyIndex(1)))]"
-            }
-          ]
-        }
-      },
-      "tags": {
-        "workshop": "[parameters('workshopName')]"
-      }
-    },
-    {
-      "apiVersion": "2017-11-01",
-      "type": "Microsoft.Network/networkSecurityGroups",
-      "name": "[variables('netSecurityGroup')]",
-      "location": "[resourceGroup().location]",
-      "tags": {
-        "workshop": "[parameters('workshopName')]"
-      },
-      "properties": {
-        "securityRules": [
-          {
-            "name": "default-open-ports",
-            "properties": {
-              "protocol": "Tcp",
-              "sourcePortRange": "*",
-              "destinationPortRange": "*",
-              "sourceAddressPrefix": "*",
-              "destinationAddressPrefix": "*",
-              "access": "Allow",
-              "priority": 1000,
-              "direction": "Inbound"
-            }
-          }
-        ]
-      }
-    }
-  ],
-  "outputs": {
-    "resourceID": {
-      "type": "string",
-      "value": "[resourceId('Microsoft.Network/publicIPAddresses', concat(variables('publicIPAddressName'),'1'))]"
-    }
-  }
-}
--- a/prepare-vms/azuredeploy.parameters.json
+++ b/prepare-vms/azuredeploy.parameters.json
@@ -1,18 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "sshKeyData": {
-      "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXTIl/M9oeSlcsC5Rfe+nZr4Jc4sl200pSw2lpdxlZ3xzeP15NgSSMJnigUrKUXHfqRQ+2wiPxEf0Odz2GdvmXvR0xodayoOQsO24AoERjeSBXCwqITsfp1bGKzMb30/3ojRBo6LBR6r1+lzJYnNCGkT+IQwLzRIpm0LCNz1j08PUI2aZ04+mcDANvHuN/hwi/THbLLp6SNWN43m9r02RcC6xlCNEhJi4wk4VzMzVbSv9RlLGST2ocbUHwmQ2k9OUmpzoOx73aQi9XNnEaFh2w/eIdXM75VtkT3mRryyykg9y0/hH8/MVmIuRIdzxHQqlm++DLXVH5Ctw6a4kS+ki7 workshop"
-      },
-    "workshopName": {
-      "value": "workshop"
-    },
-    "numberOfInstances": {
-      "value": 3
-    },
-    "vmSize": {
-      "value": "Standard_D1_v2"
-    }
-  }
-}
--- a/prepare-vms/cards.html
+++ b/prepare-vms/cards.html
@@ -12,9 +12,7 @@
    {%- set cluster_or_machine = "cluster" -%}
    {%- set this_or_each = "each" -%}
    {%- set machine_is_or_machines_are = "machines are" -%}
-    {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%}
-    {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%}
-    {%- set image_src = image_src_swarm -%}
+    {%- set image_src = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%}
 {%- endif -%}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
--- a/prepare-vms/clusters.csv
+++ b/prepare-vms/clusters.csv
@@ -1,5 +0,0 @@
-Put your initials in the first column to "claim" a cluster.
-Initials{% for node in clusters[0] %}	node{{ loop.index }}{% endfor %}
-{% for cluster in clusters -%}
-  {%- for node in cluster %}	{{ node|trim }}{% endfor %}
-{% endfor %}
--- a/prepare-vms/cncsetup.sh
+++ b/prepare-vms/cncsetup.sh
@@ -1,21 +0,0 @@
-#!/bin/sh
-if [ $(whoami) != ubuntu ]; then
-  echo "This script should be executed on a freshly deployed node,"
-  echo "with the 'ubuntu' user. Aborting."
-  exit 1
-fi
-if id docker; then
-  sudo userdel -r docker
-fi
-pip install --user awscli jinja2 pdfkit
-sudo apt-get install -y wkhtmltopdf xvfb
-tmux new-session \; send-keys "
-[ -f ~/.ssh/id_rsa ] || ssh-keygen
-
-eval \$(ssh-agent)
-ssh-add
-Xvfb :0 &
-export DISPLAY=:0
-mkdir -p ~/www
-sudo docker run -d -p 80:80 -v \$HOME/www:/usr/share/nginx/html nginx
-"
--- a/prepare-vms/docker-compose.yml
+++ b/prepare-vms/docker-compose.yml
@@ -15,6 +15,5 @@ services:
            AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
            AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
            AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION}
-            AWS_INSTANCE_TYPE: ${AWS_INSTANCE_TYPE}
            USER: ${USER}
        entrypoint: /root/prepare-vms/workshopctl
--- a/prepare-vms/lib/cli.sh
+++ b/prepare-vms/lib/cli.sh
@@ -2,7 +2,7 @@
 _ERR() {
    error "Command $BASH_COMMAND failed (exit status: $?)"
 }
-set -eE
+set -e
 trap _ERR ERR

 die() {
--- a/prepare-vms/lib/commands.sh
+++ b/prepare-vms/lib/commands.sh
@@ -39,10 +39,7 @@ _cmd_cards() {
    need_tag $TAG
    need_settings $SETTINGS

-    # If you're not using AWS, populate the ips.txt file manually
-    if [ ! -f tags/$TAG/ips.txt ]; then
-      aws_get_instance_ips_by_tag $TAG >tags/$TAG/ips.txt
-    fi
+    aws_get_instance_ips_by_tag $TAG >tags/$TAG/ips.txt

    # Remove symlinks to old cards
    rm -f ips.html ips.pdf
@@ -127,7 +124,7 @@ _cmd kube "Setup kubernetes clusters with kubeadm (must be run AFTER deploy)"
 _cmd_kube() {

    # Install packages
-    pssh --timeout 200 "
+    pssh "
    curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg |
    sudo apt-key add - &&
    echo deb http://apt.kubernetes.io/ kubernetes-xenial main |
@@ -137,11 +134,17 @@ _cmd_kube() {
    sudo apt-get install -qy kubelet kubeadm kubectl
    kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl"

+    # Work around https://github.com/kubernetes/kubernetes/issues/53356
+    pssh "
+    if [ ! -f /etc/kubernetes/kubelet.conf ]; then
+        sudo systemctl stop kubelet
+        sudo rm -rf /var/lib/kubelet/pki
+    fi"
+
    # Initialize kube master
-    pssh --timeout 200 "
+    pssh "
    if grep -q node1 /tmp/node && [ ! -f /etc/kubernetes/admin.conf ]; then
-        kubeadm token generate > /tmp/token
-	sudo kubeadm init --token \$(cat /tmp/token)
+        sudo kubeadm init
    fi"

    # Put kubeconfig in ubuntu's and docker's accounts
@@ -154,6 +157,15 @@ _cmd_kube() {
        sudo chown -R docker /home/docker/.kube
    fi"

+    # Get bootstrap token
+    pssh "
+    if grep -q node1 /tmp/node; then
+        TOKEN_NAME=\$(kubectl -n kube-system get secret -o name | grep bootstrap-token)
+        TOKEN_ID=\$(kubectl -n kube-system get \$TOKEN_NAME -o go-template --template '{{ index .data \"token-id\" }}' | base64 -d)
+        TOKEN_SECRET=\$(kubectl -n kube-system get \$TOKEN_NAME -o go-template --template '{{ index .data \"token-secret\" }}' | base64 -d)
+        echo \$TOKEN_ID.\$TOKEN_SECRET >/tmp/token
+    fi"
+
    # Install weave as the pod network
    pssh "
    if grep -q node1 /tmp/node; then
@@ -162,28 +174,15 @@ _cmd_kube() {
    fi"

    # Join the other nodes to the cluster
-    pssh --timeout 200 "
+    pssh "
    if ! grep -q node1 /tmp/node && [ ! -f /etc/kubernetes/kubelet.conf ]; then
        TOKEN=\$(ssh -o StrictHostKeyChecking=no node1 cat /tmp/token)
-        sudo kubeadm join --discovery-token-unsafe-skip-ca-verification --token \$TOKEN node1:6443
+        sudo kubeadm join --token \$TOKEN node1:6443
    fi"

    sep "Done"
 }

-_cmd kubetest "Check that all notes are reporting as Ready"
-_cmd_kubetest() {
-    # There are way too many backslashes in the command below.
-    # Feel free to make that better ♥
-    pssh "
-    set -e
-    if grep -q node1 /tmp/node; then
-      for NODE in \$(awk /\ node/\ {print\ \\\$2} /etc/hosts); do
-        echo \$NODE ; kubectl get nodes | grep -w \$NODE | grep -w Ready
-      done
-    fi"
-}
-
 _cmd ids "List the instance IDs belonging to a given tag or token"
 _cmd_ids() {
    TAG=$1
@@ -281,9 +280,6 @@ _cmd_start() {
    key_name=$(sync_keys)

    AMI=$(_cmd_ami)    # Retrieve the AWS image ID
-    if [ -z "$AMI" ]; then
-        die "I could not find which AMI to use in this region. Try another region?"
-    fi
    TOKEN=$(get_token) # generate a timestamp token for this batch of VMs
    AWS_KEY_NAME=$(make_key_name)

@@ -296,7 +292,7 @@ _cmd_start() {
    result=$(aws ec2 run-instances \
        --key-name $AWS_KEY_NAME \
        --count $COUNT \
-        --instance-type ${AWS_INSTANCE_TYPE-t2.medium} \
+        --instance-type t2.medium \
        --client-token $TOKEN \
        --image-id $AMI)
    reservation_id=$(echo "$result" | head -1 | awk '{print $2}')
@@ -434,7 +430,6 @@ tag_is_reachable() {
 }

 test_tag() {
-    TAG=$1
    ips_file=tags/$TAG/ips.txt
    info "Picking a random IP address in $ips_file to run tests."
    n=$((1 + $RANDOM % $(wc -l <$ips_file)))
--- a/prepare-vms/settings/csv.yaml
+++ b/prepare-vms/settings/csv.yaml
@@ -1,5 +0,0 @@
-# Number of VMs per cluster
-clustersize: 5
-
-# Jinja2 template to use to generate ready-to-cut cards
-cards_template: clusters.csv
--- a/prepare-vms/settings/example.yaml
+++ b/prepare-vms/settings/example.yaml
@@ -1,24 +0,0 @@
-# customize your cluster size, your cards template, and the versions
-
-# Number of VMs per cluster
-clustersize: 5
-
-# Jinja2 template to use to generate ready-to-cut cards
-cards_template: cards.html
-
-# Use "Letter" in the US, and "A4" everywhere else
-paper_size: Letter
-
-# Feel free to reduce this if your printer can handle it
-paper_margin: 0.2in
-
-# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
-# If you print (or generate a PDF) using ips.html, they will be ignored.
-# (The equivalent parameters must be set from the browser's print dialog.)
-
-# This can be "test" or "stable"
-engine_version: test
-
-# These correspond to the version numbers visible on their respective GitHub release pages
-compose_version: 1.18.0
-machine_version: 0.13.0
--- a/prepare-vms/settings/kube101.html
+++ b/prepare-vms/settings/kube101.html
@@ -1,106 +0,0 @@
-{# Feel free to customize or override anything in there! #}
-{%- set url = "http://container.training/" -%}
-{%- set pagesize = 12 -%}
-{%- if clustersize == 1 -%}
-    {%- set workshop_name = "Docker workshop" -%}
-    {%- set cluster_or_machine = "machine" -%}
-    {%- set this_or_each = "this" -%}
-    {%- set machine_is_or_machines_are = "machine is" -%}
-    {%- set image_src = "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png" -%}
-{%- else -%}
-    {%- set workshop_name = "Kubernetes workshop" -%}
-    {%- set cluster_or_machine = "cluster" -%}
-    {%- set this_or_each = "each" -%}
-    {%- set machine_is_or_machines_are = "machines are" -%}
-    {%- set image_src_swarm = "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png" -%}
-    {%- set image_src_kube = "https://avatars1.githubusercontent.com/u/13629408" -%}
-    {%- set image_src = image_src_kube -%}
-{%- endif -%}
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><style>
-body, table {
-    margin: 0;
-    padding: 0;
-    line-height: 1em;
-    font-size: 14px;
-}
-
-table {
-    border-spacing: 0;
-    margin-top: 0.4em;
-    margin-bottom: 0.4em;
-    border-left: 0.8em double grey;
-    padding-left: 0.4em;
-}
-
-div {
-    float: left;
-    border: 1px dotted black;
-    padding-top: 1%;
-    padding-bottom: 1%;
-    /* columns * (width+left+right) < 100% */
-    width: 21.5%;
-    padding-left: 1.5%;
-    padding-right: 1.5%;
-}
-
-p {
-    margin: 0.4em 0 0.4em 0;
-}
-
-img {
-    height: 4em;
-    float: right;
-    margin-right: -0.4em;
-}
-
-.logpass {
-    font-family: monospace;
-    font-weight: bold;
-}
-
-.pagebreak {
-    page-break-after: always;
-    clear: both;
-    display: block;
-    height: 8px;
-}
-</style></head>
-<body>
-{% for cluster in clusters %}
-    {% if loop.index0>0 and loop.index0%pagesize==0 %}
-        <span class="pagebreak"></span>
-    {% endif %}
-    <div>
-
-        <p>
-            Here is the connection information to your very own
-            {{ cluster_or_machine }} for this {{ workshop_name }}.
-            You can connect to {{ this_or_each }} VM with any SSH client.
-        </p>
-        <p>
-            <img src="{{ image_src }}" />
-            <table>
-                <tr><td>login:</td></tr>
-                <tr><td class="logpass">docker</td></tr>
-                <tr><td>password:</td></tr>
-                <tr><td class="logpass">training</td></tr>
-            </table>
-
-        </p>
-        <p>
-            Your {{ machine_is_or_machines_are }}:
-            <table>
-                {% for node in cluster %}
-                <tr><td>node{{ loop.index }}:</td><td>{{ node }}</td></tr>
-                {% endfor %}
-            </table>
-        </p>
-        <p>You can find the slides at:
-            <center>{{ url }}</center>
-        </p>
-    </div>
-{% endfor %}
-</body>
-</html>
--- a/prepare-vms/settings/kube101.yaml
+++ b/prepare-vms/settings/kube101.yaml
@@ -1,24 +0,0 @@
-# 3 nodes for k8s 101 workshops
-
-# Number of VMs per cluster
-clustersize: 3
-
-# Jinja2 template to use to generate ready-to-cut cards
-cards_template: settings/kube101.html
-
-# Use "Letter" in the US, and "A4" everywhere else
-paper_size: Letter
-
-# Feel free to reduce this if your printer can handle it
-paper_margin: 0.2in
-
-# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
-# If you print (or generate a PDF) using ips.html, they will be ignored.
-# (The equivalent parameters must be set from the browser's print dialog.)
-
-# This can be "test" or "stable"
-engine_version: test
-
-# These correspond to the version numbers visible on their respective GitHub release pages
-compose_version: 1.18.0
-machine_version: 0.13.0
--- a/prepare-vms/workshopctl
+++ b/prepare-vms/workshopctl
@@ -38,7 +38,7 @@ check_envvars() {
        if [ -z "${!envvar}" ]; then
            error "Environment variable $envvar is not set."
            if [ "$envvar" = "SSH_AUTH_SOCK" ]; then
-                error "Hint: run 'eval \$(ssh-agent) ; ssh-add' and try again?"
+                error "Hint: run '\$(ssh-agent) ; ssh-add' and try again?"
            fi
            status=1
        fi
--- a/slides/_redirects
+++ b/slides/_redirects
@@ -1 +1 @@
-/* http://paris-container-training.netlify.com/:splat 200!
+/ /kube-halfday.yml.html 200!
--- a/slides/autopilot/autotest.py
+++ b/slides/autopilot/autotest.py
@@ -1,413 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-import click
-import logging
-import os
-import random
-import re
-import select
-import subprocess
-import sys
-import time
-import uuid
-import yaml
-
-
-logging.basicConfig(level=os.environ.get("LOG_LEVEL", "INFO"))
-
-
-TIMEOUT = 60 # 1 minute
-
-
-class State(object):
-
-    def __init__(self):
-        self.interactive = True
-        self.verify_status = False
-        self.simulate_type = True
-        self.slide = 1
-        self.snippet = 0
-
-    def load(self):
-        data = yaml.load(open("state.yaml"))
-        self.interactive = bool(data["interactive"])
-        self.verify_status = bool(data["verify_status"])
-        self.simulate_type = bool(data["simulate_type"])
-        self.slide = int(data["slide"])
-        self.snippet = int(data["snippet"])
-
-    def save(self):
-        with open("state.yaml", "w") as f:
-            yaml.dump(dict(
-                interactive=self.interactive,
-                verify_status=self.verify_status,
-                simulate_type=self.simulate_type,
-                slide=self.slide,
-                snippet=self.snippet,
-                ), f, default_flow_style=False)
-
-
-state = State()
-
-
-def hrule():
-    return "="*int(subprocess.check_output(["tput", "cols"]))
-
-# A "snippet" is something that the user is supposed to do in the workshop.
-# Most of the "snippets" are shell commands.
-# Some of them can be key strokes or other actions.
-# In the markdown source, they are the code sections (identified by triple-
-# quotes) within .exercise[] sections.
-
-class Snippet(object):
-
-    def __init__(self, slide, content):
-        self.slide = slide
-        self.content = content
-        # Extract the "method" (e.g. bash, keys, ...)
-        # On multi-line snippets, the method is alone on the first line
-        # On single-line snippets, the data follows the method immediately
-        if '\n' in content:
-            self.method, self.data = content.split('\n', 1)
-        else:
-            self.method, self.data = content.split(' ', 1)
-        self.data = self.data.strip()
-        self.next = None
-
-    def __str__(self):
-        return self.content
-
-
-class Slide(object):
-
-    current_slide = 0
-
-    def __init__(self, content):
-        self.number = Slide.current_slide
-        Slide.current_slide += 1
-
-        # Remove commented-out slides
-        # (remark.js considers ??? to be the separator for speaker notes)
-        content = re.split("\n\?\?\?\n", content)[0]
-        self.content = content
-
-        self.snippets = []
-        exercises = re.findall("\.exercise\[(.*)\]", content, re.DOTALL)
-        for exercise in exercises:
-            if "```" in exercise:
-                previous = None
-                for snippet_content in exercise.split("```")[1::2]:
-                    snippet = Snippet(self, snippet_content)
-                    if previous:
-                        previous.next = snippet
-                    previous = snippet
-                    self.snippets.append(snippet)
-            else:
-                logging.warning("Exercise on slide {} does not have any ``` snippet."
-                                .format(self.number))
-                self.debug()
-
-    def __str__(self):
-        text = self.content
-        for snippet in self.snippets:
-            text = text.replace(snippet.content, ansi("7")(snippet.content))
-        return text
-
-    def debug(self):
-        logging.debug("\n{}\n{}\n{}".format(hrule(), self.content, hrule()))
-
-
-def focus_slides():
-    subprocess.check_output(["i3-msg", "workspace", "3"])
-    subprocess.check_output(["i3-msg", "workspace", "1"])
-
-def focus_terminal():
-    subprocess.check_output(["i3-msg", "workspace", "2"])
-    subprocess.check_output(["i3-msg", "workspace", "1"])
-
-def focus_browser():
-    subprocess.check_output(["i3-msg", "workspace", "4"])
-    subprocess.check_output(["i3-msg", "workspace", "1"])
-
-
-def ansi(code):
-    return lambda s: "\x1b[{}m{}\x1b[0m".format(code, s)
-
-
-# Sleeps the indicated delay, but interruptible by pressing ENTER.
-# If interrupted, returns True.
-def interruptible_sleep(t):
-    rfds, _, _ = select.select([0], [], [], t)
-    return 0 in rfds
-
-
-def wait_for_string(s, timeout=TIMEOUT):
-    logging.debug("Waiting for string: {}".format(s))
-    deadline = time.time() + timeout
-    while time.time() < deadline:
-        output = capture_pane()
-        if s in output:
-            return
-        if interruptible_sleep(1): return
-    raise Exception("Timed out while waiting for {}!".format(s))
-
-
-def wait_for_prompt():
-    logging.debug("Waiting for prompt.")
-    deadline = time.time() + TIMEOUT
-    while time.time() < deadline:
-        output = capture_pane()
-        # If we are not at the bottom of the screen, there will be a bunch of extra \n's
-        output = output.rstrip('\n')
-        last_line = output.split('\n')[-1]
-        # Our custom prompt on the VMs has two lines; the 2nd line is just '$'
-        if last_line == "$":
-            return
-        # When we are in an alpine container, the prompt will be "/ #"
-        if last_line == "/ #":
-            return
-        # We did not recognize a known prompt; wait a bit and check again
-        logging.debug("Could not find a known prompt on last line: {!r}"
-                      .format(last_line))
-        if interruptible_sleep(1): return
-    raise Exception("Timed out while waiting for prompt!")
-
-
-def check_exit_status():
-    if not state.verify_status:
-        return
-    token = uuid.uuid4().hex
-    data = "echo {} $?\n".format(token)
-    logging.debug("Sending {!r} to get exit status.".format(data))
-    send_keys(data)
-    time.sleep(0.5)
-    wait_for_prompt()
-    screen = capture_pane()
-    status = re.findall("\n{} ([0-9]+)\n".format(token), screen, re.MULTILINE)
-    logging.debug("Got exit status: {}.".format(status))
-    if len(status) == 0:
-        raise Exception("Couldn't retrieve status code {}. Timed out?".format(token))
-    if len(status) > 1:
-        raise Exception("More than one status code {}. I'm seeing double! Shoot them both.".format(token))
-    code = int(status[0])
-    if code != 0:
-        raise Exception("Non-zero exit status: {}.".format(code))
-    # Otherwise just return peacefully.
-
-
-def setup_tmux_and_ssh():
-    if subprocess.call(["tmux", "has-session"]):
-        logging.error("Couldn't connect to tmux. Please setup tmux first.")
-        ipaddr = open("../../prepare-vms/ips.txt").read().split("\n")[0]
-        uid = os.getuid()
-
-        raise Exception("""
-1. If you're running this directly from a node:
-
-tmux
-
-2. If you want to control a remote tmux:
-
-rm -f /tmp/tmux-{uid}/default && ssh -t -L /tmp/tmux-{uid}/default:/tmp/tmux-1001/default docker@{ipaddr} tmux new-session -As 0
-
-3. If you cannot control a remote tmux:
-
-tmux new-session ssh docker@{ipaddr}
-""".format(uid=uid, ipaddr=ipaddr))
-    else:
-        logging.info("Found tmux session. Trying to acquire shell prompt.")
-        wait_for_prompt()
-    logging.info("Successfully connected to test cluster in tmux session.")
-
-
-slides = [Slide("Dummy slide zero")]
-content = open(sys.argv[1]).read()
-
-# OK, this part is definitely hackish, and will break if the
-# excludedClasses parameter is not on a single line.
-excluded_classes = re.findall("excludedClasses: (\[.*\])", content)
-excluded_classes = set(eval(excluded_classes[0]))
-
-for slide in re.split("\n---?\n", content):
-    slide_classes = re.findall("class: (.*)", slide)
-    if slide_classes:
-        slide_classes = slide_classes[0].split(",")
-        slide_classes = [c.strip() for c in slide_classes]
-    if excluded_classes & set(slide_classes):
-        logging.info("Skipping excluded slide.")
-        continue
-    slides.append(Slide(slide))
-
-
-def send_keys(data):
-    if state.simulate_type and data[0] != '^':
-        for key in data:
-            if key == ";":
-                key = "\\;"
-            if key == "\n":
-                if interruptible_sleep(1): return
-            subprocess.check_call(["tmux", "send-keys", key])
-            if interruptible_sleep(0.15*random.random()): return
-            if key == "\n":
-                if interruptible_sleep(1): return
-    else:
-        subprocess.check_call(["tmux", "send-keys", data])
-
-
-def capture_pane():
-    return subprocess.check_output(["tmux", "capture-pane", "-p"]).decode('utf-8')
-
-
-setup_tmux_and_ssh()
-
-
-try:
-    state.load()
-    logging.info("Successfully loaded state from file.")
-    # Let's override the starting state, so that when an error occurs,
-    # we can restart the auto-tester and then single-step or debug.
-    # (Instead of running again through the same issue immediately.)
-    state.interactive = True
-except Exception as e:
-    logging.exception("Could not load state from file.")
-    logging.warning("Using default values.")
-
-def move_forward():
-    state.snippet += 1
-    if state.snippet > len(slides[state.slide].snippets):
-        state.slide += 1
-        state.snippet = 0
-    check_bounds()
-
-
-def move_backward():
-    state.snippet -= 1
-    if state.snippet < 0:
-        state.slide -= 1
-        state.snippet = 0
-    check_bounds()
-
-
-def check_bounds():
-    if state.slide < 1:
-        state.slide = 1
-    if state.slide >= len(slides):
-        state.slide = len(slides)-1
-
-
-while True:
-    state.save()
-    slide = slides[state.slide]
-    snippet = slide.snippets[state.snippet-1] if state.snippet else None
-    click.clear()
-    print("[Slide {}/{}] [Snippet {}/{}] [simulate_type:{}] [verify_status:{}]"
-          .format(state.slide, len(slides)-1,
-                  state.snippet, len(slide.snippets) if slide.snippets else 0,
-                  state.simulate_type, state.verify_status))
-    print(hrule())
-    if snippet:
-        print(slide.content.replace(snippet.content, ansi(7)(snippet.content)))
-        focus_terminal()
-    else:
-        print(slide.content)
-        subprocess.check_output(["./gotoslide.js", str(slide.number)])
-        focus_slides()
-    print(hrule())
-    if state.interactive:
-        print("y/⎵/⏎   Execute snippet or advance to next snippet")
-        print("p/←     Previous")
-        print("n/→     Next")
-        print("s       Simulate keystrokes")
-        print("v       Validate exit status")
-        print("g       Go to a specific slide")
-        print("q       Quit")
-        print("c       Continue non-interactively until next error")
-        command = click.getchar()
-    else:
-        command = "y"
-
-    if command in ("n", "\x1b[C"):
-        move_forward()
-    elif command in ("p", "\x1b[D"):
-        move_backward()
-    elif command == "s":
-        state.simulate_type = not state.simulate_type
-    elif command == "v":
-        state.verify_status = not state.verify_status
-    elif command == "g":
-        state.slide = click.prompt("Enter slide number", type=int)
-        state.snippet = 0
-        check_bounds()
-    elif command == "q":
-        break
-    elif command == "c":
-        # continue until next timeout
-        state.interactive = False
-    elif command in ("y", "\r", " "):
-        if not snippet:
-            # Advance to next snippet
-            # Advance until a slide that has snippets
-            while not slides[state.slide].snippets:
-                move_forward()
-                # But stop if we reach the last slide
-                if state.slide == len(slides)-1:
-                    break
-            # And then advance to the snippet
-            move_forward()
-            continue
-        method, data = snippet.method, snippet.data
-        logging.info("Running with method {}: {}".format(method, data))
-        if method == "keys":
-            send_keys(data)
-        elif method == "bash":
-            # Make sure that we're ready
-            wait_for_prompt()
-            # Strip leading spaces
-            data = re.sub("\n +", "\n", data)
-            # Remove backticks (they are used to highlight sections)
-            data = data.replace('`', '')
-            # Add "RETURN" at the end of the command :)
-            data += "\n"
-            # Send command
-            send_keys(data)
-            # Force a short sleep to avoid race condition
-            time.sleep(0.5)
-            if snippet.next and snippet.next.method == "wait":
-                wait_for_string(snippet.next.data)
-            elif snippet.next and snippet.next.method == "longwait":
-                wait_for_string(snippet.next.data, 10*TIMEOUT)
-            else:
-                wait_for_prompt()
-                # Verify return code
-                check_exit_status()
-        elif method == "copypaste":
-            screen = capture_pane()
-            matches = re.findall(data, screen, flags=re.DOTALL)
-            if len(matches) == 0:
-                raise Exception("Could not find regex {} in output.".format(data))
-            # Arbitrarily get the most recent match
-            match = matches[-1]
-            # Remove line breaks (like a screen copy paste would do)
-            match = match.replace('\n', '')
-            send_keys(match + '\n')
-            # FIXME: we should factor out the "bash" method
-            wait_for_prompt()
-            check_exit_status()
-        elif method == "open":
-            # Cheap way to get node1's IP address
-            screen = capture_pane()
-            ipaddr = re.findall("^\[(.*)\]", screen, re.MULTILINE)[-1]
-            url = data.replace("/node1", "/{}".format(ipaddr))
-            # This should probably be adapted to run on different OS
-            subprocess.check_output(["xdg-open", url])
-            focus_browser()
-            if state.interactive:
-                print("Press any key to continue to next step...")
-                click.getchar()
-        else:
-            logging.warning("Unknown method {}: {!r}".format(method, data))
-        move_forward()
-
-    else:
-        logging.warning("Unknown command {}.".format(command))
--- a/slides/autopilot/gotoslide.js
+++ b/slides/autopilot/gotoslide.js
@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-
-/* Expects a slide number as first argument.
- * Will connect to the local pub/sub server,
- * and issue a "go to slide X" command, which
- * will be sent to all connected browsers.
- */
-
-var io = require('socket.io-client');
-var socket = io('http://localhost:3000');
-socket.on('connect_error', function(){ 
-  console.log('connection error');
-  socket.close();
-});
-socket.emit('slide change', process.argv[2], function(){
-  socket.close();
-});
--- a/slides/autopilot/package-lock.json
+++ b/slides/autopilot/package-lock.json
@@ -1,603 +0,0 @@
-{
-  "name": "container-training-pub-sub-server",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "accepts": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
-      "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
-      "requires": {
-        "mime-types": "2.1.17",
-        "negotiator": "0.6.1"
-      }
-    },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "arraybuffer.slice": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
-      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco="
-    },
-    "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
-    },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
-    },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY="
-    },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "requires": {
-        "callsite": "1.0.0"
-      }
-    },
-    "blob": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
-      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
-    },
-    "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-      "requires": {
-        "bytes": "3.0.0",
-        "content-type": "1.0.4",
-        "debug": "2.6.9",
-        "depd": "1.1.1",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
-        "type-is": "1.6.15"
-      }
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-    },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
-    },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
-    },
-    "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-    },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "depd": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
-      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA="
-    },
-    "engine.io": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz",
-      "integrity": "sha1-PQIRtwpVLOhB/8fahiezAamkFi4=",
-      "requires": {
-        "accepts": "1.3.3",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "2.6.9",
-        "engine.io-parser": "2.1.1",
-        "uws": "0.14.5",
-        "ws": "3.3.3"
-      },
-      "dependencies": {
-        "accepts": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
-          "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
-          "requires": {
-            "mime-types": "2.1.17",
-            "negotiator": "0.6.1"
-          }
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz",
-      "integrity": "sha1-T88TcLRxY70s6b4nM5ckMDUNTqE=",
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "2.6.9",
-        "engine.io-parser": "2.1.1",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "3.3.3",
-        "xmlhttprequest-ssl": "1.5.4",
-        "yeast": "0.1.2"
-      }
-    },
-    "engine.io-parser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz",
-      "integrity": "sha1-4Ps/DgRi9/WLt3waUun1p+JuRmg=",
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "0.0.6",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.4",
-        "has-binary2": "1.0.2"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "express": {
-      "version": "4.16.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
-      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
-      "requires": {
-        "accepts": "1.3.4",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.18.2",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "1.1.1",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.1.0",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.2",
-        "qs": "6.5.1",
-        "range-parser": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "send": "0.16.1",
-        "serve-static": "1.13.1",
-        "setprototypeof": "1.1.0",
-        "statuses": "1.3.1",
-        "type-is": "1.6.15",
-        "utils-merge": "1.0.1",
-        "vary": "1.1.2"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.3.1",
-        "unpipe": "1.0.0"
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "has-binary2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
-      "integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=",
-      "requires": {
-        "isarray": "2.0.1"
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-    },
-    "http-errors": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-      "requires": {
-        "depd": "1.1.1",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.0.3",
-        "statuses": "1.3.1"
-      },
-      "dependencies": {
-        "setprototypeof": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
-        }
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "ipaddr.js": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
-      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A="
-    },
-    "isarray": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "requires": {
-        "mime-db": "1.30.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
-    },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "requires": {
-        "better-assert": "1.0.2"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "requires": {
-        "better-assert": "1.0.2"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "proxy-addr": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
-      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
-      "requires": {
-        "forwarded": "0.1.2",
-        "ipaddr.js": "1.5.2"
-      }
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
-    },
-    "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "unpipe": "1.0.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "send": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
-      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "1.1.1",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.3.1"
-      }
-    },
-    "serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
-      "requires": {
-        "encodeurl": "1.0.1",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.2",
-        "send": "0.16.1"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
-    "socket.io": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz",
-      "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
-      "requires": {
-        "debug": "2.6.9",
-        "engine.io": "3.1.4",
-        "socket.io-adapter": "1.1.1",
-        "socket.io-client": "2.0.4",
-        "socket.io-parser": "3.1.2"
-      }
-    },
-    "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
-    },
-    "socket.io-client": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
-      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
-      "requires": {
-        "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "2.6.9",
-        "engine.io-client": "3.1.4",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "3.1.2",
-        "to-array": "0.1.4"
-      }
-    },
-    "socket.io-parser": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz",
-      "integrity": "sha1-28IoIVH8T6675Aru3Ady66YZ9/I=",
-      "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "2.6.9",
-        "has-binary2": "1.0.2",
-        "isarray": "2.0.1"
-      }
-    },
-    "statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4="
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
-    },
-    "type-is": {
-      "version": "1.6.15",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
-      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "2.1.17"
-      }
-    },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "uws": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz",
-      "integrity": "sha1-Z6rzPEaypYel9mZtAPdpEyjxSdw=",
-      "optional": true
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
-    "ws": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-      "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.1",
-        "ultron": "1.1.1"
-      }
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz",
-      "integrity": "sha1-BPVgkVcks4kIhxXMDteBPpZ3v1c="
-    },
-    "yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
-    }
-  }
-}
--- a/slides/autopilot/package.json
+++ b/slides/autopilot/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "container-training-pub-sub-server",
-  "version": "0.0.1",
-  "dependencies": {
-    "express": "^4.16.2",
-    "socket.io": "^2.0.4"
-  }
-}
--- a/slides/autopilot/remote.js
+++ b/slides/autopilot/remote.js
@@ -1,21 +0,0 @@
-/* This snippet is loaded from the workshop HTML file.
- * It sets up callbacks to synchronize the local slide
- * number with the remote pub/sub server.
- */
-
-var socket = io();
-var leader = true;
-
-slideshow.on('showSlide', function (slide) {
-  if (leader) {
-    var n = slide.getSlideIndex()+1;
-    socket.emit('slide change', n);
-  }
-});
-
-socket.on('slide change', function (n) {
-  leader = false;
-  slideshow.gotoSlide(n);
-  leader = true;
-});
-
--- a/slides/autopilot/server.js
+++ b/slides/autopilot/server.js
@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-/* This is a very simple pub/sub server, allowing to
- * remote control browsers displaying the slides.
- * The browsers connect to this pub/sub server using
- * Socket.IO, and the server tells them which slides
- * to display.
- *
- * The server can be controlled with a little CLI,
- * or by one of the browsers.
- */
-
-var express = require('express');
-var app = express();
-var http = require('http').Server(app);
-var io = require('socket.io')(http);
-
-app.get('/', function(req, res){
-  res.send('container.training autopilot pub/sub server');
-});
-
-/* Serve remote.js from the current directory */
-app.use(express.static('.'));
-
-/* Serve slides etc. from current and the parent directory */
-app.use(express.static('..'));
-
-io.on('connection', function(socket){
-  console.log('a client connected: ' + socket.handshake.address);
-  socket.on('slide change', function(n, ack){
-    console.log('slide change: ' + n);
-    socket.broadcast.emit('slide change', n);
-    if (typeof ack === 'function') {
-      ack();
-    }
-  });
-});
-
-http.listen(3000, function(){
-  console.log('listening on *:3000');
-});
--- a/slides/autopilot/tmux-style.sh
+++ b/slides/autopilot/tmux-style.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-# This removes the clock (and other extraneous stuff) from the
-# tmux status bar, and it gives it a non-default color.
-tmux set-option -g status-left ""
-tmux set-option -g status-right ""
-tmux set-option -g status-style bg=cyan
-
--- a/slides/autotest.py
+++ b/slides/autotest.py
@@ -0,0 +1,279 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+import click
+import logging
+import os
+import random
+import re
+import subprocess
+import sys
+import time
+import uuid
+
+logging.basicConfig(level=os.environ.get("LOG_LEVEL", "INFO"))
+
+interactive = True
+verify_status = False
+simulate_type = True
+
+TIMEOUT = 60 # 1 minute
+
+
+def hrule():
+    return "="*int(subprocess.check_output(["tput", "cols"]))
+
+# A "snippet" is something that the user is supposed to do in the workshop.
+# Most of the "snippets" are shell commands.
+# Some of them can be key strokes or other actions.
+# In the markdown source, they are the code sections (identified by triple-
+# quotes) within .exercise[] sections.
+
+class Snippet(object):
+
+    def __init__(self, slide, content):
+        self.slide = slide
+        self.content = content
+        self.actions = []
+
+    def __str__(self):
+        return self.content
+
+
+class Slide(object):
+
+    current_slide = 0
+
+    def __init__(self, content):
+        Slide.current_slide += 1
+        self.number = Slide.current_slide
+
+        # Remove commented-out slides
+        # (remark.js considers ??? to be the separator for speaker notes)
+        content = re.split("\n\?\?\?\n", content)[0]
+        self.content = content
+
+        self.snippets = []
+        exercises = re.findall("\.exercise\[(.*)\]", content, re.DOTALL)
+        for exercise in exercises:
+            if "```" in exercise:
+                for snippet in exercise.split("```")[1::2]:
+                    self.snippets.append(Snippet(self, snippet))
+            else:
+                logging.warning("Exercise on slide {} does not have any ``` snippet."
+                                .format(self.number))
+                self.debug()
+
+    def __str__(self):
+        text = self.content
+        for snippet in self.snippets:
+            text = text.replace(snippet.content, ansi("7")(snippet.content))
+        return text
+
+    def debug(self):
+        logging.debug("\n{}\n{}\n{}".format(hrule(), self.content, hrule()))
+
+
+def ansi(code):
+    return lambda s: "\x1b[{}m{}\x1b[0m".format(code, s)
+
+
+def wait_for_string(s, timeout=TIMEOUT):
+    logging.debug("Waiting for string: {}".format(s))
+    deadline = time.time() + timeout
+    while time.time() < deadline:
+        output = capture_pane()
+        if s in output:
+            return
+        time.sleep(1)
+    raise Exception("Timed out while waiting for {}!".format(s))
+
+
+def wait_for_prompt():
+    logging.debug("Waiting for prompt.")
+    deadline = time.time() + TIMEOUT
+    while time.time() < deadline:
+        output = capture_pane()
+        # If we are not at the bottom of the screen, there will be a bunch of extra \n's
+        output = output.rstrip('\n')
+        if output.endswith("\n$"):
+            return
+        if output.endswith("\n/ #"):
+            return
+        time.sleep(1)
+    raise Exception("Timed out while waiting for prompt!")
+
+
+def check_exit_status():
+    if not verify_status:
+        return
+    token = uuid.uuid4().hex
+    data = "echo {} $?\n".format(token)
+    logging.debug("Sending {!r} to get exit status.".format(data))
+    send_keys(data)
+    time.sleep(0.5)
+    wait_for_prompt()
+    screen = capture_pane()
+    status = re.findall("\n{} ([0-9]+)\n".format(token), screen, re.MULTILINE)
+    logging.debug("Got exit status: {}.".format(status))
+    if len(status) == 0:
+        raise Exception("Couldn't retrieve status code {}. Timed out?".format(token))
+    if len(status) > 1:
+        raise Exception("More than one status code {}. I'm seeing double! Shoot them both.".format(token))
+    code = int(status[0])
+    if code != 0:
+        raise Exception("Non-zero exit status: {}.".format(code))
+    # Otherwise just return peacefully.
+
+
+def setup_tmux_and_ssh():
+    if subprocess.call(["tmux", "has-session"]):
+        logging.info("Couldn't connect to tmux. A new tmux session will be created.")
+        subprocess.check_call(["tmux", "new-session", "-d"])
+        wait_for_string("$")
+        send_keys("cd ../prepare-vms\n")
+        send_keys("ssh docker@$(head -n1 ips.txt)\n")
+        wait_for_string("password:")
+        send_keys("training\n")
+        wait_for_prompt()
+    else:
+        logging.info("Found tmux session. Trying to acquire shell prompt.")
+        wait_for_prompt()
+    logging.info("Successfully connected to test cluster in tmux session.")
+
+
+
+slides = []
+content = open(sys.argv[1]).read()
+for slide in re.split("\n---?\n", content):
+    slides.append(Slide(slide))
+
+actions = []
+for slide in slides:
+    for snippet in slide.snippets:
+        content = snippet.content
+        # Extract the "method" (e.g. bash, keys, ...)
+        # On multi-line snippets, the method is alone on the first line
+        # On single-line snippets, the data follows the method immediately
+        if '\n' in content:
+            method, data = content.split('\n', 1)
+        else:
+            method, data = content.split(' ', 1)
+        actions.append((slide, snippet, method, data))
+
+
+def send_keys(data):
+    if simulate_type and data[0] != '^':
+        for key in data:
+            if key == ";":
+                key = "\\;"
+            subprocess.check_call(["tmux", "send-keys", key])
+            time.sleep(0.1*random.random())
+    else:
+        subprocess.check_call(["tmux", "send-keys", data])
+
+def capture_pane():
+    return subprocess.check_output(["tmux", "capture-pane", "-p"])
+
+
+setup_tmux_and_ssh()
+
+
+try:
+    i = int(open("nextstep").read())
+    logging.info("Loaded next step ({}) from file.".format(i))
+except Exception as e:
+    logging.warning("Could not read nextstep file ({}), initializing to 0.".format(e))
+    i = 0
+
+while i < len(actions):
+    with open("nextstep", "w") as f:
+        f.write(str(i))
+    slide, snippet, method, data = actions[i]
+
+    # Remove extra spaces (we don't want them in the terminal) and carriage returns
+    data = data.strip()
+
+    print(hrule())
+    print(slide.content.replace(snippet.content, ansi(7)(snippet.content)))
+    print(hrule())
+    if interactive:
+        print("[{}/{}] Shall we execute that snippet above?".format(i, len(actions)))
+        print("y/⏎/→   Execute snippet")
+        print("s       Skip snippet")
+        print("g       Go to a specific snippet")
+        print("q       Quit")
+        print("c       Continue non-interactively until next error")
+        command = click.getchar()
+    else:
+        command = "y"
+
+    # For now, remove the `highlighted` sections
+    # (Make sure to use $() in shell snippets!)
+    if '`' in data:
+        logging.info("Stripping ` from snippet.")
+        data = data.replace('`', '')
+
+    if command == "s":
+        i += 1
+    elif command == "g":
+        i = click.prompt("Enter snippet number", type=int)
+    elif command == "q":
+        break
+    elif command == "c":
+        # continue until next timeout
+        interactive = False
+    elif command in ("y", "\r", " ", "\x1b[C"):
+        logging.info("Running with method {}: {}".format(method, data))
+        if method == "keys":
+            send_keys(data)
+        elif method == "bash":
+            # Make sure that we're ready
+            wait_for_prompt()
+            # Strip leading spaces
+            data = re.sub("\n +", "\n", data)
+            # Add "RETURN" at the end of the command :)
+            data += "\n"
+            # Send command
+            send_keys(data)
+            # Force a short sleep to avoid race condition
+            time.sleep(0.5)
+            _, _, next_method, next_data = actions[i+1]
+            if next_method == "wait":
+                wait_for_string(next_data)
+            elif next_method == "longwait":
+                wait_for_string(next_data, 10*TIMEOUT)
+            else:
+                wait_for_prompt()
+                # Verify return code FIXME should be optional
+                check_exit_status()
+        elif method == "copypaste":
+            screen = capture_pane()
+            matches = re.findall(data, screen, flags=re.DOTALL)
+            if len(matches) == 0:
+                raise Exception("Could not find regex {} in output.".format(data))
+            # Arbitrarily get the most recent match
+            match = matches[-1]
+            # Remove line breaks (like a screen copy paste would do)
+            match = match.replace('\n', '')
+            send_keys(match + '\n')
+            # FIXME: we should factor out the "bash" method
+            wait_for_prompt()
+            check_exit_status()
+        elif method == "open":
+            # Cheap way to get node1's IP address
+            screen = capture_pane()
+            ipaddr = re.findall("^\[(.*)\]", screen, re.MULTILINE)[-1]
+            url = data.replace("/node1", "/{}".format(ipaddr))
+            # This should probably be adapted to run on different OS
+            subprocess.check_call(["open", url])
+        else:
+            logging.warning("Unknown method {}: {!r}".format(method, data))
+        i += 1
+
+    else:
+        logging.warning("Unknown command {}.".format(command))
+
+# Reset slide counter
+with open("nextstep", "w") as f:
+    f.write(str(0))
--- a/slides/common/about-slides.md
+++ b/slides/common/about-slides.md
@@ -1,28 +0,0 @@
-## About these slides
-
- All the content is available in a public GitHub repository:
-
-  https://github.com/jpetazzo/container.training
-
- You can get updated "builds" of the slides there:
-
-  http://container.training/
-
-<!--
-.exercise[
-```open https://github.com/jpetazzo/container.training```
-```open http://container.training/```
-]
-->
-
--
-
- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ...
-
-.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]
-
-<!--
-.exercise[
-```open https://github.com/jpetazzo/container.training/tree/master/slides/common/about-slides.md```
-]
-->
--- a/slides/common/composedown.md
+++ b/slides/common/composedown.md
@@ -1,12 +0,0 @@
-## Clean up
-
- Before moving on, let's remove those containers
-
-.exercise[
-
- Tell Compose to remove everything:
-  ```bash
-  docker-compose down
-  ```
-
-]
--- a/slides/common/composescale.md
+++ b/slides/common/composescale.md
@@ -1,240 +0,0 @@
-## Restarting in the background
-
- Many flags and commands of Compose are modeled after those of `docker`
-
-.exercise[
-
- Start the app in the background with the `-d` option:
-  ```bash
-  docker-compose up -d
-  ```
-
- Check that our app is running with the `ps` command:
-  ```bash
-  docker-compose ps
-  ```
-
-]
-
-`docker-compose ps` also shows the ports exposed by the application.
-
---
-
-class: extra-details
-
-## Viewing logs
-
- The `docker-compose logs` command works like `docker logs`
-
-.exercise[
-
- View all logs since container creation and exit when done:
-  ```bash
-  docker-compose logs
-  ```
-
- Stream container logs, starting at the last 10 lines for each container:
-  ```bash
-  docker-compose logs --tail 10 --follow
-  ```
-
-<!--
-```wait units of work done```
-```keys ^C```
-->
-
-]
-
-Tip: use `^S` and `^Q` to pause/resume log output.
-
---
-
-class: extra-details
-
-## Upgrading from Compose 1.6
-
-.warning[The `logs` command has changed between Compose 1.6 and 1.7!]
-
- Up to 1.6
-
-  - `docker-compose logs` is the equivalent of `logs --follow`
-
-  - `docker-compose logs` must be restarted if containers are added
-
- Since 1.7
-
-  - `--follow` must be specified explicitly
-
-  - new containers are automatically picked up by `docker-compose logs`
-
---
-
-## Scaling up the application
-
- Our goal is to make that performance graph go up (without changing a line of code!)
-
--
-
- Before trying to scale the application, we'll figure out if we need more resources
-
-  (CPU, RAM...)
-
- For that, we will use good old UNIX tools on our Docker node
-
---
-
-## Looking at resource usage
-
- Let's look at CPU, memory, and I/O usage
-
-.exercise[
-
- run `top` to see CPU and memory usage (you should see idle cycles)
-
-<!--
-```bash top```
-
-```wait Tasks```
-```keys ^C```
-->
-
- run `vmstat 1` to see I/O usage (si/so/bi/bo)
-  <br/>(the 4 numbers should be almost zero, except `bo` for logging)
-
-<!--
-```bash vmstat 1```
-
-```wait memory```
-```keys ^C```
-->
-
-]
-
-We have available resources.
-
- Why?
- How can we use them?
-
---
-
-## Scaling workers on a single node
-
- Docker Compose supports scaling
- Let's scale `worker` and see what happens!
-
-.exercise[
-
- Start one more `worker` container:
-  ```bash
-  docker-compose scale worker=2
-  ```
-
- Look at the performance graph (it should show a x2 improvement)
-
- Look at the aggregated logs of our containers (`worker_2` should show up)
-
- Look at the impact on CPU load with e.g. top (it should be negligible)
-
-]
-
---
-
-## Adding more workers
-
- Great, let's add more workers and call it a day, then!
-
-.exercise[
-
- Start eight more `worker` containers:
-  ```bash
-  docker-compose scale worker=10
-  ```
-
- Look at the performance graph: does it show a x10 improvement?
-
- Look at the aggregated logs of our containers
-
- Look at the impact on CPU load and memory usage
-
-]
-
---
-
-# Identifying bottlenecks
-
- You should have seen a 3x speed bump (not 10x)
-
- Adding workers didn't result in linear improvement
-
- *Something else* is slowing us down
-
--
-
- ... But what?
-
--
-
- The code doesn't have instrumentation
-
- Let's use state-of-the-art HTTP performance analysis!
-  <br/>(i.e. good old tools like `ab`, `httping`...)
-
---
-
-## Accessing internal services
-
- `rng` and `hasher` are exposed on ports 8001 and 8002
-
- This is declared in the Compose file:
-
-  ```yaml
-    ...
-    rng:
-      build: rng
-      ports:
-      - "8001:80"
-
-    hasher:
-      build: hasher
-      ports:
-      - "8002:80"
-    ...
-  ```
-
---
-
-## Measuring latency under load
-
-We will use `httping`.
-
-.exercise[
-
- Check the latency of `rng`:
-  ```bash
-  httping -c 3 localhost:8001
-  ```
-
- Check the latency of `hasher`:
-  ```bash
-  httping -c 3 localhost:8002
-  ```
-
-]
-
-`rng` has a much higher latency than `hasher`.
-
---
-
-## Let's draw hasty conclusions
-
- The bottleneck seems to be `rng`
-
- *What if* we don't have enough entropy and can't generate enough random numbers?
-
- We need to scale out the `rng` service on multiple machines!
-
-Note: this is a fiction! We have enough entropy. But we need a pretext to scale out.
-
-(In fact, the code of `rng` uses `/dev/urandom`, which never runs out of entropy...
-<br/>
-...and is [just as good as `/dev/random`](http://www.slideshare.net/PacSecJP/filippo-plain-simple-reality-of-entropy).)
--- a/slides/common/intro.md
+++ b/slides/common/intro.md
@@ -35,4 +35,24 @@ class: self-paced
  <br/>you will be given specific instructions to access your cluster

 - If you are doing this on your own:
-  <br/>the first chapter will give you various options to get your own cluster
+  <br/>the first chapter will give you various options like
+  [Play-With-Docker](http://www.play-with-docker.com/)
+  to get your own cluster
+
+---
+
+## About these slides
+
+- All the content is available in a public GitHub repository:
+
+  https://github.com/jpetazzo/container.training
+
+- You can get updated "builds" of the slides there:
+
+  http://container.training/
+
+- Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ...
+
+--
+
+.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]
--- a/slides/common/prereqs.md
+++ b/slides/common/prereqs.md
@@ -24,33 +24,13 @@ class: extra-details

 ## Extra details

- This slide has a little magnifying glass in the top left corner
+- This slide should have a little magnifying glass in the top left corner

- This magnifiying glass indicates slides that provide extra details
+  (If it doesn't, it's because CSS is hard — Jérôme is only a backend person, alas)

- Feel free to skip them if:
+- Slides with that magnifying glass indicate slides providing extra details

-  - you are in a hurry
-
-  - you are new to this and want to avoid cognitive overload
-
-  - you want only the most essential information
-
- You can review these slides another time if you want, they'll be waiting for you ☺
-
---
-
-class: title
-
-*Tell me and I forget.*
-<br/>
-*Teach me and I remember.*
-<br/>
-*Involve me and I learn.*
-
-Misattributed to Benjamin Franklin
-
-[(Probably inspired by Chinese Confucian philosopher Xunzi)](https://www.barrypopik.com/index.php/new_york_city/entry/tell_me_and_i_forget_teach_me_and_i_may_remember_involve_me_and_i_will_lear/)
+- Feel free to skip them if you're in a hurry!

 ---

@@ -70,9 +50,7 @@ Misattributed to Benjamin Franklin

 - Go to [container.training](http://container.training/) to view these slides

- Join the chat room: @@CHAT@@
-
-<!-- ```open http://container.training/``` -->
+- Join the chat room on @@CHAT@@

 ]

@@ -86,15 +64,15 @@ class: in-person

 class: in-person, pic

-![You get a cluster](images/you-get-a-cluster.jpg)
+![You get five VMs](images/you-get-five-vms.jpg)

 ---

 class: in-person

-## You get a cluster of cloud VMs
+## You get five VMs

- Each person gets a private cluster of cloud VMs (not shared with anybody else)
+- Each person gets 5 private VMs (not shared with anybody else)

 - They'll remain up for the duration of the workshop

@@ -159,7 +137,7 @@ class: in-person

 <!--
 ```bash
-for N in $(awk '/node/{print $2}' /etc/hosts); do
+for N in $(seq 1 5); do
  ssh -o StrictHostKeyChecking=no node$N true
 done
 ```
@@ -175,7 +153,7 @@ fi
  ```bash
  ssh node2
  ```
- Type `exit` or `^D` to come back to `node1`
+- Type `exit` or `^D` to come back to node1

 <!-- ```bash exit``` -->

@@ -205,32 +183,6 @@ If anything goes wrong — ask for help!

 ---

-class: self-paced
-
-## Get your own Docker nodes
-
- If you already have some Docker nodes: great!
-
- If not: let's get some thanks to Play-With-Docker
-
-.exercise[
-
- Go to http://www.play-with-docker.com/
-
- Log in
-
- Create your first node
-
-<!-- ```open http://www.play-with-docker.com/``` -->
-
-]
-
-You will need a Docker ID to use Play-With-Docker.
-
-(Creating a Docker ID is free.)
-
---
-
 ## We will (mostly) interact with node1 only

 *These remarks apply only when using multiple nodes, of course.*
--- a/slides/common/sampleapp.md
+++ b/slides/common/sampleapp.md
@@ -39,15 +39,21 @@ class: extra-details

 ---

-## Service discovery in container-land
+## Links, naming, and service discovery

- We do not hard-code IP addresses in the code
+- Containers can have network aliases (resolvable through DNS)

- We do not hard-code FQDN in the code, either
+- Compose file version 2+ makes each container reachable through its service name

- We just connect to a service name, and container-magic does the rest
+- Compose file version 1 did require "links" sections

-  (And by container-magic, we mean "a crafty, dynamic, embedded DNS server")
+- Our code can connect to services using their short name
+
+  (instead of e.g. IP address or FQDN)
+
+- Network aliases are automatically namespaced
+
+  (i.e. you can have multiple apps declaring and using a service named `database`)

 ---

@@ -74,26 +80,6 @@ https://github.com/jpetazzo/container.training/blob/8279a3bce9398f7c1a53bdd95187

 ---

-class: extra-details
-
-## Links, naming, and service discovery
-
- Containers can have network aliases (resolvable through DNS)
-
- Compose file version 2+ makes each container reachable through its service name
-
- Compose file version 1 did require "links" sections
-
- Network aliases are automatically namespaced
-
-  - you can have multiple apps declaring and using a service named `database`
-
-  - containers in the blue app will resolve `database` to the IP of the blue database
-
-  - containers in the green app will resolve `database` to the IP of the green database
-
---
-
 ## What's this application?

 --
@@ -165,6 +151,7 @@ Without further ado, let's start our application.

 <!--
 ```longwait units of work done```
+```keys ^C```
 -->

 ]
@@ -175,22 +162,100 @@ and displays aggregated logs.

 ---

-## Our application at work
+## Lots of logs

- On the left-hand side, the "rainbow strip" shows the container names
-
- On the right-hand side, we see the output of our containers
+- The application continuously generates logs

 - We can see the `worker` service making requests to `rng` and `hasher`

- For `rng` and `hasher`, we see HTTP access logs
+- Let's put that in the background
+
+.exercise[
+
+- Stop the application by hitting `^C`
+
+]
+
+- `^C` stops all containers by sending them the `TERM` signal
+
+- Some containers exit immediately, others take longer
+  <br/>(because they don't handle `SIGTERM` and end up being killed after a 10s timeout)
+
+---
+
+## Restarting in the background
+
+- Many flags and commands of Compose are modeled after those of `docker`
+
+.exercise[
+
+- Start the app in the background with the `-d` option:
+  ```bash
+  docker-compose up -d
+  ```
+
+- Check that our app is running with the `ps` command:
+  ```bash
+  docker-compose ps
+  ```
+
+]
+
+`docker-compose ps` also shows the ports exposed by the application.
+
+---
+
+class: extra-details
+
+## Viewing logs
+
+- The `docker-compose logs` command works like `docker logs`
+
+.exercise[
+
+- View all logs since container creation and exit when done:
+  ```bash
+  docker-compose logs
+  ```
+
+- Stream container logs, starting at the last 10 lines for each container:
+  ```bash
+  docker-compose logs --tail 10 --follow
+  ```
+
+<!--
+```wait units of work done```
+```keys ^C```
+-->
+
+]
+
+Tip: use `^S` and `^Q` to pause/resume log output.
+
+---
+
+class: extra-details
+
+## Upgrading from Compose 1.6
+
+.warning[The `logs` command has changed between Compose 1.6 and 1.7!]
+
+- Up to 1.6
+
+  - `docker-compose logs` is the equivalent of `logs --follow`
+
+  - `docker-compose logs` must be restarted if containers are added
+
+- Since 1.7
+
+  - `--follow` must be specified explicitly
+
+  - new containers are automatically picked up by `docker-compose logs`

 ---

 ## Connecting to the web UI

- "Logs are exciting and fun!" (No-one, ever)
-
 - The `webui` container exposes a web dashboard; let's view it

 .exercise[
@@ -229,7 +294,7 @@ work on a local environment, or when using Docker4Mac or Docker4Windows.

 How to fix this?

-Stop the app with `^C`, edit `dockercoins.yml`, comment out the `volumes` section, and try again.
+Edit `dockercoins.yml` and comment out the `volumes` section, and try again.

 ---

@@ -273,31 +338,191 @@ class: extra-details

 class: extra-details

- "I'm clearly incapable of writing good frontend code!" 😀 — Jérôme
+- Jérôme is clearly incapable of writing good frontend code

 ---

-## Stopping the application
+## Scaling up the application

- If we interrupt Compose (with `^C`), it will politely ask the Docker Engine to stop the app
+- Our goal is to make that performance graph go up (without changing a line of code!)

- The Docker Engine will send a `TERM` signal to the containers
+--

- If the containers do not exit in a timely manner, the Engine sends a `KILL` signal
+- Before trying to scale the application, we'll figure out if we need more resources
+
+  (CPU, RAM...)
+
+- For that, we will use good old UNIX tools on our Docker node
+
+---
+
+## Looking at resource usage
+
+- Let's look at CPU, memory, and I/O usage

 .exercise[

- Stop the application by hitting `^C`
+- run `top` to see CPU and memory usage (you should see idle cycles)

 <!--
+```bash top```
+
+```wait Tasks```
+```keys ^C```
+-->
+
+- run `vmstat 1` to see I/O usage (si/so/bi/bo)
+  <br/>(the 4 numbers should be almost zero, except `bo` for logging)
+
+<!--
+```bash vmstat 1```
+
+```wait memory```
 ```keys ^C```
 -->

 ]

+We have available resources.
+
+- Why?
+- How can we use them?
+
+---
+
+## Scaling workers on a single node
+
+- Docker Compose supports scaling
+- Let's scale `worker` and see what happens!
+
+.exercise[
+
+- Start one more `worker` container:
+  ```bash
+  docker-compose scale worker=2
+  ```
+
+- Look at the performance graph (it should show a x2 improvement)
+
+- Look at the aggregated logs of our containers (`worker_2` should show up)
+
+- Look at the impact on CPU load with e.g. top (it should be negligible)
+
+]
+
+---
+
+## Adding more workers
+
+- Great, let's add more workers and call it a day, then!
+
+.exercise[
+
+- Start eight more `worker` containers:
+  ```bash
+  docker-compose scale worker=10
+  ```
+
+- Look at the performance graph: does it show a x10 improvement?
+
+- Look at the aggregated logs of our containers
+
+- Look at the impact on CPU load and memory usage
+
+]
+
+---
+
+# Identifying bottlenecks
+
+- You should have seen a 3x speed bump (not 10x)
+
+- Adding workers didn't result in linear improvement
+
+- *Something else* is slowing us down
+
 --

-Some containers exit immediately, others take longer.
+- ... But what?

-The containers that do not handle `SIGTERM` end up being killed after a 10s timeout.
+--

+- The code doesn't have instrumentation
+
+- Let's use state-of-the-art HTTP performance analysis!
+  <br/>(i.e. good old tools like `ab`, `httping`...)
+
+---
+
+## Accessing internal services
+
+- `rng` and `hasher` are exposed on ports 8001 and 8002
+
+- This is declared in the Compose file:
+
+  ```yaml
+    ...
+    rng:
+      build: rng
+      ports:
+      - "8001:80"
+
+    hasher:
+      build: hasher
+      ports:
+      - "8002:80"
+    ...
+  ```
+
+---
+
+## Measuring latency under load
+
+We will use `httping`.
+
+.exercise[
+
+- Check the latency of `rng`:
+  ```bash
+  httping -c 10 localhost:8001
+  ```
+
+- Check the latency of `hasher`:
+  ```bash
+  httping -c 10 localhost:8002
+  ```
+
+]
+
+`rng` has a much higher latency than `hasher`.
+
+---
+
+## Let's draw hasty conclusions
+
+- The bottleneck seems to be `rng`
+
+- *What if* we don't have enough entropy and can't generate enough random numbers?
+
+- We need to scale out the `rng` service on multiple machines!
+
+Note: this is a fiction! We have enough entropy. But we need a pretext to scale out.
+
+(In fact, the code of `rng` uses `/dev/urandom`, which never runs out of entropy...
+<br/>
+...and is [just as good as `/dev/random`](http://www.slideshare.net/PacSecJP/filippo-plain-simple-reality-of-entropy).)
+
+---
+
+## Clean up
+
+- Before moving on, let's remove those containers
+
+.exercise[
+
+- Tell Compose to remove everything:
+  ```bash
+  docker-compose down
+  ```
+
+]
--- a/slides/common/thankyou.md
+++ b/slides/common/thankyou.md
@@ -6,6 +6,21 @@ Thank you!

 class: title, in-person

-That's all, folks! <br/> Questions?
+That's all folks! <br/> Questions?

 ![end](images/end.jpg)
+
+---
+
+# Links and resources
+
+- [Docker Community Slack](https://community.docker.com/registrations/groups/4316)
+- [Docker Community Forums](https://forums.docker.com/)
+- [Docker Hub](https://hub.docker.com)
+- [Docker Blog](http://blog.docker.com/)
+- [Docker documentation](http://docs.docker.com/)
+- [Docker on StackOverflow](https://stackoverflow.com/questions/tagged/docker)
+- [Docker on Twitter](http://twitter.com/docker)
+- [Play With Docker Hands-On Labs](http://training.play-with-docker.com/)
+
+.footnote[These slides (and future updates) are on → http://container.training/]
--- a/slides/common/title.md
+++ b/slides/common/title.md
@@ -8,14 +8,8 @@ class: title, self-paced

 class: title, in-person

-@@TITLE@@<br/></br>
+Docker + Kubernetes = ❤️<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: http://container.training/**
+**Slides: http://kube.container.training/**
 ]
--- a/slides/images/k8s-arch4-thanks-luxas.png
+++ b/slides/images/k8s-arch4-thanks-luxas.png
--- a/slides/images/you-get-a-cluster.jpg
+++ b/slides/images/you-get-a-cluster.jpg
--- a/slides/index.html
+++ b/slides/index.html
@@ -66,39 +66,24 @@

        <tr><td class="title" colspan="4">Coming soon at a conference near you</td></tr>

-        <tr>
-	    <!--
-	     <td>Nothing for now (stay tuned...)</td>
-thing for now (stay tuned...)</td>
-             -->
-            <td>March 14, 2018: Boosterconf — Kubernetes 101</td>
-            <td>&nbsp;</td>
-            <td><a class="attend" href="https://2018.boosterconf.no/talks/1179" />
-        </tr>
-
-        <tr>
-            <td>March 27, 2018: SREcon Americas — Kubernetes 101</td>
-            <td>&nbsp;</td>
-            <td><a class="attend" href="https://www.usenix.org/conference/srecon18americas/presentation/kromhout" />
-        </tr>
-
-
-        <tr><td class="title" colspan="4">Past workshops</td></tr>
-
-	<tr>
-	    <!-- February 22, 2018 -->
-	    <td>IndexConf: Kubernetes 101</td>
-            <td><a class="slides" href="http://indexconf2018.container.training/" /></td>
-	    <!--
-            <td><a class="attend" href="https://developer.ibm.com/indexconf/sessions/#!?id=5474" />
-	    -->
-	</tr>
-
        <tr>
            <td>Kubernetes enablement at Docker</td>
            <td><a class="slides" href="http://kube.container.training/" /></td>
+            <td><a class="chat" href="https://docker.slack.com/messages/C83M572J2" /></td>
        </tr>

+            <!--
+            <td><a class="attend" href="https://qconsf.com/sf2017/workshop/orchestrating-microservices-docker-swarm" /></td>
+            -->
+
+        <!--
+        <tr>
+            <td>Nothing for now (stay tuned...)</td>
+        </tr>
+        -->
+        
+        <tr><td class="title" colspan="4">Past workshops</td></tr>
+
        <tr>
            <td>QCON SF: Orchestrating Microservices with Docker Swarm</td>
            <td><a class="slides" href="http://qconsf2017swarm.container.training/" /></td>
@@ -107,7 +92,6 @@ thing for now (stay tuned...)</td>
        <tr>
            <td>QCON SF: Introduction to Docker and Containers</td>
            <td><a class="slides" href="http://qconsf2017intro.container.training/" /></td>
-            <td><a class="video" href="https://www.youtube.com/playlist?list=PLBAFXs0YjviLgqTum8MkspG_8VzGl6C07" /></td>
        </tr>

        <tr>
@@ -175,4 +159,4 @@ thing for now (stay tuned...)</td>
    </table>
    </div>
 </body>
-</html>
+</html>
--- a/slides/intro-fullday.yml
+++ b/slides/intro-fullday.yml
@@ -12,8 +12,7 @@ exclude:
 chapters:
 - common/title.md
 - logistics.md
- intro/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - intro/Docker_Overview.md
  #- intro/Docker_History.md
@@ -41,4 +40,3 @@ chapters:
  - intro/Compose_For_Dev_Stacks.md
  - intro/Advanced_Dockerfiles.md
  - common/thankyou.md
-  - intro/links.md
--- a/slides/intro-selfpaced.yml
+++ b/slides/intro-selfpaced.yml
@@ -12,8 +12,7 @@ exclude:
 chapters:
 - common/title.md
 # - common/logistics.md
- intro/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - intro/Docker_Overview.md
  #- intro/Docker_History.md
@@ -41,4 +40,3 @@ chapters:
  - intro/Compose_For_Dev_Stacks.md
  - intro/Advanced_Dockerfiles.md
  - common/thankyou.md
-  - intro/links.md
--- a/slides/intro/Dockerfile_Tips.md
+++ b/slides/intro/Dockerfile_Tips.md
@@ -90,11 +90,11 @@ COPY <test data sets and fixtures>
 RUN <unit tests>
 FROM <baseimage>
 RUN <install dependencies>
-COPY <code>
+COPY <vcode>
 RUN <build code>
 CMD, EXPOSE ...
 ```

-* The build fails as soon as an instruction fails
+* The build fails as soon as an instructions fails
 * If `RUN <unit tests>` fails, the build doesn't produce an image
 * If it succeeds, it produces a clean image (without test libraries and data)
--- a/slides/intro/Working_With_Volumes.md
+++ b/slides/intro/Working_With_Volumes.md
@@ -100,7 +100,7 @@ class: extra-details
 Let's start a Tomcat container:

 ```bash
-$ docker run --name webapp -d -p 8080:8080 -v /usr/local/tomcat/logs tomcat
+$ docker run --name webapp -d -p 8080:8080 -v /usr/local/tomcat/logs
 ```

 Now, start an `alpine` container accessing the same volume:
--- a/slides/intro/intro.md
+++ b/slides/intro/intro.md
@@ -1,38 +0,0 @@
-## A brief introduction
-
- This was initially written to support in-person,
-  instructor-led workshops and tutorials
-
- You can also follow along on your own, at your own pace
-
- We included as much information as possible in these slides
-
- We recommend having a mentor to help you ...
-
- ... Or be comfortable spending some time reading the Docker
- [documentation](https://docs.docker.com/) ...
-
- ... And looking for answers in the [Docker forums](forums.docker.com),
-  [StackOverflow](http://stackoverflow.com/questions/tagged/docker),
-  and other outlets
-
---
-
-class: self-paced
-
-## Hands on, you shall practice
-
- Nobody ever became a Jedi by spending their lives reading Wookiepedia
-
- Likewise, it will take more than merely *reading* these slides
-  to make you an expert
-
- These slides include *tons* of exercises and examples
-
- They assume that you have acccess to a machine running Docker
-
- If you are attending a workshop or tutorial:
-  <br/>you will be given specific instructions to access a cloud VM
-
- If you are doing this on your own:
-  <br/>we will tell you how to install Docker or access a Docker environment
--- a/slides/intro/links.md
+++ b/slides/intro/links.md
@@ -1 +0,0 @@
-../swarm/links.md
--- a/slides/kube-halfday.yml
+++ b/slides/kube-halfday.yml
@@ -1,11 +1,8 @@
 title: |
-  Deploying and Scaling Microservices
-  with Kubernetes
+  Docker + Kubernetes = <3

-
-#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+chat: "[Slack](https://docker.slack.com/messages/C83M572J2)"
 #chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
-chat: "In person!"

 exclude:
 - self-paced
@@ -13,14 +10,11 @@ exclude:
 chapters:
 - common/title.md
 - logistics.md
- kube/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - common/prereqs.md
  - kube/versions-k8s.md
  - common/sampleapp.md
-  #- common/composescale.md
-  - common/composedown.md
 - - kube/concepts-k8s.md
  - common/declarative.md
  - kube/declarative.md
@@ -36,4 +30,3 @@ chapters:
  - kube/rollout.md
  - kube/whatsnext.md
  - common/thankyou.md
-  - kube/links.md
--- a/slides/kube-selfpaced.yml
+++ b/slides/kube-selfpaced.yml
@@ -11,14 +11,11 @@ exclude:
 chapters:
 - common/title.md
 #- logistics.md
- kube/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - common/prereqs.md
  - kube/versions-k8s.md
  - common/sampleapp.md
-  - common/composescale.md
-  - common/composedown.md
 - - kube/concepts-k8s.md
  - common/declarative.md
  - kube/declarative.md
@@ -34,4 +31,3 @@ chapters:
  - kube/rollout.md
  - kube/whatsnext.md
  - common/thankyou.md
-  - kube/links.md
--- a/slides/kube/concepts-k8s.md
+++ b/slides/kube/concepts-k8s.md
@@ -184,7 +184,7 @@ Yes!

  *Probably not (in the future)*

-.footnote[More information about CRI [on the Kubernetes blog](http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html)]
+.footnote[More information about CRI [on the Kubernetes blog](http://blog.kubernetes.io/2016/12/]container-runtime-interface-cri-in-kubernetes.html).

 ---

@@ -210,24 +210,4 @@ class: pic

 ![Node, pod, container](images/k8s-arch3-thanks-weave.png)

---
-
-class: pic
-
-![One of the best Kubernetes architecture diagrams available](images/k8s-arch4-thanks-luxas.png)
-
---
-
-## Credits
-
- The first diagram is courtesy of Weave Works
-
-  - a *pod* can have multiple containers working together
-
-  - IP addresses are associated with *pods*, not with individual containers
-
- The second diagram is courtesy of Lucas Käldström, in [this presentation](https://speakerdeck.com/luxas/kubeadm-cluster-creation-internals-from-self-hosting-to-upgradability-and-ha)
-
-  - it's one of the best Kubernetes architecture diagrams available!
-
-Both diagrams used with permission.
+(Diagram courtesy of Weave Works, used with permission.)
--- a/slides/kube/daemonset.md
+++ b/slides/kube/daemonset.md
@@ -1,33 +1,19 @@
 # Daemon sets

- We want to scale `rng` in a way that is different from how we scaled `worker`
+- Remember: we did all that cluster orchestration business for `rng`

 - We want one (and exactly one) instance of `rng` per node

- What if we just scale up `deploy/rng` to the number of nodes?
-
-  - nothing guarantees that the `rng` containers will be distributed evenly
-
-  - if we add nodes later, they will not automatically run a copy of `rng`
-
-  - if we remove (or reboot) a node, one `rng` container will restart elsewhere
+- If we just scale `deploy/rng` to 4, nothing guarantees that they spread

 - Instead of a `deployment`, we will use a `daemonset`

---
-
-## Daemon sets in practice
-
 - Daemon sets are great for cluster-wide, per-node processes:

  - `kube-proxy`
-
  - `weave` (our overlay network)
-
  - monitoring agents
-
  - hardware management tools (e.g. SCSI/FC HBA agents)
-
  - etc.

 - They can also be restricted to run [only on some nodes](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/#running-pods-on-only-some-nodes)
@@ -36,7 +22,7 @@

 ## Creating a daemon set

- Unfortunately, as of Kubernetes 1.9, the CLI cannot create daemon sets
+- Unfortunately, as of Kubernetes 1.8, the CLI cannot create daemon sets

 --

@@ -396,7 +382,7 @@ Of course, option 2 offers more learning opportunities. Right?

 .exercise[

- Check the logs of all `run=rng` pods to confirm that exactly one per node is now active:
+- Check the logs of all `run=rng` pods to confirm that only 4 of them are now active:
  ```bash
  kubectl logs -l run=rng
  ```
@@ -420,4 +406,4 @@ The timestamps should give us a hint about how many pods are currently receiving

 - Bonus exercise 1: clean up the pods of the "old" daemon set

- Bonus exercise 2: how could we have done this to avoid creating new pods?
+- Bonus exercise 2: how could we have done to avoid creating new pods?
--- a/slides/kube/dashboard.md
+++ b/slides/kube/dashboard.md
@@ -4,15 +4,11 @@

 - We are going to deploy that dashboard with *three commands:*

-  1) actually *run* the dashboard
+  - one to actually *run* the dashboard

-  2) bypass SSL for the dashboard
+  - one to make the dashboard available from outside

-  3) bypass authentication for the dashboard
-
--
-
-There is an additional step to make the dashboard available from outside (we'll get to that)
+  - one to bypass authentication for the dashboard

 --

@@ -20,7 +16,7 @@ There is an additional step to make the dashboard available from outside (we'll

 ---

-## 1) Running the dashboard
+## Running the dashboard

 - We need to create a *deployment* and a *service* for the dashboard

@@ -43,109 +39,11 @@ The goo.gl URL expands to:

 ---

+## Making the dashboard reachable from outside

-## 2) Bypassing SSL for the dashboard
+- The dashboard is exposed through a `ClusterIP` service

- The Kubernetes dashboard uses HTTPS, but we don't have a certificate
-
- Recent versions of Chrome (63 and later) and Edge will refuse to connect
-
-  (You won't even get the option to ignore a security warning!)
-
- We could (and should!) get a certificate, e.g. with [Let's Encrypt](https://letsencrypt.org/)
-
- ... But for convenience, for this workshop, we'll forward HTTP to HTTPS
-
-.warning[Do not do this at home, or even worse, at work!]
-
---
-
-## Running the SSL unwrapper
-
- We are going to run [`socat`](http://www.dest-unreach.org/socat/doc/socat.html), telling it to accept TCP connections and relay them over SSL
-
- Then we will expose that `socat` instance with a `NodePort` service
-
- For convenience, these steps are neatly encapsulated into another YAML file
-
-.exercise[
-
- Apply the convenient YAML file, and defeat SSL protection:
-  ```bash
-  kubectl apply -f https://goo.gl/tA7GLz
-  ```
-
-]
-
-The goo.gl URL expands to:
-<br/>
-.small[.small[https://gist.githubusercontent.com/jpetazzo/c53a28b5b7fdae88bc3c5f0945552c04/raw/da13ef1bdd38cc0e90b7a4074be8d6a0215e1a65/socat.yaml]]
-
-.warning[All our dashboard traffic is now clear-text, including passwords!]
-
---
-
-## Connecting to the dashboard
-
-
-.exercise[
-
- Connect to http://oneofournodes:3xxxx/
-
-<!-- ```open https://node1:3xxxx/``` -->
-
-]
-
-The dashboard will then ask you which authentication you want to use.
-
---
-
-## Dashboard authentication
-
- We have three authentication options at this point:
-
-  - token (associated with a role that has appropriate permissions)
-
-  - kubeconfig (e.g. using the `~/.kube/config` file from `node1`)
-
-  - "skip" (use the dashboard "service account")
-
- Let's use "skip": we get a bunch of warnings and don't see much
-
---
-
-## 3) Bypass authentication for the dashboard
-
- The dashboard documentation [explains how to do this](https://github.com/kubernetes/dashboard/wiki/Access-control#admin-privileges)
-
- We just need to load another YAML file!
-
-.exercise[
-
- Grant admin privileges to the dashboard so we can see our resources:
-  ```bash
-  kubectl apply -f https://goo.gl/CHsLTA
-  ```
-
- Reload the dashboard and enjoy!
-
-]
-
--
-
-.warning[By the way, we just added a backdoor to our Kubernetes cluster!]
-
---
-
-## Exposing the dashboard over HTTPS
-
- We took a shortcut by forwarding HTTP to HTTPS inside the cluster
-
- Let's expose the dashboard over HTTPS!
-
- The dashboard is exposed through a `ClusterIP` service (internal traffic only)
-
- We will change that into a `NodePort` service (accepting outside traffic)
+- We need a `NodePort` service instead

 .exercise[

@@ -170,8 +68,6 @@ The dashboard will then ask you which authentication you want to use.

 - The dashboard was created in the `kube-system` namespace

--
-
 .exercise[

 - Edit the service:
@@ -187,15 +83,50 @@ The dashboard will then ask you which authentication you want to use.

 ---

-## Running the Kubernetes dashboard securely
+## Connecting to the dashboard

- The steps that we just showed you are *for educational purposes only!*
+.exercise[

- If you do that on your production cluster, people [can and will abuse it](https://blog.redlock.io/cryptojacking-tesla)
+- Connect to https://oneofournodes:3xxxx/

- For an in-depth discussion about securing the dashboard,
-  <br/>
-  check [this excellent post on Heptio's blog](https://blog.heptio.com/on-securing-the-kubernetes-dashboard-16b09b1b7aca)
+  (You will have to work around the TLS certificate validation warning)
+
+<!-- ```open https://node1:3xxxx/``` -->
+
+]
+
+- We have three authentication options at this point:
+
+  - token (associated with a role that has appropriate permissions)
+
+  - kubeconfig (e.g. using the `~/.kube/config` file from `node1`)
+
+  - "skip" (use the dashboard "service account")
+
+- Let's use "skip": we get a bunch of warnings and don't see much
+
+---
+
+## Granting more rights to the dashboard
+
+- The dashboard documentation [explains how to do](https://github.com/kubernetes/dashboard/wiki/Access-control#admin-privileges)
+
+- We just need to load another YAML file!
+
+.exercise[
+
+- Grant admin privileges to the dashboard so we can see our resources:
+  ```bash
+  kubectl apply -f https://goo.gl/CHsLTA
+  ```
+
+- Reload the dashboard and enjoy!
+
+]
+
+--
+
+.warning[By the way, we just added a backdoor to our Kubernetes cluster!]

 ---

@@ -248,4 +179,3 @@ The dashboard will then ask you which authentication you want to use.
 - It introduces new failure modes

 - Example: the official setup instructions for most pod networks
-
--- a/slides/kube/intro.md
+++ b/slides/kube/intro.md
@@ -1,35 +0,0 @@
-## A brief introduction
-
- This was initially written to support in-person,
-  instructor-led workshops and tutorials
-
- You can also follow along on your own, at your own pace
-
- We included as much information as possible in these slides
-
- We recommend having a mentor to help you ...
-
- ... Or be comfortable spending some time reading the Kubernetes [documentation](https://kubernetes.io/docs/) ...
-
- ... And looking for answers on [StackOverflow](http://stackoverflow.com/questions/tagged/kubernetes) and other outlets
-
---
-
-class: self-paced
-
-## Hands on, you shall practice
-
- Nobody ever became a Jedi by spending their lives reading Wookiepedia
-
- Likewise, it will take more than merely *reading* these slides
-  to make you an expert
-
- These slides include *tons* of exercises and examples
-
- They assume that you have access to a Kubernetes cluster
-
- If you are attending a workshop or tutorial:
-  <br/>you will be given specific instructions to access your cluster
-
- If you are doing this on your own:
-  <br/>the first chapter will give you various options to get your own cluster
--- a/slides/kube/kubectlget.md
+++ b/slides/kube/kubectlget.md
@@ -48,7 +48,7 @@

 .exercise[

- Give us more info about the nodes:
+- Give us more info about them nodes:
  ```bash
  kubectl get nodes -o wide
  ```
@@ -136,8 +136,7 @@ There is already one service on our cluster: the Kubernetes API itself.
  ```
  
  - `-k` is used to skip certificate verification
-
-  - Make sure to replace 10.96.0.1 with the CLUSTER-IP shown by `kubectl get svc`
+  - Make sure to replace 10.96.0.1 with the CLUSTER-IP shown earlier

 ]

@@ -174,7 +173,7 @@ The error that we see is expected: the Kubernetes API requires authentication.

 ## Namespaces

- Namespaces allow us to segregate resources
+- Namespaces allow to segregate resources

 .exercise[

@@ -212,11 +211,9 @@ The error that we see is expected: the Kubernetes API requires authentication.

 *Ding ding ding ding ding!*

-The `kube-system` namespace is used for the control plane.
-
 ---

-## What are all these control plane pods?
+## What are all these pods?

 - `etcd` is our etcd server

@@ -235,34 +232,3 @@ The `kube-system` namespace is used for the control plane.
 - the pods with a name ending with `-node1` are the master components
  <br/>
  (they have been specifically "pinned" to the master node)
-
---
-
-## What about `kube-public`?
-
-.exercise[
-
- List the pods in the `kube-public` namespace:
-  ```bash
-  kubectl -n kube-public get pods
-  ```
-
-]
-
--
-
- Maybe it doesn't have pods, but what secrets is `kube-public` keeping?
-
--
-
-.exercise[
-
- List the secrets in the `kube-public` namespace:
-  ```bash
-  kubectl -n kube-public get secrets
-  ```
-
-]
--
-
- `kube-public` is created by kubeadm & [used for security bootstrapping](http://blog.kubernetes.io/2017/01/stronger-foundation-for-creating-and-managing-kubernetes-clusters.html)
--- a/slides/kube/kubectlrun.md
+++ b/slides/kube/kubectlrun.md
@@ -245,4 +245,4 @@ at the Google NOC ...
 <br/>
 .small[are we getting 1000 packets per second]
 <br/>
-.small[of ICMP ECHO traffic from these IPs?!?”]
+.small[of ICMP ECHO traffic from EC2 ?!?”]
--- a/slides/kube/links-bridget.md
+++ b/slides/kube/links-bridget.md
@@ -1,17 +0,0 @@
-# Links and resources
-
- [Kubernetes Community](https://kubernetes.io/community/) - Slack, Google Groups, meetups
-
- [Kubernetes on StackOverflow](https://stackoverflow.com/questions/tagged/kubernetes)
-
- [Play With Kubernetes Hands-On Labs](https://medium.com/@marcosnils/introducing-pwk-play-with-k8s-159fcfeb787b)
-
- [Azure Container Service](https://docs.microsoft.com/azure/aks/)
-
- [Cloud Developer Advocates](https://developer.microsoft.com/advocates/)
-
- [Local meetups](https://www.meetup.com/)
-
- [devopsdays](https://www.devopsdays.org/)
-
-.footnote[These slides (and future updates) are on → http://container.training/]
--- a/slides/kube/links.md
+++ b/slides/kube/links.md
@@ -1,20 +0,0 @@
-# Links and resources
-
-All things Kubernetes:
-
- [Kubernetes Community](https://kubernetes.io/community/) - Slack, Google Groups, meetups
- [Kubernetes on StackOverflow](https://stackoverflow.com/questions/tagged/kubernetes)
- [Play With Kubernetes Hands-On Labs](https://medium.com/@marcosnils/introducing-pwk-play-with-k8s-159fcfeb787b)
-
-All things Docker:
-
- [Docker documentation](http://docs.docker.com/)
- [Docker Hub](https://hub.docker.com)
- [Docker on StackOverflow](https://stackoverflow.com/questions/tagged/docker)
- [Play With Docker Hands-On Labs](http://training.play-with-docker.com/)
-
-Everything else:
-
- [Local meetups](https://www.meetup.com/)
-
-.footnote[These slides (and future updates) are on → http://container.training/]
--- a/slides/kube/ourapponkube.md
+++ b/slides/kube/ourapponkube.md
@@ -40,7 +40,7 @@ In this part, we will:

 - We could use the Docker Hub

- Or a service offered by our cloud provider (ACR, GCR, ECR...)
+- Or a service offered by our cloud provider (GCR, ECR...)

 - Or we could just self-host that registry

@@ -185,7 +185,6 @@ The curl command should now output:
 - Build and push the images:
  ```bash
  export REGISTRY
-  export TAG=v0.1
  docker-compose -f dockercoins.yml build
  docker-compose -f dockercoins.yml push
  ```
@@ -221,30 +220,6 @@ services:

 ---

-class: extra-details
-
-## Avoiding the `latest` tag
-
-.warning[Make sure that you've set the `TAG` variable properly!]
-
- If you don't, the tag will default to `latest`
-
- The problem with `latest`: nobody knows what it points to!
-
-  - the latest commit in the repo?
-
-  - the latest commit in some branch? (Which one?)
-
-  - the latest tag?
-
-  - some random version pushed by a random team member?
-
- If you keep pushing the `latest` tag, how do you roll back?
-
- Image tags should be meaningful, i.e. correspond to code branches, tags, or hashes
-
---
-
 ## Deploying all the things

 - We can now deploy our code (as well as a redis instance)
@@ -259,7 +234,7 @@ class: extra-details
 - Deploy everything else:
  ```bash
    for SERVICE in hasher rng webui worker; do
-      kubectl run $SERVICE --image=$REGISTRY/$SERVICE:$TAG
+      kubectl run $SERVICE --image=$REGISTRY/$SERVICE
    done
  ```

@@ -293,7 +268,7 @@ class: extra-details

 ---

-# Exposing services internally
+# Exposing services internally 

 - Three deployments need to be reachable by others: `hasher`, `redis`, `rng`

--- a/slides/kube/setup-k8s.md
+++ b/slides/kube/setup-k8s.md
@@ -4,7 +4,7 @@

 --

- We used `kubeadm` on freshly installed VM instances running Ubuntu 16.04 LTS
+- We used `kubeadm` on "fresh" EC2 instances with Ubuntu 16.04 LTS

    1. Install Docker

@@ -36,27 +36,26 @@

 --

- "It's still twice as many steps as setting up a Swarm cluster 😕" -- Jérôme
+- It's still twice as many steps as setting up a Swarm cluster 😕

 ---

 ## Other deployment options

- If you are on Azure:
-  [AKS](https://azure.microsoft.com/services/container-service/)
-
 - If you are on Google Cloud:
-  [GKE](https://cloud.google.com/kubernetes-engine/)
+  [GKE](https://cloud.google.com/container-engine/)
+
+  Empirically the best Kubernetes deployment out there

 - If you are on AWS:
-  [EKS](https://aws.amazon.com/eks/)
-  or
  [kops](https://github.com/kubernetes/kops)

+  ... But with AWS re:invent just around the corner, expect some changes
+
 - On a local machine:
  [minikube](https://kubernetes.io/docs/getting-started-guides/minikube/),
  [kubespawn](https://github.com/kinvolk/kube-spawn),
-  [Docker4Mac](https://docs.docker.com/docker-for-mac/kubernetes/)
+  [Docker4Mac (coming soon)](https://beta.docker.com/)

 - If you want something customizable:
  [kubicorn](https://github.com/kris-nova/kubicorn)
--- a/slides/kube/versions-k8s.md
+++ b/slides/kube/versions-k8s.md
@@ -1,8 +1,8 @@
-## Versions installed
+## Brand new versions!

- Kubernetes 1.9.3
- Docker Engine 18.02.0-ce
- Docker Compose 1.18.0
+- Kubernetes 1.8
+- Docker Engine 17.11
+- Docker Compose 1.17


 .exercise[
--- a/slides/kube/whatsnext.md
+++ b/slides/kube/whatsnext.md
@@ -133,7 +133,6 @@ And *then* it is time to look at orchestration!
  - YAML resources descriptions committed to a repo
  - [Helm](https://github.com/kubernetes/helm) (~package manager)
  - [Spinnaker](https://www.spinnaker.io/) (Netflix' CD platform)
-  - [Brigade](https://brigade.sh/) (event-driven scripting; no YAML)

 ---

@@ -161,7 +160,7 @@ Sorry Star Trek fans, this is not the federation you're looking for!

 - Raft recommends low latency between nodes

- What if our cluster spreads to multiple regions?
+- What if our cluster spreads multiple regions?

 --

--- a/slides/logistics-bridget.md
+++ b/slides/logistics-bridget.md
@@ -1,16 +0,0 @@
-## Intros
-
- - Hello! We are:
-
-   - .emoji[✨] Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
-
-   - .emoji[🌟] Joe ([@joelaha](https://twitter.com/joelaha))
-
- The workshop will run from 13:30-16:45
-
- There will be a break from 15:00-15:15
-
- Feel free to interrupt for questions at any time
-
- *Especially when you see full screen container pictures!*
-
--- a/slides/logistics.md
+++ b/slides/logistics.md
@@ -1,19 +1,19 @@
-## Intros
+## Logistics

- - Hello! We are:
+- Hi!

-   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake](https://twitter.com/s0ulshake), Travis CI)
+- This will run from 9am to 1:30pm

-   - .emoji[🐳] Jérôme ([@jpetazzo](https://twitter.com/jpetazzo), Docker Inc.)
+- We'll have a coffee break around 10:30am

- The workshop will run from 9am to 4pm
+- Food will be served (to be confirmed)

- There will be a lunch break at noon
+- Feel free (please do) interrupt me to ask questions

-  (And coffee breaks!)
+- There is a Slack channel for questions: #kube

- Feel free to interrupt for questions at any time
+- Chapters are separated by pictures of containers

- *Especially when you see full screen container pictures!*
+- The slides are targeting a wide audience

- Live feedback, questions, help on @@CHAT@@
+  (i.e. people who might not have the Docker expertise that you have)
--- a/slides/swarm-fullday.yml
+++ b/slides/swarm-fullday.yml
@@ -16,14 +16,11 @@ exclude:
 chapters:
 - common/title.md
 - logistics.md
- swarm/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - common/prereqs.md
  - swarm/versions.md
  - common/sampleapp.md
-  - common/composescale.md
-  - common/composedown.md
  - swarm/swarmkit.md
  - common/declarative.md
  - swarm/swarmmode.md
@@ -54,4 +51,3 @@ chapters:
  - swarm/stateful.md
  - swarm/extratips.md
  - common/thankyou.md
-  - swarm/links.md
--- a/slides/swarm-halfday.yml
+++ b/slides/swarm-halfday.yml
@@ -16,14 +16,11 @@ exclude:
 chapters:
 - common/title.md
 - logistics.md
- swarm/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - common/prereqs.md
  - swarm/versions.md
  - common/sampleapp.md
-  - common/composescale.md
-  - common/composedown.md
  - swarm/swarmkit.md
  - common/declarative.md
  - swarm/swarmmode.md
@@ -54,4 +51,3 @@ chapters:
  #- swarm/stateful.md
  #- swarm/extratips.md
  - common/thankyou.md
-  - swarm/links.md
--- a/slides/swarm-selfpaced.yml
+++ b/slides/swarm-selfpaced.yml
@@ -11,8 +11,7 @@ exclude:
 chapters:
 - common/title.md
 #- common/logistics.md
- swarm/intro.md
- common/about-slides.md
+- common/intro.md
 - common/toc.md
 - - common/prereqs.md
  - swarm/versions.md
@@ -23,13 +22,11 @@ chapters:

    Part 1
  - common/sampleapp.md
-  - common/composescale.md
-  - common/composedown.md
  - swarm/swarmkit.md
  - common/declarative.md
  - swarm/swarmmode.md
  - swarm/creatingswarm.md
-  #- swarm/machine.md
+  - swarm/machine.md
  - swarm/morenodes.md
 - - swarm/firstservice.md
  - swarm/ourapponswarm.md
@@ -63,4 +60,3 @@ chapters:
  - swarm/stateful.md
  - swarm/extratips.md
  - common/thankyou.md
-  - swarm/links.md
--- a/slides/swarm-video.yml
+++ b/slides/swarm-video.yml
@@ -1,66 +0,0 @@
-title: |
-  Container Orchestration
-  with Docker and Swarm
-
-chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
-
-exclude:
- in-person
- btp-auto
-
-chapters:
- common/title.md
-#- common/logistics.md
- swarm/intro.md
- common/about-slides.md
- common/toc.md
- - common/prereqs.md
-  - swarm/versions.md
-  - |
-    name: part-1
-
-    class: title, self-paced
-
-    Part 1
-  - common/sampleapp.md
-  - common/composescale.md
-  - common/composedown.md
-  - swarm/swarmkit.md
-  - common/declarative.md
-  - swarm/swarmmode.md
-  - swarm/creatingswarm.md
-  #- swarm/machine.md
-  - swarm/morenodes.md
- - swarm/firstservice.md
-  - swarm/ourapponswarm.md
-  - swarm/hostingregistry.md
-  - swarm/testingregistry.md
-  - swarm/btp-manual.md
-  - swarm/swarmready.md
-  - swarm/compose2swarm.md
-  - |
-    name: part-2
-
-    class: title, self-paced
-
-    Part 2
- - swarm/operatingswarm.md
-  #- swarm/netshoot.md
-  #- swarm/swarmnbt.md
-  - swarm/ipsec.md
-  - swarm/updatingservices.md
-  - swarm/rollingupdates.md
-  #- swarm/healthchecks.md
-  - swarm/nodeinfo.md
-  - swarm/swarmtools.md
- - swarm/security.md
-  - swarm/secrets.md
-  - swarm/encryptionatrest.md
-  - swarm/leastprivilege.md
-  - swarm/apiscope.md
-  #- swarm/logging.md
-  #- swarm/metrics.md
-  - swarm/stateful.md
-  - swarm/extratips.md
-  - common/thankyou.md
-  - swarm/links.md
--- a/slides/swarm/creatingswarm.md
+++ b/slides/swarm/creatingswarm.md
@@ -33,43 +33,17 @@ class: advertise-addr
  <br/>
  (i.e. it tells them *"you can contact me on 10.1.2.3:2377"*)

- If the node has only one IP address, it is used automatically
-  <br/>
-  (The addresses of the loopback interface and the Docker bridge are ignored)
+- If the node has only one IP address (other than 127.0.0.1), it is used automatically

 - If the node has multiple IP addresses, you **must** specify which one to use
  <br/>
  (Docker refuses to pick one randomly)

 - You can specify an IP address or an interface name
-  <br/>
-  (in the latter case, Docker will read the IP address of the interface and use it)
+  <br/>(in the latter case, Docker will read the IP address of the interface and use it)

 - You can also specify a port number
-  <br/>
-  (otherwise, the default port 2377 will be used)
-
---
-
-class: advertise-addr
-
-## Using a non-default port number
-
- Changing the *advertised* port does not change the *listening* port
-
- If you only pass `--advertise-addr eth0:7777`, Swarm will still listen on port 2377
-
- You will probably need to pass `--listen-addr eth0:7777` as well
-
- This is to accommodate scenarios where these ports *must* be different
-  <br/>
-  (port mapping, load balancers...)
-
-Example to run Swarm on a different port:
-
-```bash
-docker swarm init --advertise-addr eth0:7777 --listen-addr eth0:7777
-```
+  <br/>(otherwise, the default port 2377 will be used)

 ---

@@ -96,8 +70,8 @@ class: advertise-addr
 Examples:

 ```bash
-docker swarm init --advertise-addr 172.24.0.2
-docker swarm init --advertise-addr eth0
+docker swarm init --advertise-addr 10.0.9.2
+docker swarm init --advertise-addr eth0:7777
 ```

 ---
@@ -108,7 +82,7 @@ class: extra-details

 - You can use different interfaces (or IP addresses) for control and data

- You set the _control plane path_ with `--advertise-addr` and `--listen-addr`
+- You set the _control plane path_ with `--advertise-addr`

  (This will be used for SwarmKit manager/worker communication, leader election, etc.)

--- a/slides/swarm/encryptionatrest.md
+++ b/slides/swarm/encryptionatrest.md
@@ -68,8 +68,6 @@ that you [provisioned yourself](https://github.com/jpetazzo/container.training/t
  docker node ls
  ```

-<!-- ```wait Swarm is encrypted``` -->
-
 ]

 (The last command should fail, and it will tell you how to unlock this node.)
--- a/slides/swarm/firstservice.md
+++ b/slides/swarm/firstservice.md
@@ -89,7 +89,7 @@ class: extra-details

 - If you use Play-With-Docker, switch to that node's tab, or set `DOCKER_HOST`

- Otherwise, `ssh` into that node or use `$(eval docker-machine env node...)`
+- Otherwise, `ssh` into tht node or use `$(eval docker-machine env node...)`

 ]

@@ -174,7 +174,7 @@ class: extra-details

  - great in headless scripts (where nobody's watching anyway)

-.warning[`--detach=true` does not complete *faster*. It just *doesn't wait* for completion.]
+.warning[`--detach=false` does not complete *faster*. It just *doesn't wait* for completion.]

 ---

@@ -203,7 +203,7 @@ class: extra-details

 - And then to 4 copies per node:
  ```bash
-  docker service update pingpong --replicas 20 --detach=true
+  docker service update pingpong --replicas 15 --detach=true
  ```

 ]
@@ -281,8 +281,6 @@ class: extra-details

 .exercise[

-<!-- Give it a few seconds to be ready ```bash sleep 5``` -->
-
 - Try the following command:
  ```bash
  curl localhost:9200
--- a/slides/swarm/ipsec.md
+++ b/slides/swarm/ipsec.md
@@ -71,9 +71,6 @@
  docker run --net host nicolaka/netshoot ngrep -tpd eth0 HTTP
  ```

-<!-- ```wait User-Agent``` -->
-<!-- ```keys ^C``` -->
-
 ]

 --
--- a/slides/swarm/links.md
+++ b/slides/swarm/links.md
@@ -1,12 +0,0 @@
-# Links and resources
-
- [Docker Community Slack](https://community.docker.com/registrations/groups/4316)
- [Docker Community Forums](https://forums.docker.com/)
- [Docker Hub](https://hub.docker.com)
- [Docker Blog](http://blog.docker.com/)
- [Docker documentation](http://docs.docker.com/)
- [Docker on StackOverflow](https://stackoverflow.com/questions/tagged/docker)
- [Docker on Twitter](http://twitter.com/docker)
- [Play With Docker Hands-On Labs](http://training.play-with-docker.com/)
-
-.footnote[These slides (and future updates) are on → http://container.training/]
--- a/slides/swarm/morenodes.md
+++ b/slides/swarm/morenodes.md
@@ -22,7 +22,7 @@ With Play-With-Docker:

 ```bash
 TOKEN=$(docker swarm join-token -q manager)
-for N in $(seq 3 5); do
+for N in $(seq 4 5); do
  export DOCKER_HOST=tcp://node$N:2375
  docker swarm join --token $TOKEN node1:2377
 done
--- a/slides/swarm/netshoot.md
+++ b/slides/swarm/netshoot.md
@@ -257,7 +257,7 @@ First, we need to put the POST payload in a temporary file.

 .exercise[

- Generate 10 bytes of random data:
+- Install curl in the container, and generate 10 bytes of random data:
  ```bash
  curl http://rng/10 >/tmp/random
  ```
@@ -284,8 +284,6 @@ Once again, we will send 50 requests, with different levels of concurrency.
    ab -c 50 -n 50 -T application/octet-stream -p /tmp/random http://hasher/
  ```

-<!-- ```bash exit``` -->
-
 ]

 ---
@@ -384,6 +382,6 @@ class: extra-details

 ## More about overlay networks

-.blackbelt[DC17US: Deep Dive in Docker Overlay Networks ([video](https://www.youtube.com/watch?v=b3XDl0YsVsg&index=1&list=PLkA60AVN3hh-biQ6SCtBJ-WVTyBmmYho8))]
+.blackbelt[[Deep Dive in Docker Overlay Networks](https://www.youtube.com/watch?v=b3XDl0YsVsg&index=1&list=PLkA60AVN3hh-biQ6SCtBJ-WVTyBmmYho8) by Laurent Bernaille (DC17US)]

-.blackbelt[DC17EU: Deeper Dive in Docker Overlay Networks ([video](https://dockercon.docker.com/watch/XkRRA7Etsznv7uAk1UKsri))]
+.blackbelt[Deeper Dive in Docker Overlay Networks by Laurent Bernaille (Wednesday 13:30)]
--- a/slides/swarm/operatingswarm.md
+++ b/slides/swarm/operatingswarm.md
@@ -10,7 +10,7 @@ Otherwise: check [part 1](#part-1) to learn how to set up your own cluster.

 We pick up exactly where we left you, so we assume that you have:

- a Swarm cluster with at least 3 nodes,
+- a five nodes Swarm cluster,

 - a self-hosted registry,

--- a/slides/swarm/rollingupdates.md
+++ b/slides/swarm/rollingupdates.md
@@ -29,17 +29,11 @@
  watch docker service ps dockercoins_worker
  ```

-<!-- ```wait dockercoins_worker.1``` -->
-<!-- ```keys ^C``` -->
-
 - Hide the tasks that are shutdown:
  ```bash
  watch -n1 "docker service ps dockercoins_worker | grep -v Shutdown.*Shutdown"
  ```

-<!-- ```wait dockercoins_worker.1``` -->
-<!-- ```keys ^C``` -->
-
 ]

 If you had stopped the workers earlier, this will automatically restart them.
--- a/slides/swarm/secrets.md
+++ b/slides/swarm/secrets.md
@@ -68,16 +68,13 @@ class: secrets
  ```bash
    docker service create \
           --secret hackme --secret arewesecureyet \
-           --name dummyservice \
-           --constraint node.hostname==$HOSTNAME \
+           --name dummyservice --mode global \
           alpine sleep 1000000000
  ```

 ]

-We constrain the container to be on the local node for convenience.
-<br/>
-(We are going to use `docker exec` in just a moment!)
+We use a global service to make sure that there will be an instance on the local node.

 ---

@@ -101,9 +98,6 @@ class: secrets

 - Check the files in `/run/secrets`

-<!-- ```bash grep . /run/secrets/*``` -->
-<!-- ```bash exit``` -->
-
 ]

 ---
--- a/slides/swarm/swarmkit.md
+++ b/slides/swarm/swarmkit.md
@@ -46,7 +46,7 @@ class: extra-details
 - SwarmKit implements the Raft algorithm directly
  <br/>
  (Nomad is similar; thanks [@cbednarski](https://twitter.com/@cbednarski),
-  [@diptanu](https://twitter.com/diptanu) and others for pointing it out!)
+  [@diptanu](https://twitter.com/diptanu) and others for point it out!)

 - Analogy courtesy of [@aluzzardi](https://twitter.com/aluzzardi):

--- a/slides/swarm/swarmtools.md
+++ b/slides/swarm/swarmtools.md
@@ -152,8 +152,6 @@ It *cannot* work on live files, so you must stop Docker or make a copy first.
  cp -r /graph/swarm /swarmdata
  ```

-<!-- ```wait cp: cannot stat``` -->
-
 - Otherwise, it is in the default `/var/lib/docker`:
  ```bash
  sudo cp -r /var/lib/docker/swarm /swarmdata
@@ -176,8 +174,6 @@ It *cannot* work on live files, so you must stop Docker or make a copy first.
  /lib/ld-musl-x86_64.so.1 /usr/local/bin/swarm-rafttool -d /swarmdata/ dump-wal
  ```

-<!-- ```wait -bash:``` -->
-
 - Otherwise, you don't need the musl linker but you need to get root:
  ```bash
  sudo swarm-rafttool -d /swarmdata/ dump-wal
--- a/slides/swarm/versions.md
+++ b/slides/swarm/versions.md
@@ -1,6 +1,6 @@
 ## Brand new versions!

- Engine 17.12
+- Engine 17.11
 - Compose 1.17
 - Machine 0.13

@@ -17,7 +17,7 @@

 ---

-## Wait, what, 17.12 ?!?
+## Wait, what, 17.11 ?!?

 --

--- a/slides/workshop.html
+++ b/slides/workshop.html
@@ -31,16 +31,5 @@
        excludedClasses: [@@EXCLUDE@@]
      });
    </script>
-    
-    <!-- 
-    These two scripts will be available only when loading the
-    content using the pub/sub server. Otherwise, they'll just
-    404 and that's OK.
-    -->
-    <script src="/socket.io/socket.io.js">
-    </script>
-    <script src="/remote.js">
-    </script>
-
  </body>
 </html>
Author	SHA1	Message	Date
Jerome Petazzoni	30e2045b1c	fix-redirects.sh: adding forced redirect	2020-04-07 16:49:45 -05:00
Jérôme Petazzoni	07258c0354	Update title slide	2017-11-19 23:45:38 -08:00
Jérôme Petazzoni	a5101b2db3	Merge branch 'master' into kube	2017-11-19 23:34:32 -08:00
Jérôme Petazzoni	5e9e8fa95b	Fix redirects for good this time	2017-11-19 23:20:56 -08:00
Jérôme Petazzoni	908a05e98e	Logistics	2017-11-19 17:51:23 -08:00
Jérôme Petazzoni	7b02733ee1	fix redirects	2017-11-19 17:46:22 -08:00
Jérôme Petazzoni	ec1c0a9c38	Update Slack link	2017-11-19 17:41:20 -08:00
Jérôme Petazzoni	9eb7f7042b	Setup redirect for kube.container.training	2017-11-19 17:38:50 -08:00