Add redirect for shorter url to work

compose/simple-k8s-control-plane/docker-compose.yaml

@@ -1,6 +1,3 @@
-# Note: hyperkube isn't available after Kubernetes 1.18.
-# So we'll have to update this for Kubernetes 1.19!
-
 version: "3"
 
 services:

k8s/consul-2.yaml

@@ -62,8 +62,11 @@ spec:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
-                matchLabels:
-                  app: consul
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - consul
               topologyKey: kubernetes.io/hostname
       terminationGracePeriodSeconds: 10
       containers:
@@ -85,4 +88,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: [ "sh", "-c", "consul leave" ]
+                command:
+                - /bin/sh
+                - -c
+                - consul leave

k8s/consul-3.yaml

@@ -69,8 +69,11 @@ spec:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
-                matchLabels:
-                  app: consul
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - persistentconsul
               topologyKey: kubernetes.io/hostname
       terminationGracePeriodSeconds: 10
       containers:
@@ -95,4 +98,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: [ "sh", "-c", "consul leave" ]
+                command:
+                - /bin/sh
+                - -c
+                - consul leave

k8s/efk.yaml

@@ -5,7 +5,7 @@ metadata:
   name: fluentd
   namespace: default
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: fluentd
@@ -21,7 +21,7 @@ rules:
   - watch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: fluentd
 roleRef:

k8s/elasticsearch-operator.yaml

@@ -11,7 +11,7 @@ metadata:
   name: elasticsearch-operator
   namespace: elasticsearch-operator
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: elasticsearch-operator
@@ -41,7 +41,7 @@ rules:
   resources: ["elasticsearchclusters"]
   verbs: ["*"]
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: elasticsearch-operator
@@ -55,16 +55,13 @@ subjects:
   name: elasticsearch-operator
   namespace: elasticsearch-operator
 ---
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: elasticsearch-operator
   namespace: elasticsearch-operator
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      name: elasticsearch-operator
   template:
     metadata:
       labels:

k8s/filebeat.yaml

@@ -131,7 +131,7 @@ spec:
           path: /var/lib/filebeat-data
           type: DirectoryOrCreate
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: filebeat
@@ -144,7 +144,7 @@ roleRef:
   name: filebeat
   apiGroup: rbac.authorization.k8s.io
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: filebeat

k8s/grant-admin-to-dashboard.yaml

@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: kubernetes-dashboard
@@ -11,4 +11,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: kubernetes-dashboard
-  namespace: kube-system
+  namespace: kube-system

k8s/hackthecluster.yaml

@@ -1,34 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: hackthecluster
-spec:
-  selector:
-    matchLabels:
-      app: hackthecluster
-  template:
-    metadata:
-      labels:
-        app: hackthecluster
-    spec:
-      volumes:
-      - name: slash
-        hostPath:
-          path: /
-      tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      containers:
-      - name: alpine
-        image: alpine
-        volumeMounts:
-        - name: slash
-          mountPath: /hostfs
-        command:
-        - sleep
-        - infinity
-        securityContext:
-          #privileged: true
-          capabilities:
-            add:
-            - SYS_CHROOT

k8s/ingress-v1.yaml

@@ -1,20 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: whatever
-spec:
-  #tls:
-  #- secretName: whatever.A.B.C.D.nip.io
-  #  hosts:
-  #  - whatever.A.B.C.D.nip.io
-  rules:
-  - host: whatever.A.B.C.D.nip.io
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: whatever
-            port:
-              number: 1234

k8s/ingress-v1beta1.yaml

@@ -1,17 +0,0 @@
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: whatever
-spec:
-  #tls:
-  #- secretName: whatever.A.B.C.D.nip.io
-  #  hosts:
-  #  - whatever.A.B.C.D.nip.io
-  rules:
-  - host: whatever.A.B.C.D.nip.io
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: whatever
-          servicePort: 1234

k8s/ingress.yaml

@@ -1 +0,0 @@
-ingress-v1beta1.yaml

k8s/ingress.yaml

@@ -0,0 +1,17 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: whatever
+spec:
+  #tls:
+  #- secretName: whatever.A.B.C.D.nip.io
+  #  hosts:
+  #  - whatever.A.B.C.D.nip.io
+  rules:
+  - host: whatever.A.B.C.D.nip.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: whatever
+          servicePort: 1234

k8s/local-path-storage.yaml

@@ -1,50 +1,49 @@
 # This is a local copy of:
 # https://github.com/rancher/local-path-provisioner/blob/master/deploy/local-path-storage.yaml
+---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: local-path-storage
-
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: local-path-provisioner-service-account
   namespace: local-path-storage
-
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: local-path-provisioner-role
+  namespace: local-path-storage
 rules:
-  - apiGroups: [ "" ]
-    resources: [ "nodes", "persistentvolumeclaims", "configmaps" ]
-    verbs: [ "get", "list", "watch" ]
-  - apiGroups: [ "" ]
-    resources: [ "endpoints", "persistentvolumes", "pods" ]
-    verbs: [ "*" ]
-  - apiGroups: [ "" ]
-    resources: [ "events" ]
-    verbs: [ "create", "patch" ]
-  - apiGroups: [ "storage.k8s.io" ]
-    resources: [ "storageclasses" ]
-    verbs: [ "get", "list", "watch" ]
-
+- apiGroups: [""]
+  resources: ["nodes", "persistentvolumeclaims"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources: ["endpoints", "persistentvolumes", "pods"]
+  verbs: ["*"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
+- apiGroups: ["storage.k8s.io"]
+  resources: ["storageclasses"]
+  verbs: ["get", "list", "watch"]
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: local-path-provisioner-bind
+  namespace: local-path-storage
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: local-path-provisioner-role
 subjects:
-  - kind: ServiceAccount
-    name: local-path-provisioner-service-account
-    namespace: local-path-storage
-
+- kind: ServiceAccount
+  name: local-path-provisioner-service-account
+  namespace: local-path-storage
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -63,28 +62,27 @@ spec:
     spec:
       serviceAccountName: local-path-provisioner-service-account
       containers:
-        - name: local-path-provisioner
-          image: rancher/local-path-provisioner:v0.0.19
-          imagePullPolicy: IfNotPresent
-          command:
-            - local-path-provisioner
-            - --debug
-            - start
-            - --config
-            - /etc/config/config.json
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/config/
-          env:
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+      - name: local-path-provisioner
+        image: rancher/local-path-provisioner:v0.0.8
+        imagePullPolicy: Always
+        command:
+        - local-path-provisioner
+        - --debug
+        - start
+        - --config
+        - /etc/config/config.json
+        volumeMounts:
+        - name: config-volume
+          mountPath: /etc/config/
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-volume
           configMap:
             name: local-path-config
-
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -93,7 +91,6 @@ metadata:
 provisioner: rancher.io/local-path
 volumeBindingMode: WaitForFirstConsumer
 reclaimPolicy: Delete
-
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -102,59 +99,12 @@ metadata:
   namespace: local-path-storage
 data:
   config.json: |-
-    {
-            "nodePathMap":[
-            {
-                    "node":"DEFAULT_PATH_FOR_NON_LISTED_NODES",
-                    "paths":["/opt/local-path-provisioner"]
-            }
-            ]
-    }
-  setup: |-
-    #!/bin/sh
-    while getopts "m:s:p:" opt
-    do
-        case $opt in
-            p)
-            absolutePath=$OPTARG
-            ;;
-            s)
-            sizeInBytes=$OPTARG
-            ;;
-            m)
-            volMode=$OPTARG
-            ;;
-        esac
-    done
-
-    mkdir -m 0777 -p ${absolutePath}
-  teardown: |-
-    #!/bin/sh
-    while getopts "m:s:p:" opt
-    do
-        case $opt in
-            p)
-            absolutePath=$OPTARG
-            ;;
-            s)
-            sizeInBytes=$OPTARG
-            ;;
-            m)
-            volMode=$OPTARG
-            ;;
-        esac
-    done
-
-    rm -rf ${absolutePath}
-  helperPod.yaml: |-
-    apiVersion: v1
-    kind: Pod
-    metadata:
-      name: helper-pod
-    spec:
-      containers:
-      - name: helper-pod
-        image: busybox
-
-
+        {
+                "nodePathMap":[
+                {
+                        "node":"DEFAULT_PATH_FOR_NON_LISTED_NODES",
+                        "paths":["/opt/local-path-provisioner"]
+                }
+                ]
+        }
 

k8s/metrics-server.yaml

@@ -1,61 +1,32 @@
-# This file is https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
-# But with the following arguments added to metrics-server:
-#   args:
-#   - --kubelet-insecure-tls
-#   - --metric-resolution=5s
-apiVersion: v1
-kind: ServiceAccount
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
+  name: system:aggregated-metrics-reader
   labels:
-    k8s-app: metrics-server
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+- apiGroups: ["metrics.k8s.io"]
+  resources: ["pods"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: metrics-server:system:auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
   name: metrics-server
   namespace: kube-system
 ---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    k8s-app: metrics-server
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-  name: system:aggregated-metrics-reader
-rules:
-- apiGroups:
-  - metrics.k8s.io
-  resources:
-  - pods
-  - nodes
-  verbs:
-  - get
-  - list
-  - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    k8s-app: metrics-server
-  name: system:metrics-server
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  - nodes
-  - nodes/stats
-  - namespaces
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
-  labels:
-    k8s-app: metrics-server
   name: metrics-server-auth-reader
   namespace: kube-system
 roleRef:
@@ -67,127 +38,101 @@ subjects:
   name: metrics-server
   namespace: kube-system
 ---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
 metadata:
-  labels:
-    k8s-app: metrics-server
-  name: metrics-server:system:auth-delegator
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:auth-delegator
-subjects:
-- kind: ServiceAccount
-  name: metrics-server
-  namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    k8s-app: metrics-server
-  name: system:metrics-server
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:metrics-server
-subjects:
-- kind: ServiceAccount
-  name: metrics-server
-  namespace: kube-system
+  name: v1beta1.metrics.k8s.io
+spec:
+  service:
+    name: metrics-server
+    namespace: kube-system
+  group: metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100
 ---
 apiVersion: v1
-kind: Service
+kind: ServiceAccount
 metadata:
-  labels:
-    k8s-app: metrics-server
   name: metrics-server
   namespace: kube-system
-spec:
-  ports:
-  - name: https
-    port: 443
-    protocol: TCP
-    targetPort: https
-  selector:
-    k8s-app: metrics-server
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    k8s-app: metrics-server
   name: metrics-server
   namespace: kube-system
+  labels:
+    k8s-app: metrics-server
 spec:
   selector:
     matchLabels:
       k8s-app: metrics-server
-  strategy:
-    rollingUpdate:
-      maxUnavailable: 0
   template:
     metadata:
+      name: metrics-server
       labels:
         k8s-app: metrics-server
     spec:
-      containers:
-      - args:
-        - --cert-dir=/tmp
-        - --secure-port=4443
-        - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
-        - --kubelet-use-node-status-port
-        - --kubelet-insecure-tls
-        - --metric-resolution=5s
-        image: k8s.gcr.io/metrics-server/metrics-server:v0.4.3
-        imagePullPolicy: IfNotPresent
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /livez
-            port: https
-            scheme: HTTPS
-          periodSeconds: 10
-        name: metrics-server
-        ports:
-        - containerPort: 4443
-          name: https
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /readyz
-            port: https
-            scheme: HTTPS
-          periodSeconds: 10
-        securityContext:
-          readOnlyRootFilesystem: true
-          runAsNonRoot: true
-          runAsUser: 1000
-        volumeMounts:
-        - mountPath: /tmp
-          name: tmp-dir
-      nodeSelector:
-        kubernetes.io/os: linux
-      priorityClassName: system-cluster-critical
       serviceAccountName: metrics-server
       volumes:
-      - emptyDir: {}
-        name: tmp-dir
+      # mount in tmp so we can safely use from-scratch images and/or read-only containers
+      - name: tmp-dir
+        emptyDir: {}
+      containers:
+      - name: metrics-server
+        image: k8s.gcr.io/metrics-server-amd64:v0.3.3
+        imagePullPolicy: Always
+        volumeMounts:
+        - name: tmp-dir
+          mountPath: /tmp
+        args:
+        - --kubelet-preferred-address-types=InternalIP
+        - --kubelet-insecure-tls
+        - --metric-resolution=5s
+
 ---
-apiVersion: apiregistration.k8s.io/v1
-kind: APIService
+apiVersion: v1
+kind: Service
 metadata:
+  name: metrics-server
+  namespace: kube-system
   labels:
-    k8s-app: metrics-server
-  name: v1beta1.metrics.k8s.io
+    kubernetes.io/name: "Metrics-server"
 spec:
-  group: metrics.k8s.io
-  groupPriorityMinimum: 100
-  insecureSkipTLSVerify: true
-  service:
-    name: metrics-server
-    namespace: kube-system
-  version: v1beta1
-  versionPriority: 100
+  selector:
+    k8s-app: metrics-server
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 443
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: system:metrics-server
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - nodes
+  - nodes/stats
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: system:metrics-server
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:metrics-server
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system

k8s/openebs-pod.yaml

@@ -1,24 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: openebs-local-hostpath-pod
-spec:
-  volumes:
-  - name: storage
-    persistentVolumeClaim:
-      claimName: local-hostpath-pvc
-  containers:
-  - name: better
-    image: alpine
-    command:
-       - sh
-       - -c
-       - |
-         while true; do
-           echo "$(date) [$(hostname)] Kubernetes is better with PVs." >> /mnt/storage/greet.txt
-           sleep $(($RANDOM % 5 + 20))
-         done
-    volumeMounts:
-    - mountPath: /mnt/storage
-      name: storage
-

k8s/traefik-v1.yaml

@@ -49,8 +49,24 @@ spec:
         - --kubernetes
         - --logLevel=INFO
 ---
+kind: Service
+apiVersion: v1
+metadata:
+  name: traefik-ingress-service
+  namespace: kube-system
+spec:
+  selector:
+    k8s-app: traefik-ingress-lb
+  ports:
+    - protocol: TCP
+      port: 80
+      name: web
+    - protocol: TCP
+      port: 8080
+      name: admin
+---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: traefik-ingress-controller
 rules:
@@ -74,7 +90,7 @@ rules:
       - watch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: traefik-ingress-controller
 roleRef:

k8s/traefik-v2.yaml

@@ -55,8 +55,28 @@ spec:
         - --entrypoints.https.Address=:443
         - --entrypoints.https.http.tls.certResolver=default
 ---
+kind: Service
+apiVersion: v1
+metadata:
+  name: traefik-ingress-service
+  namespace: kube-system
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
+    prometheus.io/path: "/metrics"
+spec:
+  selector:
+    k8s-app: traefik-ingress-lb
+  ports:
+    - protocol: TCP
+      port: 80
+      name: web
+    - protocol: TCP
+      port: 8080
+      name: admin
+---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: traefik-ingress-controller
 rules:
@@ -89,7 +109,7 @@ rules:
       - watch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: traefik-ingress-controller
 roleRef:

k8s/volumes-for-consul.yaml

@@ -3,6 +3,8 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: consul-node2
+  annotations:
+    node: node2
 spec:
   capacity:
     storage: 10Gi
@@ -24,6 +26,8 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: consul-node3
+  annotations:
+    node: node3
 spec:
   capacity:
     storage: 10Gi
@@ -45,6 +49,8 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: consul-node4
+  annotations:
+    node: node4
 spec:
   capacity:
     storage: 10Gi

prepare-vms/README.md

@@ -4,11 +4,7 @@ These tools can help you to create VMs on:
 
 - Azure
 - EC2
-- Hetzner
-- Linode
 - OpenStack
-- OVHcloud
-- Scaleway
 
 ## Prerequisites
 
@@ -17,8 +13,7 @@ These tools can help you to create VMs on:
 - [Parallel SSH](https://code.google.com/archive/p/parallel-ssh/) (on a Mac: `brew install pssh`) 
 
 Depending on the infrastructure that you want to use, you also need to install
-the CLI that is specific to that cloud. For OpenStack deployments, you will
-need Terraform.
+the Azure CLI, the AWS CLI, or terraform (for OpenStack deployment).
 
 And if you want to generate printable cards:
 
@@ -95,9 +90,6 @@ You're all set!
 
 ## `./workshopctl` Usage
 
-If you run `./workshopctl` without arguments, it will show a list of
-available commands, looking like this:
-
 ```
 workshopctl - the orchestration workshop swiss army knife
 Commands:
@@ -106,7 +98,32 @@ cards                Generate ready-to-print cards for a group of VMs
 deploy               Install Docker on a bunch of running VMs
 disableaddrchecks    Disable source/destination IP address checks
 disabledocker        Stop Docker Engine and don't restart it automatically
-...
+helmprom             Install Helm and Prometheus
+help                 Show available commands
+ids                  (FIXME) List the instance IDs belonging to a given tag or token
+kubebins             Install Kubernetes and CNI binaries but don't start anything
+kubereset            Wipe out Kubernetes configuration on all nodes
+kube                 Setup kubernetes clusters with kubeadm (must be run AFTER deploy)
+kubetest             Check that all nodes are reporting as Ready
+listall              List VMs running on all configured infrastructures
+list                 List available groups for a given infrastructure
+netfix               Disable GRO and run a pinger job on the VMs
+opensg               Open the default security group to ALL ingress traffic
+ping                 Ping VMs in a given tag, to check that they have network access
+pssh                 Run an arbitrary command on all nodes
+pull_images          Pre-pull a bunch of Docker images
+quotas               Check our infrastructure quotas (max instances)
+remap_nodeports      Remap NodePort range to 10000-10999
+retag                (FIXME) Apply a new tag to a group of VMs
+ssh                  Open an SSH session to the first node of a tag
+start                Start a group of VMs
+stop                 Stop (terminate, shutdown, kill, remove, destroy...) instances
+tags                 List groups of VMs known locally
+test                 Run tests (pre-flight checks) on a group of VMs
+weavetest            Check that weave seems properly setup
+webssh               Install a WEB SSH server on the machines (port 1080)
+wrap                 Run this program in a container
+www                  Run a web server to access card HTML and PDF
 ```
 
 ### Summary of What `./workshopctl` Does For You
@@ -121,8 +138,7 @@ disabledocker        Stop Docker Engine and don't restart it automatically
 
 ### Example Steps to Launch a group of AWS Instances for a Workshop
 
-- Run `./workshopctl start --infra infra/aws-us-east-2 --settings/myworkshop.yaml --students 50` to create 50 clusters
-  - The number of instances will be `students × clustersize`
+- Run `./workshopctl start --infra infra/aws-us-east-2 --settings/myworkshop.yaml --count 60` to create 60 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` to run `lib/postprep.py` via parallel-ssh
@@ -232,19 +248,12 @@ If you don't have `wkhtmltopdf` installed, you will get a warning that it is a m
 
 #### List tags
 
+    $ ./workshopctl list infra/some-infra-file
+
+    $ ./workshopctl listall
+
     $ ./workshopctl tags
 
-    $ ./workshopctl inventory infra/some-infra-file
-
-    $ ./workshopctl inventory
-
-Note: the `tags` command will show only the VMs that you have provisioned
-and deployed on the current machine (i.e. listed in the `tags` subdirectory).
-The `inventory` command will try to list all existing VMs (including the
-ones not listed in the `tags` directory, and including VMs provisioned
-through other mechanisms). It is not supported across all platforms,
-however.
-
 #### Stop and destroy VMs
 
     $ ./workshopctl stop TAG

prepare-vms/infra/hetzner

@@ -1,5 +1,5 @@
 INFRACLASS=hetzner
 if ! [ -f ~/.config/hcloud/cli.toml ]; then
-  warning "~/.config/hcloud/cli.toml not found."
-  warning "Make sure that the Hetzner CLI (hcloud) is installed and configured."
+  warn "~/.config/hcloud/cli.toml not found."
+  warn "Make sure that the Hetzner CLI (hcloud) is installed and configured."
 fi

prepare-vms/lib/cli.sh

@@ -66,7 +66,7 @@ need_infra() {
 
 need_tag() {
     if [ -z "$TAG" ]; then
-        die "Please specify a tag. To see available tags, run: $0 tags"
+        die "Please specify a tag or token. To see available tags and tokens, run: $0 list"
     fi
     if [ ! -d "tags/$TAG" ]; then
         die "Tag $TAG not found (directory tags/$TAG does not exist)."

prepare-vms/lib/commands.sh

@@ -1,9 +1,5 @@
 export AWS_DEFAULT_OUTPUT=text
 
-# Ignore SSH key validation when connecting to these remote hosts.
-# (Otherwise, deployment scripts break when a VM IP address reuse.)
-SSHOPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR"
-
 HELP=""
 _cmd() {
     HELP="$(printf "%s\n%-20s %s\n" "$HELP" "$1" "$2")"
@@ -126,7 +122,7 @@ _cmd_deploy() {
     # If /home/docker/.ssh/id_rsa doesn't exist, copy it from the first node
     pssh "
     sudo -u docker [ -f /home/docker/.ssh/id_rsa ] ||
-    ssh $SSHOPTS \$(cat /etc/name_of_first_node) sudo -u docker tar -C /home/docker -cvf- .ssh |
+    ssh -o StrictHostKeyChecking=no \$(cat /etc/name_of_first_node) sudo -u docker tar -C /home/docker -cvf- .ssh |
     sudo -u docker tar -C /home/docker -xf-"
 
     # if 'docker@' doesn't appear in /home/docker/.ssh/authorized_keys, copy it there
@@ -170,27 +166,24 @@ _cmd_kubebins() {
     TAG=$1
     need_tag
 
-    ##VERSION##
-    ETCD_VERSION=v3.4.13
-    K8SBIN_VERSION=v1.19.11 # Can't go to 1.20 because it requires a serviceaccount signing key.
-    CNI_VERSION=v0.8.7
     pssh --timeout 300 "
     set -e
     cd /usr/local/bin
     if ! [ -x etcd ]; then
-        curl -L https://github.com/etcd-io/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz \
+        ##VERSION##
+        curl -L https://github.com/etcd-io/etcd/releases/download/v3.4.9/etcd-v3.4.9-linux-amd64.tar.gz \
         | sudo tar --strip-components=1 --wildcards -zx '*/etcd' '*/etcdctl'
     fi
     if ! [ -x hyperkube ]; then
         ##VERSION##
-        curl -L https://dl.k8s.io/$K8SBIN_VERSION/kubernetes-server-linux-amd64.tar.gz \
+        curl -L https://dl.k8s.io/v1.18.10/kubernetes-server-linux-amd64.tar.gz \
         | sudo tar --strip-components=3 -zx \
           kubernetes/server/bin/kube{ctl,let,-proxy,-apiserver,-scheduler,-controller-manager}
     fi
     sudo mkdir -p /opt/cni/bin
     cd /opt/cni/bin
     if ! [ -x bridge ]; then
-        curl -L https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION/cni-plugins-linux-amd64-$CNI_VERSION.tgz \
+        curl -L https://github.com/containernetworking/plugins/releases/download/v0.8.6/cni-plugins-linux-amd64-v0.8.6.tgz \
         | sudo tar -zx
     fi
     "
@@ -259,7 +252,7 @@ _cmd_kube() {
     pssh --timeout 200 "
     if ! i_am_first_node && [ ! -f /etc/kubernetes/kubelet.conf ]; then
         FIRSTNODE=\$(cat /etc/name_of_first_node) &&
-        TOKEN=\$(ssh $SSHOPTS \$FIRSTNODE cat /tmp/token) &&
+        TOKEN=\$(ssh -o StrictHostKeyChecking=no \$FIRSTNODE cat /tmp/token) &&
         sudo kubeadm join --discovery-token-unsafe-skip-ca-verification --token \$TOKEN \$FIRSTNODE:6443
     fi"
 
@@ -330,7 +323,7 @@ EOF"
     # Install the AWS IAM authenticator
     pssh "
     if [ ! -x /usr/local/bin/aws-iam-authenticator ]; then
-        ##VERSION##
+	    ##VERSION##
         sudo curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.12.7/2019-03-27/bin/linux/amd64/aws-iam-authenticator
 	sudo chmod +x /usr/local/bin/aws-iam-authenticator
     fi"
@@ -345,17 +338,13 @@ EOF"
         echo export PATH=/home/docker/.krew/bin:\\\$PATH | sudo -u docker tee -a /home/docker/.bashrc
     fi"
 
-    # Install k9s
+    # Install k9s and popeye
     pssh "
     if [ ! -x /usr/local/bin/k9s ]; then
-        VERSION=v0.24.10 &&
-        FILENAME=k9s_\${VERSION}_\$(uname -s)_\$(uname -m).tar.gz &&
-        curl -sSL https://github.com/derailed/k9s/releases/download/\$VERSION/\$FILENAME |
+        FILENAME=k9s_\$(uname -s)_\$(uname -m).tar.gz &&
+        curl -sSL https://github.com/derailed/k9s/releases/latest/download/\$FILENAME |
         sudo tar -zxvf- -C /usr/local/bin k9s
-    fi"
-
-    # Install popeye
-    pssh "
+    fi
     if [ ! -x /usr/local/bin/popeye ]; then
         FILENAME=popeye_\$(uname -s)_\$(uname -m).tar.gz &&
         curl -sSL https://github.com/derailed/popeye/releases/latest/download/\$FILENAME |
@@ -430,12 +419,12 @@ _cmd_ips() {
     done < tags/$TAG/ips.txt
 }
 
-_cmd inventory "List all VMs on a given infrastructure (or all infras if no arg given)"
-_cmd_inventory() {
+_cmd list "List all VMs on a given infrastructure (or all infras if no arg given)"
+_cmd_list() {
     case "$1" in
     "")
         for INFRA in infra/*; do
-            $0 inventory $INFRA
+            $0 list $INFRA
         done
         ;;
     */example.*)
@@ -448,6 +437,21 @@ _cmd_inventory() {
     esac
 }
 
+_cmd listall "List VMs running on all configured infrastructures"
+_cmd_listall() {
+    for infra in infra/*; do
+        case $infra in
+        infra/example.*)
+            ;;
+        *)
+            info "Listing infrastructure $infra:"
+            need_infra $infra
+            infra_list
+            ;;
+        esac
+    done
+}
+
 _cmd maketag "Generate a quasi-unique tag for a group of instances"
 _cmd_maketag() {
     if [ -z $USER ]; then
@@ -585,8 +589,7 @@ _cmd_ssh() {
     need_tag
     IP=$(head -1 tags/$TAG/ips.txt)
     info "Logging into $IP"
-    ssh $SSHOPTS docker@$IP
-
+    ssh docker@$IP
 }
 
 _cmd start "Start a group of VMs"
@@ -595,7 +598,7 @@ _cmd_start() {
         case "$1" in
         --infra) INFRA=$2; shift 2;;
         --settings) SETTINGS=$2; shift 2;;
-        --count) die "Flag --count is deprecated; please use --students instead." ;;
+        --count) COUNT=$2; shift 2;;
         --tag) TAG=$2; shift 2;;
         --students) STUDENTS=$2; shift 2;;
         *) die "Unrecognized parameter: $1."
@@ -725,7 +728,7 @@ _cmd_tmux() {
     IP=$(head -1 tags/$TAG/ips.txt)
     info "Opening ssh+tmux with $IP"
     rm -f /tmp/tmux-$UID/default
-    ssh $SSHOPTS -t -L /tmp/tmux-$UID/default:/tmp/tmux-1001/default docker@$IP tmux new-session -As 0
+    ssh -t -L /tmp/tmux-$UID/default:/tmp/tmux-1001/default docker@$IP tmux new-session -As 0
 }
 
 _cmd helmprom "Install Helm and Prometheus"
@@ -744,31 +747,6 @@ _cmd_helmprom() {
     fi"
 }
 
-_cmd passwords "Set individual passwords for each cluster"
-_cmd_passwords() {
-    TAG=$1
-    need_tag
-    PASSWORDS_FILE="tags/$TAG/passwords"
-    if ! [ -f "$PASSWORDS_FILE" ]; then
-        error "File $PASSWORDS_FILE not found. Please create it first."
-        error "It should contain one password per line."
-        error "It should have as many lines as there are clusters."
-        die "Aborting."
-    fi
-    N_CLUSTERS=$($0 ips "$TAG" | wc -l)
-    N_PASSWORDS=$(wc -l < "$PASSWORDS_FILE")
-    if [ "$N_CLUSTERS" != "$N_PASSWORDS" ]; then
-        die "Found $N_CLUSTERS clusters and $N_PASSWORDS passwords. Aborting."
-    fi
-    $0 ips "$TAG" | paste "$PASSWORDS_FILE" - | while read password nodes; do
-        info "Setting password for $nodes..."
-        for node in $nodes; do
-            echo docker:$password | ssh $SSHOPTS ubuntu@$node sudo chpasswd
-        done
-    done
-    info "Done."
-}
-
 # Sometimes, weave fails to come up on some nodes.
 # Symptom: the pods on a node are unreachable (they don't even ping).
 # Remedy: wipe out Weave state and delete weave pod on that node.
@@ -897,7 +875,10 @@ test_vm() {
         "ls -la /home/docker/.ssh"; do
         sep "$cmd"
         echo "$cmd" \
-            | ssh -A $SSHOPTS $user@$ip sudo -u docker -i \
+            | ssh -A -q \
+                -o "UserKnownHostsFile /dev/null" \
+                -o "StrictHostKeyChecking=no" \
+                $user@$ip sudo -u docker -i \
             || {
                 status=$?
                 error "$cmd exit status: $status"

prepare-vms/lib/infra/aws.sh

@@ -1,5 +1,5 @@
 if ! command -v aws >/dev/null; then
-    warning "AWS CLI (aws) not found."
+    warn "AWS CLI (aws) not found."
 fi
 
 infra_list() {
@@ -217,7 +217,7 @@ aws_tag_instances() {
 
 aws_get_ami() {
     ##VERSION##
-    find_ubuntu_ami -r $AWS_DEFAULT_REGION -a ${AWS_ARCHITECTURE-amd64} -v 18.04 -t hvm:ebs -N -q
+    find_ubuntu_ami -r $AWS_DEFAULT_REGION -a amd64 -v 18.04 -t hvm:ebs -N -q
 }
 
 aws_greet() {

prepare-vms/lib/infra/hetzner.sh

@@ -1,8 +1,8 @@
 if ! command -v hcloud >/dev/null; then
-  warning "Hetzner CLI (hcloud) not found."
+  warn "Hetzner CLI (hcloud) not found."
 fi
 if ! [ -f ~/.config/hcloud/cli.toml ]; then
-  warning "~/.config/hcloud/cli.toml not found."
+  warn "~/.config/hcloud/cli.toml not found."
 fi
 
 infra_list() {

prepare-vms/lib/infra/linode.sh

@@ -1,8 +1,8 @@
 if ! command -v linode-cli >/dev/null; then
-  warning "Linode CLI (linode-cli) not found."
+  warn "Linode CLI (linode-cli) not found."
 fi
 if ! [ -f ~/.config/linode-cli ]; then
-  warning "~/.config/linode-cli not found."
+  warn "~/.config/linode-cli not found."
 fi
 
 # To view available regions: "linode-cli regions list"

prepare-vms/lib/infra/openstack-tf.sh

@@ -1,28 +1,20 @@
 infra_start() {
-        COUNT=$1
+	COUNT=$1
 
-        cp terraform/*.tf tags/$TAG
-        (
-                cd tags/$TAG
-                if ! terraform init; then
-                        error "'terraform init' failed."
-                        error "If it mentions the following error message:"
-                        error "openpgp: signature made by unknown entity."
-                        error "Then you need to upgrade Terraform to 0.11.15"
-                        error "to upgrade its signing keys following the"
-                        error "codecov breach."
-                        die "Aborting."
-                fi
-                echo prefix = \"$TAG\" >> terraform.tfvars
-                echo count = \"$COUNT\" >> terraform.tfvars
-                terraform apply -auto-approve
-                terraform output ip_addresses > ips.txt
-        )
+	cp terraform/*.tf tags/$TAG
+	(
+		cd tags/$TAG
+		terraform init
+		echo prefix = \"$TAG\" >> terraform.tfvars
+		echo count = \"$COUNT\" >> terraform.tfvars
+		terraform apply -auto-approve
+		terraform output ip_addresses > ips.txt
+	)
 }
 
 infra_stop() {
-        (
-                cd tags/$TAG
-                terraform destroy -auto-approve
-        )
-}
+	(
+		cd tags/$TAG
+		terraform destroy -auto-approve
+	)
+}

prepare-vms/lib/infra/scaleway.sh

@@ -1,8 +1,8 @@
 if ! command -v scw >/dev/null; then
-  warning "Scaleway CLI (scw) not found."
+  warn "Scaleway CLI (scw) not found."
 fi
 if ! [ -f ~/.config/scw/config.yaml ]; then
-  warning "~/.config/scw/config.yaml not found."
+  warn "~/.config/scw/config.yaml not found."
 fi
 
 SCW_INSTANCE_TYPE=${SCW_INSTANCE_TYPE-DEV1-M}

prepare-vms/settings/kube101.yaml

@@ -0,0 +1,24 @@
+# 3 nodes for k8s 101 workshops
+
+# Number of VMs per cluster
+clustersize: 3
+
+# The hostname of each node will be clusterprefix + a number
+clusterprefix: node
+
+# 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
+
+# This can be "test" or "stable"
+engine_version: stable
+
+# These correspond to the version numbers visible on their respective GitHub release pages
+compose_version: 1.24.1
+machine_version: 0.14.0
+
+# Password used to connect with the "docker user"
+docker_user_password: training
+

prepare-vms/setup-admin-clusters.sh

@@ -30,7 +30,7 @@ TAG=$PREFIX-$SETTINGS
 	--tag $TAG \
 	--infra $INFRA \
 	--settings settings/$SETTINGS.yaml \
-	--students $STUDENTS
+	--count $STUDENTS
 
 retry 5 ./workshopctl deploy $TAG
 retry 5 ./workshopctl disabledocker $TAG
@@ -45,7 +45,7 @@ TAG=$PREFIX-$SETTINGS
 	--tag $TAG \
 	--infra $INFRA \
 	--settings settings/$SETTINGS.yaml \
-	--students $STUDENTS
+	--count $((3*$STUDENTS))
 
 retry 5 ./workshopctl disableaddrchecks $TAG
 retry 5 ./workshopctl deploy $TAG
@@ -60,7 +60,7 @@ TAG=$PREFIX-$SETTINGS
 	--tag $TAG \
 	--infra $INFRA \
 	--settings settings/$SETTINGS.yaml \
-	--students $STUDENTS
+	--count $((3*$STUDENTS))
 
 retry 5 ./workshopctl disableaddrchecks $TAG
 retry 5 ./workshopctl deploy $TAG
@@ -79,9 +79,10 @@ TAG=$PREFIX-$SETTINGS
 	--tag $TAG \
 	--infra $INFRA \
 	--settings settings/$SETTINGS.yaml \
-	--students $STUDENTS
+	--count $((3*$STUDENTS))
 
 retry 5 ./workshopctl deploy $TAG
-retry 5 ./workshopctl kube $TAG 1.19.11
+retry 5 ./workshopctl kube $TAG 1.17.13
 retry 5 ./workshopctl webssh $TAG
 retry 5 ./workshopctl tailhist $TAG
+./workshopctl cards $TAG

prepare-vms/workshopctl

@@ -17,7 +17,6 @@ done
 DEPENDENCIES="
     ssh
     curl
-    fping
     jq
     pssh
     wkhtmltopdf

slides/_redirects

@@ -2,7 +2,6 @@
 #/ /kube-halfday.yml.html 200!
 #/ /kube-fullday.yml.html 200!
 #/ /kube-twodays.yml.html 200!
-/ /kube.yml.html 200!
 
 # And this allows to do "git clone https://container.training".
 /info/refs service=git-upload-pack https://github.com/jpetazzo/container.training/info/refs?service=git-upload-pack
@@ -22,3 +21,5 @@
 
 # Survey form
 /please https://docs.google.com/forms/d/e/1FAIpQLSfIYSgrV7tpfBNm1hOaprjnBHgWKn5n-k5vtNXYJkOX1sRxng/viewform
+
+/ /helm.yml.html 200!

slides/containers/Background_Containers.md

@@ -44,64 +44,6 @@ Fri Feb 20 00:28:55 UTC 2015
 
 ---
 
-## When `^C` doesn't work...
-
-Sometimes, `^C` won't be enough.
-
-Why? And how can we stop the container in that case?
-
----
-
-## What happens when we hit `^C`
-
-`SIGINT` gets sent to the container, which means:
-
-- `SIGINT` gets sent to PID 1 (default case)
-
-- `SIGINT` gets sent to *foreground processes* when running with `-ti`
-
-But there is a special case for PID 1: it ignores all signals!
-
-- except `SIGKILL` and `SIGSTOP`
-
-- except signals handled explicitly
-
-TL,DR: there are many circumstances when `^C` won't stop the container.
-
----
-
-class: extra-details
-
-## Why is PID 1 special?
-
-- PID 1 has some extra responsibilities:
-
-  - it starts (directly or indirectly) every other process
-
-  - when a process exits, its processes are "reparented" under PID 1
-
-- When PID 1 exits, everything stops:
-
-  - on a "regular" machine, it causes a kernel panic
-
-  - in a container, it kills all the processes
-
-- We don't want PID 1 to stop accidentally
-
-- That's why it has these extra protections
-
----
-
-## How to stop these containers, then?
-
-- Start another terminal and forget about them
-
-  (for now!)
-
-- We'll shortly learn about `docker kill`
-
----
-
 ## Run a container in the background
 
 Containers can be started in the background, with the `-d` flag (daemon mode):

slides/containers/Building_Images_Interactively.md

@@ -131,7 +131,7 @@ root@fcfb62f0bfde:/# figlet hello
 |_| |_|\___|_|_|\___/ 
 ```
 
-It works! 🎉
+It works! .emoji[🎉]
 
 ---
 

slides/containers/Building_Images_With_Dockerfiles.md

@@ -89,44 +89,6 @@ To keep things simple for now: this is the directory where our Dockerfile is loc
 
 ## What happens when we build the image?
 
-It depends if we're using BuildKit or not!
-
-If there are lots of blue lines and the first line looks like this:
-```
-[+] Building 1.8s (4/6)
-```
-... then we're using BuildKit.
-
-If the output is mostly black-and-white and the first line looks like this:
-```
-Sending build context to Docker daemon  2.048kB
-```
-... then we're using the "classic" or "old-style" builder.
-
----
-
-## To BuildKit or Not To BuildKit
-
-Classic builder:
-
-- copies the whole "build context" to the Docker Engine
-
-- linear (processes lines one after the other)
-
-- requires a full Docker Engine
-
-BuildKit:
-
-- only transfers parts of the "build context" when needed
-
-- will parallelize operations (when possible)
-
-- can run in non-privileged containers (e.g. on Kubernetes)
-
----
-
-## With the classic builder
-
 The output of `docker build` looks like this:
 
 .small[
@@ -169,7 +131,7 @@ Sending build context to Docker daemon 2.048 kB
 
 * Be careful (or patient) if that directory is big and your link is slow.
 
-* You can speed up the process with a [`.dockerignore`](https://docs.docker.com/engine/reference/builder/#dockerignore-file) file
+* You can speed up the process with a [`.dockerignore`](https://docs.docker.com/engine/reference/builder/#dockerignore-file) file 
 
   * It tells docker to ignore specific files in the directory
 
@@ -199,64 +161,6 @@ Removing intermediate container e01b294dbffd
 
 ---
 
-## With BuildKit
-
-.small[
-```bash
-[+] Building 7.9s (7/7) FINISHED
- => [internal] load build definition from Dockerfile                                                 0.0s
- => => transferring dockerfile: 98B                                                                  0.0s
- => [internal] load .dockerignore                                                                    0.0s
- => => transferring context: 2B                                                                      0.0s
- => [internal] load metadata for docker.io/library/ubuntu:latest                                     1.2s
- => [1/3] FROM docker.io/library/ubuntu@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386  3.2s
- => => resolve docker.io/library/ubuntu@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386  0.0s
- => => sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 1.20kB / 1.20kB       0.0s
- => => sha256:1de4c5e2d8954bf5fa9855f8b4c9d3c3b97d1d380efe19f60f3e4107a66f5cae 943B / 943B           0.0s
- => => sha256:6a98cbe39225dadebcaa04e21dbe5900ad604739b07a9fa351dd10a6ebad4c1b 3.31kB / 3.31kB       0.0s
- => => sha256:80bc30679ac1fd798f3241208c14accd6a364cb8a6224d1127dfb1577d10554f 27.14MB / 27.14MB     2.3s
- => => sha256:9bf18fab4cfbf479fa9f8409ad47e2702c63241304c2cdd4c33f2a1633c5f85e 850B / 850B           0.5s
- => => sha256:5979309c983a2adeff352538937475cf961d49c34194fa2aab142effe19ed9c1 189B / 189B           0.4s
- => => extracting sha256:80bc30679ac1fd798f3241208c14accd6a364cb8a6224d1127dfb1577d10554f            0.7s
- => => extracting sha256:9bf18fab4cfbf479fa9f8409ad47e2702c63241304c2cdd4c33f2a1633c5f85e            0.0s
- => => extracting sha256:5979309c983a2adeff352538937475cf961d49c34194fa2aab142effe19ed9c1            0.0s
- => [2/3] RUN apt-get update                                                                         2.5s
- => [3/3] RUN apt-get install figlet                                                                 0.9s
- => exporting to image                                                                               0.1s
- => => exporting layers                                                                              0.1s
- => => writing image sha256:3b8aee7b444ab775975dfba691a72d8ac24af2756e0a024e056e3858d5a23f7c         0.0s
- => => naming to docker.io/library/figlet                                                            0.0s
- ```
- ]
-
----
-
-## Understanding BuildKit output
-
-- BuildKit transfers the Dockerfile and the *build context*
-
-  (these are the first two `[internal]` stages)
-
-- Then it executes the steps defined in the Dockerfile
-
-  (`[1/3]`, `[2/3]`, `[3/3]`)
-
-- Finally, it exports the result of the build
-
-  (image definition + collection of layers)
-
----
-
-class: extra-details
-
-## BuildKit plain output
-
-- When running BuildKit in e.g. a CI pipeline, its output will be different
-
-- We can see the same output format by using `--progress=plain`
-
----
-
 ## The caching system
 
 If you run the same build again, it will be instantaneous. Why?
@@ -267,10 +171,10 @@ If you run the same build again, it will be instantaneous. Why?
 
 * Docker uses the exact strings defined in your Dockerfile, so:
 
-  * `RUN apt-get install figlet cowsay`
+  * `RUN apt-get install figlet cowsay ` 
     <br/> is different from
     <br/> `RUN apt-get install cowsay figlet`
-
+  
   * `RUN apt-get update` is not re-executed when the mirrors are updated
 
 You can force a rebuild with `docker build --no-cache ...`.
@@ -292,7 +196,7 @@ root@91f3c974c9a1:/# figlet hello
 ```
 
 
-Yay! 🎉
+Yay! .emoji[🎉]
 
 ---
 

slides/containers/Cmd_And_Entrypoint.md

@@ -272,45 +272,6 @@ $ docker run -it --entrypoint bash myfiglet
 root@6027e44e2955:/# 
 ```
 
----
-
-## `CMD` and `ENTRYPOINT` recap
-
-- `docker run myimage` executes `ENTRYPOINT` + `CMD`
-
-- `docker run myimage args` executes `ENTRYPOINT` + `args` (overriding `CMD`)
-
-- `docker run --entrypoint prog myimage` executes `prog` (overriding both)
-
-.small[
-| Command                         | `ENTRYPOINT`       | `CMD`   | Result
-|---------------------------------|--------------------|---------|-------
-| `docker run figlet`             | none               | none    | Use values from base image (`bash`)
-| `docker run figlet hola`        | none               | none    | Error (executable `hola` not found)
-| `docker run figlet`             | `figlet -f script` | none    | `figlet -f script`
-| `docker run figlet hola`        | `figlet -f script` | none    | `figlet -f script hola`
-| `docker run figlet`             | none    | `figlet -f script` | `figlet -f script`
-| `docker run figlet hola`        | none    | `figlet -f script` | Error (executable `hola` not found)
-| `docker run figlet`             | `figlet -f script` | `hello` | `figlet -f script hello`
-| `docker run figlet hola`        | `figlet -f script` | `hello` | `figlet -f script hola`
-]
-
----
-
-## When to use `ENTRYPOINT` vs `CMD`
-
-`ENTRYPOINT` is great for "containerized binaries".
-
-Example: `docker run consul --help`
-
-(Pretend that the `docker run` part isn't there!)
-
-`CMD` is great for images with multiple binaries.
-
-Example: `docker run busybox ifconfig`
-
-(It makes sense to indicate *which* program we want to run!)
-
 ???
 
 :EN:- CMD and ENTRYPOINT

slides/containers/Compose_For_Dev_Stacks.md

@@ -1,40 +1,51 @@
 # Compose for development stacks
 
-Dockerfile = great to build *one* container image.
+Dockerfiles are great to build container images.
 
-What if we have multiple containers?
+But what if we work with a complex stack made of multiple containers?
 
-What if some of them require particular `docker run` parameters?
+Eventually, we will want to write some custom scripts and automation to build, run, and connect
+our containers together.
 
-How do we connect them all together?
+There is a better way: using Docker Compose.
 
-... Compose solves these use-cases (and a few more).
+In this section, you will use Compose to bootstrap a development environment.
 
 ---
 
-## Life before Compose
+## What is Docker Compose?
 
-Before we had Compose, we would typically write custom scripts to:
+Docker Compose (formerly known as `fig`) is an external tool.
 
-- build container images,
+Unlike the Docker Engine, it is written in Python. It's open source as well.
 
-- run containers using these images,
+The general idea of Compose is to enable a very simple, powerful onboarding workflow:
 
-- connect the containers together,
-
-- rebuild, restart, update these images and containers.
-
----
-
-## Life with Compose
-
-Compose enables a simple, powerful onboarding workflow:
-
-1. Checkout our code.
+1. Checkout your code.
 
 2. Run `docker-compose up`.
 
-3. Our app is up and running!
+3. Your app is up and running!
+
+---
+
+## Compose overview
+
+This is how you work with Compose:
+
+* You describe a set (or stack) of containers in a YAML file called `docker-compose.yml`.
+
+* You run `docker-compose up`.
+
+* Compose automatically pulls images, builds containers, and starts them.
+
+* Compose can set up links, volumes, and other Docker options for you.
+
+* Compose can run the containers in the background, or in the foreground.
+
+* When containers are running in the foreground, their aggregated output is shown.
+
+Before diving in, let's see a small example of Compose in action.
 
 ---
 
@@ -44,61 +55,20 @@ class: pic
 
 ---
 
-## Life after Compose
+## Checking if Compose is installed
 
-(Or: when do we need something else?)
+If you are using the official training virtual machines, Compose has been
+pre-installed.
 
-- Compose is *not* an orchestrator
+If you are using Docker for Mac/Windows or the Docker Toolbox, Compose comes with them.
 
-- It isn't designed to need to run containers on multiple nodes
+If you are on Linux (desktop or server environment), you will need to install Compose from its [release page](https://github.com/docker/compose/releases) or with `pip install docker-compose`.
 
-  (it can, however, work with Docker Swarm Mode)
+You can always check that it is installed by running:
 
-- Compose isn't ideal if we want to run containers on Kubernetes
-
-  - it uses different concepts (Compose services ≠ Kubernetes services)
-
-  - it needs a Docker Engine (althought containerd support might be coming)
-
----
-
-## First rodeo with Compose
-
-1. Write Dockerfiles
-
-2. Describe our stack of containers in a YAML file called `docker-compose.yml`
-
-3. `docker-compose up` (or `docker-compose up -d` to run in the background)
-
-4. Compose pulls and builds the required images, and starts the containers
-
-5. Compose shows the combined logs of all the containers
-
-   (if running in the background, use `docker-compose logs`)
-
-6. Hit Ctrl-C to stop the whole stack
-
-   (if running in the background, use `docker-compose stop`)
-
----
-
-## Iterating
-
-After making changes to our source code, we can:
-
-1. `docker-compose build` to rebuild container images
-
-2. `docker-compose up` to restart the stack with the new images
-
-We can also combine both with `docker-compose up --build`
-
-Compose will be smart, and only recreate the containers that have changed.
-
-When working with interpreted languages:
-
-- dont' rebuild each time
-
-- leverage a `volumes` section instead
+```bash
+$ docker-compose --version
+```
 
 ---
 
@@ -107,37 +77,38 @@ When working with interpreted languages:
 First step: clone the source code for the app we will be working on.
 
 ```bash
-git clone https://github.com/jpetazzo/trainingwheels
-cd trainingwheels
+$ cd
+$ git clone https://github.com/jpetazzo/trainingwheels
+...
+$ cd trainingwheels
 ```
 
-Second step: start the app.
+
+Second step: start your app.
 
 ```bash
-docker-compose up
+$ docker-compose up
 ```
 
-Watch Compose build and run the app.
-
-That Compose stack exposes a web server on port 8000; try connecting to it.
+Watch Compose build and run your app with the correct parameters,
+including linking the relevant containers together.
 
 ---
 
 ## Launching Our First Stack with Compose
 
-We should see a web page like this:
+Verify that the app is running at `http://<yourHostIP>:8000`.
 
 ![composeapp](images/composeapp.png)
 
-Each time we reload, the counter should increase.
-
 ---
 
 ## Stopping the app
 
-When we hit Ctrl-C, Compose tries to gracefully terminate all of the containers.
+When you hit `^C`, Compose tries to gracefully terminate all of the containers.
 
-After ten seconds (or if we press `^C` again) it will forcibly kill them.
+After ten seconds (or if you press `^C` again) it will forcibly kill
+them.
 
 ---
 
@@ -147,13 +118,13 @@ Here is the file used in the demo:
 
 .small[
 ```yaml
-version: "3"
+version: "2"
 
 services:
   www:
     build: www
     ports:
-      - ${PORT-8000}:5000
+      - 8000:5000
     user: nobody
     environment:
       DEBUG: 1
@@ -172,9 +143,9 @@ services:
 
 A Compose file has multiple sections:
 
-* `version` is mandatory. (Typically use "3".)
+* `version` is mandatory. (We should use `"2"` or later; version 1 is deprecated.)
 
-* `services` is mandatory. Each service corresponds to a container.
+* `services` is mandatory. A service is one or more replicas of the same image running as containers.
 
 * `networks` is optional and indicates to which networks containers should be connected.
   <br/>(By default, containers will be connected on a private, per-compose-file network.)
@@ -193,8 +164,6 @@ A Compose file has multiple sections:
 
 * Version 3 added support for deployment options (scaling, rolling updates, etc).
 
-* Typically use `version: "3"`.
-
 The [Docker documentation](https://docs.docker.com/compose/compose-file/)
 has excellent information about the Compose file format if you need to know more about versions.
 
@@ -232,45 +201,34 @@ For the full list, check: https://docs.docker.com/compose/compose-file/
 
 ---
 
-## Environment variables
+## Compose commands
 
-- We can use environment variables in Compose files
+We already saw `docker-compose up`, but another one is `docker-compose build`.
 
-  (like `$THIS` or `${THAT}`)
+It will execute `docker build` for all containers mentioning a `build` path.
 
-- We can provide default values, e.g. `${PORT-8000}`
+It can also be invoked automatically when starting the application:
 
-- Compose will also automatically load the environment file `.env`
+```bash
+docker-compose up --build
+```
 
-  (it should contain `VAR=value`, one per line)
+Another common option is to start containers in the background:
 
-- This is a great way to customize build and run parameters
-
-  (base image versions to use, build and run secrets, port numbers...)
+```bash
+docker-compose up -d
+```
 
 ---
 
-## Running multiple copies of a stack
+## Check container status
 
-- Copy the stack in two different directories, e.g. `front` and `frontcopy`
+It can be tedious to check the status of your containers with `docker ps`,
+especially when running multiple apps at the same time.
 
-- Compose prefixes images and containers with the directory name:
+Compose makes it easier; with `docker-compose ps` you will see only the status of the
+containers of the current stack:
 
-  `front_www`, `front_www_1`, `front_db_1`
-
-  `frontcopy_www`, `frontcopy_www_1`, `frontcopy_db_1`
-
-- Alternatively, use `docker-compose -p frontcopy` 
-
-  (to set the `--project-name` of a stack, which default to the dir name)
-
-- Each copy is isolated from the others (runs on a different network)
-
----
-
-## Checking stack status
-
-We have `ps`, `docker ps`, and similarly, `docker-compose ps`:
 
 ```bash
 $ docker-compose ps
@@ -280,10 +238,6 @@ trainingwheels_redis_1   /entrypoint.sh red   Up      6379/tcp
 trainingwheels_www_1     python counter.py    Up      0.0.0.0:8000->5000/tcp 
 ```
 
-Shows the status of all the containers of our stack.
-
-Doesn't show the other containers.
-
 ---
 
 ## Cleaning up (1)
@@ -327,39 +281,47 @@ Use `docker-compose down -v` to remove everything including volumes.
 
 ## Special handling of volumes
 
-- When an image gets updated, Compose automatically creates a new container
+Compose is smart. If your container uses volumes, when you restart your
+application, Compose will create a new container, but carefully re-use
+the volumes it was using previously.
 
-- The data in the old container is lost...
-
-- ... Except if the container is using a *volume*
-
-- Compose will then re-attach that volume to the new container
-
-  (and data is then retained across database upgrades)
-
-- All good database images use volumes
-
-  (e.g. all official images)
+This makes it easy to upgrade a stateful service, by pulling its
+new image and just restarting your stack with Compose.
 
 ---
 
-class: extra-details
+## Compose project name
 
-## A bit of history and trivia
+* When you run a Compose command, Compose infers the "project name" of your app.
 
-- Compose was initially named "Fig"
+* By default, the "project name" is the name of the current directory.
 
-- Compose is one of the only components of Docker written in Python
+* For instance, if you are in `/home/zelda/src/ocarina`, the project name is `ocarina`.
 
-  (almost everything else is in Go)
+* All resources created by Compose are tagged with this project name.
 
-- In 2020, Docker introduced "Compose CLI":
+* The project name also appears as a prefix of the names of the resources.
 
-  - `docker compose` command to deploy Compose stacks to some clouds
+  E.g. in the previous example, service `www` will create a container `ocarina_www_1`.
 
-  - progressively getting feature parity with `docker-compose`
+* The project name can be overridden with `docker-compose -p`.
 
-  - also provides numerous improvements (e.g. leverages BuildKit by default)
+---
+
+## Running two copies of the same app
+
+If you want to run two copies of the same app simultaneously, all you have to do is to
+make sure that each copy has a different project name.
+
+You can:
+
+* copy your code in a directory with a different name
+
+* start each copy with `docker-compose -p myprojname up`
+
+Each copy will run in a different network, totally isolated from the other.
+
+This is ideal to debug regressions, do side-by-side comparisons, etc.
 
 ???
 

slides/containers/Container_Network_Model.md

@@ -27,9 +27,9 @@ We will also explain the principle of overlay networks and network plugins.
 
 ## The Container Network Model
 
-Docker has "networks".
+The CNM was introduced in Engine 1.9.0 (November 2015).
 
-We can manage them with the `docker network` commands; for instance:
+The CNM adds the notion of a *network*, and a new top-level command to manipulate and see those networks: `docker network`.
 
 ```bash
 $ docker network ls
@@ -41,79 +41,59 @@ eb0eeab782f4        host                host
 228a4355d548        blog-prod           overlay
 ```
 
-New networks can be created (with `docker network create`).
+---
 
-(Note: networks `none` and `host` are special; let's set them aside for now.)
+## What's in a network?
+
+* Conceptually, a network is a virtual switch.
+
+* It can be local (to a single Engine) or global (spanning multiple hosts).
+
+* A network has an IP subnet associated to it.
+
+* Docker will allocate IP addresses to the containers connected to a network.
+
+* Containers can be connected to multiple networks.
+
+* Containers can be given per-network names and aliases.
+
+* The names and aliases can be resolved via an embedded DNS server.
 
 ---
 
-## What's a network?
+## Network implementation details
 
-- Conceptually, a Docker "network" is a virtual switch
+* A network is managed by a *driver*.
 
-  (we can also think about it like a VLAN, or a WiFi SSID, for instance)
+* The built-in drivers include:
 
-- By default, containers are connected to a single network
+  * `bridge` (default)
 
-  (but they can be connected to zero, or many networks, even dynamically)
+  * `none`
 
-- Each network has its own subnet (IP address range)
+  * `host`
 
-- A network can be local (to a single Docker Engine) or global (span multiple hosts)
+  * `macvlan`
 
-- Containers can have *network aliases* providing DNS-based service discovery
+* A multi-host driver, *overlay*, is available out of the box (for Swarm clusters).
 
-  (and each network has its own "domain", "zone", or "scope")
+* More drivers can be provided by plugins (OVS, VLAN...)
+
+* A network can have a custom IPAM (IP allocator).
 
 ---
 
-## Service discovery
+class: extra-details
 
-- A container can be given a network alias
+## Differences with the CNI
 
-  (e.g. with `docker run --net some-network --net-alias db ...`)
+* CNI = Container Network Interface
 
-- The containers running in the same network can resolve that network alias
+* CNI is used notably by Kubernetes
 
-  (i.e. if they do a DNS lookup on `db`, it will give the container's address)
+* With CNI, all the nodes and containers are on a single IP network
 
-- We can have a different `db` container in each network
-
-  (this avoids naming conflicts between different stacks)
-
-- When we name a container, it automatically adds the name as a network alias
-
-  (i.e. `docker run --name xyz ...` is like `docker run --net-alias xyz ...`
-
----
-
-## Network isolation
-
-- Networks are isolated
-
-- By default, containers in network A cannot reach those in network B
-
-- A container connected to both networks A and B can act as a router or proxy
-
-- Published ports are always reachable through the Docker host address
-
-  (`docker run -P ...` makes a container port available to everyone)
-
----
-
-## How to use networks
-
-- We typically create one network per "stack" or app that we deploy
-
-- More complex apps or stacks might require multiple networks
-
-  (e.g. `frontend`, `backend`, ...)
-
-- Networks allow us to deploy multiple copies of the same stack
-
-  (e.g. `prod`, `dev`, `pr-442`, ....)
-
-- If we use Docker Compose, this is managed automatically for us
+* Both CNI and CNM offer the same functionality, but with very different methods
 
 ---
 
@@ -141,30 +121,6 @@ class: pic
 
 ---
 
-class: extra-details
-
-## CNM vs CNI
-
-- CNM is the model used by Docker
-
-- Kubernetes uses a different model, architectured around CNI
-
-  (CNI is a kind of API between a container engine and *CNI plugins*)
-
-- Docker model:
-
-  - multiple isolated networks
-  - per-network service discovery
-  - network interconnection requires extra steps
-
-- Kubernetes model:
-
-  - single flat network
-  - per-namespace service discovery
-  - network isolation requires extra steps (Network Policies)
-
----
-
 ## Creating a network
 
 Let's create a network called `dev`.
@@ -234,12 +190,8 @@ class: extra-details
 
 ## Resolving container addresses
 
-Since Docker Engine 1.10, name resolution is implemented by a dynamic resolver.
-
-Archeological note: when CNM was intoduced (in Docker Engine 1.9, November 2015)
-name resolution was implemented with `/etc/hosts`, and it was updated each time
-CONTAINERs were added/removed. This could cause interesting race conditions
-since `/etc/hosts` was a bind-mount (and couldn't be updated atomically).
+In Docker Engine 1.9, name resolution is implemented with `/etc/hosts`, and
+updating it each time containers are added/removed.
 
 .small[
 ```bash
@@ -256,6 +208,10 @@ ff02::2 ip6-allrouters
 ```
 ]
 
+In Docker Engine 1.10, this has been replaced by a dynamic resolver.
+
+(This avoids race conditions when updating `/etc/hosts`.)
+
 ---
 
 # Service discovery with containers
@@ -309,12 +265,12 @@ Note: we're not using a FQDN or an IP address here; just `redis`.
 
 * That container must be on the same network as the web server.
 
-* It must have the right network alias (`redis`) so the application can find it.
+* It must have the right name (`redis`) so the application can find it.
 
 Start the container:
 
 ```bash
-$ docker run --net dev --net-alias redis -d redis
+$ docker run --net dev --name redis -d redis
 ```
 
 ---
@@ -331,19 +287,36 @@ $ docker run --net dev --net-alias redis -d redis
 
 ## A few words on *scope*
 
-- Container names are unique (there can be only one `--name redis`)
+* What if we want to run multiple copies of our application?
 
-- Network aliases are not unique
+* Since names are unique, there can be only one container named `redis` at a time.
 
-- We can have the same network alias in different networks:
-  ```bash
-  docker run --net dev --net-alias redis ...
-  docker run --net prod --net-alias redis ...
-  ```
+* However, we can specify the network name of our container with `--net-alias`.
 
-- We can even have multiple containers with the same alias in the same network
+* `--net-alias` is scoped per network, and independent from the container name.
 
-  (in that case, we get multiple DNS entries, aka "DNS round robin")
+---
+
+class: extra-details
+
+## Using a network alias instead of a name
+
+Let's remove the `redis` container:
+
+```bash
+$ docker rm -f redis
+```
+
+* `-f`: Force the removal of a running container (uses SIGKILL)
+
+And create one that doesn't block the `redis` name:
+
+```bash
+$ docker run --net dev --net-alias redis -d redis
+```
+
+Check that the app still works (but the counter is back to 1,
+since we wiped out the old Redis container).
 
 ---
 
@@ -376,9 +349,7 @@ A container can have multiple network aliases.
 
 Network aliases are *local* to a given network (only exist in this network).
 
-Multiple containers can have the same network alias (even on the same network).
-
-Since Docker Engine 1.11, resolving a network alias yields the IP addresses of all containers holding this alias.
+Multiple containers can have the same network alias (even on the same network). In Docker Engine 1.11, resolving a network alias yields the IP addresses of all containers holding this alias.
 
 ---
 
@@ -531,24 +502,6 @@ b2887adeb5578a01fd9c55c435cad56bbbe802350711d2743691f95743680b09
 
 ---
 
-## Network drivers
-
-* A network is managed by a *driver*.
-
-* The built-in drivers include:
-
-  * `bridge` (default)
-  * `none`
-  * `host`
-  * `macvlan`
-  * `overlay` (for Swarm clusters)
-
-* More drivers can be provided by plugins (OVS, VLAN...)
-
-* A network can have a custom IPAM (IP allocator).
-
----
-
 ## Overlay networks
 
 * The features we've seen so far only work when all containers are on a single host.

slides/containers/Container_Networking_Basics.md

@@ -15,84 +15,53 @@ At the end of this section, you will be able to:
 
 * Run a network service in a container.
 
-* Connect to that network service.
+* Manipulate container networking basics.
 
 * Find a container's IP address.
 
----
-
-## Running a very simple service
-
-- We need something small, simple, easy to configure
-
-  (or, even better, that doesn't require any configuration at all)
-
-- Let's use the official NGINX image (named `nginx`)
-
-- It runs a static web server listening on port 80
-
-- It serves a default "Welcome to nginx!" page
+We will also explain the different network models used by Docker.
 
 ---
 
-## Runing an NGINX server
+## A simple, static web server
+
+Run the Docker Hub image `nginx`, which contains a basic web server:
 
 ```bash
 $ docker run -d -P nginx
 66b1ce719198711292c8f34f84a7b68c3876cf9f67015e752b94e189d35a204e
 ```
 
-- Docker will automatically pull the `nginx` image from the Docker Hub
+* Docker will download the image from the Docker Hub.
 
-- `-d` / `--detach` tells Docker to run it in the background
+* `-d` tells Docker to run the image in the background.
 
-- `P` / `--publish-all` tells Docker to publish all ports
+* `-P` tells Docker to make this service reachable from other computers.
+  <br/>(`-P` is the short version of `--publish-all`.)
 
-  (publish = make them reachable from other computers)
-
-- ...OK, how do we connect to our web server now?
+But, how do we connect to our web server now?
 
 ---
 
 ## Finding our web server port
 
-- First, we need to find the *port number* used by Docker
+We will use `docker ps`:
 
-  (the NGINX container listens on port 80, but this port will be *mapped*)
+```bash
+$ docker ps
+CONTAINER ID  IMAGE  ...  PORTS                  ...
+e40ffb406c9e  nginx  ...  0.0.0.0:32768->80/tcp  ...
+```
 
-- We can use `docker ps`:
-  ```bash
-  $ docker ps
-  CONTAINER ID  IMAGE  ...  PORTS                  ...
-  e40ffb406c9e  nginx  ...  0.0.0.0:`12345`->80/tcp  ...
-  ```
 
-- This means:
+* The web server is running on port 80 inside the container.
 
-  *port 12345 on the Docker host is mapped to port 80 in the container*
+* This port is mapped to port 32768 on our Docker host.
 
-- Now we need to connect to the Docker host!
+We will explain the whys and hows of this port mapping.
 
----
+But first, let's make sure that everything works properly.
 
-## Finding the address of the Docker host
-
-- When running Docker on your Linux workstation:
-
-  *use `localhost`, or any IP address of your machine*
-
-- When running Docker on a remote Linux server:
-
-  *use any IP address of the remote machine*
-
-- When running Docker Desktop on Mac or Windows:
-
-  *use `localhost`*
-
-- In other scenarios (`docker-machine`, local VM...):
-
-  *use the IP address of the Docker VM*
-  
 ---
 
 ## Connecting to our web server (GUI)
@@ -112,7 +81,7 @@ Make sure to use the right port number if it is different
 from the example below:
 
 ```bash
-$ curl localhost:12345
+$ curl localhost:32768
 <!DOCTYPE html>
 <html>
 <head>
@@ -147,41 +116,17 @@ IMAGE               CREATED             CREATED BY
 
 ---
 
-## Why can't we just connect to port 80?
+## Why are we mapping ports?
 
-- Our Docker host has only one port 80
+* We are out of IPv4 addresses.
 
-- Therefore, we can only have one container at a time on port 80
+* Containers cannot have public IPv4 addresses.
 
-- Therefore, if multiple containers want port 80, only one can get it
+* They have private addresses.
 
-- By default, containers *do not* get "their" port number, but a random one
+* Services have to be exposed port by port.
 
-  (not "random" as "crypto random", but as "it depends on various factors")
-
-- We'll see later how to force a port number (including port 80!)
-
----
-
-class: extra-details
-
-## Using multiple IP addresses
-
-*Hey, my network-fu is strong, and I have questions...*
-
-- Can I publish one container on 127.0.0.2:80, and another on 127.0.0.3:80?
-
-- My machine has multiple (public) IP addresses, let's say A.A.A.A and B.B.B.B.
-  <br/>
-  Can I have one container on A.A.A.A:80 and another on B.B.B.B:80?
-
-- I have a whole IPV4 subnet, can I allocate it to my containers?
-
-- What about IPV6?
-
-You can do all these things when running Docker directly on Linux.
-
-(On other platforms, *generally not*, but there are some exceptions.)
+* Ports have to be mapped to avoid conflicts.
 
 ---
 
@@ -193,7 +138,7 @@ There is a command to help us:
 
 ```bash
 $ docker port <containerID> 80
-0.0.0.0:12345
+32768
 ```
 
 ---
@@ -227,11 +172,13 @@ There are many ways to integrate containers in your network.
 * Pick a fixed port number in advance, when you generate your configuration.
   <br/>Then start your container by setting the port numbers manually.
 
-* Use an orchestrator like Kubernetes or Swarm.
-  <br/>The orchestrator will provide its own networking facilities.
+* Use a network plugin, connecting your containers with e.g. VLANs, tunnels...
 
-Orchestrators typically provide mechanisms to enable direct container-to-container
-communication across hosts, and publishing/load balancing for inbound traffic.
+* Enable *Swarm Mode* to deploy across a cluster.
+  <br/>The container will then be reachable through any node of the cluster.
+
+When using Docker through an extra management layer like Mesos or Kubernetes,
+these will usually provide their own mechanism to expose containers.
 
 ---
 
@@ -255,34 +202,16 @@ $ docker inspect --format '{{ .NetworkSettings.IPAddress }}' <yourContainerID>
 
 ## Pinging our container
 
-Let's try to ping our container *from another container.*
+We can test connectivity to the container using the IP address we've
+just discovered. Let's see this now by using the `ping` tool.
 
 ```bash
-docker run alpine ping `<ipaddress>`
-PING 172.17.0.X (172.17.0.X): 56 data bytes
-64 bytes from 172.17.0.X: seq=0 ttl=64 time=0.106 ms
-64 bytes from 172.17.0.X: seq=1 ttl=64 time=0.250 ms
-64 bytes from 172.17.0.X: seq=2 ttl=64 time=0.188 ms
+$ ping <ipAddress>
+64 bytes from <ipAddress>: icmp_req=1 ttl=64 time=0.085 ms
+64 bytes from <ipAddress>: icmp_req=2 ttl=64 time=0.085 ms
+64 bytes from <ipAddress>: icmp_req=3 ttl=64 time=0.085 ms
 ```
 
-When running on Linux, we can even ping that IP address directly!
-
-(And connect to a container's ports even if they aren't published.)
-
----
-
-## How often do we use `-p` and `-P` ?
-
-- When running a stack of containers, we will often use Compose
-
-- Compose will take care of exposing containers
-
-  (through a `ports:` section in the `docker-compose.yml` file)
-
-- It is, however, fairly common to use `docker run -P` for a quick test
-
-- Or `docker run -p ...` when an image doesn't `EXPOSE` a port correctly
-
 ---
 
 ## Section summary
@@ -291,10 +220,13 @@ We've learned how to:
 
 * Expose a network port.
 
-* Connect to an application running in a container.
+* Manipulate container networking basics.
 
 * Find a container's IP address.
 
+In the next chapter, we will see how to connect
+containers together without exposing their ports.
+
 ???
 
 :EN:- Exposing single containers

slides/containers/Copying_Files_During_Build.md

@@ -88,43 +88,16 @@ Success!
 
 ## Details
 
-* We can `COPY` whole directories recursively
+* You can `COPY` whole directories recursively.
 
-* It is possible to do e.g. `COPY . .`
-
-  (but it might require some extra precautions to avoid copying too much)
- 
-* In older Dockerfiles, you might see the `ADD` command; consider it deprecated
-
-  (it is similar to `COPY` but can automatically extract archives)
+* Older Dockerfiles also have the `ADD` instruction.
+  <br/>It is similar but can automatically extract archives.
 
 * If we really wanted to compile C code in a container, we would:
 
-  * place it in a different directory, with the `WORKDIR` instruction
+  * Place it in a different directory, with the `WORKDIR` instruction.
 
-  * even better, use the `gcc` official image
-
----
-
-class: extra-details
-
-## `.dockerignore`
-
-- We can create a file named `.dockerignore`
-
-  (at the top-level of the build context)
-
-- It can contain file names and globs to ignore
-
-- They won't be sent to the builder
-
-  (and won't end up in the resulting image)
-
-- See the [documentation] for the little details
-
-  (exceptions can be made with `!`, multiple directory levels with `**`...)
-
-[documentation]: https://docs.docker.com/engine/reference/builder/#dockerignore-file
+  * Even better, use the `gcc` official image.
 
 ???
 

slides/containers/Dockerfile_Tips.md

@@ -66,9 +66,9 @@ Adding the dependencies as a separate step means that Docker can cache more effi
 
 ```bash
 FROM python
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install -qr /tmp/requirements.txt
 WORKDIR /src
-COPY requirements.txt .
-RUN pip install -qr requirements.txt
 COPY . .
 EXPOSE 5000
 CMD ["python", "app.py"]

slides/containers/Exercise_Dockerfile_Basic.md

@@ -2,99 +2,4 @@
 
 Let's write Dockerfiles for an existing application!
 
-1. Check out the code repository
-
-2. Read all the instructions
-
-3. Write Dockerfiles
-
-4. Build and test them individually
-
-<!--
-5. Test them together with the provided Compose file
--->
-
----
-
-## Code repository
-
-Clone the repository available at:
-
-https://github.com/jpetazzo/wordsmith
-
-It should look like this:
-```
-├── LICENSE
-├── README
-├── db/
-│   └── words.sql
-├── web/
-│   ├── dispatcher.go
-│   └── static/
-└── words/
-    ├── pom.xml
-    └── src/
-```
-
----
-
-## Instructions
-
-The repository contains instructions in English and French.
-<br/>
-For now, we only care about the first part (about writing Dockerfiles).
-<br/>
-Place each Dockerfile in its own directory, like this:
-```
-├── LICENSE
-├── README
-├── db/
-│   ├── `Dockerfile`
-│   └── words.sql
-├── web/
-│   ├── `Dockerfile`
-│   ├── dispatcher.go
-│   └── static/
-└── words/
-    ├── `Dockerfile`
-    ├── pom.xml
-    └── src/
-```
-
----
-
-## Build and test
-
-Build and run each Dockerfile individually.
-
-For `db`, we should be able to see some messages confirming that the data set
-was loaded successfully (some `INSERT` lines in the container output).
-
-For `web` and `words`, we should be able to see some message looking like
-"server started successfully".
-
-That's all we care about for now!
-
-Bonus question: make sure that each container stops correctly when hitting Ctrl-C.
-
-???
-
-## Test with a Compose file
-
-Place the following Compose file at the root of the repository:
-
-
-```yaml
-version: "3"
-services:
-  db:
-    build: db
-  words:
-    build: words
-  web:
-    build: web
-    ports:
-    - 8888:80
-```
-
-Test the whole app by bringin up the stack and connecting to port 8888.
+The code is at: https://github.com/jpetazzo/wordsmith

slides/containers/First_Containers.md

@@ -106,7 +106,7 @@ root@04c0bb0a6c07:/# figlet hello
 |_| |_|\___|_|_|\___/ 
 ```
 
-Beautiful! 😍
+Beautiful! .emoji[😍]
 
 ---
 
@@ -118,7 +118,7 @@ Let's check how many packages are installed there.
 
 ```bash
 root@04c0bb0a6c07:/# dpkg -l | wc -l
-97
+190
 ```
 
 * `dpkg -l` lists the packages installed in our container
@@ -175,7 +175,7 @@ Now try to run `figlet`. Does that work?
 
 * We can run *any container* on *any host*.
 
-  (One exception: Windows containers can only run on Windows hosts; at least for now.)
+  (One exception: Windows containers cannot run on Linux machines; at least not yet.)
 
 ---
 

slides/containers/Initial_Images.md

@@ -56,8 +56,6 @@ Each of the following items will correspond to one layer:
 * Our application code and assets
 * Our application configuration
 
-(Note: app config is generally added by orchestration facilities.)
-
 ---
 
 class: pic
@@ -369,44 +367,6 @@ This is similar to what we would do with `pip install`, `npm install`, etc.
 
 ---
 
-class: extra-details
-
-## Multi-arch images
-
-- An image can support multiple architectures
-
-- More precisely, a specific *tag* in a given *repository* can have either:
-
-  - a single *manifest* referencing an image for a single architecture
-
-  - a *manifest list* (or *fat manifest*) referencing multiple images
-
-- In a *manifest list*, each image is identified by a combination of:
-
-  - `os` (linux, windows)
-
-  - `architecture` (amd64, arm, arm64...)
-
-  - optional fields like `variant` (for arm and arm64), `os.version` (for windows)
-
----
-
-class: extra-details
-
-## Working with multi-arch images
-
-- The Docker Engine will pull "native" images when available
-
-  (images matching its own os/architecture/variant)
-
-- We can ask for a specific image platform with `--platform`
-
-- The Docker Engine can run non-native images thanks to QEMU+binfmt
-
-  (automatically on Docker Desktop; with a bit of setup on Linux)
-
----
-
 ## Section summary
 
 We've learned how to:

slides/containers/Local_Development_Workflow.md

@@ -154,7 +154,7 @@ Option 2:
 
 Option 3:
 
-* Use a *bind mount* to share local files with the container
+* Use a *volume* to mount local files into the container
 * Make changes locally
 * Changes are reflected in the container
 
@@ -199,28 +199,7 @@ The flag structure is:
 
 * If you don't specify `rw` or `ro`, it will be `rw` by default.
 
----
-
-class: extra-details
-
-## Hold your horses... and your mounts
-
-- The `-v /path/on/host:/path/in/container` syntax is the "old" syntax
-
-- The modern syntax looks like this:
-
-  `--mount type=bind,source=/path/on/host,target=/path/in/container`
-
-- `--mount` is more explicit, but `-v` is quicker to type
-
-- `--mount` supports all mount types; `-v` doesn't support `tmpfs` mounts
-
-- `--mount` fails if the path on the host doesn't exist; `-v` creates it
-
-With the new syntax, our command becomes:
-```bash
-docker run --mount=type=bind,source=$(pwd),target=/src -dP namer
-```
+There will be a full chapter about volumes!
 
 ---
 
@@ -274,43 +253,15 @@ color: red;
 
 ## Understanding volumes
 
-- Volumes are *not* copying or synchronizing files between the host and the container
+* Volumes are *not* copying or synchronizing files between the host and the container.
 
-- Changes made in the host are immediately visible in the container (and vice versa)
+* Volumes are *bind mounts*: a kernel mechanism associating one path with another.
 
-- When running on Linux:
+* Bind mounts are *kind of* similar to symbolic links, but at a very different level.
 
-  - volumes and bind mounts correspond to directories on the host
+* Changes made on the host or on the container will be visible on the other side.
 
-  - if Docker runs in a Linux VM, these directories are in the Linux VM
-
-- When running on Docker Desktop:
-
-  - volumes correspond to directories in a small Linux VM running Docker
-
-  - access to bind mounts is translated to host filesystem access
-    <br/>
-    (a bit like a network filesystem)
-
----
-
-class: extra-details
-
-## Docker Desktop caveats
-
-- When running Docker natively on Linux, accessing a mount = native I/O
-
-- When running Docker Desktop, accessing a bind mount = file access translation
-
-- That file access translation has relatively good performance *in general*
-
-  (watch out, however, for that big `npm install` working on a bind mount!)
-
-- There are some corner cases when watching files (with mechanisms like inotify)
-
-- Features like "live reload" or programs like `entr` don't always behave properly
-
-  (due to e.g. file attribute caching, and other interesting details!)
+  (Under the hood, it's the same file anyway.)
 
 ---
 
@@ -446,4 +397,4 @@ We've learned how to:
 :EN:- “Containerize” a development environment
 
 :FR:Développer au jour le jour
-:FR:- « Containeriser » son environnement de développement
+:FR:- « Containeriser » son environnement de développement

slides/containers/Multi_Stage_Builds.md

@@ -298,20 +298,21 @@ virtually "free."
 
 ## Build targets
 
-* We can also tag an intermediary stage with the following command:
-  ```bash
-  docker build --target STAGE --tag NAME
-  ```
+* We can also tag an intermediary stage with `docker build --target STAGE --tag NAME`
 
 * This will create an image (named `NAME`) corresponding to stage `STAGE`
 
 * This can be used to easily access an intermediary stage for inspection
 
-  (instead of parsing the output of `docker build` to find out the image ID)
+  (Instead of parsing the output of `docker build` to find out the image ID)
 
 * This can also be used to describe multiple images from a single Dockerfile
 
-  (instead of using multiple Dockerfiles, which could go out of sync)
+  (Instead of using multiple Dockerfiles, which could go out of sync)
+
+* Sometimes, we want to inspect a specific intermediary build stage.
+
+* Or, we want to describe multiple images using a single Dockerfile.
 
 ???
 

slides/containers/Network_Drivers.md

@@ -1,20 +1,18 @@
 # Container network drivers
 
-The Docker Engine supports different network drivers.
+The Docker Engine supports many different network drivers.
 
 The built-in drivers include:
 
 * `bridge` (default)
 
-* `null` (for the special network called `none`)
+* `none`
 
-* `host` (for the special network called `host`)
+* `host`
 
-* `container` (that one is a bit magic!)
+* `container`
 
-The network is selected with `docker run --net ...`.
-
-Each network is managed by a driver.
+The driver is selected with `docker run --net ...`.
 
 The different drivers are explained with more details on the following slides.
 

slides/count-slides.py

@@ -11,10 +11,10 @@ class State(object):
         self.section_title = None
         self.section_start = 0
         self.section_slides = 0
-        self.parts = {}
+        self.modules = {}
         self.sections = {}
     def show(self):
-        if self.section_title.startswith("part-"):
+        if self.section_title.startswith("module-"):
             return
         print("{0.section_title}\t{0.section_start}\t{0.section_slides}".format(self))
         self.sections[self.section_title] = self.section_slides
@@ -38,10 +38,10 @@ for line in open(sys.argv[1]):
     if line == "--":
         state.current_slide += 1
     toc_links = re.findall("\(#toc-(.*)\)", line)
-    if toc_links and state.section_title.startswith("part-"):
-        if state.section_title not in state.parts:
-            state.parts[state.section_title] = []
-        state.parts[state.section_title].append(toc_links[0])
+    if toc_links and state.section_title.startswith("module-"):
+        if state.section_title not in state.modules:
+            state.modules[state.section_title] = []
+        state.modules[state.section_title].append(toc_links[0])
     # This is really hackish
     if line.startswith("class:"):
         for klass in EXCLUDED:
@@ -51,7 +51,7 @@ for line in open(sys.argv[1]):
 
 state.show()
 
-for part in sorted(state.parts, key=lambda f: int(f.split("-")[1])):
-    part_size = sum(state.sections[s] for s in state.parts[part])
-    print("{}\t{}\t{}".format("total size for", part, part_size))
+for module in sorted(state.modules, key=lambda f: int(f.split("-")[1])):
+    module_size = sum(state.sections[s] for s in state.modules[module])
+    print("{}\t{}\t{}".format("total size for", module, module_size))
 

slides/helm.yml

@@ -0,0 +1,43 @@
+title: |
+  Packaging d'applications
+  et CI/CD pour Kubernetes
+
+#chat: "[Gitter](https://gitter.im/jpetazzo/training-202102-online)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://2021-04-dijon.container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+#- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/prereqs.md
+- shared/webssh.md
+- shared/connecting.md
+#- shared/chat-room-im.md
+#- shared/chat-room-zoom.md
+- shared/toc.md
+-
+  - shared/sampleapp.md
+  - k8s/helm-intro.md
+  - k8s/helm-chart-format.md
+  - k8s/helm-create-basic-chart.md
+-
+  - k8s/helm-create-better-chart.md
+  - k8s/helm-dependencies.md
+  - k8s/helm-values-schema-validation.md
+  - k8s/helm-secrets.md
+-
+  - k8s/cert-manager.md
+  - k8s/gitlab.md
+  - |
+    # (Extra content)
+  - k8s/prometheus.md
+

slides/images/control-planes/single-node-dev.svg

@@ -1,914 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1600"
-   height="900"
-   viewBox="0 0 1600 900"
-   version="1.1"
-   id="svg696"
-   sodipodi:docname="single-node-dev.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
-   enable-background="new">
-  <metadata
-     id="metadata700">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>how-does-k8s-work</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1080"
-     id="namedview698"
-     showgrid="false"
-     inkscape:zoom="0.64"
-     inkscape:cx="133.80574"
-     inkscape:cy="440.39529"
-     inkscape:window-x="0"
-     inkscape:window-y="1080"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="how-does-k8s-work"
-     units="px"
-     inkscape:snap-object-midpoints="true"
-     inkscape:document-rotation="0" />
-  <title
-     id="title304">how-does-k8s-work</title>
-  <style
-     type="text/css"
-     id="style5"><![CDATA[
-    @font-face {
-        font-family: "Droid Serif";
-        src: url(https://fonts.gstatic.com/s/droidserif/v9/tDbI2oqRg1oM3QBjjcaDkOr9rAU.woff2) format("woff2");
-    }
-  ]]></style>
-  <defs
-     id="defs483">
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker4502"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4500"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker4492"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path4490"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker3758"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path3756" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker3586"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path3584" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2794"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2792" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2634"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2632" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2202"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2200" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2054"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2052" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2781"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2779" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker2657"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path2655" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker2327"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2325"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker2181"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path2179"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker2026"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path2024"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker1880"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path1878"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker1725"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1723"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker1613"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path1611"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <linearGradient
-       id="linearGradient15544"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#f7fe9a;stop-opacity:1;"
-         offset="0"
-         id="stop15542" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker15078"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path15076"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker14924"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path14922"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker6635"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path6633" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker6541"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path6539" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker6297"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path6295"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         transform="scale(-0.2)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker4353"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleInS"
-       inkscape:collect="always">
-      <path
-         transform="scale(-0.2)"
-         style="fill-rule:evenodd;stroke:#cccccc;stroke-width:1pt;stroke-opacity:1;fill:#cccccc;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4351" />
-    </marker>
-    <filter
-       x="-0.039000001"
-       y="-0.096999995"
-       width="1.077"
-       height="1.181"
-       filterUnits="objectBoundingBox"
-       id="filter-1">
-      <feOffset
-         dx="0"
-         dy="2"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset308" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur310" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix312" />
-      <feMerge
-         id="feMerge318">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode314" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode316" />
-      </feMerge>
-    </filter>
-    <filter
-       x="-0.039000001"
-       y="-0.096999995"
-       width="1.077"
-       height="1.181"
-       filterUnits="objectBoundingBox"
-       id="filter-1-3">
-      <feOffset
-         dx="0"
-         dy="2"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset308-6" />
-      <feGaussianBlur
-         stdDeviation="2"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur310-7" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         result="shadowMatrixOuter1"
-         id="feColorMatrix312-5" />
-      <feMerge
-         id="feMerge318-3">
-        <feMergeNode
-           in="shadowMatrixOuter1"
-           id="feMergeNode314-5" />
-        <feMergeNode
-           in="SourceGraphic"
-           id="feMergeNode316-6" />
-      </feMerge>
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1101"
-       x="-0.023413722"
-       width="1.0468274"
-       y="-0.023627247"
-       height="1.0472545">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.3996521"
-         id="feGaussianBlur1103" />
-    </filter>
-  </defs>
-  <g
-     id="how-does-k8s-work"
-     style="display:inline;fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
-     transform="translate(240,90)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3461"
-       d="m 550.17888,-14.918735 c -5.79916,0.29836 -11.4811,1.76683 -16.7125,4.31926 L 305.41221,100.68854 c -11.95688,5.8319 -20.64156,16.86146 -23.59583,29.96674 l -56.2625,249.981 c -2.62478,11.6363 -0.48906,23.8532 5.92083,33.869 0.7693,1.2119 1.59668,2.3849 2.47917,3.515 l 157.85,200.44354 c 8.27676,10.5066 20.82591,16.6243 34.09583,16.6217 l 253.13751,-0.06 c 13.26496,0.01 25.81322,-6.0964 34.09583,-16.5919 L 870.92472,417.96068 c 8.28119,-10.5119 11.38389,-24.2726 8.42917,-37.384 l -56.35,-249.98098 c -2.95427,-13.10528 -11.63895,-24.13483 -23.59583,-29.96674 L 571.32472,-10.599475 c -6.58031,-3.21076 -13.85136,-4.69595 -21.14584,-4.31926 z"
-       style="display:inline;opacity:1;mix-blend-mode:overlay;vector-effect:none;fill:#4285f4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.78722;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter1101)"
-       transform="matrix(1.1552713,0,0,1.1552713,-85.780113,43.857391)"
-       inkscape:label="control plane" />
-    <text
-       id="text3581"
-       y="763.69812"
-       x="502.07855"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:32.6588px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter-1)"
-       xml:space="preserve"
-       transform="matrix(1.4029438,0,0,1.4029438,-157.63347,-1100.6682)"
-       inkscape:label="control plane label"><tspan
-         y="763.69812"
-         x="502.07855"
-         id="tspan3579"
-         sodipodi:role="line">SINGLE-NODE CLUSTER (FOR DEVELOPMENT)</tspan></text>
-    <g
-       id="apiserver"
-       transform="translate(-160.72924,-102.29405)">
-      <rect
-         transform="matrix(0.83465672,0,0,0.83465672,99.00177,261.15864)"
-         ry="5.617908"
-         y="135.0636"
-         x="427.27243"
-         height="125.52966"
-         width="231.99153"
-         id="rect3668"
-         style="display:inline;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-         inkscape:label="API server" />
-      <text
-         id="text4504"
-         y="438.31876"
-         x="552.05261"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           y="438.31876"
-           x="552.05261"
-           id="tspan4502"
-           sodipodi:role="line">API server</tspan></text>
-    </g>
-    <g
-       id="controller-manager"
-       transform="translate(-200,22)">
-      <rect
-         transform="matrix(0.83465672,0,0,0.83465672,205.00177,315.15864)"
-         style="display:inline;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-         id="rect4506"
-         width="231.99153"
-         height="125.52966"
-         x="426.37198"
-         y="298.2099"
-         ry="5.617908"
-         inkscape:label="controller manager" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-         x="656.36871"
-         y="606.2431"
-         id="text4510"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           sodipodi:role="line"
-           id="tspan4508"
-           x="656.36871"
-           y="606.2431">controller</tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           id="tspan4524"
-           sodipodi:role="line"
-           x="656.36871"
-           y="647.06647">manager</tspan></text>
-    </g>
-    <g
-       id="scheduler"
-       transform="translate(-100,-118)">
-      <rect
-         transform="matrix(0.83465672,0,0,0.83465672,-4.99823,167.15864)"
-         ry="5.617908"
-         y="475.73566"
-         x="427.94846"
-         height="125.52966"
-         width="231.99153"
-         id="rect4512"
-         style="display:inline;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-         inkscape:label="scheduler" />
-      <text
-         id="text4516"
-         y="628.66296"
-         x="447.62476"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           y="628.66296"
-           x="447.62476"
-           id="tspan4514"
-           sodipodi:role="line">scheduler</tspan></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-       x="560.76428"
-       y="764.29028"
-       id="text1649"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-         sodipodi:role="line"
-         id="tspan1647"
-         x="560.76428"
-         y="764.29028">VM or container</tspan></text>
-    <text
-       id="text3666"
-       y="281.34979"
-       x="-192.40442"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:71.7295px;line-height:1.25;font-family:'Noto Color Emoji';-inkscape-font-specification:'Noto Color Emoji, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79323"
-       xml:space="preserve"
-       inkscape:label="emojis"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:71.7295px;font-family:'Noto Color Emoji';-inkscape-font-specification:'Noto Color Emoji, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1.79323"
-         y="281.34979"
-         x="-192.40442"
-         id="tspan3664"
-         sodipodi:role="line">👩🏼‍💻👨🏾‍💻🤖</tspan></text>
-    <rect
-       transform="matrix(0.74849003,0,0,0.42877044,-44.82304,220.38115)"
-       y="149.33455"
-       x="-217.52838"
-       height="357.51495"
-       width="435.94931"
-       id="rect3662"
-       style="display:inline;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1-3)"
-       inkscape:label="terminal" />
-    <text
-       inkscape:label="commands"
-       id="text3656"
-       y="331.70175"
-       x="-189.80005"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.8105px;line-height:1.25;font-family:Consolas;-inkscape-font-specification:'Consolas, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.895262"
-       xml:space="preserve"><tspan
-         style="stroke-width:0.895262"
-         y="331.70175"
-         x="-189.80005"
-         sodipodi:role="line"
-         id="tspan1145">$ kubectl ...</tspan></text>
-    <text
-       inkscape:label="thumbsup"
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:71.7295px;line-height:1.25;font-family:'Noto Color Emoji';-inkscape-font-specification:'Noto Color Emoji, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79323"
-       x="207.5956"
-       y="359.34979"
-       id="text5150"><tspan
-         sodipodi:role="line"
-         id="tspan5148"
-         x="207.5956"
-         y="359.34979"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:71.7295px;font-family:'Noto Color Emoji';-inkscape-font-specification:'Noto Color Emoji, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1.79323" /></text>
-    <path
-       inkscape:label="arrow kubectl"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path1135"
-       d="m 198.47677,432.58136 237.89885,-0.39724"
-       style="display:none;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker1613);marker-end:url(#marker1725);paint-order:normal" />
-    <path
-       inkscape:label="arrow scheduler"
-       style="display:inline;fill:#cccccc;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4353);paint-order:normal"
-       d="m 414.32586,398.25642 -3.32843,50.64656"
-       id="path4349"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:label="arrow controller manager"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path6293"
-       d="m 469.44118,396.89114 20.93237,189.75864"
-       style="display:inline;fill:#cccccc;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker6297);paint-order:normal" />
-    <path
-       inkscape:label="node top"
-       style="vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4502);paint-order:normal"
-       d="M 117.18356,331.36155 274.9691,326.32941"
-       id="path4488"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <g
-       id="etcd"
-       transform="translate(1.971505,-80.740088)">
-      <rect
-         transform="matrix(0.83465672,0,0,0.83465672,99.00177,181.15864)"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-         id="rect4518"
-         width="231.99153"
-         height="125.52966"
-         x="427.27246"
-         y="-4.9364014"
-         ry="5.617908"
-         inkscape:label="etcd" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.834657"
-         x="552.46265"
-         y="161.46683"
-         id="text4522"
-         transform="translate(0,80)"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           sodipodi:role="line"
-           id="tspan4520"
-           x="552.46265"
-           y="161.46683">etcd</tspan></text>
-      <g
-         id="g3228"
-         inkscape:label="storage"
-         style="display:inline"
-         transform="matrix(0.24039167,0,0,0.24784672,397.27503,204.48707)">
-        <ellipse
-           cx="374.0946"
-           cy="234.48322"
-           rx="92.65731"
-           ry="25.358843"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
-           id="ellipse9871" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="rect9873"
-           d="M 281.43729,235.006 V -24.92734 H 466.75191 V 235.006"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-        <ellipse
-           ry="25.358843"
-           rx="92.65731"
-           cy="-24.750473"
-           cx="374.0946"
-           id="path9869"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
-      </g>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:1.25;font-family:'Noto Color Emoji';-inkscape-font-specification:'Noto Color Emoji, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="-314.87122"
-       y="76.790283"
-       id="text5696"><tspan
-         sodipodi:role="line"
-         id="tspan5694"
-         x="-314.87122"
-         y="76.790283" /></text>
-    <g
-       id="g6027"
-       transform="translate(173.26362,-123.65545)"
-       inkscape:label="kubelet">
-      <rect
-         transform="matrix(0.83465672,0,0,0.83465672,99.00177,261.15864)"
-         ry="5.617908"
-         y="135.0636"
-         x="427.27243"
-         height="125.52966"
-         width="231.99153"
-         id="rect6021"
-         style="display:inline;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-         inkscape:label="rect" />
-      <text
-         id="text6025"
-         y="438.31876"
-         x="552.05261"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-           y="438.31876"
-           x="552.05261"
-           id="tspan6023"
-           sodipodi:role="line">kubelet</tspan></text>
-    </g>
-    <g
-       id="g6159"
-       inkscape:label="pod"
-       style="display:inline"
-       transform="translate(-465.32975,388.44365)">
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
-         id="path6139" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,193.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
-         id="path6141" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1254.6157,193.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
-         id="path6143" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.0298px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.550744"
-         x="1195.4893"
-         y="274.76129"
-         id="text6147"><tspan
-           sodipodi:role="line"
-           id="tspan6145"
-           x="1195.4893"
-           y="274.76129"
-           style="stroke-width:0.550744">pod</tspan></text>
-    </g>
-    <g
-       id="g7100"
-       inkscape:label="container engine"
-       transform="translate(780.76442,-206.55137)">
-      <g
-         id="g7089"
-         transform="translate(-657.05924,68.771622)">
-        <rect
-           transform="matrix(0.83465672,0,0,0.83465672,205.00177,315.15864)"
-           style="display:inline;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
-           id="rect7081"
-           width="231.99153"
-           height="125.52966"
-           x="426.37198"
-           y="298.2099"
-           ry="5.617908"
-           inkscape:label="controller manager" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.834657"
-           x="656.36871"
-           y="606.2431"
-           id="text7087"><tspan
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-             id="tspan7085"
-             sodipodi:role="line"
-             x="656.36871"
-             y="606.2431">container</tspan><tspan
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.6587px;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.834657"
-             sodipodi:role="line"
-             x="656.36871"
-             y="647.06647"
-             id="tspan7093">engine</tspan></text>
-      </g>
-    </g>
-    <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path2048"
-       d="m 718.47061,417.59763 2.84701,-46.58932"
-       style="display:inline;fill:#cccccc;fill-rule:evenodd;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker2054);marker-end:url(#marker2202);paint-order:normal"
-       inkscape:label="node top left" />
-    <path
-       inkscape:label="arrow etcd"
-       style="display:inline;fill:#cccccc;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker6635);paint-order:normal"
-       d="m 465.71622,277.64 30.73977,-64.3282"
-       id="path6537"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:label="node top"
-       style="display:inline;vector-effect:none;fill:#cccccc;fill-opacity:1;stroke:#cccccc;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker1880);marker-end:url(#marker2026);paint-order:normal"
-       d="m 505.55141,327.11713 103.53017,-3.03009"
-       id="path8569"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <g
-       id="g7154"
-       inkscape:label="pod"
-       style="display:inline"
-       transform="translate(-578.21351,370.84416)">
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
-         id="path7144" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,193.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
-         id="path7146" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1254.6157,193.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
-         id="path7148" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.0298px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.550744"
-         x="1195.4893"
-         y="274.76129"
-         id="text7152"><tspan
-           sodipodi:role="line"
-           id="tspan7150"
-           x="1195.4893"
-           y="274.76129"
-           style="stroke-width:0.550744">pod</tspan></text>
-    </g>
-    <g
-       id="g7166"
-       inkscape:label="pod"
-       style="display:inline"
-       transform="translate(-606.70424,238.95491)">
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
-         id="path7156" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1177.078,193.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
-         id="path7158" />
-      <path
-         inkscape:export-ydpi="376.57999"
-         inkscape:export-xdpi="376.57999"
-         style="fill:#eeeeee;fill-rule:evenodd;stroke:#000000;stroke-width:2.74114;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 1254.6157,193.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
-         id="path7160" />
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.0298px;line-height:1.25;font-family:'Droid Serif';-inkscape-font-specification:'Droid Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.550744"
-         x="1195.4893"
-         y="274.76129"
-         id="text7164"><tspan
-           sodipodi:role="line"
-           id="tspan7162"
-           x="1195.4893"
-           y="274.76129"
-           style="stroke-width:0.550744">pod</tspan></text>
-    </g>
-  </g>
-</svg>

slides/index.py

@@ -112,10 +112,7 @@ TEMPLATE="""<html>
         {% for item in all_past_workshops %}
           <tr>
             <td>{{ item.title }}</td>
-            <td>{% if item.slides %}<a class="slides" href="{{ item.slides }}" />
-            {% else %}
-              <p class="details">{{ item.status }}</p>
-            {% endif %}</td>
+            <td><a class="slides" href="{{ item.slides }}" /></td>
             {% if item.video %}
               <td><a class="video" href="{{ item.video }}" /></td>
             {% endif %}

slides/index.yaml

@@ -1,103 +1,3 @@
-- date: [2021-09-27, 2021-09-29]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Docker intensif (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  #slides: https://2021-05-enix.container.training/1.yml.html
-
-- date: [2021-10-04, 2021-10-07]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Fondamentaux Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  #slides: https://2021-05-enix.container.training/2.yml.html
-
-- date: [2021-10-11, 2021-10-12]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Packaging et CI/CD pour Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  #slides: https://2021-05-enix.container.training/3.yml.html
-
-- date: [2021-11-08, 2021-11-16]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Kubernetes avancé (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  #slides: https://2021-05-enix.container.training/4.yml.html
-
-- date: [2021-11-18, 2021-11-19]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Opérer Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  #slides: https://2021-05-enix.container.training/5.yml.html
-
-- date: [2021-05-10, 2021-05-12]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Docker intensif (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-05-enix.container.training/1.yml.html
-
-- date: [2021-05-17, 2021-05-20]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Fondamentaux Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-05-enix.container.training/2.yml.html
-
-- date: [2021-05-24, 2021-05-25]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Packaging et CI/CD pour Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-05-enix.container.training/3.yml.html
-
-- date: [2021-05-26, 2021-05-28]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Kubernetes avancé (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-05-enix.container.training/4.yml.html
-
-- date: [2021-05-31, 2021-06-01]
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Opérer Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-05-enix.container.training/5.yml.html
-
 - date: [2021-02-08, 2021-02-10]
   country: www
   city: streaming
@@ -106,7 +6,6 @@
   title: Docker intensif (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-02-enix.container.training/1.yml.html
 
 - date: [2021-02-15, 2021-02-18]
   country: www
@@ -116,7 +15,6 @@
   title: Fondamentaux Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-02-enix.container.training/2.yml.html
 
 - date: [2021-02-22, 2021-02-23]
   country: www
@@ -126,7 +24,6 @@
   title: Packaging et CI/CD pour Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-02-enix.container.training/3.yml.html
 
 - date: [2021-02-24, 2021-02-26]
   country: www
@@ -136,7 +33,6 @@
   title: Kubernetes avancé (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-02-enix.container.training/4.yml.html
 
 - date: [2021-03-01, 2021-03-02]
   country: www
@@ -146,7 +42,6 @@
   title: Opérer Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2021-02-enix.container.training/5.yml.html
 
 - date: [2020-10-05, 2020-10-06]
   country: www
@@ -156,7 +51,6 @@
   title: Docker intensif (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-10-enix.container.training/1.yml.html
 
 - date: [2020-10-07, 2020-10-09]
   country: www
@@ -166,7 +60,6 @@
   title: Fondamentaux Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-10-enix.container.training/2.yml.html
 
 - date: 2020-10-12
   country: www
@@ -176,7 +69,6 @@
   title: Packaging pour Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-10-enix.container.training/3.yml.html
 
 - date: [2020-10-13, 2020-10-14]
   country: www
@@ -186,7 +78,6 @@
   title: Kubernetes avancé (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-10-enix.container.training/4.yml.html
 
 - date: [2020-10-19, 2020-10-20]
   country: www
@@ -196,7 +87,6 @@
   title: Opérer Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-10-enix.container.training/5.yml.html
 
 - date: [2020-09-28, 2020-10-01]
   country: www
@@ -205,7 +95,6 @@
   speaker: jpetazzo
   title: Advanced Kubernetes Concepts
   attend: https://skillsmatter.com/courses/700-advanced-kubernetes-concepts-workshop-jerome-petazzoni
-  slides: https://2020-09-skillsmatter.container.training/
 
 - date: [2020-08-29, 2020-08-30]
   country: www
@@ -241,7 +130,6 @@
   title: Docker intensif (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-06-enix.container.training/1.yml.html
 
 - date: [2020-06-17, 2020-06-19]
   country: www
@@ -251,7 +139,6 @@
   title: Fondamentaux Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-06-enix.container.training/2.yml.html
 
 - date: 2020-06-22
   country: www
@@ -261,7 +148,6 @@
   title: Packaging pour Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-06-enix.container.training/3.yml.html
 
 - date: [2020-06-23, 2020-06-24]
   country: www
@@ -271,7 +157,6 @@
   title: Kubernetes avancé (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-06-enix.container.training/4.yml.html
 
 - date: [2020-06-25, 2020-06-26]
   country: www
@@ -281,8 +166,6 @@
   title: Opérer Kubernetes (en français)
   lang: fr
   attend: https://enix.io/fr/services/formation/online/
-  slides: https://2020-06-enix.container.training/5.yml.html
-
 
 - date: [2020-06-09, 2020-06-11]
   country: www

slides/intro-fullday.yml

@@ -0,0 +1,70 @@
+title: |
+  Introduction
+  to Containers
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- containers/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+-
+  #- containers/Docker_Overview.md
+  #- containers/Docker_History.md
+  - containers/Training_Environment.md
+  #- containers/Installing_Docker.md
+  - containers/First_Containers.md
+  - containers/Background_Containers.md
+  #- containers/Start_And_Attach.md
+  - containers/Naming_And_Inspecting.md
+  #- containers/Labels.md
+  - containers/Getting_Inside.md
+  - containers/Initial_Images.md
+-
+  - containers/Building_Images_Interactively.md
+  - containers/Building_Images_With_Dockerfiles.md
+  - containers/Cmd_And_Entrypoint.md
+  - containers/Copying_Files_During_Build.md
+  - containers/Exercise_Dockerfile_Basic.md
+-
+  - containers/Container_Networking_Basics.md
+  #- containers/Network_Drivers.md
+  - containers/Local_Development_Workflow.md
+  - containers/Container_Network_Model.md
+  - containers/Compose_For_Dev_Stacks.md
+  - containers/Exercise_Composefile.md
+-
+  - containers/Multi_Stage_Builds.md
+  #- containers/Publishing_To_Docker_Hub.md
+  - containers/Dockerfile_Tips.md
+  - containers/Exercise_Dockerfile_Advanced.md
+  #- containers/Docker_Machine.md
+  #- containers/Advanced_Dockerfiles.md
+  #- containers/Init_Systems.md
+  #- containers/Application_Configuration.md
+  #- containers/Logging.md
+  #- containers/Namespaces_Cgroups.md
+  #- containers/Copy_On_Write.md
+  #- containers/Containers_From_Scratch.md
+  #- containers/Container_Engines.md
+  #- containers/Pods_Anatomy.md
+  #- containers/Ecosystem.md
+  #- containers/Orchestration_Overview.md
+  - shared/thankyou.md
+  - containers/links.md

slides/intro-selfpaced.yml

@@ -0,0 +1,71 @@
+title: |
+  Introduction
+  to Containers
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- in-person
+
+content:
+- shared/title.md
+# - shared/logistics.md
+- containers/intro.md
+- shared/about-slides.md
+#- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- - containers/Docker_Overview.md
+  - containers/Docker_History.md
+  - containers/Training_Environment.md
+  - containers/Installing_Docker.md
+  - containers/First_Containers.md
+  - containers/Background_Containers.md
+  - containers/Start_And_Attach.md
+- - containers/Initial_Images.md
+  - containers/Building_Images_Interactively.md
+  - containers/Building_Images_With_Dockerfiles.md
+  - containers/Cmd_And_Entrypoint.md
+  - containers/Copying_Files_During_Build.md
+  - containers/Exercise_Dockerfile_Basic.md
+- - containers/Multi_Stage_Builds.md
+  - containers/Publishing_To_Docker_Hub.md
+  - containers/Dockerfile_Tips.md
+  - containers/Exercise_Dockerfile_Advanced.md
+- - containers/Naming_And_Inspecting.md
+  - containers/Labels.md
+  - containers/Getting_Inside.md
+- - containers/Container_Networking_Basics.md
+  - containers/Network_Drivers.md
+  - containers/Container_Network_Model.md
+  #- containers/Connecting_Containers_With_Links.md
+  - containers/Ambassadors.md
+- - containers/Local_Development_Workflow.md
+  - containers/Windows_Containers.md
+  - containers/Working_With_Volumes.md
+  - containers/Compose_For_Dev_Stacks.md
+  - containers/Exercise_Composefile.md
+  - containers/Docker_Machine.md
+- - containers/Advanced_Dockerfiles.md
+  - containers/Init_Systems.md
+  - containers/Application_Configuration.md
+  - containers/Logging.md
+  - containers/Resource_Limits.md
+- - containers/Namespaces_Cgroups.md
+  - containers/Copy_On_Write.md
+  #- containers/Containers_From_Scratch.md
+- - containers/Container_Engines.md
+  - containers/Pods_Anatomy.md
+  - containers/Ecosystem.md
+  - containers/Orchestration_Overview.md
+  - shared/thankyou.md
+  - containers/links.md

slides/intro-twodays.yml

@@ -0,0 +1,79 @@
+title: |
+  Introduction
+  to Containers
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- containers/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- # DAY 1
+  - containers/Docker_Overview.md
+  #- containers/Docker_History.md
+  - containers/Training_Environment.md
+  - containers/First_Containers.md
+  - containers/Background_Containers.md
+  - containers/Initial_Images.md
+-
+  - containers/Building_Images_Interactively.md
+  - containers/Building_Images_With_Dockerfiles.md
+  - containers/Cmd_And_Entrypoint.md
+  - containers/Copying_Files_During_Build.md
+  - containers/Exercise_Dockerfile_Basic.md
+-
+  - containers/Dockerfile_Tips.md
+  - containers/Multi_Stage_Builds.md
+  - containers/Publishing_To_Docker_Hub.md
+  - containers/Exercise_Dockerfile_Advanced.md
+-
+  - containers/Naming_And_Inspecting.md
+  - containers/Labels.md
+  - containers/Start_And_Attach.md
+  - containers/Getting_Inside.md
+  - containers/Resource_Limits.md
+- # DAY 2
+  - containers/Container_Networking_Basics.md
+  - containers/Network_Drivers.md
+  - containers/Container_Network_Model.md
+-
+  - containers/Local_Development_Workflow.md
+  - containers/Working_With_Volumes.md
+  - containers/Compose_For_Dev_Stacks.md
+  - containers/Exercise_Composefile.md
+-
+  - containers/Installing_Docker.md
+  - containers/Container_Engines.md
+  - containers/Init_Systems.md
+  - containers/Advanced_Dockerfiles.md
+-
+  - containers/Application_Configuration.md
+  - containers/Logging.md
+  - containers/Orchestration_Overview.md
+-
+  - shared/thankyou.md
+  - containers/links.md
+#-
+  #- containers/Docker_Machine.md
+  #- containers/Ambassadors.md
+  #- containers/Namespaces_Cgroups.md
+  #- containers/Copy_On_Write.md
+  #- containers/Containers_From_Scratch.md
+  #- containers/Pods_Anatomy.md
+  #- containers/Ecosystem.md

slides/k8s/authn-authz.md

@@ -733,19 +733,17 @@ class: extra-details
 
 ## Figuring out who can do what
 
-- For auditing purposes, sometimes we want to know who can perform which actions
+- For auditing purposes, sometimes we want to know who can perform an action
 
-- There are a few tools to help us with that, available as `kubectl` plugins:
+- There are a few tools to help us with that
 
-  - `kubectl who-can` / [kubectl-who-can](https://github.com/aquasecurity/kubectl-who-can) by Aqua Security
+  - [kubectl-who-can](https://github.com/aquasecurity/kubectl-who-can) by Aqua Security
 
-  - `kubectl access-matrix` / [Rakkess (Review Access)](https://github.com/corneliusweig/rakkess) by Cornelius Weig
+  - [Review Access (aka Rakkess)](https://github.com/corneliusweig/rakkess)
 
-  - `kubectl rbac-lookup` / [RBAC Lookup](https://github.com/FairwindsOps/rbac-lookup) by FairwindsOps
+- Both are available as standalone programs, or as plugins for `kubectl`
 
-- `kubectl` plugins can be installed and managed with `krew`
-
-- They can also be installed and executed as standalone programs
+  (`kubectl` plugins can be installed and managed with `krew`)
 
 ???
 

slides/k8s/cert-manager.md

@@ -58,20 +58,25 @@
 
 .exercise[
 
-- Let's install the cert-manager Helm chart with this one-liner:
+- Create the namespace for cert-manager:
   ```bash
-    helm install cert-manager cert-manager \
-        --repo https://charts.jetstack.io \
-        --create-namespace --namespace cert-manager \
-        --set installCRDs=true
+  kubectl create ns cert-manager
+  ```
+
+- Add the Jetstack repository:
+  ```bash
+  helm repo add jetstack https://charts.jetstack.io
+  ```
+
+- Install cert-manager:
+  ```bash
+    helm install cert-manager jetstack/cert-manager \
+         --namespace cert-manager \
+         --set installCRDs=true
   ```
 
 ]
 
-- If you prefer to install with a single YAML file, that's fine too!
-
-  (see [the documentation](https://cert-manager.io/docs/installation/kubernetes/#installing-with-regular-manifests) for instructions)
-
 ---
 
 ## ClusterIssuer manifest
@@ -218,24 +223,6 @@ spec:
 
 class: extra-details
 
-## Automatic TLS Ingress with annotations
-
-- It is also possible to annotate Ingress resources for cert-manager
-
-- If we annotate an Ingress resource with `cert-manager.io/cluster-issuer=xxx`:
-
-  - cert-manager will detect that annotation
-
-  - it will obtain a certificate using the specified ClusterIssuer (`xxx`)
-
-  - it will store the key and certificate in the specified Secret
-
-- Note: the Ingress still needs the `tls` section with `secretName` and `hosts`
-
----
-
-class: extra-details
-
 ## Let's Encrypt and nip.io
 
 - Let's Encrypt has [rate limits](https://letsencrypt.org/docs/rate-limits/) per domain

slides/k8s/concepts-k8s.md

@@ -220,41 +220,6 @@ class: extra-details
 
 ---
 
-class: pic
-![](images/control-planes/single-node-dev.svg)
-
----
-
-class: pic
-![](images/control-planes/managed-kubernetes.svg)
-
----
-
-class: pic
-![](images/control-planes/single-control-and-workers.svg)
-
----
-
-class: pic
-![](images/control-planes/stacked-control-plane.svg)
-
----
-
-class: pic
-![](images/control-planes/non-dedicated-stacked-nodes.svg)
-
----
-
-class: pic
-![](images/control-planes/advanced-control-plane.svg)
-
----
-
-class: pic
-![](images/control-planes/advanced-control-plane-split-events.svg)
-
----
-
 class: extra-details
 
 ## How many nodes should a cluster have?

slides/k8s/crd.md

@@ -187,7 +187,7 @@ Note: we can update a CRD without having to re-create the corresponding resource
 
 ---
 
-## OpenAPI v3 schema example
+## OpenAPI v3 scheme exapmle
 
 This is what we have in @@LINK[k8s/coffee-3.yaml]:
 

slides/k8s/exercise-sealed-secrets.md

@@ -1,99 +0,0 @@
-# Exercise — sealed secrets
-
-This is a "combo exercise" to practice the following concepts:
-
-- Secrets (mounting them in containers)
-
-- RBAC (granting specific permissions to specific users)
-
-- Operators (specifically, sealed secrets)
-
-- Migrations (copying/transferring resources from a cluster to another)
-
-For this exercise, you will need two clusters.
-
-(It can be two local clusters.)
-
-We will call them "source cluster" and "target cluster".
-
----
-
-## Step 1 (easy)
-
-- Install the sealed secrets operator on both clusters
-
-- On source cluster, create a Namespace called `dev`
-
-- Create two sealed secrets, `verysecure` and `veryverysecure`
-
-  (the content doesn't matter; put a random string of your choice)
-
-- Create a Deployment called `app` using both secrets
-
-  (use a mount or environment variables; whatever you prefer!)
-
-- Verify that the secrets are available to the Deployment
-
----
-
-## Step 2 (medium)
-
-- Create another Namespace called `prod`
-
-  (on the source cluster)
-
-- Create the same Deployment `app` using both secrets
-
-- Verify that the secrets are available to the Deployment
-
----
-
-## Step 3 (hard)
-
-- On the target cluster, create a Namespace called `prod`
-
-- Create the `app` Deployment and both sealed secrets
-
-  (do not copy the Secrets; only the sealed secrets)
-
-- Check the next slide if you need a hint!
-
---
-
-- You will have to copy the Sealed Secret private key
-
----
-
-## Step 4 (medium)
-
-On the target cluster, create the Namespace `dev`.
-
-Let's say that user `alice` has access to the target cluster.
-
-(You can use `kubectl --as=alice` to impersonate her.)
-
-We want Alice to be able to:
-
-- deploy the whole application
-
-- access the `verysecure` secret
-
-- but *not* the `veryverysecure` secret
-
----
-
-## Step 5 (hard)
-
-- Make sure that Alice can view the logs of the Deployment
-
-- Can you think of a way for Alice to access the `veryverysecure` Secret?
-
-  (check next slide for a hint)
-
---
-
-- `kubectl exec`, maybe?
-
---
-
-- Can you think of a way to prevent that?

slides/k8s/helm-chart-format.md

@@ -40,22 +40,7 @@
 
   - a `Chart.yaml` file, containing metadata (name, version, description ...)
 
-- Let's look at a simple chart for a basic demo app
-
----
-
-## Adding the repo
-
-- If you haven't done it before, you need to add the repo for that chart
-
-.exercise[
-
-- Add the repo that holds the chart for the OWASP Juice Shop:
-  ```bash
-  helm repo add juice https://charts.securecodebox.io
-  ```
-
-]
+- Let's look at a simple chart, `stable/tomcat`
 
 ---
 
@@ -65,17 +50,17 @@
 
 .exercise[
 
-- Download the tarball for `juice/juice-shop`:
+- Download the tarball for `stable/tomcat`:
   ```bash
-  helm pull juice/juice-shop
+  helm pull stable/tomcat
   ```
-  (This will create a file named `juice-shop-X.Y.Z.tgz`.)
+  (This will create a file named `tomcat-X.Y.Z.tgz`.)
 
-- Or, download + untar `juice/juice-shop`:
+- Or, download + untar `stable/tomcat`:
   ```bash
-  helm pull juice/juice-shop --untar
+  helm pull stable/tomcat --untar
   ```
-  (This will create a directory named `juice-shop`.)
+  (This will create a directory named `tomcat`.)
 
 ]
 
@@ -83,13 +68,13 @@
 
 ## Looking at the chart's content
 
-- Let's look at the files and directories in the `juice-shop` chart
+- Let's look at the files and directories in the `tomcat` chart
 
 .exercise[
 
 - Display the tree structure of the chart we just downloaded:
   ```bash
-  tree juice-shop
+  tree tomcat
   ```
 
 ]
@@ -108,11 +93,12 @@ We see the components mentioned above: `Chart.yaml`, `templates/`, `values.yaml`
 
   (using the standard Go template library)
 
+
 .exercise[
 
-- Look at the template file for the Service resource:
+- Look at the template file for the tomcat Service resource:
   ```bash
-  cat juice-shop/templates/service.yaml
+  cat tomcat/templates/appsrv-svc.yaml
   ```
 
 ]
@@ -204,7 +190,7 @@ We see the components mentioned above: `Chart.yaml`, `templates/`, `values.yaml`
 
 - At the top-level of the chart, it's a good idea to have a README
 
-- It will be viewable with e.g. `helm show readme juice/juice-shop`
+- It will be viewable with e.g. `helm show readme stable/tomcat`
 
 - In the `templates/` directory, we can also have a `NOTES.txt` file
 

slides/k8s/helm-dependencies.md

@@ -134,7 +134,7 @@ use Bitnami's Redis chart.
   ```yaml
     dependencies:
       - name: redis
-        version: ">=11, <12"
+        version: ">=11 <12"
         repository: https://charts.bitnami.com/bitnami
   ```
 

slides/k8s/helm-intro.md

@@ -1,84 +1,20 @@
 # Managing stacks with Helm
 
-- Helm is a (kind of!) package manager for Kubernetes
+- We created our first resources with `kubectl run`, `kubectl expose` ...
 
-- We can use it to:
+- We have also created resources by loading YAML files with `kubectl apply -f`
 
-  - find existing packages (called "charts") created by other folks
+- For larger stacks, managing thousands of lines of YAML is unreasonable
 
-  - install these packages, configuring them for our particular setup
+- These YAML bundles need to be customized with variable parameters
 
-  - package our own things (for distribution or for internal use)
+  (E.g.: number of replicas, image version to use ...)
 
-  - manage the lifecycle of these installs (rollback to previous version etc.)
+- It would be nice to have an organized, versioned collection of bundles
 
-- It's a "CNCF graduate project", indicating a certain level of maturity
+- It would be nice to be able to upgrade/rollback these bundles carefully
 
-  (more on that later)
-
----
-
-## From `kubectl run` to YAML
-
-- We can create resources with one-line commands
-
-  (`kubectl run`, `kubectl createa deployment`, `kubectl expose`...)
-
-- We can also create resources by loading YAML files
-
-  (with `kubectl apply -f`, `kubectl create -f`...)
-
-- There can be multiple resources in a single YAML files
-
-  (making them convenient to deploy entire stacks)
-
-- However, these YAML bundles often need to be customized
-
-  (e.g.: number of replicas, image version to use, features to enable...)
-
----
-
-## Beyond YAML
-
-- Very often, after putting together our first `app.yaml`, we end up with:
-
-  - `app-prod.yaml`
-
-  - `app-staging.yaml`
-
-  - `app-dev.yaml`
-
-  - instructions indicating to users "please tweak this and that in the YAML"
-
-- That's where using something like
-  [CUE](https://github.com/cuelang/cue/blob/v0.3.2/doc/tutorial/kubernetes/README.md),
-  [Kustomize](https://kustomize.io/),
-  or [Helm](https://helm.sh/) can help!
-
-- Now we can do something like this:
-  ```bash
-  helm install app ... --set this.parameter=that.value
-  ```
-
----
-
-## Other features of Helm
-
-- With Helm, we create "charts"
-
-- These charts can be used internally or distributed publicly
-
-- Public charts can be indexed through the [Artifact Hub](https://artifacthub.io/)
-
-- This gives us a way to find and install other folks' charts
-
-- Helm also gives us ways to manage the lifecycle of what we install:
-
-  - keep track of what we have installed
-
-  - upgrade versions, change parameters, roll back, uninstall
-
-- Furthermore, even if it's not "the" standard, it's definitely "a" standard!
+- [Helm](https://helm.sh/) is an open source project offering all these things!
 
 ---
 
@@ -86,7 +22,7 @@
 
 - On April 30th 2020, Helm was the 10th project to *graduate* within the CNCF
 
-  🎉
+  .emoji[🎉]
 
   (alongside Containerd, Prometheus, and Kubernetes itself)
 
@@ -293,95 +229,71 @@ fine for personal and development clusters.)
 
 ---
 
+## Managing repositories
+
+- Let's check what repositories we have, and add the `stable` repo
+
+  (the `stable` repo contains a set of official-ish charts)
+
+.exercise[
+
+- List our repos:
+  ```bash
+  helm repo list
+  ```
+
+- Add the `stable` repo:
+  ```bash
+  helm repo add stable https://charts.helm.sh/stable
+  ```
+
+]
+
+Adding a repo can take a few seconds (it downloads the list of charts from the repo).
+
+It's OK to add a repo that already exists (it will merely update it).
+
+---
+
 class: extra-details
 
-## How to find charts, the old way
+## Deprecation warning
 
-- Helm 2 came with one pre-configured repo, the "stable" repo
+- That "stable" is being deprecated, in favor of a more decentralized approach
 
-  (located at https://charts.helm.sh/stable)
+  (each community / company / group / project hosting their own repository)
 
-- Helm 3 doesn't have any pre-configured repo
+- We're going to use it here for educational purposes
 
-- The "stable" repo mentioned above is now being deprecated
+- But if you're looking for production-grade charts, look elsewhere!
 
-- The new approach is to have fully decentralized repos
-
-- Repos can be indexed in the Artifact Hub
-
-  (which supersedes the Helm Hub)
+  (namely, on the Helm Hub)
 
 ---
 
-## How to find charts, the new way
+## Search available charts
 
-- Go to the [Artifact Hub](https://artifacthub.io/packages/search?kind=0) (https://artifacthub.io)
+- We can search available charts with `helm search`
 
-- Or use `helm search hub ...` from the CLI
+- We need to specify where to search (only our repos, or Helm Hub)
 
-- Let's try to find a Helm chart for something called "OWASP Juice Shop"!
-
-  (it is a famous demo app used in security challenges)
-
----
-
-## Finding charts from the CLI
-
-- We can use `helm search hub <keyword>`
+- Let's search for all charts mentioning tomcat!
 
 .exercise[
 
-- Look for the OWASP Juice Shop app:
+- Search for tomcat in the repo that we added earlier:
   ```bash
-  helm search hub owasp juice
+  helm search repo tomcat
   ```
 
-- Since the URLs are truncated, try with the YAML output:
+- Search for tomcat on the Helm Hub:
   ```bash
-  helm search hub owasp juice -o yaml
+  helm search hub tomcat
   ```
 
 ]
 
-Then go to → https://artifacthub.io/packages/helm/seccurecodebox/juice-shop
-
----
-
-## Finding charts on the web
-
-- We can also use the Artifact Hub search feature
-
-.exercise[
-
-- Go to https://artifacthub.io/
-
-- In the search box on top, enter "owasp juice"
-
-- Click on the "juice-shop" result (not "multi-juicer" or "juicy-ctf")
-
-]
-
----
-
-## Installing the chart
-
-- Click on the "Install" button, it will show instructions
-
-.exercise[
-
-- First, add the repository for that chart:
-  ```bash
-  helm repo add juice https://charts.securecodebox.io
-  ```
-
-- Then, install the chart:
-  ```bash
-  helm install my-juice-shop juice/juice-shop
-  ```
-
-]
-
-Note: it is also possible to install directly a chart, with `--repo https://...`
+[Helm Hub](https://hub.helm.sh/) indexes many repos, using the [Monocular](https://github.com/helm/monocular) server.
 
 ---
 
@@ -389,22 +301,22 @@ Note: it is also possible to install directly a chart, with `--repo https://...`
 
 - "Installing a chart" means creating a *release*
 
-- In the previous exemple, the release was named "my-juice-shop"
+- We need to name that release
 
-- We can also use `--generate-name` to ask Helm to generate a name for us
+  (or use the `--generate-name` to get Helm to generate one for us)
 
 .exercise[
 
+- Install the tomcat chart that we found earlier:
+  ```bash
+  helm install java4ever stable/tomcat
+  ```
+
 - List the releases:
   ```bash
   helm list
   ```
 
-- Check that we have a `my-juice-shop-...` Pod up and running:
-  ```bash
-  kubectl get pods
-  ```
-
 ]
 
 ---
@@ -417,13 +329,13 @@ class: extra-details
 
 - The `helm search` command only takes a search string argument
 
-  (e.g. `helm search juice-shop`)
+  (e.g. `helm search tomcat`)
 
 - With Helm 2, the name is optional:
 
-  `helm install juice/juice-shop` will automatically generate a name
+  `helm install stable/tomcat` will automatically generate a name
 
-  `helm install --name my-juice-shop juice/juice-shop` will specify a name
+  `helm install --name java4ever stable/tomcat` will specify a name
 
 ---
 
@@ -437,12 +349,12 @@ class: extra-details
 
 - List all the resources created by this release:
   ```bash
-  kubectl get all --selector=app.kubernetes.io/instance=my-juice-shop
+  kubectl get all --selector=release=java4ever
   ```
 
 ]
 
-Note: this label wasn't added automatically by Helm.
+Note: this `release` label wasn't added automatically by Helm.
 <br/>
 It is defined in that chart. In other words, not all charts will provide this label.
 
@@ -450,11 +362,11 @@ It is defined in that chart. In other words, not all charts will provide this la
 
 ## Configuring a release
 
-- By default, `juice/juice-shop` creates a service of type `ClusterIP`
+- By default, `stable/tomcat` creates a service of type `LoadBalancer`
 
 - We would like to change that to a `NodePort`
 
-- We could use `kubectl edit service my-juice-shop`, but ...
+- We could use `kubectl edit service java4ever-tomcat`, but ...
 
   ... our changes would get overwritten next time we update that chart!
 
@@ -474,14 +386,14 @@ It is defined in that chart. In other words, not all charts will provide this la
 
 .exercise[
 
-- Look at the README for the app:
+- Look at the README for tomcat:
   ```bash
-  helm show readme juice/juice-shop
+  helm show readme stable/tomcat
   ```
 
 - Look at the values and their defaults:
   ```bash
-  helm show values juice/juice-shop
+  helm show values stable/tomcat
   ```
 
 ]
@@ -498,19 +410,18 @@ The `readme` may or may not have (accurate) explanations for the values.
 
 - Values can be set when installing a chart, or when upgrading it
 
-- We are going to update `my-juice-shop` to change the type of the service
+- We are going to update `java4ever` to change the type of the service
 
 .exercise[
 
-- Update `my-juice-shop`:
+- Update `java4ever`:
   ```bash
-  helm upgrade my-juice-shop juice/my-juice-shop \
-       --set service.type=NodePort
+  helm upgrade java4ever stable/tomcat --set service.type=NodePort
   ```
 
 ]
 
-Note that we have to specify the chart that we use (`juice/my-juice-shop`),
+Note that we have to specify the chart that we use (`stable/tomcat`),
 even if we just want to update some values.
 
 We can set multiple values. If we want to set many values, we can use `-f`/`--values` and pass a YAML file with all the values.
@@ -519,21 +430,25 @@ All unspecified values will take the default values defined in the chart.
 
 ---
 
-## Connecting to the Juice Shop
+## Connecting to tomcat
 
-- Let's check the app that we just installed
+- Let's check the tomcat server that we just installed
+
+- Note: its readiness probe has a 60s delay
+
+  (so it will take 60s after the initial deployment before the service works)
 
 .exercise[
 
 - Check the node port allocated to the service:
   ```bash
-  kubectl get service my-juice-shop
-  PORT=$(kubectl get service my-juice-shop -o jsonpath={..nodePort})
+  kubectl get service java4ever-tomcat
+  PORT=$(kubectl get service java4ever-tomcat -o jsonpath={..nodePort})
   ```
 
-- Connect to it:
+- Connect to it, checking the demo app on `/sample/`:
   ```bash
-  curl localhost:$PORT/
+  curl localhost:$PORT/sample/
   ```
 
 ]

slides/k8s/helm-secrets.md

@@ -12,37 +12,22 @@
 
 ---
 
-## Adding the repo
-
-- If you haven't done it before, you need to add the repo for that chart
-
-.exercise[
-
-- Add the repo that holds the chart for the OWASP Juice Shop:
-  ```bash
-  helm repo add juice https://charts.securecodebox.io
-  ```
-
-]
-
----
-
 ## We need a release
 
 - We need to install something with Helm
 
-- Let's use the `juice/juice-shop` chart as an example
+- Let's use the `stable/tomcat` chart as an example
 
 .exercise[
 
-- Install a release called `orange` with the chart `juice/juice-shop`:
+- Install a release called `tomcat` with the chart `stable/tomcat`:
   ```bash
-  helm upgrade orange juice/juice-shop --install
+  helm upgrade tomcat stable/tomcat --install
   ```
 
 - Let's upgrade that release, and change a value:
   ```bash
-  helm upgrade orange juice/juice-shop --set ingress.enabled=true
+  helm upgrade tomcat stable/tomcat --set ingress.enabled=true
   ```
 
 ]
@@ -57,7 +42,7 @@
 
 - View the history for that release:
   ```bash
-  helm history orange
+  helm history tomcat
   ```
 
 ]
@@ -97,11 +82,11 @@ We should see a number of secrets with TYPE `helm.sh/release.v1`.
 
 .exercise[
 
-- Examine the secret corresponding to the second release of `orange`:
+- Examine the secret corresponding to the second release of `tomcat`:
   ```bash
-  kubectl describe secret sh.helm.release.v1.orange.v2
+  kubectl describe secret sh.helm.release.v1.tomcat.v2
   ```
-  (`v1` is the secret format; `v2` means revision 2 of the `orange` release)
+  (`v1` is the secret format; `v2` means revision 2 of the `tomcat` release)
 
 ]
 
@@ -117,7 +102,7 @@ There is a key named `release`.
 
 - Dump the secret:
   ```bash
-  kubectl get secret sh.helm.release.v1.orange.v2 \
+  kubectl get secret sh.helm.release.v1.tomcat.v2 \
       -o go-template='{{ .data.release }}'
   ```
 
@@ -135,7 +120,7 @@ Secrets are encoded in base64. We need to decode that!
 
 - Decode the secret:
   ```bash
-  kubectl get secret sh.helm.release.v1.orange.v2 \
+  kubectl get secret sh.helm.release.v1.tomcat.v2 \
       -o go-template='{{ .data.release | base64decode }}'
   ```
 
@@ -159,7 +144,7 @@ Let's try one more round of decoding!
 
 - Decode it twice:
   ```bash
-  kubectl get secret sh.helm.release.v1.orange.v2 \
+  kubectl get secret sh.helm.release.v1.tomcat.v2 \
       -o go-template='{{ .data.release | base64decode | base64decode }}'
   ```
 
@@ -179,7 +164,7 @@ Let's try one more round of decoding!
 
 - Pipe the decoded release through `file -`:
   ```bash
-  kubectl get secret sh.helm.release.v1.orange.v2 \
+  kubectl get secret sh.helm.release.v1.tomcat.v2 \
       -o go-template='{{ .data.release | base64decode | base64decode }}' \
       | file -
   ```
@@ -200,7 +185,7 @@ Gzipped data! It can be decoded with `gunzip -c`.
 
 - Rerun the previous command, but with `| gunzip -c > release-info` :
   ```bash
-  kubectl get secret sh.helm.release.v1.orange.v2 \
+  kubectl get secret sh.helm.release.v1.tomcat.v2 \
       -o go-template='{{ .data.release | base64decode | base64decode }}' \
       | gunzip -c > release-info
   ```
@@ -226,7 +211,7 @@ If we inspect that JSON (e.g. with `jq keys release-info`), we see:
 - `config` (contains the values that we've set)
 - `info` (date of deployment, status messages)
 - `manifest` (YAML generated from the templates)
-- `name` (name of the release, so `orange`)
+- `name` (name of the release, so `tomcat`)
 - `namespace` (namespace where we deployed the release)
 - `version` (revision number within that release; starts at 1)
 

slides/k8s/kubectl-logs.md

@@ -160,8 +160,3 @@ class: extra-details
 - The problem was fixed in Kubernetes 1.13
 
 *See [#70554](https://github.com/kubernetes/kubernetes/issues/70554) for details.*
-
-???
-
-:EN:- Viewing logs with "kubectl logs"
-:FR:- Consulter les logs avec "kubectl logs"

slides/k8s/kubercoins.md

@@ -69,7 +69,7 @@ Without further ado, let's start this application!
 
 --
 
-- It is a DockerCoin miner! 💰🐳📦🚢
+- It is a DockerCoin miner! .emoji[💰🐳📦🚢]
 
 --
 

slides/k8s/kustomize.md

@@ -1,60 +1,38 @@
 # Kustomize
 
-- Kustomize lets us transform Kubernetes resources:
+- Kustomize lets us transform YAML files representing Kubernetes resources
 
-  *YAML + kustomize → new YAML*
+- The original YAML files are valid resource files
 
-- Starting point = valid resource files
+  (e.g. they can be loaded with `kubectl apply -f`)
 
-  (i.e. something that we could load with `kubectl apply -f`)
+- They are left untouched by Kustomize
 
-- Recipe = a *kustomization* file
+- Kustomize lets us define *kustomizations*
 
-  (describing how to transform the resources)
+- A *kustomization* is conceptually similar to a *layer*
 
-- Result = new resource files
+- Technically, a *kustomization* is a file named `kustomization.yaml`
 
-  (that we can load with `kubectl apply -f`)
+  (or a directory containing that files + additional files)
 
 ---
 
-## Pros and cons
+## What's in a kustomization
 
-- Relatively easy to get started
+- A kustomization can do any combination of the following:
 
-  (just get some existing YAML files)
+  - include other kustomizations
 
-- Easy to leverage existing "upstream" YAML files
+  - include Kubernetes resources defined in YAML files
 
-  (or other *kustomizations*)
+  - patch Kubernetes resources (change values)
 
-- Somewhat integrated with `kubectl`
+  - add labels or annotations to all resources
 
-  (but only "somewhat" because of version discrepancies)
+  - specify ConfigMaps and Secrets from literal values or local files
 
-- Less complex than e.g. Helm, but also less powerful
-
-- No central index like the Artifact Hub (but is there a need for it?)
-
----
-
-## Kustomize in a nutshell
-
-- Get some valid YAML (our "resources")
-
-- Write a *kustomization* (technically, a file named `kustomization.yaml`)
-
-  - reference our resources
-
-  - reference other kustomizations
-
-  - add some *patches*
-
-  - ...
-
-- Use that kustomization either with `kustomize build` or `kubectl apply -k`
-
-- Write new kustomizations referencing the first one to handle minor differences
+(... And a few more advanced features that we won't cover today!)
 
 ---
 
@@ -80,17 +58,11 @@ On the next slide, let's see a more complex example ...
 
 ---
 
-## A more complex Kustomization
-
-.small[
 ```yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-commonAnnotations:
-  mood: 😎
 commonLabels:
   add-this-to-all-my-resources: please
-namePrefix: prod-
 patchesStrategicMerge:
 - prod-scaling.yaml
 - prod-healthchecks.yaml
@@ -108,7 +80,6 @@ configMapGenerator:
   - global.conf
   - local.conf=prod.conf
 ```
-]
 
 ---
 
@@ -168,7 +139,7 @@ configMapGenerator:
 
 ## Remote bases
 
-- Kustomize can also use bases that are remote git repositories
+- Kustomize can fetch remote bases using Hashicorp go-getter library
 
 - Examples:
 
@@ -176,31 +147,11 @@ configMapGenerator:
 
   github.com/jpetazzo/kubercoins?ref=kustomize (specific tag or branch)
 
-- Note that this only works for kustomizations, not individual resources
-
-  (the specified repository or directory must contain a `kustomization.yaml` file)
-
----
-
-class: extra-details
-
-## Hashicorp go-getter
-
-- Some versions of Kustomize support additional forms for remote resources
-
-- Examples:
-
   https://releases.hello.io/k/1.0.zip (remote archive)
 
   https://releases.hello.io/k/1.0.zip//some-subdir (subdirectory in archive)
 
-- This relies on [hashicorp/go-getter](https://github.com/hashicorp/go-getter#url-format)
-
-- ... But it prevents Kustomize inclusion in `kubectl`
-
-- Avoid them!
-
-- See [kustomize#3578](https://github.com/kubernetes-sigs/kustomize/issues/3578) for details
+- See [hashicorp/go-getter URL format docs](https://github.com/hashicorp/go-getter#url-format) for more examples
 
 ---
 
@@ -332,7 +283,7 @@ class: extra-details
   kubectl apply -f rendered.yaml --namespace=kustomcoins
   ```
 
-- Or, with Kubernetes 1.14, we can also do this:
+- Or, with Kubernetes 1.14, you can also do this:
   ```bash
   kubectl apply -k overlays/ship --namespace=kustomcoins
   ```
@@ -386,163 +337,39 @@ Note: it might take a minute or two for the worker to start.
 
 ---
 
-## `kubectl` integration
+## `kubectl apply -k`
 
-- Kustomize has been integrated in `kubectl` (since Kubernetes 1.14)
-
-  - `kubectl kustomize` can apply a kustomization
-
-  - commands that use `-f` can also use `-k` (`kubectl apply`/`delete`/...)
+- Kustomize has been integrated in `kubectl`
 
 - The `kustomize` tool is still needed if we want to use `create`, `edit`, ...
 
-- Kubernetes 1.14 to 1.20 uses Kustomize 2.0.3
+- Also, warning: `kubectl apply -k` is a slightly older version than `kustomize`!
 
-- Kubernetes 1.21 jumps to Kustomize 4.1.2
+- In recent versions of `kustomize`, bases can be listed in `resources`
 
-- Future versions should track Kustomize updates more closely
+  (and `kustomize edit add base` will add its arguments to `resources`)
 
----
+- `kubectl apply -k` requires bases to be listed in `bases`
 
-class: extra-details
-
-## Differences between 2.0.3 and later
-
-- Kustomize 2.1 / 3.0 deprecates `bases` (they should be listed in `resources`)
-
-  (this means that "modern" `kustomize edit add resource` won't work with "old" `kubectl apply -k`)
-
-- Kustomize 2.1 introduces `replicas` and `envs`
-
-- Kustomize 3.1 introduces multipatches
-
-- Kustomize 3.2 introduce inline patches in `kustomization.yaml`
-
-- Kustomize 3.3 to 3.10 is mostly internal refactoring
-
-- Kustomize 4.0 drops go-getter again
-
-- Kustomize 4.1 allows patching kind and name
-
----
-
-## Scaling
-
-Instead of using a patch, scaling can be done like this:
-
-```yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-...
-replicas:
-- name: worker
-  count: 5
-```
-
-It will automatically work with Deployments, ReplicaSets, StatefulSets.
-
-(For other resource types, fall back to a patch.)
-
----
-
-## Updating images
-
-Instead of using patches, images can be changed like this:
-
-```yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-...
-images:
-- name: postgres
-  newName: harbor.enix.io/my-postgres
-- name: dockercoins/worker
-  newTag: v0.2
-- name: dockercoins/hasher
-  newName: registry.dockercoins.io/hasher
-  newTag: v0.2
-- name: alpine
-  digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
-```
-
----
-
-## Updating images, pros and cons
-
-- Very convenient when the same image appears multiple times
-
-- Very convenient to define tags (or pin to hashes) outside of the main YAML
-
-- Doesn't support wildcard or generic substitutions:
-
-  - cannot "replace `dockercoins/*` with `ghcr.io/dockercoins/*`"
-
-  - cannot "tag all `dockercoins/*` with `v0.2`"
-
-- Only patches "well-known" image fields (won't work with CRDs referencing images)
-
-- Helm can deal with these scenarios, for instance:
-  ```yaml
-  image: {{ .Values.registry }}/worker:{{ .Values.version }}
-  ```
-
----
-
-## Advanced resource patching
-
-The example below shows how to:
-
-- patch multiple resources with a selector (new in Kustomize 3.1)
-- use an inline patch instead of a separate patch file (new in Kustomize 3.2)
-
-```yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-...
-patches:
-- patch: |-
-    - op: replace
-      path: /spec/template/spec/containers/0/image
-      value: alpine
-  target:
-    kind: Deployment
-    labelSelector: "app"
-```
-
-(This replaces all images of Deployments matching the `app` selector with `alpine`.)
-
----
-
-## Advanced resource patching, pros and cons
-
-- Very convenient to patch an arbitrary number of resources
-
-- Very convenient to patch any kind of resource, including CRDs
-
-- Doesn't support "fine-grained" patching (e.g. image registry or tag)
-
-- Once again, Helm can do it:
-  ```yaml
-  image: {{ .Values.registry }}/worker:{{ .Values.version }}
-  ```
+  (so after using `kustomize edit add base`, we need to fix `kustomization.yaml`)
 
 ---
 
 ## Differences with Helm
 
-- Helm charts generally require more upfront work
+- Helm charts use placeholders `{{ like.this }}`
 
-  (while kustomize "bases" are standard Kubernetes YAML)
+- Kustomize "bases" are standard Kubernetes YAML
 
-- ... But Helm charts are also more powerful; their templating language can:
+- It is possible to use an existing set of YAML as a Kustomize base
 
-  - conditionally include/exclude resources or blocks within resources
+- As a result, writing a Helm chart is more work ...
 
-  - generate values by concatenating, hashing, transforming parameters
+- ... But Helm charts are also more powerful; e.g. they can:
 
-  - generate values or resources by iteration (`{{ range ... }}`)
+  - use flags to conditionally include resources or blocks
 
-  - access the Kubernetes API during template evaluation
+  - check if a given Kubernetes API group is supported
 
   - [and much more](https://helm.sh/docs/chart_template_guide/)
 
@@ -550,3 +377,4 @@ patches:
 
 :EN:- Packaging and running apps with Kustomize
 :FR:- *Packaging* d'applications avec Kustomize
+

slides/k8s/metrics-server.md

@@ -1,182 +1,69 @@
-# Checking Node and Pod resource usage
+# Checking pod and node resource usage
 
-- We've installed a few things on our cluster so far
+- Since Kubernetes 1.8, metrics are collected by the [resource metrics pipeline](https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/)
 
-- How much resources (CPU, RAM) are we using?
+- The resource metrics pipeline is:
 
-- We need metrics!
+  - optional (Kubernetes can function without it)
+
+  - necessary for some features (like the Horizontal Pod Autoscaler)
+
+  - exposed through the Kubernetes API using the [aggregation layer](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
+
+  - usually implemented by the "metrics server"
+
+---
+
+## How to know if the metrics server is running?
+
+- The easiest way to know is to run `kubectl top`
 
 .exercise[
 
-- Let's try the following command:
+- Check if the core metrics pipeline is available:
   ```bash
   kubectl top nodes
   ```
+
+]
+
+If it shows our nodes and their CPU and memory load, we're good!
+
+---
+
+## Installing metrics server
+
+- The metrics server doesn't have any particular requirements
+
+  (it doesn't need persistence, as it doesn't *store* metrics)
+
+- It has its own repository, [kubernetes-incubator/metrics-server](https://github.com/kubernetes-incubator/metrics-server)
+
+- The repository comes with [YAML files for deployment](https://github.com/kubernetes-incubator/metrics-server/tree/master/deploy/1.8%2B)
+
+- These files may not work on some clusters
+
+  (e.g. if your node names are not in DNS)
+
+- The container.training repository has a [metrics-server.yaml](https://github.com/jpetazzo/container.training/blob/master/k8s/metrics-server.yaml#L90) file to help with that
+
+  (we can `kubectl apply -f` that file if needed)
+
+---
+
+## Showing container resource usage
+
+- Once the metrics server is running, we can check container resource usage
+
+.exercise[
+
+- Show resource usage across all containers:
+  ```bash
+  kubectl top pods --containers --all-namespaces
+  ```
 ]
 
----
-
-## Is metrics-server installed?
-
-- If we see a list of nodes, with CPU and RAM usage:
-
-  *great, metrics-server is installed!*
-
-- If we see `error: Metrics API not available`:
-
-  *metrics-server isn't installed, so we'll install it!*
-
----
-
-## The resource metrics pipeline
-
-- The `kubectl top` command relies on the Metrics API
-
-- The Metrics API is part of the "[resource metrics pipeline]"
-
-- The Metrics API isn't served (built into) the Kubernetes API server
-
-- It is made available through the [aggregation layer]
-
-- It is usually served by a component called metrics-server
-
-- It is optional (Kubernetes can function without it)
-
-- It is necessary for some features (like the Horizontal Pod Autoscaler)
-
-[resource metrics pipeline]: https://kubernetes.io/docs/tasks/debug-application-cluster/resource-metrics-pipeline/
-[aggregation layer]: https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/
-
----
-
-## Other ways to get metrics
-
-- We could use a SAAS like Datadog, New Relic...
-
-- We could use a self-hosted solution like Prometheus
-
-- Or we could use metrics-server
-
-- What's special about metrics-server?
-
----
-
-## Pros/cons
-
-Cons:
-
-- no data retention (no history data, just instant numbers)
-
-- only CPU and RAM of nodes and pods (no disk or network usage or I/O...)
-
-Pros:
-
-- very lightweight
-
-- doesn't require storage
-
-- used by Kubernetes autoscaling
-
----
-
-## Why metrics-server
-
-- We may install something fancier later
-
-  (think: Prometheus with Grafana)
-
-- But metrics-server will work in *minutes*
-
-- It will barely use resources on our cluster
-
-- It's required for autoscaling anyway
-
----
-
-## How metric-server works
-
-- It runs a single Pod
-
-- That Pod will fetch metrics from all our Nodes
-
-- It will expose them through the Kubernetes API agregation layer
-
-  (we won't say much more about that agregation layer; that's fairly advanced stuff!)
-
----
-
-## Installing metrics-server
-
-- In a lot of places, this is done with a little bit of custom YAML
-
-  (derived from the [official installation instructions](https://github.com/kubernetes-sigs/metrics-server#installation))
-
-- We're going to use Helm one more time:
-  ```bash
-    helm upgrade --install metrics-server bitnami/metrics-server \
-      --create-namespace --namespace metrics-server \
-      --set apiService.create=true \
-      --set extraArgs.kubelet-insecure-tls=true \
-      --set extraArgs.kubelet-preferred-address-types=InternalIP
-  ```
-
-- What are these options for?
-
----
-
-## Installation options
-
-- `apiService.create=true`
-
-  register `metrics-server` with the Kubernetes agregation layer
-
-  (create an entry that will show up in `kubectl get apiservices`)
-
-- `extraArgs.kubelet-insecure-tls=true`
-
-  when connecting to nodes to collect their metrics, don't check kubelet TLS certs
-
-  (because most kubelet certs include the node name, but not its IP address)
-
-- `extraArgs.kubelet-preferred-address-types=InternalIP`
-
-  when connecting to nodes, use their internal IP address instead of node name
-
-  (because the latter requires an internal DNS, which is rarely configured)
-
----
-
-## Testing metrics-server
-
-- After a minute or two, metrics-server should be up
-
-- We should now be able to check Nodes resource usage:
-  ```bash
-  kubectl top nodes
-  ```
-
-- And Pods resource usage, too:
-  ```bash
-  kubectl top pods --all-namespaces
-  ```
-
----
-
-## Keep some padding
-
-- The RAM usage that we see should correspond more or less to the Resident Set Size
-
-- Our pods also need some extra space for buffers, caches...
-
-- Do not aim for 100% memory usage!
-
-- Some more realistic targets:
-
-  50% (for workloads with disk I/O and leveraging caching)
-
-  90% (on very big nodes with mostly CPU-bound workloads)
-
-  75% (anywhere in between!)
+- We can also use selectors (`-l app=...`)
 
 ---
 
@@ -196,8 +83,5 @@ Pros:
 
 ???
 
-:EN:- The resource metrics pipeline
-:EN:- Installing metrics-server
-
-:EN:- Le *resource metrics pipeline*
-:FR:- Installtion de metrics-server
+:EN:- The *core metrics pipeline*
+:FR:- Le *core metrics pipeline*

slides/k8s/openebs.md

@@ -1,529 +0,0 @@
-# OpenEBS 
-
- - [OpenEBS] is a popular open-source storage solution for Kubernetes
-
- - Uses the concept of "Container Attached Storage"
-
-   (1 volume = 1 dedicated controller pod + a set of replica pods)
-
- - Supports a wide range of storage engines:
-
-   - LocalPV: local volumes (hostpath or device), no replication
-
-   - Jiva: for lighter workloads with basic cloning/snapshotting
-
-   - cStor: more powerful engine that also supports resizing, RAID, disk pools ...
-
-   - [Mayastor]: newer, even more powerful engine with NVMe and vhost-user support
-
-[OpenEBS]: https://openebs.io/
-
-[Mayastor]: https://github.com/openebs/MayaStor#mayastor
-
----
-
-class: extra-details
-
-## What are all these storage engines?
-
-- LocalPV is great if we want good performance, no replication, easy setup
-
-  (it is similar to the Rancher local path provisioner)
-
-- Jiva is great if we want replication and easy setup
-
-  (data is stored in containers' filesystems)
-
-- cStor is more powerful and flexible, but requires more extensive setup
-
-- Mayastor is designed to achieve extreme performance levels
-
-  (with the right hardware and disks)
-
-- The OpenEBS documentation has a [good comparison of engines] to help us pick
-
-[good comparison of engines]: https://docs.openebs.io/docs/next/casengines.html#cstor-vs-jiva-vs-localpv-features-comparison
-
----
-
-## Installing OpenEBS with Helm
-
-- The OpenEBS control plane can be installed with Helm
-
-- It will run as a set of containers on Kubernetes worker nodes
-
-.exercise[
-
-  - Install OpenEBS:
-  ```bash  
-    helm upgrade --install openebs openebs \
-         --repo https://openebs.github.io/charts \
-         --namespace openebs --create-namespace
-  ```
-]
-
----
-
-## Checking what was installed
-
-- Wait a little bit ...
-
-.exercise[
-
-- Look at the pods in the `openebs` namespace:
-  ```bash  
-      kubectl get pods --namespace openebs
-  ```
-
-- And the StorageClasses that were created:
-  ```bash  
-      kubectl get sc
-  ```
-
-]
-
----
-
-## The default StorageClasses
-
-- OpenEBS typically creates three default StorageClasses
-
-- `openebs-jiva-default` provisions 3 replicated Jiva pods per volume
-
-  - data is stored in `/openebs` in the replica pods
-  - `/openebs` is a localpath volume mapped to `/var/openebs/pvc-...` on the node
-
-- `openebs-hostpath` uses LocalPV with local directories
-
-  - volumes are hostpath volumes created in `/var/openebs/local` on each node
-
-- `openebs-device` uses LocalPV with local block devices
-
-  - requires available disks and/or a bit of extra configuration
-  - the default configuration filters out loop, LVM, MD devices
-
----
-
-## When do we need custom StorageClasses?
-
-- To store LocalPV hostpath volumes on a different path on the host
-
-- To change the number of replicated Jiva pods
-
-- To use a different Jiva pool
-
-  (i.e. a different path on the host to store the Jiva volumes)
-
-- To create a cStor pool
-
-- ...
-
----
-
-class: extra-details
-
-## Defining a custom StorageClass
-
-Example for a LocalPV hostpath class using an extra mount on `/mnt/vol001`:
-
-```yaml
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: localpv-hostpath-mntvol001
-  annotations:
-    openebs.io/cas-type: local
-    cas.openebs.io/config: |
-      - name: BasePath
-        value: "/mnt/vol001"
-      - name: StorageType
-        value: "hostpath"
-provisioner: openebs.io/local
-```
-
-- `provisioner` needs to be set accordingly
-- Storage engine is chosen by specifying the annotation `openebs.io/cas-type`
-- Storage engine configuration is set with the annotation `cas.openebs.io/config` 
-
----
-
-## Checking the default hostpath StorageClass
-
-- Let's inspect the StorageClass that OpenEBS created for us
-
-.exercise[
-
-- Let's look at the OpenEBS LocalPV hostpath StorageClass:
-  ```bash
-  kubectl get storageclass openebs-hostpath -o yaml
-  ``` 
-]
-
----
-
-## Create a host path PVC
-
-- Let's create a Persistent Volume Claim using an explicit StorageClass
-
-.exercise[
-
-```bash
-kubectl apply -f - <<EOF
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: local-hostpath-pvc
-spec:
-  storageClassName: openebs-hostpath
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1G
-EOF
-```
-
-]
-
----
-
-## Making sure that a PV was created for our PVC
-
-- Normally, the `openebs-hostpath` StorageClass created a PV for our PVC
-
-.exercise[
-
-- Look at the PV and PVC:
-  ```bash
-  kubectl get pv,pvc
-  ```
-
-]
-
----
-
-## Create a Pod to consume the PV
-
-.exercise[
-
-- Create a Pod using that PVC:
-  ```bash
-  kubectl apply -f ~/container.training/k8s/openebs-pod.yaml
-  ```
-
-- Here are the sections that declare and use the volume:
-  ```yaml
-    volumes:
-    - name: my-storage
-      persistentVolumeClaim:
-        claimName: local-hostpath-pvc
-    containers:
-    ...  
-      volumeMounts:
-      - mountPath: /mnt/storage
-        name: my-storage
-  ```
-
-]
-
----
-
-## Verify that data is written on the node
-
-- Let's find the file written by the Pod on the node where the Pod is running
-
-.exercise[
-
-- Get the worker node where the pod is located
-  ```bash
-  kubectl get pod openebs-local-hostpath-pod -ojsonpath={.spec.nodeName}
-  ```
-
-- SSH into the node
-
-- Check the volume content
-  ```bash
-  sudo tail /var/openebs/local/pvc-*/greet.txt
-  ```
-
-]
-
----
-
-## Heads up!
-
-- The following labs and exercises will use the Jiva storage class
-
-- This storage class creates 3 replicas by default
-
-- It uses *anti-affinity* placement constraits to put these replicas on different nodes
-
-- **This requires a cluster with multiple nodes!**
-
-- It also requires the iSCSI client (aka *initiator*) to be installed on the nodes
-
-- On many platforms, the iSCSI client is preinstalled and will start automatically
-
-- If it doesn't, you might want to check [this documentation page] for details
-
-[this documentation page]: https://docs.openebs.io/docs/next/prerequisites.html
-
----
-
-## The default StorageClass
-
-- The PVC that we defined earlier specified an explicit StorageClass
-
-- We can also set a default StorageClass
-
-- It will then be used for all PVC that *don't* specify and explicit StorageClass
-
-- This is done with the annotation `storageclass.kubernetes.io/is-default-class`
-
-.exercise[
-
-- Check if we have a default StorageClass:
-  ```bash
-  kubectl get storageclasses
-  ```
-]
-
-- The default StorageClass (if there is one) is shown with `(default)`
-
----
-
-## Setting a default StorageClass
-
-- Let's set the default StorageClass to use `openebs-jiva-default`
-
-.exercise[
-
-- Remove the annotation (just in case we already have a default class):
-  ```bash
-  kubectl annotate storageclass storageclass.kubernetes.io/is-default-class- --all
-  ```
-
-- Annotate the Jiva StorageClass:
-  ```bash
-  kubectl annotate storageclasses \
-      openebs-jiva-default storageclass.kubernetes.io/is-default-class=true
-  ```
-
-- Check the result:
-  ```bash
-  kuectl get storageclasses
-  ```
-
-]
-
----
-
-## Creating a Pod using the Jiva class
-
-- We will create a Pod running PostgreSQL, using the default class
-
-.exercise[
-
-- Create the Pod:
-  ```bash
-  kubectl apply -f ~/container.training/k8s/postgres.yaml
-  ```
-
-- Wait for the PV, PVC, and Pod to be up:
-  ```bash
-  watch kubectl get pv,pvc,pod
-  ```
-
-- We can also check what's going on in the `openebs` namespace:
-  ```bash
-  watch kubectl get pods --namespace openebs
-  ```
-
-]
-
----
-
-## Node failover
-
-⚠️ This will partially break your cluster!
-
-- We are going to disconnect the node running PostgreSQL from the cluster
-
-- We will see what happens, and how to recover
-
-- We will not reconnect the node to the cluster
-
-- This whole lab will take at least 10-15 minutes (due to various timeouts)
-
-⚠️ Only do this lab at the very end, when you don't want to run anything else after!
-
----
-
-## Disconnecting the node from the cluster
-
-.exercise[
-
-- Find out where the Pod is running, and SSH into that node:
-  ```bash
-  kubectl get pod postgres-0 -o jsonpath={.spec.nodeName}
-  ssh nodeX
-  ```
-
-- Check the name of the network interface:
-  ```bash
-  sudo ip route ls default
-  ```
-
-- The output should look like this:
-  ```
-  default via 10.10.0.1 `dev ensX` proto dhcp src 10.10.0.13 metric 100 
-  ```
-
-- Shutdown the network interface:
-  ```bash
-  sudo ip link set ensX down
-  ```
-
-]
-
----
-
-## Watch what's going on
-
-- Let's look at the status of Nodes, Pods, and Events
-
-.exercise[
-
-- In a first pane/tab/window, check Nodes and Pods:
-  ```bash
-  watch kubectl get nodes,pods -o wide
-  ```
-
-- In another pane/tab/window, check Events:
-  ```bash
-  kubectl get events --watch
-  ```
-
-]
-
----
-
-## Node Ready → NotReady
-
-- After \~30 seconds, the control plane stops receiving heartbeats from the Node
-
-- The Node is marked NotReady
-
-- It is not *schedulable* anymore
-
-  (the scheduler won't place new pods there, except some special cases)
-
-- All Pods on that Node are also *not ready*
-
-  (they get removed from service Endpoints)
-
-- ... But nothing else happens for now
-
-  (the control plane is waiting: maybe the Node will come back shortly?)
-
----
-
-## Pod eviction
-
-- After \~5 minutes, the control plane will evict most Pods from the Node
-
-- These Pods are now `Terminating`
-
-- The Pods controlled by e.g. ReplicaSets are automatically moved
-
-  (or rather: new Pods are created to replace them)
-
-- But nothing happens to the Pods controlled by StatefulSets at this point
-
-  (they remain `Terminating` forever)
-
-- Why? 🤔
-
---
-
-- This is to avoid *split brain scenarios*
-
----
-
-class: extra-details
-
-## Split brain 🧠⚡️🧠
-
-- Imagine that we create a replacement pod `postgres-0` on another Node
-
-- And 15 minutes later, the Node is reconnected and the original `postgres-0` comes back
-
-- Which one is the "right" one?
-
-- What if they have conflicting data?
-
-😱
-
-- We *cannot* let that happen!
-
-- Kubernetes won't do it
-
-- ... Unless we tell it to
-
----
-
-## The Node is gone
-
-- One thing we can do, is tell Kubernetes "the Node won't come back"
-
-  (there are other methods; but this one is the simplest one here)
-
-- This is done with a simple `kubectl delete node`
-
-.exercise[
-
-- `kubectl delete` the Node that we disconnected
-
-]
-
----
-
-## Pod rescheduling
-
-- Kubernetes removes the Node
-
-- After a brief period of time (\~1 minute) the "Terminating" Pods are removed
-
-- A replacement Pod is created on another Node
-
-- ... But it doens't start yet!
-
-- Why? 🤔
-
----
-
-## Multiple attachment
-
-- By default, a disk can only be attached to one Node at a time
-
-  (sometimes it's a hardware or API limitation; sometimes enforced in software)
-
-- In our Events, we should see `FailedAttachVolume` and `FailedMount` messages
-
-- After \~5 more minutes, the disk will be force-detached from the old Node
-
-- ... Which will allow attaching it to the new Node!
-
-🎉
-
-- The Pod will then be able to start
-
-- Failover is complete!
-
-???
-
-:EN:- Understanding Container Attached Storage (CAS)
-:EN:- Deploying stateful apps with OpenEBS
-
-:FR:- Comprendre le "Container Attached Storage" (CAS)
-:FR:- Déployer une application "stateful" avec OpenEBS

slides/k8s/prometheus-stack.md

@@ -1,123 +0,0 @@
-# Prometheus and Grafana
-
-- What if we want metrics retention, view graphs, trends?
-
-- A very popular combo is Prometheus+Grafana:
-
-  - Prometheus as the "metrics engine"
-
-  - Grafana to display comprehensive dashboards
-
-- Prometheus also has an alert-manager component to trigger alerts
-
-  (we won't talk about that one)
-
----
-
-## Installing Prometheus and Grafana
-
-- A complete metrics stack needs at least:
-
-  - the Prometheus server (collects metrics and stores them efficiently)
-
-  - a collection of *exporters* (exposing metrics to Prometheus)
-
-  - Grafana
-
-  - a collection of Grafana dashboards (building them from scratch is tedious)
-
-- The Helm chart `kube-prometheus-stack` combines all these elements
-
-- ... So we're going to use it to deploy our metrics stack!
-
----
-
-## Installing `kube-prometheus-stack`
-
-- Let's install that stack *directly* from its repo
-
-  (without doing `helm repo add` first)
-
-- Otherwise, keep the same naming strategy:
-  ```bash
-    helm upgrade --install kube-prometheus-stack kube-prometheus-stack \
-      --namespace kube-prometheus-stack --create-namespace \
-      --repo https://prometheus-community.github.io/helm-charts 
-  ```
-
-- This will take a minute...
-
-- Then check what was installed:
-  ```bash
-  kubectl get all --namespace kube-prometheus-stack
-  ```
-
----
-
-## Exposing Grafana
-
-- Let's create an Ingress for Grafana
-  ```bash
-    kubectl create ingress --namespace kube-prometheus-stack grafana \
-      --rule=grafana.`cloudnative.party`/*=kube-prometheus-stack-grafana:80
-  ```
-
-  (as usual, make sure to use *your* domain name above)
-
-- Connect to Grafana
-
-  (remember that the DNS record might take a few minutes to come up)
-
----
-
-## Grafana credentials
-
-- What could the login and password be?
-
-- Let's look at the Secrets available in the namespace:
-  ```bash
-  kubectl get secrets --namespace kube-prometheus-stack
-  ```
-
-- There is a `kube-prometheus-stack-grafana` that looks promising!
-
-- Decode the Secret:
-  ```bash
-    kubectl get secret --namespace kube-prometheus-stack \
-      kube-prometheus-stack-grafana -o json | jq '.data | map_values(@base64d)'
-  ```
-
-- If you don't have the `jq` tool mentioned above, don't worry...
-
---
-
-- The login/password is hardcoded to `admin`/`prom-operator` 😬
-
----
-
-## Grafana dashboards
-
-- Once logged in, click on the "Dashboards" icon on the left
-
-  (it's the one that looks like four squares)
-
-- Then click on the "Manage" entry
-
-- Then click on "Kubernetes / Compute Resources / Cluster"
-
-- This gives us a breakdown of resource usage by Namespace
-
-- Feel free to explore the other dashboards!
-
-???
-
-:EN:- Installing Prometheus and Grafana
-:FR:- Installer Prometheus et Grafana
-
-:T: Observing our cluster with Prometheus and Grafana
-
-:Q: What's the relationship between Prometheus and Grafana?
-:A: Prometheus collects and graphs metrics; Grafana sends alerts
-:A: ✔️Prometheus collects metrics; Grafana displays them on dashboards
-:A: Prometheus collects and graphs metrics; Grafana is its configuration interface
-:A: Grafana collects and graphs metrics; Prometheus sends alerts

slides/k8s/resource-limits.md

@@ -66,7 +66,7 @@ class: extra-details
 
 - Each request takes 1 second of CPU
 
-- Average load: 1.66%
+- Average load: 0.16%
 
 - Let's say we set a CPU limit of 10%
 

slides/k8s/statefulsets.md

@@ -331,8 +331,11 @@ consul agent -data-dir=/consul/data -client=0.0.0.0 -server -ui \
       podAntiAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
-              matchLabels:
-                app: consul
+              matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                    - consul
             topologyKey: kubernetes.io/hostname
   ```
 
@@ -350,7 +353,10 @@ consul agent -data-dir=/consul/data -client=0.0.0.0 -server -ui \
     lifecycle:
       preStop:
         exec:
-          command: [ "sh", "-c", "consul leave" ]
+          command:
+          - /bin/sh
+          - -c
+          - consul leave
   ```
 
 ---

slides/kadm-fullday.yml

@@ -0,0 +1,60 @@
+title: |
+  Kubernetes
+  for Admins and Ops
+
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "In person!"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+- static-pods-exercise
+
+content:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+-
+  - k8s/prereqs-admin.md
+  - k8s/architecture.md
+  #- k8s/internal-apis.md
+  - k8s/deploymentslideshow.md
+  - k8s/dmuc.md
+-
+  - k8s/multinode.md
+  - k8s/cni.md
+  - k8s/cni-internals.md
+  - k8s/interco.md
+-
+  - k8s/apilb.md
+  #- k8s/setup-overview.md
+  #- k8s/setup-devel.md
+  #- k8s/setup-managed.md
+  #- k8s/setup-selfhosted.md
+  - k8s/cluster-upgrade.md
+  - k8s/cluster-backup.md
+  - k8s/staticpods.md
+-
+  #- k8s/cloud-controller-manager.md
+  #- k8s/bootstrap.md  
+  - k8s/control-plane-auth.md
+  - k8s/podsecuritypolicy.md
+  - k8s/user-cert.md
+  - k8s/csr-api.md
+  - k8s/openid-connect.md
+-
+  #- k8s/lastwords-admin.md
+  - k8s/links.md
+  - shared/thankyou.md

slides/kadm-twodays.yml

@@ -0,0 +1,84 @@
+title: |
+  Kubernetes
+  for administrators
+  and operators
+
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "In person!"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+# DAY 1
+- - k8s/prereqs-admin.md
+  - k8s/architecture.md
+  - k8s/internal-apis.md
+  - k8s/deploymentslideshow.md
+  - k8s/dmuc.md
+- - k8s/multinode.md
+  - k8s/cni.md
+  - k8s/cni-internals.md
+  - k8s/interco.md
+- - k8s/apilb.md
+  - k8s/setup-overview.md
+  #- k8s/setup-devel.md
+  - k8s/setup-managed.md
+  - k8s/setup-selfhosted.md
+  - k8s/cluster-upgrade.md
+  - k8s/staticpods.md
+- - k8s/cluster-backup.md
+  - k8s/cloud-controller-manager.md
+  - k8s/healthchecks.md
+  - k8s/healthchecks-more.md
+# DAY 2
+- - k8s/kubercoins.md
+  - k8s/logs-cli.md
+  - k8s/logs-centralized.md
+  - k8s/authn-authz.md
+  - k8s/user-cert.md
+  - k8s/csr-api.md
+- - k8s/openid-connect.md
+  - k8s/control-plane-auth.md
+  ###- k8s/bootstrap.md
+  - k8s/netpol.md
+  - k8s/podsecuritypolicy.md
+- - k8s/resource-limits.md
+  - k8s/metrics-server.md
+  - k8s/cluster-sizing.md
+  - k8s/horizontal-pod-autoscaler.md
+- - k8s/prometheus.md
+  - k8s/extending-api.md
+  - k8s/crd.md
+  - k8s/operators.md
+  - k8s/eck.md
+  ###- k8s/operators-design.md
+# CONCLUSION
+- - k8s/lastwords.md
+  - k8s/links.md
+  - shared/thankyou.md
+  - |
+    # (All content after this slide is bonus material)
+# EXTRA
+- - k8s/volumes.md
+  - k8s/configuration.md
+  - k8s/secrets.md
+  - k8s/statefulsets.md
+  - k8s/local-persistent-volumes.md
+  - k8s/portworx.md

slides/kube-adv.yml

@@ -0,0 +1,82 @@
+title: |
+  Advanced
+  Kubernetes
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: https://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+#- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- #1
+  - k8s/prereqs-admin.md
+  - k8s/architecture.md
+  - k8s/internal-apis.md
+  - k8s/deploymentslideshow.md
+  - k8s/dmuc.md
+- #2
+  - k8s/multinode.md
+  - k8s/cni.md
+  - k8s/interco.md
+- #3
+  - k8s/cni-internals.md
+  - k8s/apilb.md
+  - k8s/control-plane-auth.md
+  - |
+    # (Extra content)
+  - k8s/staticpods.md
+  - k8s/cluster-upgrade.md
+- #4
+  - k8s/kustomize.md
+  - k8s/helm-intro.md
+  - k8s/helm-chart-format.md
+  - k8s/helm-create-basic-chart.md
+  - |
+    # (Extra content)
+  - k8s/helm-create-better-chart.md
+  - k8s/helm-secrets.md
+- #5
+  - k8s/extending-api.md
+  - k8s/operators.md
+  - k8s/sealed-secrets.md
+  - k8s/crd.md
+- #6
+  - k8s/ingress-tls.md
+  - k8s/cert-manager.md
+  - k8s/eck.md
+- #7
+  - k8s/admission.md
+  - k8s/kyverno.md
+- #8
+  - k8s/aggregation-layer.md
+  - k8s/metrics-server.md
+  - k8s/prometheus.md
+  - k8s/hpa-v2.md
+- #9
+  - k8s/operators-design.md
+  - k8s/kubebuilder.md
+  - k8s/events.md
+  - k8s/finalizers.md
+  - |
+    # (Extra content)
+  - k8s/owners-and-dependents.md
+  - k8s/apiserver-deepdive.md
+  #- k8s/record.md
+  - shared/thankyou.md
+

slides/kube-fullday.yml

@@ -0,0 +1,122 @@
+title: |
+  Deploying and Scaling Microservices
+  with Kubernetes
+
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "In person!"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+-
+  - shared/prereqs.md
+  #- shared/webssh.md
+  - shared/connecting.md
+  #- k8s/versions-k8s.md
+  - shared/sampleapp.md
+  #- shared/composescale.md
+  #- shared/hastyconclusions.md
+  - shared/composedown.md
+  - k8s/concepts-k8s.md
+  - k8s/kubectlget.md
+-
+  - k8s/kubectl-run.md
+  - k8s/batch-jobs.md
+  - k8s/labels-annotations.md
+  - k8s/kubectl-logs.md
+  - k8s/logs-cli.md
+  - shared/declarative.md
+  - k8s/declarative.md
+  - k8s/deploymentslideshow.md
+  - k8s/kubenet.md
+  - k8s/kubectlexpose.md
+  - k8s/shippingimages.md
+  #- k8s/buildshiprun-selfhosted.md
+  - k8s/buildshiprun-dockerhub.md
+  - k8s/ourapponkube.md
+  #- k8s/exercise-wordsmith.md
+-
+  - k8s/yamldeploy.md
+  - k8s/setup-overview.md
+  #- k8s/setup-devel.md
+  #- k8s/setup-managed.md
+  #- k8s/setup-selfhosted.md
+  #- k8s/dashboard.md
+  #- k8s/k9s.md
+  #- k8s/tilt.md
+  #- k8s/kubectlscale.md
+  - k8s/scalingdockercoins.md
+  - shared/hastyconclusions.md
+  - k8s/daemonset.md
+  #- k8s/authoring-yaml.md
+  #- k8s/exercise-yaml.md
+  #- k8s/localkubeconfig.md
+  #- k8s/access-eks-cluster.md
+  #- k8s/accessinternal.md
+  #- k8s/kubectlproxy.md
+  - k8s/rollout.md
+  #- k8s/healthchecks.md
+  #- k8s/healthchecks-more.md
+  #- k8s/record.md
+-
+  - k8s/namespaces.md
+  - k8s/ingress.md
+  #- k8s/ingress-tls.md
+  #- k8s/kustomize.md
+  #- k8s/helm-intro.md
+  #- k8s/helm-chart-format.md
+  #- k8s/helm-create-basic-chart.md
+  #- k8s/helm-create-better-chart.md
+  #- k8s/helm-secrets.md
+  #- k8s/exercise-helm.md
+  #- k8s/gitlab.md
+  #- k8s/create-chart.md
+  #- k8s/create-more-charts.md
+  #- k8s/netpol.md
+  #- k8s/authn-authz.md
+  #- k8s/user-cert.md
+  #- k8s/csr-api.md
+  #- k8s/openid-connect.md
+  #- k8s/podsecuritypolicy.md
+  - k8s/volumes.md
+  #- k8s/exercise-configmap.md
+  #- k8s/build-with-docker.md
+  #- k8s/build-with-kaniko.md
+  - k8s/configuration.md
+  - k8s/secrets.md
+  #- k8s/logs-centralized.md
+  #- k8s/prometheus.md
+  #- k8s/statefulsets.md
+  #- k8s/local-persistent-volumes.md
+  #- k8s/portworx.md
+  #- k8s/extending-api.md
+  #- k8s/crd.md
+  #- k8s/admission.md
+  #- k8s/operators.md
+  #- k8s/operators-design.md
+  #- k8s/staticpods.md
+  #- k8s/finalizers.md
+  #- k8s/owners-and-dependents.md
+  #- k8s/gitworkflows.md
+-
+  - k8s/whatsnext.md
+  - k8s/lastwords.md
+  - k8s/links.md
+  - shared/thankyou.md

slides/kube-halfday.yml

@@ -0,0 +1,86 @@
+title: |
+  Kubernetes 101
+
+
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/training-20180413-paris)"
+chat: "In person!"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+
+content:
+- shared/title.md
+#- logistics.md
+# Bridget-specific; others use logistics.md
+- logistics-bridget.md
+- k8s/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- - shared/prereqs.md
+  #- shared/webssh.md
+  - shared/connecting.md
+  - k8s/versions-k8s.md
+  - shared/sampleapp.md
+# Bridget doesn't go into as much depth with compose
+  #- shared/composescale.md
+  #- shared/hastyconclusions.md
+  - shared/composedown.md
+  - k8s/concepts-k8s.md
+  - shared/declarative.md
+  - k8s/declarative.md
+  - k8s/kubenet.md
+  - k8s/kubectlget.md
+  - k8s/setup-overview.md
+  #- k8s/setup-devel.md
+  #- k8s/setup-managed.md
+  #- k8s/setup-selfhosted.md
+- - k8s/kubectl-run.md
+  #- k8s/batch-jobs.md
+  #- k8s/labels-annotations.md
+  - k8s/kubectl-logs.md
+  - k8s/deploymentslideshow.md
+  - k8s/kubectlexpose.md
+  - k8s/shippingimages.md
+  #- k8s/buildshiprun-selfhosted.md
+  - k8s/buildshiprun-dockerhub.md
+  - k8s/ourapponkube.md
+  #- k8s/localkubeconfig.md
+  #- k8s/access-eks-cluster.md
+  #- k8s/accessinternal.md
+  #- k8s/kubectlproxy.md
+- - k8s/dashboard.md
+  #- k8s/k9s.md
+  #- k8s/tilt.md
+  #- k8s/kubectlscale.md
+  - k8s/scalingdockercoins.md
+  - shared/hastyconclusions.md
+  - k8s/daemonset.md
+  - k8s/rollout.md
+  #- k8s/record.md
+- - k8s/logs-cli.md
+# Bridget hasn't added EFK yet
+  #- k8s/logs-centralized.md
+  - k8s/namespaces.md
+  - k8s/helm-intro.md
+  #- k8s/helm-chart-format.md
+  - k8s/helm-create-basic-chart.md
+  #- k8s/helm-create-better-chart.md
+  #- k8s/helm-secrets.md
+  #- k8s/kustomize.md
+  #- k8s/netpol.md
+  - k8s/whatsnext.md
+#  - k8s/links.md
+# Bridget-specific
+  - k8s/links-bridget.md
+  - shared/thankyou.md

slides/kube-selfpaced.yml

@@ -0,0 +1,151 @@
+title: |
+  Deploying and Scaling Microservices
+  with Docker and Kubernetes
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- in-person
+
+content:
+- shared/title.md
+#- logistics.md
+- k8s/intro.md
+- shared/about-slides.md
+#- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+-
+  - shared/prereqs.md
+  #- shared/webssh.md
+  - shared/connecting.md
+  - k8s/versions-k8s.md
+  - shared/sampleapp.md
+  #- shared/composescale.md
+  #- shared/hastyconclusions.md
+  - shared/composedown.md
+  - k8s/concepts-k8s.md
+-
+  - k8s/kubectlget.md
+  - k8s/kubectl-run.md
+  - k8s/batch-jobs.md
+  - k8s/labels-annotations.md
+  - k8s/kubectl-logs.md
+  - k8s/logs-cli.md
+  - shared/declarative.md
+  - k8s/declarative.md
+  - k8s/deploymentslideshow.md
+-
+  - k8s/kubenet.md
+  - k8s/kubectlexpose.md
+  - k8s/shippingimages.md
+  - k8s/buildshiprun-selfhosted.md
+  - k8s/buildshiprun-dockerhub.md
+  - k8s/ourapponkube.md
+  #- k8s/exercise-wordsmith.md
+  - k8s/yamldeploy.md
+-
+  - k8s/setup-overview.md
+  - k8s/setup-devel.md
+  - k8s/setup-managed.md
+  - k8s/setup-selfhosted.md
+  - k8s/dashboard.md
+  - k8s/k9s.md
+  - k8s/tilt.md
+  #- k8s/kubectlscale.md
+  - k8s/scalingdockercoins.md
+  - shared/hastyconclusions.md
+  - k8s/daemonset.md
+  - k8s/authoring-yaml.md
+  #- k8s/exercise-yaml.md
+-
+  - k8s/rollout.md
+  - k8s/healthchecks.md
+  - k8s/healthchecks-more.md
+  - k8s/record.md
+-
+  - k8s/namespaces.md
+  - k8s/localkubeconfig.md
+  #- k8s/access-eks-cluster.md
+  - k8s/accessinternal.md
+  - k8s/kubectlproxy.md
+-
+  - k8s/ingress.md
+  - k8s/ingress-tls.md
+  - k8s/cert-manager.md
+  - k8s/kustomize.md
+  - k8s/helm-intro.md
+  - k8s/helm-chart-format.md
+  - k8s/helm-create-basic-chart.md
+  - k8s/helm-create-better-chart.md
+  - k8s/helm-secrets.md
+  #- k8s/exercise-helm.md
+  - k8s/gitlab.md
+-
+  - k8s/netpol.md
+  - k8s/authn-authz.md
+  - k8s/podsecuritypolicy.md
+  - k8s/user-cert.md
+  - k8s/csr-api.md
+  - k8s/openid-connect.md
+  - k8s/control-plane-auth.md
+-
+  - k8s/volumes.md
+  #- k8s/exercise-configmap.md
+  - k8s/build-with-docker.md
+  - k8s/build-with-kaniko.md
+-
+  - k8s/configuration.md
+  - k8s/secrets.md
+  - k8s/statefulsets.md
+  - k8s/local-persistent-volumes.md
+  - k8s/portworx.md
+-
+  - k8s/logs-centralized.md
+  - k8s/prometheus.md
+  - k8s/resource-limits.md
+  - k8s/metrics-server.md
+  - k8s/cluster-sizing.md
+  - k8s/horizontal-pod-autoscaler.md
+  - k8s/hpa-v2.md
+-
+  - k8s/extending-api.md
+  - k8s/apiserver-deepdive.md
+  - k8s/crd.md
+  - k8s/aggregation-layer.md
+  - k8s/admission.md
+  - k8s/operators.md
+  - k8s/operators-design.md
+  - k8s/kubebuilder.md
+  - k8s/sealed-secrets.md
+  - k8s/kyverno.md
+  - k8s/eck.md
+  - k8s/finalizers.md
+  - k8s/owners-and-dependents.md
+  - k8s/events.md
+-
+  - k8s/dmuc.md
+  - k8s/multinode.md
+  - k8s/cni.md
+  - k8s/cni-internals.md
+  - k8s/apilb.md
+  - k8s/staticpods.md
+-
+  - k8s/cluster-upgrade.md
+  - k8s/cluster-backup.md
+  - k8s/cloud-controller-manager.md
+  - k8s/gitworkflows.md
+-
+  - k8s/lastwords.md
+  - k8s/links.md
+  - shared/thankyou.md

slides/kube-twodays.yml

@@ -1,11 +1,14 @@
 title: |
-  Kubernetes Training
+  Deploying and Scaling Microservices
+  with Kubernetes
 
-chat: "Teams"
+#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+chat: "In person!"
 
 gitrepo: github.com/jpetazzo/container.training
 
-slides: https://2021-06-mbition.container.training/
+slides: http://container.training/
 
 #slidenumberprefix: "#SomeHashTag — "
 
@@ -17,13 +20,14 @@ content:
 - logistics.md
 - k8s/intro.md
 - shared/about-slides.md
-#- shared/chat-room-im.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
 #- shared/chat-room-zoom-meeting.md
 #- shared/chat-room-zoom-webinar.md
 - shared/toc.md
 -
   - shared/prereqs.md
-  - shared/webssh.md
+  #- shared/webssh.md
   - shared/connecting.md
   #- k8s/versions-k8s.md
   - shared/sampleapp.md
@@ -32,7 +36,15 @@ content:
   - shared/composedown.md
   - k8s/concepts-k8s.md
   - k8s/kubectlget.md
+-
   - k8s/kubectl-run.md
+  - k8s/batch-jobs.md
+  - k8s/labels-annotations.md
+  - k8s/kubectl-logs.md
+  - k8s/logs-cli.md
+  - shared/declarative.md
+  - k8s/declarative.md
+  - k8s/deploymentslideshow.md
   - k8s/kubenet.md
   - k8s/kubectlexpose.md
   - k8s/shippingimages.md
@@ -41,52 +53,69 @@ content:
   - k8s/ourapponkube.md
   #- k8s/exercise-wordsmith.md
 -
-  - k8s/labels-annotations.md
-  - k8s/kubectl-logs.md
-  - k8s/logs-cli.md
-  - k8s/namespaces.md
   - k8s/yamldeploy.md
-  - k8s/localkubeconfig.md
-  - k8s/accessinternal.md
-  - k8s/kubectlproxy.md
-  - k8s/dashboard.md
   - k8s/setup-overview.md
   - k8s/setup-devel.md
   #- k8s/setup-managed.md
   #- k8s/setup-selfhosted.md
--
+  - k8s/dashboard.md
+  - k8s/k9s.md
+  #- k8s/tilt.md
   #- k8s/kubectlscale.md
   - k8s/scalingdockercoins.md
   - shared/hastyconclusions.md
   - k8s/daemonset.md
+  - k8s/authoring-yaml.md
+  #- k8s/exercise-yaml.md
+-
+  - k8s/localkubeconfig.md
+  #- k8s/access-eks-cluster.md
+  - k8s/accessinternal.md
+  #- k8s/kubectlproxy.md
   - k8s/rollout.md
   - k8s/healthchecks.md
   #- k8s/healthchecks-more.md
-  - shared/declarative.md
-  - k8s/declarative.md
-  - k8s/deploymentslideshow.md
+  - k8s/record.md
+-
+  - k8s/namespaces.md
+  - k8s/ingress.md
+  #- k8s/ingress-tls.md
+  - k8s/kustomize.md
+  - k8s/helm-intro.md
+  - k8s/helm-chart-format.md
+  - k8s/helm-create-basic-chart.md
+  - k8s/helm-create-better-chart.md
+  - k8s/helm-secrets.md
+  #- k8s/exercise-helm.md
+  - k8s/gitlab.md
+-
+  - k8s/netpol.md
+  - k8s/authn-authz.md
+  #- k8s/csr-api.md
+  #- k8s/openid-connect.md
+  #- k8s/podsecuritypolicy.md
+-
   - k8s/volumes.md
   #- k8s/exercise-configmap.md
   #- k8s/build-with-docker.md
   #- k8s/build-with-kaniko.md
   - k8s/configuration.md
-  #- k8s/batch-jobs.md
-  #- k8s/logs-centralized.md
-  #- k8s/prometheus.md
-  #- k8s/statefulsets.md
-  #- k8s/local-persistent-volumes.md
-  #- k8s/portworx.md
+  - k8s/secrets.md
+  - k8s/logs-centralized.md
+  - k8s/prometheus.md
+-
+  - k8s/statefulsets.md
+  - k8s/local-persistent-volumes.md
+  - k8s/portworx.md
   #- k8s/extending-api.md
+  #- k8s/admission.md
   #- k8s/operators.md
   #- k8s/operators-design.md
   #- k8s/staticpods.md
   #- k8s/owners-and-dependents.md
   #- k8s/gitworkflows.md
-  #- k8s/whatsnext.md
-  #- k8s/lastwords.md
-  - shared/thankyou.md
-  #- k8s/links.md
 -
-  - |
-    # (Extra material)
-  - k8s/ingress.md
+  - k8s/whatsnext.md
+  - k8s/lastwords.md
+  - k8s/links.md
+  - shared/thankyou.md

slides/logistics-bridget.md

@@ -2,9 +2,9 @@
 
  - Hello! We are:
 
-   - ✨ Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
+   - .emoji[✨] Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
 
-   - 🌟 Joe ([@joelaha](https://twitter.com/joelaha))
+   - .emoji[🌟] Joe ([@joelaha](https://twitter.com/joelaha))
 
 - The workshop will run from 13:30-16:45
 

slides/logistics-online.md

@@ -2,9 +2,9 @@
 
 - Hello! We are:
 
-   - 👷🏻‍♀️ AJ ([@s0ulshake], [EphemeraSearch])
+   - .emoji[👷🏻‍♀️] AJ ([@s0ulshake], [EphemeraSearch])
 
-   - 🐳 Jérôme ([@jpetazzo], Enix SAS)
+   - .emoji[🐳] Jérôme ([@jpetazzo], Enix SAS)
 
 - The training will run for 4 hours, with a 10 minutes break every hour
 

slides/logistics-template.md

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

slides/markmaker.py

@@ -42,7 +42,7 @@ def insertslide(markdown, title):
 
     before = markdown[:slide_position]
 
-    toclink = "toc-part-{}".format(title2part[title])
+    toclink = "toc-module-{}".format(title2path[title][0])
     _titles_ = [""] + all_titles + [""]
     currentindex = _titles_.index(title)
     previouslink = anchor(_titles_[currentindex-1])
@@ -54,7 +54,7 @@ def insertslide(markdown, title):
 
 class: pic
 
-.interstitial[![Image separating from the next part]({interstitial})]
+.interstitial[![Image separating from the next module]({interstitial})]
 
 ---
 
@@ -64,11 +64,11 @@ class: title
  {title}
 
 .nav[
-[Previous part](#{previouslink})
+[Previous section](#{previouslink})
 |
 [Back to table of contents](#{toclink})
 |
-[Next part](#{nextlink})
+[Next section](#{nextlink})
 ]
 
 .debug[(automatically generated title slide)]
@@ -156,44 +156,43 @@ def generatefromyaml(manifest, filename):
     return html
 
 
-# Maps a title (the string just after "^# ") to its position in the TOC
-# (to which part it belongs).
-title2part = {}
+# Maps a section title (the string just after "^# ") to its position
+# in the table of content (as a (module,part,subpart,...) tuple).
+title2path = {}
 all_titles = []
 
-# Generate the table of contents for a tree of titles.
 # "tree" is a list of titles, potentially nested.
-# Each entry is either:
-# - a title (then it's a top-level section that doesn't show up in the TOC)
-# - a list (then it's a part that will show up in the TOC on its own slide)
-# In a list, we can have:
-# - titles (simple entry)
-# - further lists (they are then flattened; we don't represent subsubparts)
-def gentoc(tree):
-    # First, remove the top-level sections that don't show up in the TOC.
-    tree = [ entry for entry in tree if type(entry)==list ]
-    # Then, flatten the sublists.
-    tree = [ list(flatten(entry)) for entry in tree ]
-    # Now, process each part.
-    parts = []
-    for i, part in enumerate(tree):
-        slide = "name: toc-part-{}\n\n".format(i+1)
-        if len(tree) == 1:
-            slide += "## Table of contents\n\n"
+def gentoc(tree, path=()):
+    if not tree:
+        return ""
+    if isinstance(tree, str):
+        logging.debug("Path {} Title {}".format(path, tree))
+        title = tree
+        title2path[title] = path
+        all_titles.append(title)
+        return "- [{}](#{})".format(title, anchor(title))
+    if isinstance(tree, list):
+        # If there is only one sub-element, give it index zero.
+        # Otherwise, elements will have indices 1-to-N.
+        offset = 0 if len(tree) == 1 else 1
+        logging.debug(
+            "Path {} Tree [...({} sub-elements)]"
+            .format(path, len(tree)))
+        if len(path) == 0:
+            return "\n---\n".join(gentoc(subtree, path+(i+offset,)) for (i,subtree) in enumerate(tree))
+        elif len(path) == 1:
+            # If there is only one module, don't show "Module 1" but just "TOC"
+            if path[0] == 0:
+                label = "Table of contents"
+            else:
+                label = "Module {}".format(path[0])
+            moduleslide = "name: toc-module-{n}\n\n## {label}\n\n".format(n=path[0], label=label)
+            for (i,subtree) in enumerate(tree):
+                moduleslide += gentoc(subtree, path+(i+offset,)) + "\n\n"
+            moduleslide += ".debug[(auto-generated TOC)]"
+            return moduleslide
         else:
-            slide += "## Part {}\n\n".format(i+1)
-        for title in part:
-            logging.debug("Generating TOC, part {}, title {}.".format(i+1, title))
-            title2part[title] = i+1
-            all_titles.append(title)
-            slide += "- [{}](#{})\n".format(title, anchor(title))
-            # If we don't have too many subparts, add some space to breathe.
-            # (Otherwise, we display the titles smooched together.)
-            if len(part) < 10:
-                slide += "\n"
-        slide += "\n.debug[(auto-generated TOC)]"
-        parts.append(slide)
-    return "\n---\n".join(parts)
+            return "\n\n".join(gentoc(subtree, path+(i+offset,)) for (i,subtree) in enumerate(tree))
 
 
 # Arguments:

slides/shared/about-slides.md

@@ -46,7 +46,7 @@
 
 - Typos? Mistakes? Questions? Feel free to hover over the bottom of the slide ...
 
-.footnote[👇 Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]
+.footnote[.emoji[👇] Try it! The source file will be shown and you can view it on GitHub and fork and edit it.]
 
 <!--
 .exercise[

slides/shared/chat-room-twitch.md

@@ -28,7 +28,7 @@
 
 - Some of our favorites:
 
-  🤔✔️👍🏻👍🏼👍🏽👍🏾👍🏿⚠️🛑
+  .emoji[🤔✔️👍🏻👍🏼👍🏽👍🏾👍🏿⚠️🛑]
 
 - During the session, we'll often ask audience participation questions
 

slides/shared/chat-room-zoom-webinar.md

@@ -28,7 +28,7 @@
 
 - Some of our favorites:
 
-  🤔✔️👍🏻👍🏼👍🏽👍🏾👍🏿⚠️🛑
+  .emoji[🤔✔️👍🏻👍🏼👍🏽👍🏾👍🏿⚠️🛑]
 
 - During the session, we'll often ask audience participation questions
 

slides/shared/sampleapp.md

@@ -58,7 +58,7 @@ and displays aggregated logs.
 
 --
 
-- It is a DockerCoin miner! 💰🐳📦🚢
+- It is a DockerCoin miner! .emoji[💰🐳📦🚢]
 
 --
 

slides/swarm-fullday.yml

@@ -0,0 +1,71 @@
+title: |
+  Container Orchestration
+  with Docker and Swarm
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+- snap
+- btp-auto
+- benchmarking
+- elk-manual
+- prom-manual
+
+content:
+- shared/title.md
+- logistics.md
+- swarm/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- - shared/prereqs.md
+  - shared/connecting.md
+  - swarm/versions.md
+  - shared/sampleapp.md
+  - shared/composescale.md
+  - shared/hastyconclusions.md
+  - shared/composedown.md
+  - swarm/swarmkit.md
+  - shared/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/stacks.md
+  - swarm/cicd.md
+  - swarm/updatingservices.md
+  - swarm/rollingupdates.md
+  - swarm/healthchecks.md
+- - swarm/operatingswarm.md
+  - swarm/netshoot.md
+  - swarm/ipsec.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/gui.md
+  - swarm/stateful.md
+  - swarm/extratips.md
+  - shared/thankyou.md
+  - swarm/links.md

slides/swarm-halfday.yml

@@ -0,0 +1,70 @@
+title: |
+  Container Orchestration
+  with Docker and Swarm
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- self-paced
+- snap
+- btp-manual
+- benchmarking
+- elk-manual
+- prom-manual
+
+content:
+- shared/title.md
+- logistics.md
+- swarm/intro.md
+- shared/about-slides.md
+- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- - shared/prereqs.md
+  - shared/connecting.md
+  - swarm/versions.md
+  - shared/sampleapp.md
+  - shared/composescale.md
+  - shared/hastyconclusions.md
+  - shared/composedown.md
+  - swarm/swarmkit.md
+  - shared/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/stacks.md
+  - swarm/cicd.md
+  - swarm/updatingservices.md
+  #- swarm/rollingupdates.md
+  #- swarm/healthchecks.md
+- - swarm/operatingswarm.md
+  #- swarm/netshoot.md
+  #- swarm/ipsec.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
+  - shared/thankyou.md
+  - swarm/links.md

slides/swarm-selfpaced.yml

@@ -0,0 +1,79 @@
+title: |
+  Container Orchestration
+  with Docker and Swarm
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- in-person
+- btp-auto
+
+content:
+- shared/title.md
+#- shared/logistics.md
+- swarm/intro.md
+- shared/about-slides.md
+#- shared/chat-room-im.md
+#- shared/chat-room-slack.md
+#- shared/chat-room-zoom-meeting.md
+#- shared/chat-room-zoom-webinar.md
+- shared/toc.md
+- - shared/prereqs.md
+  - shared/connecting.md
+  - swarm/versions.md
+  - |
+    name: part-1
+
+    class: title, self-paced
+
+    Part 1
+  - shared/sampleapp.md
+  - shared/composescale.md
+  - shared/hastyconclusions.md
+  - shared/composedown.md
+  - swarm/swarmkit.md
+  - shared/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/stacks.md
+  - swarm/cicd.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
+  - shared/thankyou.md
+  - swarm/links.md

slides/swarm-video.yml

@@ -0,0 +1,74 @@
+title: |
+  Container Orchestration
+  with Docker and Swarm
+
+chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
+
+gitrepo: github.com/jpetazzo/container.training
+
+slides: http://container.training/
+
+#slidenumberprefix: "#SomeHashTag — "
+
+exclude:
+- in-person
+- btp-auto
+
+content:
+- shared/title.md
+#- shared/logistics.md
+- swarm/intro.md
+- shared/about-slides.md
+- shared/toc.md
+- - shared/prereqs.md
+  - shared/connecting.md
+  - swarm/versions.md
+  - |
+    name: part-1
+
+    class: title, self-paced
+
+    Part 1
+  - shared/sampleapp.md
+  - shared/composescale.md
+  - shared/hastyconclusions.md
+  - shared/composedown.md
+  - swarm/swarmkit.md
+  - shared/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/stacks.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
+  - shared/thankyou.md
+  - swarm/links.md

slides/swarm/creatingswarm.md

@@ -205,7 +205,7 @@ ID             HOSTNAME  STATUS  AVAILABILITY  MANAGER STATUS
 
 --
 
-- Don't panic, we can easily see it again 😏
+- Don't panic, we can easily see it again .emoji[😏]
 
 ---