fix-redirects.sh: adding forced redirect

Fix resource typo in k8s slides [outreach branch]

k8s/insecure-dashboard.yaml

@@ -1,10 +1,3 @@
-# This file is based on the following manifest:
-# https://github.com/kubernetes/dashboard/blob/master/aio/deploy/recommended.yaml
-# It adds the "skip login" flag, as well as an insecure hack to defeat SSL.
-# As its name implies, it is INSECURE and you should not use it in production,
-# or on clusters that contain any kind of important or sensitive data, or on
-# clusters that have a life span of more than a few hours.
-
 # Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -194,7 +187,7 @@ spec:
     spec:
       containers:
         - name: kubernetes-dashboard
-          image: kubernetesui/dashboard:v2.0.0
+          image: kubernetesui/dashboard:v2.0.0-rc2
           imagePullPolicy: Always
           ports:
             - containerPort: 8443
@@ -233,7 +226,7 @@ spec:
           emptyDir: {}
       serviceAccountName: kubernetes-dashboard
       nodeSelector:
-        "kubernetes.io/os": linux
+        "beta.kubernetes.io/os": linux
       # Comment the following tolerations if Dashboard must not be deployed on master
       tolerations:
         - key: node-role.kubernetes.io/master
@@ -279,7 +272,7 @@ spec:
     spec:
       containers:
         - name: dashboard-metrics-scraper
-          image: kubernetesui/metrics-scraper:v1.0.4
+          image: kubernetesui/metrics-scraper:v1.0.2
           ports:
             - containerPort: 8000
               protocol: TCP
@@ -300,7 +293,7 @@ spec:
             runAsGroup: 2001
       serviceAccountName: kubernetes-dashboard
       nodeSelector:
-        "kubernetes.io/os": linux
+        "beta.kubernetes.io/os": linux
       # Comment the following tolerations if Dashboard must not be deployed on master
       tolerations:
         - key: node-role.kubernetes.io/master

k8s/kubernetes-dashboard.yaml

@@ -1,6 +1,3 @@
-# This is a copy of the following file:
-# https://github.com/kubernetes/dashboard/blob/master/aio/deploy/recommended.yaml
-
 # Copyright 2017 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,38 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kubernetes-dashboard
-
----
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard
-  namespace: kubernetes-dashboard
-
----
-
-kind: Service
-apiVersion: v1
-metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard
-  namespace: kubernetes-dashboard
-spec:
-  ports:
-    - port: 443
-      targetPort: 8443
-  selector:
-    k8s-app: kubernetes-dashboard
-
----
+# ------------------- Dashboard Secret ------------------- #
 
 apiVersion: v1
 kind: Secret
@@ -54,121 +20,74 @@ metadata:
   labels:
     k8s-app: kubernetes-dashboard
   name: kubernetes-dashboard-certs
-  namespace: kubernetes-dashboard
+  namespace: kube-system
 type: Opaque
 
 ---
+# ------------------- Dashboard Service Account ------------------- #
 
 apiVersion: v1
-kind: Secret
+kind: ServiceAccount
 metadata:
   labels:
     k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard-csrf
-  namespace: kubernetes-dashboard
-type: Opaque
-data:
-  csrf: ""
-
----
-
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard-key-holder
-  namespace: kubernetes-dashboard
-type: Opaque
-
----
-
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard-settings
-  namespace: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kube-system
 
 ---
+# ------------------- Dashboard Role & Role Binding ------------------- #
 
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard
-  namespace: kubernetes-dashboard
+  name: kubernetes-dashboard-minimal
+  namespace: kube-system
 rules:
+  # Allow Dashboard to create 'kubernetes-dashboard-key-holder' secret.
+- apiGroups: [""]
+  resources: ["secrets"]
+  verbs: ["create"]
+  # Allow Dashboard to create 'kubernetes-dashboard-settings' config map.
+- apiGroups: [""]
+  resources: ["configmaps"]
+  verbs: ["create"]
   # Allow Dashboard to get, update and delete Dashboard exclusive secrets.
-  - apiGroups: [""]
-    resources: ["secrets"]
-    resourceNames: ["kubernetes-dashboard-key-holder", "kubernetes-dashboard-certs", "kubernetes-dashboard-csrf"]
-    verbs: ["get", "update", "delete"]
-    # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
-  - apiGroups: [""]
-    resources: ["configmaps"]
-    resourceNames: ["kubernetes-dashboard-settings"]
-    verbs: ["get", "update"]
-    # Allow Dashboard to get metrics.
-  - apiGroups: [""]
-    resources: ["services"]
-    resourceNames: ["heapster", "dashboard-metrics-scraper"]
-    verbs: ["proxy"]
-  - apiGroups: [""]
-    resources: ["services/proxy"]
-    resourceNames: ["heapster", "http:heapster:", "https:heapster:", "dashboard-metrics-scraper", "http:dashboard-metrics-scraper"]
-    verbs: ["get"]
+- apiGroups: [""]
+  resources: ["secrets"]
+  resourceNames: ["kubernetes-dashboard-key-holder", "kubernetes-dashboard-certs"]
+  verbs: ["get", "update", "delete"]
+  # Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
+- apiGroups: [""]
+  resources: ["configmaps"]
+  resourceNames: ["kubernetes-dashboard-settings"]
+  verbs: ["get", "update"]
+  # Allow Dashboard to get metrics from heapster.
+- apiGroups: [""]
+  resources: ["services"]
+  resourceNames: ["heapster"]
+  verbs: ["proxy"]
+- apiGroups: [""]
+  resources: ["services/proxy"]
+  resourceNames: ["heapster", "http:heapster:", "https:heapster:"]
+  verbs: ["get"]
 
 ---
-
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard
-rules:
-  # Allow Metrics Scraper to get metrics from the Metrics server
-  - apiGroups: ["metrics.k8s.io"]
-    resources: ["pods", "nodes"]
-    verbs: ["get", "list", "watch"]
-
----
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  labels:
-    k8s-app: kubernetes-dashboard
-  name: kubernetes-dashboard
-  namespace: kubernetes-dashboard
+  name: kubernetes-dashboard-minimal
+  namespace: kube-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: kubernetes-dashboard
+  name: kubernetes-dashboard-minimal
 subjects:
-  - kind: ServiceAccount
-    name: kubernetes-dashboard
-    namespace: kubernetes-dashboard
-
----
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kubernetes-dashboard
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kubernetes-dashboard
-subjects:
-  - kind: ServiceAccount
-    name: kubernetes-dashboard
-    namespace: kubernetes-dashboard
+- kind: ServiceAccount
+  name: kubernetes-dashboard
+  namespace: kube-system
 
 ---
+# ------------------- Dashboard Deployment ------------------- #
 
 kind: Deployment
 apiVersion: apps/v1
@@ -176,7 +95,7 @@ metadata:
   labels:
     k8s-app: kubernetes-dashboard
   name: kubernetes-dashboard
-  namespace: kubernetes-dashboard
+  namespace: kube-system
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -189,117 +108,55 @@ spec:
         k8s-app: kubernetes-dashboard
     spec:
       containers:
-        - name: kubernetes-dashboard
-          image: kubernetesui/dashboard:v2.0.0
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8443
-              protocol: TCP
-          args:
-            - --auto-generate-certificates
-            - --namespace=kubernetes-dashboard
-            # Uncomment the following line to manually specify Kubernetes API server Host
-            # If not specified, Dashboard will attempt to auto discover the API server and connect
-            # to it. Uncomment only if the default does not work.
-            # - --apiserver-host=http://my-address:port
-          volumeMounts:
-            - name: kubernetes-dashboard-certs
-              mountPath: /certs
-              # Create on-disk volume to store exec logs
-            - mountPath: /tmp
-              name: tmp-volume
-          livenessProbe:
-            httpGet:
-              scheme: HTTPS
-              path: /
-              port: 8443
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            runAsUser: 1001
-            runAsGroup: 2001
-      volumes:
+      - name: kubernetes-dashboard
+        image: k8s.gcr.io/kubernetes-dashboard-amd64:v1.10.1
+        ports:
+        - containerPort: 8443
+          protocol: TCP
+        args:
+          - --auto-generate-certificates
+          # Uncomment the following line to manually specify Kubernetes API server Host
+          # If not specified, Dashboard will attempt to auto discover the API server and connect
+          # to it. Uncomment only if the default does not work.
+          # - --apiserver-host=http://my-address:port
+        volumeMounts:
         - name: kubernetes-dashboard-certs
-          secret:
-            secretName: kubernetes-dashboard-certs
-        - name: tmp-volume
-          emptyDir: {}
+          mountPath: /certs
+          # Create on-disk volume to store exec logs
+        - mountPath: /tmp
+          name: tmp-volume
+        livenessProbe:
+          httpGet:
+            scheme: HTTPS
+            path: /
+            port: 8443
+          initialDelaySeconds: 30
+          timeoutSeconds: 30
+      volumes:
+      - name: kubernetes-dashboard-certs
+        secret:
+          secretName: kubernetes-dashboard-certs
+      - name: tmp-volume
+        emptyDir: {}
       serviceAccountName: kubernetes-dashboard
-      nodeSelector:
-        "kubernetes.io/os": linux
       # Comment the following tolerations if Dashboard must not be deployed on master
       tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
 
 ---
+# ------------------- Dashboard Service ------------------- #
 
 kind: Service
 apiVersion: v1
 metadata:
   labels:
-    k8s-app: dashboard-metrics-scraper
-  name: dashboard-metrics-scraper
-  namespace: kubernetes-dashboard
+    k8s-app: kubernetes-dashboard
+  name: kubernetes-dashboard
+  namespace: kube-system
 spec:
   ports:
-    - port: 8000
-      targetPort: 8000
+    - port: 443
+      targetPort: 8443
   selector:
-    k8s-app: dashboard-metrics-scraper
-
----
-
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  labels:
-    k8s-app: dashboard-metrics-scraper
-  name: dashboard-metrics-scraper
-  namespace: kubernetes-dashboard
-spec:
-  replicas: 1
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      k8s-app: dashboard-metrics-scraper
-  template:
-    metadata:
-      labels:
-        k8s-app: dashboard-metrics-scraper
-      annotations:
-        seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
-    spec:
-      containers:
-        - name: dashboard-metrics-scraper
-          image: kubernetesui/metrics-scraper:v1.0.4
-          ports:
-            - containerPort: 8000
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              scheme: HTTP
-              path: /
-              port: 8000
-            initialDelaySeconds: 30
-            timeoutSeconds: 30
-          volumeMounts:
-          - mountPath: /tmp
-            name: tmp-volume
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            runAsUser: 1001
-            runAsGroup: 2001
-      serviceAccountName: kubernetes-dashboard
-      nodeSelector:
-        "kubernetes.io/os": linux
-      # Comment the following tolerations if Dashboard must not be deployed on master
-      tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
-      volumes:
-        - name: tmp-volume
-          emptyDir: {}
+    k8s-app: kubernetes-dashboard

k8s/nginx-4-with-init.yaml

@@ -14,7 +14,7 @@ spec:
   initContainers:
   - name: git
     image: alpine
-    command: [ "sh", "-c", "apk add git && sleep 5 && git clone https://github.com/octocat/Spoon-Knife /www" ]
+    command: [ "sh", "-c", "apk add --no-cache git && git clone https://github.com/octocat/Spoon-Knife /www" ]
     volumeMounts:
     - name: www
       mountPath: /www/

k8s/postgres.yaml

@@ -22,10 +22,7 @@ spec:
         command: ["sh", "-c", "if [ -d /vol/lost+found ]; then rmdir /vol/lost+found; fi"]
       containers:
       - name: postgres
-        image: postgres:12
-        env:
-        - name: POSTGRES_HOST_AUTH_METHOD
-          value: trust
+        image: postgres:11
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
           name: postgres

k8s/psp-restricted.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: policy/v1beta1
+apiVersion: extensions/v1beta1
 kind: PodSecurityPolicy
 metadata:
   annotations:

k8s/users:jean.doe.yaml

@@ -8,24 +8,24 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: user=jean.doe
+  name: users:jean.doe
 rules:
 - apiGroups: [ certificates.k8s.io ]
   resources: [ certificatesigningrequests ]
   verbs:     [ create ]
 - apiGroups:     [ certificates.k8s.io ]
-  resourceNames: [ user=jean.doe ]
+  resourceNames: [ users:jean.doe ]
   resources:     [ certificatesigningrequests ]
   verbs:         [ get, create, delete, watch ]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: user=jean.doe
+  name: users:jean.doe
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: user=jean.doe
+  name: users:jean.doe
 subjects:
 - kind: ServiceAccount
   name: jean.doe

prepare-vms/lib/commands.sh

@@ -246,21 +246,11 @@ EOF"
         helm completion bash | sudo tee /etc/bash_completion.d/helm
     fi"
 
-    # Install kustomize
-    pssh "
-    if [ ! -x /usr/local/bin/kustomize ]; then
-        curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.5.4/kustomize_v3.5.1_linux_amd64.tar.gz |
-            sudo tar -C /usr/local/bin -zx kustomize
-        echo complete -C /usr/local/bin/kustomize kustomize | sudo tee /etc/bash_completion.d/kustomize
-    fi"
-
     # Install ship
-    # Note: 0.51.3 is the last version that doesn't display GIN-debug messages
-    # (don't want to get folks confused by that!)
     pssh "
     if [ ! -x /usr/local/bin/ship ]; then
         ##VERSION##
-        curl -L https://github.com/replicatedhq/ship/releases/download/v0.51.3/ship_0.51.3_linux_amd64.tar.gz |
+        curl -L https://github.com/replicatedhq/ship/releases/download/v0.40.0/ship_0.40.0_linux_amd64.tar.gz |
              sudo tar -C /usr/local/bin -zx ship
     fi"
 
@@ -339,7 +329,7 @@ _cmd_maketag() {
     if [ -z $USER ]; then
         export USER=anonymous
     fi
-    MS=$(($(date +%N | tr -d 0)/1000000))
+    MS=$(($(date +%N)/1000000))
     date +%Y-%m-%d-%H-%M-$MS-$USER
 }
 
@@ -376,34 +366,6 @@ EOF
     sudo systemctl start pinger"
 }
 
-_cmd tailhist "Install history viewer on port 1088"
-_cmd_tailhist () {
-    TAG=$1
-    need_tag
-
-    pssh "
-    wget https://github.com/joewalnes/websocketd/releases/download/v0.3.0/websocketd-0.3.0_amd64.deb
-    sudo dpkg -i websocketd-0.3.0_amd64.deb
-    sudo mkdir -p /tmp/tailhist
-    sudo tee /root/tailhist.service <<EOF
-[Unit]
-Description=tailhist
-
-[Install]
-WantedBy=multi-user.target
-
-[Service]
-WorkingDirectory=/tmp/tailhist
-ExecStart=/usr/bin/websocketd --port=1088 --staticdir=. sh -c \"tail -n +1 -f /home/docker/.history || echo 'Could not read history file. Perhaps you need to \\\"chmod +r .history\\\"?'\"
-User=nobody
-Group=nogroup
-Restart=always
-EOF
-    sudo systemctl enable /root/tailhist.service
-    sudo systemctl start tailhist"
-    pssh -I sudo tee /tmp/tailhist/index.html <lib/tailhist.html
-}
-
 _cmd opensg "Open the default security group to ALL ingress traffic"
 _cmd_opensg() {
     need_infra $1
@@ -493,7 +455,6 @@ _cmd_start() {
         --settings) SETTINGS=$2; shift 2;;
         --count) COUNT=$2; shift 2;;
         --tag) TAG=$2; shift 2;;
-        --students) STUDENTS=$2; shift 2;;
         *) die "Unrecognized parameter: $1."
         esac
     done
@@ -505,14 +466,8 @@ _cmd_start() {
         die "Please add --settings flag to specify which settings file to use."
     fi
     if [ -z "$COUNT" ]; then
-        CLUSTERSIZE=$(awk '/^clustersize:/ {print $2}' $SETTINGS)
-        if [ -z "$STUDENTS" ]; then
-            warning "Neither --count nor --students was specified."
-            warning "According to the settings file, the cluster size is $CLUSTERSIZE."
-            warning "Deploying one cluster of $CLUSTERSIZE nodes."
-            STUDENTS=1
-        fi
-        COUNT=$(($STUDENTS*$CLUSTERSIZE))
+        COUNT=$(awk '/^clustersize:/ {print $2}' $SETTINGS)
+        warning "No --count option was specified. Using value from settings file ($COUNT)."
     fi
 
     # Check that the specified settings and infrastructure are valid.
@@ -530,41 +485,11 @@ _cmd_start() {
     infra_start $COUNT
     sep
     info "Successfully created $COUNT instances with tag $TAG"
+    sep
     echo created > tags/$TAG/status
 
-    # If the settings.yaml file has a "steps" field,
-    # automatically execute all the actions listed in that field.
-    # If an action fails, retry it up to 10 times.
-    python -c 'if True: # hack to deal with indentation
-        import sys, yaml
-        settings = yaml.safe_load(sys.stdin)
-        print ("\n".join(settings.get("steps", [])))
-        ' < tags/$TAG/settings.yaml \
-    | while read step; do
-        if [ -z "$step" ]; then
-            break
-        fi
-        sep
-        info "Automatically executing step '$step'."
-        TRY=1
-        MAXTRY=10
-        while ! $0 $step $TAG ; do
-            TRY=$(($TRY+1))
-            if [ $TRY -gt $MAXTRY ]; then
-                error "This step ($step) failed after $MAXTRY attempts."
-                info "You can troubleshoot the situation manually, or terminate these instances with:"
-                info "$0 stop $TAG"
-                die "Giving up."
-            else
-                sep
-                info "Step '$step' failed. Let's wait 10 seconds and try again."
-                info "(Attempt $TRY out of $MAXTRY.)"
-                sleep 10
-            fi
-        done
-    done
-    sep
-    info "Deployment successful."
+    info "To deploy Docker on these instances, you can run:"
+    info "$0 deploy $TAG"
     info "To terminate these instances, you can run:"
     info "$0 stop $TAG"
 }

prepare-vms/lib/ips-txt-to-html.py

@@ -42,15 +42,13 @@ print("Generated ips.html")
 
 try:
     import pdfkit
-    paper_size = context["paper_size"]
-    margin = {"A4": "0.5cm", "Letter": "0.2in"}[paper_size]
     with open("ips.html") as f:
         pdfkit.from_file(f, "ips.pdf", options={
-            "page-size": paper_size,
-            "margin-top": margin,
-            "margin-bottom": margin,
-            "margin-left": margin,
-            "margin-right": margin,
+            "page-size": context["paper_size"],
+            "margin-top": context["paper_margin"],
+            "margin-bottom": context["paper_margin"],
+            "margin-left": context["paper_margin"],
+            "margin-right": context["paper_margin"],
             })
     print("Generated ips.pdf")
 except ImportError:

prepare-vms/lib/postprep.py

@@ -65,15 +65,6 @@ system("""sudo -u docker tee -a /home/docker/.bashrc <<SQRL
 export PS1='\e[1m\e[31m[{}] \e[32m(\\$(docker-prompt)) \e[34m\u@\h\e[35m \w\e[0m\n$ '
 SQRL""".format(ipv4))
 
-# Bigger history, in a different file, and saved before executing each command
-system("""sudo -u docker tee -a /home/docker/.bashrc <<SQRL
-export HISTSIZE=9999
-export HISTFILESIZE=9999
-shopt -s histappend
-trap 'history -a' DEBUG
-export HISTFILE=~/.history
-SQRL""")
-
 # Custom .vimrc
 system("""sudo -u docker tee /home/docker/.vimrc <<SQRL
 syntax on

prepare-vms/lib/tailhist.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>bash history</title>
-    <style>
-      #log {
-        font: bold 24px courier;
-      }
-
-      #log div:last-child {
-        background: yellow;
-      }
-    </style>
-  </head>
-  <body>
-
-    <div id="log"></div>
-
-    <script>
-      var ws = new WebSocket('ws://' + (location.host ? location.host : "localhost:8080") + "/");
-      var log = document.getElementById('log');
-      var echo = function(text) {
-        var line = document.createElement('div');
-        line.textContent = text;
-        log.appendChild(line);
-        line.scrollIntoView();
-      }
-      ws.onopen = function() {
-        document.body.style.backgroundColor = '#cfc';
-      };
-      ws.onclose = function() {
-        document.body.style.backgroundColor = '#fcc';
-        echo("Disconnected from server. Try to reload this page?");
-      };
-      ws.onmessage = function(event) {
-        echo(event.data);
-      };
-    </script>
-
-  </body>
-</html>
-

prepare-vms/map-dns.py

@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-import os
-import requests
-import yaml
-
-# configurable stuff
-domains_file = "../../plentydomains/domains.txt"
-config_file = os.path.join(
-	os.environ["HOME"], ".config/gandi/config.yaml")
-tag = "test"
-apiurl = "https://dns.api.gandi.net/api/v5/domains"
-
-# inferred stuff
-domains = open(domains_file).read().split()
-apikey = yaml.safe_load(open(config_file))["apirest"]["key"]
-ips = open(f"tags/{tag}/ips.txt").read().split()
-settings_file = f"tags/{tag}/settings.yaml"
-clustersize = yaml.safe_load(open(settings_file))["clustersize"]
-
-# now do the fucking work
-while domains and ips:
-	domain = domains[0]
-	domains = domains[1:]
-	cluster = ips[:clustersize]
-	ips = ips[clustersize:]
-	print(f"{domain} => {cluster}")
-	zone = ""
-	node = 0
-	for ip in cluster:
-		node += 1
-		zone += f"@ 300 IN A {ip}\n"
-		zone += f"* 300 IN A {ip}\n"
-		zone += f"node{node} 300 IN A {ip}\n"
-	r = requests.put(
-		f"{apiurl}/{domain}/records",
-		headers={"x-api-key": apikey},
-		data=zone)
-	print(r.text)
-
-	#r = requests.get(
-	#	f"{apiurl}/{domain}/records",
-	#	headers={"x-api-key": apikey},
-	#	)
-
-if domains:
-	print(f"Good, we have {len(domains)} domains left.")
-
-if ips:
-	print(f"Crap, we have {len(ips)} IP addresses left.")

prepare-vms/settings/admin-dmuc.yaml

@@ -10,6 +10,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: A4
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/settings/admin-kubenet.yaml

@@ -10,6 +10,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: A4
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/settings/admin-kuberouter.yaml

@@ -10,6 +10,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: A4
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/settings/admin-test.yaml

@@ -10,6 +10,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: A4
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/settings/example.yaml

@@ -12,6 +12,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: Letter
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: test
 

prepare-vms/settings/fundamentals.yaml

@@ -12,18 +12,19 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: Letter
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 
 # These correspond to the version numbers visible on their respective GitHub release pages
-compose_version: 1.25.4
+compose_version: 1.24.1
 machine_version: 0.15.0
 
 # Password used to connect with the "docker user"
 docker_user_password: training
-
-steps:
-  - deploy
-  - webssh
-  - tailhist
-  - cards

prepare-vms/settings/jerome.yaml

@@ -10,20 +10,19 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: Letter
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 
 # These correspond to the version numbers visible on their respective GitHub release pages
-compose_version: 1.25.4
+compose_version: 1.24.1
 machine_version: 0.14.0
 
 # Password used to connect with the "docker user"
 docker_user_password: training
-
-steps:
-  - deploy
-  - webssh
-  - tailhist
-  - kube
-  - cards
-  - kubetest

prepare-vms/settings/kube101.yaml

@@ -12,6 +12,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: Letter
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/settings/swarm.yaml

@@ -12,6 +12,13 @@ cards_template: cards.html
 # Use "Letter" in the US, and "A4" everywhere else
 paper_size: Letter
 
+# Feel free to reduce this if your printer can handle it
+paper_margin: 0.2in
+
+# Note: paper_size and paper_margin only apply to PDF generated with pdfkit.
+# If you print (or generate a PDF) using ips.html, they will be ignored.
+# (The equivalent parameters must be set from the browser's print dialog.)
+
 # This can be "test" or "stable"
 engine_version: stable
 

prepare-vms/templates/cards.html

@@ -18,14 +18,8 @@
     | default("kube") -%}
 {%- set clusternumber = clusternumber
     | default(None) -%}
-{%- if qrcode == True -%}
-    {%- set qrcode = "https://container.training/q" -%}
-{%- elif qrcode -%}
-    {%- set qrcode = qrcode -%}
-{%- endif -%}
 
-{# You can also set img_bottom_src instead. #}
-{%- set img_logo_src = {
+{%- set image_src = {
 	"docker": "https://s3-us-west-2.amazonaws.com/www.breadware.com/integrations/docker.png",
 	"swarm": "https://cdn.wp.nginx.com/wp-content/uploads/2016/07/docker-swarm-hero2.png",
 	"kube": "https://avatars1.githubusercontent.com/u/13629408",
@@ -91,33 +85,9 @@
 {%- endif -%}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<head>
-<style>
+<head><style>
 @import url('https://fonts.googleapis.com/css?family=Slabo+27px');
 
-{% if paper_size == "A4" %}
-@page {
-    size: A4; /* Change from the default size of A4 */
-    margin: 0.5cm; /* Set margin on each page */
-}
-body {
-    /* this is A4 minus 0.5cm margins */
-	width: 20cm;
-	height: 28.7cm;
-}
-{% elif paper_size == "Letter" %}
-@page {
-	size: Letter;
-	margin: 0.2in;
-}
-body {
-	/* this is Letter minus 0.2in margins */
-	width: 8.6in;
-	heigth: 10.6in;
-}
-{% endif %}
-
-
 body, table {
     margin: 0;
     padding: 0;
@@ -138,45 +108,53 @@ div {
     float: left;
     border: 1px dotted black;
     {% if backside %}
-    height: 33%;
+    height: 31%;
     {% endif %}
+    padding-top: 1%;
+    padding-bottom: 1%;
     /* columns * (width+left+right) < 100% */
     /*
-    width: 24.8%;
+    width: 21.5%;
+    padding-left: 1.5%;
+    padding-right: 1.5%;
     */
     /**/
-    width: 33%;
+    width: 30%;
+    padding-left: 1.5%;
+    padding-right: 1.5%;
     /**/    
 }
 
 p {
-    margin: 0.8em;
+    margin: 0.4em 0 0.4em 0;
 }
 
 div.back {
-	border: 1px dotted grey;
+	border: 1px dotted white;
 }
 
-span.scale {
-	white-space: nowrap;
+div.back p {
+    margin: 0.5em 1em 0 1em;
 }
 
-img.logo {
-    height: 4.5em;
+img {
+    height: 4em;
     float: right;
- }
-
-img.bottom {
-    height: 2.5em;
-    display: block;
-    margin: 0.5em auto;
+    margin-right: -0.2em;
 }
 
-.qrcode img {
-    width: 40%;
-    margin: 1em;
+/*
+img.enix {
+    height: 4.0em;
+    margin-top: 0.4em;
 }
 
+img.kube {
+    height: 4.2em;
+    margin-top: 1.7em;
+}
+*/
+
 .logpass {
     font-family: monospace;
     font-weight: bold;
@@ -186,43 +164,16 @@ img.bottom {
     page-break-after: always;
     clear: both;
     display: block;
-    height: 0;
+    height: 8px;
 }
-</style>
-<script type="text/javascript" src="https://cdn.rawgit.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js"></script>
-<script type="text/javascript">
-function qrcodes() {
-	[].forEach.call(
-		document.getElementsByClassName("qrcode"),
-		(e, index) => {
-			new QRCode(e, {
-				text: "{{ qrcode }}",
-				correctLevel: QRCode.CorrectLevel.L
-			});
-		}
-	);
-}
-
-function scale() {
-	[].forEach.call(
-		document.getElementsByClassName("scale"),
-		(e, index) => {
-			var text_width = e.getBoundingClientRect().width;
-			var box_width = e.parentElement.getBoundingClientRect().width;
-			var percent = 100 * box_width / text_width + "%";
-			e.style.fontSize = percent;
-		}
-	);
-}
-</script>
-</head>
-<body onload="qrcodes(); scale();">
+</style></head>
+<body>
 {% for cluster in clusters %}
     <div>
         <p>{{ intro }}</p>
         <p>
-            {% if img_logo_src %}
-            <img class="logo" src="{{ img_logo_src }}" />
+            {% if image_src %}
+            <img src="{{ image_src }}" />
             {% endif %}
             <table>
             	{% if clusternumber != None %}
@@ -251,12 +202,7 @@ function scale() {
         <p>
             {% if url %}
         	{{ slides_are_at }}
-            <p>
-                <span class="scale">{{ url }}</span>
-            </p>
-            {% endif %}
-            {% if img_bottom_src %}
-            <img class="bottom" src="{{ img_bottom_src }}" />
+            <center>{{ url }}</center>
             {% endif %}
         </p>
     </div>
@@ -265,21 +211,18 @@ function scale() {
         {% if backside %}
 			{% for x in range(pagesize) %}
 		        <div class="back">
-				<p>Thanks for attending
+		        <br/>
+				<p>You got this at the workshop
 				"Getting Started With Kubernetes and Container Orchestration"
-				during CONFERENCE in Month YYYY!</p>
+				during QCON London (March 2019).</p>
 				<p>If you liked that workshop,
-				I can train your team, in person or
-				online, with custom courses of
-				any length and any level.
+				I can train your team or organization
+				on Docker, container, and Kubernetes,
+				with curriculums of 1 to 5 days.
 				</p>
-	            {% if qrcode %}
-	            <p>If you're interested, please scan that QR code to contact me:</p>
-				<span class="qrcode"></span>
-                {% else %}
-				<p>If you're interested, you can contact me at:</p>
-				{% endif %}
+				<p>Interested? Contact me at:</p>
 				<p>jerome.petazzoni@gmail.com</p>
+				<p>Thank you!</p>
 		        </div>
 			{% endfor %}
 		<span class="pagebreak"></span>

slides/_redirects

@@ -1,22 +1,11 @@
 # Uncomment and/or edit one of the the following lines if necessary.
-#/ /kube-halfday.yml.html 200!
-#/ /kube-fullday.yml.html 200!
-#/ /kube-twodays.yml.html 200!
+#/ /kube-halfday.yml.html 200
+#/ /kube-fullday.yml.html 200
+#/ /kube-twodays.yml.html 200
+/ /outreach.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
 
-#/dockermastery https://www.udemy.com/course/docker-mastery/?referralCode=1410924A733D33635CCB
-#/kubernetesmastery https://www.udemy.com/course/kubernetesmastery/?referralCode=7E09090AF9B79E6C283F
-/dockermastery https://www.udemy.com/course/docker-mastery/?couponCode=SWEETFEBSALEC1
-/kubernetesmastery https://www.udemy.com/course/kubernetesmastery/?couponCode=SWEETFEBSALEC4
-
-# Shortlink for the QRCode
-/q /qrcode.html 200
-
-# Shortlinks for next training in English and French
-/next https://www.eventbrite.com/e/livestream-intensive-kubernetes-bootcamp-tickets-103262336428
-/hi5 https://enix.io/fr/services/formation/online/
-
-/ /k8s-bootcamp.yml.html 200!
-/chat https://gitter.im/jpetazzo/training-20200609-online
+/dockermastery https://www.udemy.com/course/docker-mastery/?referralCode=1410924A733D33635CCB
+/kubernetesmastery https://www.udemy.com/course/kubernetesmastery/?referralCode=7E09090AF9B79E6C283F

slides/containers/Advanced_Dockerfiles.md

@@ -1,7 +1,7 @@
 
 class: title
 
-# Advanced Dockerfile Syntax
+# Advanced Dockerfiles
 
 ![construction](images/title-advanced-dockerfiles.jpg)
 
@@ -12,10 +12,7 @@ class: title
 We have seen simple Dockerfiles to illustrate how Docker build
 container images.
 
-In this section, we will give a recap of the Dockerfile syntax,
-and introduce advanced Dockerfile commands that we might
-come across sometimes; or that we might want to use in some
-specific scenarios.
+In this section, we will see more Dockerfile commands.
 
 ---
 
@@ -423,8 +420,3 @@ ONBUILD COPY . /src
 
 * You can't chain `ONBUILD` instructions with `ONBUILD`.
 * `ONBUILD` can't be used to trigger `FROM` instructions.
-
-???
-
-:EN:- Advanced Dockerfile syntax
-:FR:- Dockerfile niveau expert

slides/containers/Background_Containers.md

@@ -280,8 +280,3 @@ CONTAINER ID  IMAGE           ...  CREATED      STATUS
 5c1dfd4d81f1  jpetazzo/clock  ...  40 min. ago  Exited (0) 40 min. ago
 b13c164401fb  ubuntu          ...  55 min. ago  Exited (130) 53 min. ago
 ```
-
-???
-
-:EN:- Foreground and background containers
-:FR:- Exécution interactive ou en arrière-plan

slides/containers/Building_Images_Interactively.md

@@ -167,8 +167,3 @@ Automated process = good.
 
 In the next chapter, we will learn how to automate the build
 process by writing a `Dockerfile`.
-
-???
-
-:EN:- Building our first images interactively
-:FR:- Fabriquer nos premières images à la main

slides/containers/Building_Images_With_Dockerfiles.md

@@ -222,63 +222,21 @@ f9e8f1642759  About an hour ago  /bin/sh -c apt-get install fi  1.627 MB
 
 ---
 
-class: extra-details
+## Introducing JSON syntax
 
-## Why `sh -c`?
+Most Dockerfile arguments can be passed in two forms:
 
-* On UNIX, to start a new program, we need two system calls:
-
-  - `fork()`, to create a new child process;
-
-  - `execve()`, to replace the new child process with the program to run.
-
-* Conceptually, `execve()` works like this:
-
-  `execve(program, [list, of, arguments])`
-
-* When we run a command, e.g. `ls -l /tmp`, something needs to parse the command.
-
-  (i.e. split the program and its arguments into a list.)
-
-* The shell is usually doing that.
-
-  (It also takes care of expanding environment variables and special things like `~`.)
-
----
-
-class: extra-details
-
-## Why `sh -c`?
-
-* When we do `RUN ls -l /tmp`, the Docker builder needs to parse the command.
-
-* Instead of implementing its own parser, it outsources the job to the shell.
-
-* That's why we see `sh -c ls -l /tmp` in that case.
-
-* But we can also do the parsing jobs ourselves.
-
-* This means passing `RUN` a list of arguments.
-
-* This is called the *exec syntax*.
-
----
-
-## Shell syntax vs exec syntax
-
-Dockerfile commands that execute something can have two forms:
-
-* plain string, or *shell syntax*:
+* plain string:
   <br/>`RUN apt-get install figlet`
 
-* JSON list, or *exec syntax*:
+* JSON list:
   <br/>`RUN ["apt-get", "install", "figlet"]`
 
 We are going to change our Dockerfile to see how it affects the resulting image.
 
 ---
 
-## Using exec syntax in our Dockerfile
+## Using JSON syntax in our Dockerfile
 
 Let's change our Dockerfile as follows!
 
@@ -296,7 +254,7 @@ $ docker build -t figlet .
 
 ---
 
-## History with exec syntax
+## JSON syntax vs string syntax
 
 Compare the new history:
 
@@ -311,62 +269,24 @@ IMAGE         CREATED            CREATED BY                     SIZE
 <missing>     4 days ago         /bin/sh -c #(nop) ADD file:b   187.8 MB
 ```
 
-* Exec syntax specifies an *exact* command to execute.
+* JSON syntax specifies an *exact* command to execute.
 
-* Shell syntax specifies a command to be wrapped within `/bin/sh -c "..."`.
+* String syntax specifies a command to be wrapped within `/bin/sh -c "..."`.
 
 ---
 
-## When to use exec syntax and shell syntax
+## When to use JSON syntax and string syntax
 
-* shell syntax:
+* String syntax:
 
   * is easier to write
   * interpolates environment variables and other shell expressions
   * creates an extra process (`/bin/sh -c ...`) to parse the string
   * requires `/bin/sh` to exist in the container
 
-* exec syntax:
+* JSON syntax:
 
   * is harder to write (and read!)
   * passes all arguments without extra processing
   * doesn't create an extra process
   * doesn't require `/bin/sh` to exist in the container
-
----
-
-## Pro-tip: the `exec` shell built-in
-
-POSIX shells have a built-in command named `exec`.
-
-`exec` should be followed by a program and its arguments.
-
-From a user perspective:
-
-- it looks like the shell exits right away after the command execution,
-
-- in fact, the shell exits just *before* command execution;
-
-- or rather, the shell gets *replaced* by the command.
-
----
-
-## Example using `exec`
-
-```dockerfile
-CMD exec figlet -f script hello
-```
-
-In this example, `sh -c` will still be used, but
-`figlet` will be PID 1 in the container.
-
-The shell gets replaced by `figlet` when `figlet` starts execution.
-
-This allows to run processes as PID 1 without using JSON.
-
-???
-
-:EN:- Towards automated, reproducible builds
-:EN:- Writing our first Dockerfile
-:FR:- Rendre le processus automatique et reproductible
-:FR:- Écrire son premier Dockerfile

slides/containers/Cmd_And_Entrypoint.md

@@ -272,7 +272,3 @@ $ docker run -it --entrypoint bash myfiglet
 root@6027e44e2955:/# 
 ```
 
-???
-
-:EN:- CMD and ENTRYPOINT
-:FR:- CMD et ENTRYPOINT

slides/containers/Compose_For_Dev_Stacks.md

@@ -322,11 +322,3 @@ You can:
 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.
-
-???
-
-:EN:- Using compose to describe an environment
-:EN:- Connecting services together with a *Compose file*
-
-:FR:- Utiliser Compose pour décrire son environnement
-:FR:- Écrire un *Compose file* pour connecter les services entre eux

slides/containers/Container_Networking_Basics.md

@@ -226,13 +226,3 @@ We've learned how to:
 
 In the next chapter, we will see how to connect
 containers together without exposing their ports.
-
-???
-
-:EN:Connecting containers
-:EN:- Container networking basics
-:EN:- Exposing a container
-
-:FR:Connecter les conteneurs
-:FR:- Description du modèle réseau des conteneurs
-:FR:- Exposer un conteneur

slides/containers/Copying_Files_During_Build.md

@@ -98,8 +98,3 @@ Success!
   * Place it in a different directory, with the `WORKDIR` instruction.
 
   * Even better, use the `gcc` official image.
-
-???
-
-:EN:- The build cache
-:FR:- Tirer parti du cache afin d'optimiser la vitesse de *build*

slides/containers/Dockerfile_Tips.md

@@ -431,8 +431,3 @@ services:
 - It's OK (and even encouraged) to start simple and evolve as needed.
 
 - Feel free to review this chapter later (after writing a few Dockerfiles) for inspiration!
-
-???
-
-:EN:- Dockerfile tips, tricks, and best practices
-:FR:- Bonnes pratiques pour la construction des images

slides/containers/First_Containers.md

@@ -290,8 +290,3 @@ bash: figlet: command not found
 * We have a clear definition of our environment, and can share it reliably with others.
 
 * Let's see in the next chapters how to bake a custom image with `figlet`!
-
-???
-
-:EN:- Running our first container
-:FR:- Lancer nos premiers conteneurs

slides/containers/Getting_Inside.md

@@ -226,8 +226,3 @@ docker export <container_id> | tar tv
 ```
 
 This will give a detailed listing of the content of the container.
-
-???
-
-:EN:- Troubleshooting and getting inside a container
-:FR:- Inspecter un conteneur en détail, en *live* ou *post-mortem*

slides/containers/Initial_Images.md

@@ -375,13 +375,3 @@ We've learned how to:
 * Understand Docker image namespacing.
 * Search and download images.
 
-???
-
-:EN:Building images
-:EN:- Containers, images, and layers
-:EN:- Image addresses and tags
-:EN:- Finding and transferring images
-
-:FR:Construire des images
-:FR:- La différence entre un conteneur et une image
-:FR:- La notion de *layer* partagé entre images

slides/containers/Labels.md

@@ -80,8 +80,3 @@ $ docker ps --filter label=owner=alice
   (To determine internal cross-billing, or who to page in case of outage.)
 
 * etc.
-
-???
-
-:EN:- Using labels to identify containers
-:FR:- Étiqueter ses conteneurs avec des méta-données

slides/containers/Local_Development_Workflow.md

@@ -391,10 +391,3 @@ We've learned how to:
 
 * Use a simple local development workflow.
 
-???
-
-:EN:Developing with containers
-:EN:- “Containerize” a development environment
-
-:FR:Développer au jour le jour
-:FR:- « Containeriser » son environnement de développement

slides/containers/Multi_Stage_Builds.md

@@ -313,11 +313,3 @@ virtually "free."
 * Sometimes, we want to inspect a specific intermediary build stage.
 
 * Or, we want to describe multiple images using a single Dockerfile.
-
-???
-
-:EN:Optimizing our images and their build process
-:EN:- Leveraging multi-stage builds
-
-:FR:Optimiser les images et leur construction
-:FR:- Utilisation d'un *multi-stage build*

slides/containers/Naming_And_Inspecting.md

@@ -130,12 +130,3 @@ $ docker inspect --format '{{ json .Created }}' <containerID>
 
 * The optional `json` keyword asks for valid JSON output.
   <br/>(e.g. here it adds the surrounding double-quotes.)
-
-???
-
-:EN:Managing container lifecycle
-:EN:- Naming and inspecting containers
-
-:FR:Suivre ses conteneurs à la loupe
-:FR:- Obtenir des informations détaillées sur un conteneur
-:FR:- Associer un identifiant unique à un conteneur

slides/containers/Start_And_Attach.md

@@ -175,10 +175,3 @@ class: extra-details
 * This will cause some CLI and TUI programs to redraw the screen.
 
 * But not all of them.
-
-???
-
-:EN:- Restarting old containers
-:EN:- Detaching and reattaching to container
-:FR:- Redémarrer des anciens conteneurs
-:FR:- Se détacher et rattacher à des conteneurs

slides/containers/Training_Environment.md

@@ -125,11 +125,3 @@ Server:
 ]
 
 If this doesn't work, raise your hand so that an instructor can assist you!
-
-???
-
-:EN:Container concepts
-:FR:Premier contact avec les conteneurs
-
-:EN:- What's a container engine?
-:FR:- Qu'est-ce qu'un *container engine* ?

slides/count-slides.py

@@ -11,10 +11,10 @@ class State(object):
         self.section_title = None
         self.section_start = 0
         self.section_slides = 0
-        self.modules = {}
+        self.chapters = {}
         self.sections = {}
     def show(self):
-        if self.section_title.startswith("module-"):
+        if self.section_title.startswith("chapter-"):
             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("module-"):
-        if state.section_title not in state.modules:
-            state.modules[state.section_title] = []
-        state.modules[state.section_title].append(toc_links[0])
+    if toc_links and state.section_title.startswith("chapter-"):
+        if state.section_title not in state.chapters:
+            state.chapters[state.section_title] = []
+        state.chapters[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 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))
+for chapter in sorted(state.chapters, key=lambda f: int(f.split("-")[1])):
+    chapter_size = sum(state.sections[s] for s in state.chapters[chapter])
+    print("{}\t{}\t{}".format("total size for", chapter, chapter_size))
 

slides/fix-redirects.sh

@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# This script helps to add "force-redirects" where needed.
-# This might replace your entire git repos with Vogon poetry.
-# Use at your own peril!
-
-set -eu
-
-# The easiest way to set this env var is by copy-pasting from
-# the netlify web dashboard, then doctoring the output a bit.
-# Yeah, that's gross, but after spending 10 minutes with the
-# API and the CLI and OAuth, it took about 10 seconds to do it
-# with le copier-coller, so ... :)
-
-SITES="
-2020-01-caen
-2020-01-zr
-2020-02-caen
-2020-02-enix
-2020-02-outreach
-2020-02-vmware
-2020-03-ardan
-2020-03-qcon
-alfun-2019-06
-boosterconf2018
-clt-2019-10
-dc17eu
-decembre2018
-devopsdaysams2018
-devopsdaysmsp2018
-gotochgo2018
-gotochgo2019
-indexconf2018
-intro-2019-01
-intro-2019-04
-intro-2019-06
-intro-2019-08
-intro-2019-09
-intro-2019-11
-intro-2019-12
-k8s2d
-kadm-2019-04
-kadm-2019-06
-kube
-kube-2019-01
-kube-2019-02
-kube-2019-03
-kube-2019-04
-kube-2019-06
-kube-2019-08
-kube-2019-09
-kube-2019-10
-kube-2019-11
-lisa-2019-10
-lisa16t1
-lisa17m7
-lisa17t9
-maersk-2019-07
-maersk-2019-08
-ndcminnesota2018
-nr-2019-08
-oscon2018
-oscon2019
-osseu17
-pycon2019
-qconsf18wkshp
-qconsf2017intro
-qconsf2017swarm
-qconsf2018
-qconuk2019
-septembre2018
-sfsf-2019-06
-srecon2018
-swarm2017
-velny-k8s101-2018
-velocity-2019-11
-velocityeu2018
-velocitysj2018
-vmware-2019-11
-weka
-wwc-2019-10
-wwrk-2019-05
-wwrk-2019-06
-"
-
-for SITE in $SITES; do
-	echo "##### $SITE"
-	git checkout -q origin/$SITE
-	# No _redirects? No problem.
-	if ! [ -f _redirects ]; then
-		continue
-	fi
-	# If there is already a force redirect on /, we're good.
-	if grep '^/ .* 200!' _redirects; then
-		continue
-	fi
-	# If there is a redirect on / ... and it's not forced ... do something.
-	if grep "^/ .* 200$" _redirects; then
-		echo "##### $SITE needs to be patched"
-		sed -i 's,^/ \(.*\) 200$,/ \1 200!,' _redirects
-		git add _redirects
-		git commit -m "fix-redirects.sh: adding forced redirect"
-		git push origin HEAD:$SITE
-		continue
-	fi
-    if grep "^/ " _redirects; then
-		echo "##### $SITE with / but no status code"
-		echo "##### Should I add '200!' ?"
-		read foo
-		sed -i 's,^/ \(.*\)$,/ \1 200!,' _redirects
-		git add _redirects
-		git commit -m "fix-redirects.sh: adding status code and forced redirect"
-		git push origin HEAD:$SITE
-		continue
-	fi
-    echo "##### $SITE without / ?"
-    cat _redirects
-done

slides/images/kubectl-run-slideshow/03.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="03.svg"
+   sodipodi:docname="how-k8s-works-3.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3333"
+     inkscape:current-layer="g4090"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -561,17 +561,17 @@
            id="tspan3660"
            y="334.98642"
            x="-215.28352"
-           sodipodi:role="line">$ kubectl create \</tspan><tspan
+           sodipodi:role="line">$ kubectl run web \</tspan><tspan
            style="stroke-width:0.89526182"
            y="379.74951"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan1139">  deployment web \</tspan><tspan
+           id="tspan4926">    --image=nginx \</tspan><tspan
            style="stroke-width:0.89526182"
            y="424.5126"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan4928">  --image=nginx</tspan></text>
+           id="tspan4928">    --replicas=3</tspan></text>
     </g>
     <g
        transform="matrix(2.7869707,0,0,2.7869707,980.45108,349.43174)"

slides/images/kubectl-run-slideshow/04.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="04.svg"
+   sodipodi:docname="how-k8s-works-4.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3333"
+     inkscape:current-layer="g1250"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -561,17 +561,17 @@
            id="tspan3660"
            y="334.98642"
            x="-215.28352"
-           sodipodi:role="line">$ kubectl create \</tspan><tspan
+           sodipodi:role="line">$ kubectl run web \</tspan><tspan
            style="stroke-width:0.89526182"
            y="379.74951"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan1139">  deployment web \</tspan><tspan
+           id="tspan4926">    --image=nginx \</tspan><tspan
            style="stroke-width:0.89526182"
            y="424.5126"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan4928">  --image=nginx</tspan></text>
+           id="tspan4928">    --replicas=3</tspan></text>
     </g>
     <g
        transform="matrix(2.7869707,0,0,2.7869707,980.45108,349.43174)"

slides/images/kubectl-run-slideshow/05.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="05.svg"
+   sodipodi:docname="how-k8s-works-05.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,10 +42,10 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="246.38378"
+     inkscape:cx="521.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      inkscape:current-layer="g3333"
      units="px"
@@ -558,34 +558,39 @@
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.8104744px;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;stroke:none;stroke-width:0.89526182"
          xml:space="preserve"><tspan
            style="stroke-width:0.89526182"
+           id="tspan3660"
            y="334.98642"
            x="-215.28352"
-           sodipodi:role="line"
-           id="tspan1146">$ kubectl create \</tspan><tspan
+           sodipodi:role="line">$ kubectl run web \</tspan><tspan
            style="stroke-width:0.89526182"
            y="379.74951"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan1150">  deployment web \</tspan><tspan
+           id="tspan4926">    --image=nginx \</tspan><tspan
            style="stroke-width:0.89526182"
            y="424.5126"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan4926">  --image=nginx</tspan><tspan
+           id="tspan4928">    --replicas=3</tspan><tspan
            style="stroke-width:0.89526182"
            y="469.2757"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan1143">deployment.apps/web</tspan><tspan
+           id="tspan1141">...</tspan><tspan
            style="stroke-width:0.89526182"
            y="514.03882"
            x="-215.28352"
            sodipodi:role="line"
-           id="tspan1147">created</tspan><tspan
+           id="tspan1143">deployment.apps/web</tspan><tspan
            style="stroke-width:0.89526182"
            y="558.80188"
            x="-215.28352"
            sodipodi:role="line"
+           id="tspan1147">created</tspan><tspan
+           style="stroke-width:0.89526182"
+           y="603.565"
+           x="-215.28352"
+           sodipodi:role="line"
            id="tspan1145">$</tspan></text>
       <text
          inkscape:label="thumbsup"

slides/images/kubectl-run-slideshow/11.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="11.svg"
+   sodipodi:docname="how-k8s-works-11.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,10 +42,10 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
      inkscape:current-layer="g3409"
      units="px"
@@ -1132,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">PENDING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/12.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="12.svg"
+   sodipodi:docname="how-k8s-works-12.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3409"
+     inkscape:current-layer="g4153"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -1132,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">PENDING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/13.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="13.svg"
+   sodipodi:docname="how-k8s-works-13.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3409"
+     inkscape:current-layer="g4153"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -1132,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">PENDING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">PENDING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/14.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="14.svg"
+   sodipodi:docname="how-k8s-works-14.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3409"
+     inkscape:current-layer="how-does-k8s-work"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -1132,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">→ node 2</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/15.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="15.svg"
+   sodipodi:docname="how-k8s-works-15.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="521.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3409"
+     inkscape:current-layer="g4090"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -1132,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">→ node 2</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/16.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="16.svg"
+   sodipodi:docname="how-k8s-works-16.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="527.63378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g3958"
+     inkscape:current-layer="g1226"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -215,7 +215,7 @@
       <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"
+         style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
          transform="scale(0.2)" />
     </marker>
     <marker
@@ -229,7 +229,7 @@
       <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"
+         style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
          transform="scale(-0.2)" />
     </marker>
     <marker
@@ -622,7 +622,7 @@
        inkscape:label="processes">
       <rect
          transform="matrix(0.81282896,0,0,0.58385092,716.88649,392.00625)"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
          id="rect10198"
          width="231.99153"
          height="125.52966"
@@ -917,6 +917,22 @@
            d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
            inkscape:connector-curvature="0" />
       </g>
+      <g
+         inkscape:label="gear kubelet bottom"
+         style="display:inline;fill:#000000;stroke:none"
+         transform="matrix(0.00664382,0,0,-0.00664382,1197.6781,433.7108)"
+         id="g15716">
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 3178,10980 c -109,-24 -156,-48 -202,-102 -77,-89 -98,-254 -77,-588 7,-116 7,-187 1,-211 -17,-59 -55,-87 -156,-110 -144,-33 -203,-54 -355,-125 -184,-85 -283,-124 -314,-124 -28,0 -28,0 -189,184 -206,237 -328,326 -458,334 -59,4 -75,0 -130,-25 -78,-37 -132,-86 -313,-280 -163,-175 -205,-241 -212,-337 -10,-130 39,-209 284,-452 106,-106 193,-196 193,-202 0,-5 -25,-50 -56,-98 -88,-141 -179,-338 -240,-521 -65,-195 -66,-197 -101,-221 -24,-15 -58,-17 -313,-17 -247,-1 -291,-3 -331,-18 C 150,8044 96,7999 64,7945 5,7844 -18,7561 15,7341 c 26,-171 62,-247 143,-301 88,-58 118,-63 451,-69 l 305,-6 32,-100 c 17,-55 44,-131 59,-170 42,-109 160,-334 211,-400 67,-87 78,-118 59,-155 -8,-16 -70,-82 -138,-147 -300,-287 -368,-369 -386,-466 -11,-59 2,-128 33,-181 110,-185 442,-493 569,-527 93,-25 201,14 309,110 35,31 140,139 234,241 95,102 188,200 208,219 l 35,34 118,-55 c 179,-84 294,-125 574,-202 93,-26 92,-21 79,-256 -13,-265 -13,-526 1,-592 21,-98 65,-165 130,-198 88,-45 152,-54 384,-54 402,2 489,31 562,191 55,120 64,260 37,632 -12,160 -13,230 -6,247 9,19 40,32 171,74 196,62 300,103 454,181 65,33 123,59 127,57 4,-2 93,-97 197,-213 311,-344 393,-405 552,-405 101,0 156,32 333,194 253,233 323,333 323,461 0,61 -5,79 -35,135 -41,76 -146,190 -310,333 -195,172 -220,199 -220,238 0,23 26,81 89,194 88,158 141,273 197,430 55,153 110,182 323,171 384,-19 419,-19 486,-1 87,23 137,61 169,127 40,83 51,177 50,433 -1,203 -3,239 -23,310 -29,110 -61,152 -141,192 -96,48 -177,57 -410,47 -265,-12 -300,-11 -338,5 -49,21 -70,58 -102,185 -32,123 -38,138 -147,346 -40,74 -79,162 -88,194 -28,96 -21,107 175,294 183,176 250,258 282,349 40,114 4,248 -98,363 -302,341 -390,409 -524,410 -136,0 -248,-84 -515,-385 -101,-114 -137,-143 -186,-151 -35,-6 -56,3 -229,99 -36,19 -135,57 -220,82 -187,57 -291,104 -321,146 -21,30 -21,34 -13,217 16,337 -1,480 -67,584 -66,102 -140,134 -342,149 -287,20 -346,20 -439,-1 z m 417,-2460 c 230,-33 421,-122 573,-265 176,-166 263,-357 279,-612 15,-258 -65,-503 -224,-682 -321,-360 -957,-435 -1393,-163 -189,117 -322,293 -386,509 -32,109 -44,319 -24,440 74,463 476,779 995,782 61,0 142,-4 180,-9 z"
+           id="path15712" />
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
+           id="path15714" />
+      </g>
       <g
          inkscape:label="gear kubelet top"
          id="g15722"
@@ -983,7 +999,7 @@
          inkscape:connector-curvature="0"
          id="path10622"
          d="m 667.78448,388.64882 378.69472,37.60476"
-         style="display:inline;opacity:1;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(#marker2181);marker-end:url(#marker2327);paint-order:normal" />
+         style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker2181);marker-end:url(#marker2327);paint-order:normal" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
@@ -1116,6 +1132,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">→ node 2</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">→ node 1</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/17.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="17.svg"
+   sodipodi:docname="how-k8s-works-17.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="992.73727"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g10196"
+     inkscape:current-layer="g4153"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -146,6 +146,36 @@
          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:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1984"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1982"
+         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:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
+         transform="scale(0.2)" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleInS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1196"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1194"
+         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:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
+         transform="scale(-0.2)" />
+    </marker>
     <marker
        inkscape:isstock="true"
        style="overflow:visible"
@@ -558,12 +588,12 @@
       <path
          inkscape:connector-curvature="0"
          d="M 68.458394,58.765531 H 59.79659 a 0.92615261,0.92615261 0 0 0 -0.918561,0.918561 v 8.661804 a 0.92615261,0.92615261 0 0 0 0.918561,0.926153 h 8.661804 a 0.92615261,0.92615261 0 0 0 0.888196,-0.926153 v -8.661804 a 0.92615261,0.92615261 0 0 0 -0.918561,-0.918561"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10192" />
       <path
          inkscape:connector-curvature="0"
          d="m 82.16849,58.067121 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 55.888385 A 0.82746421,0.82746421 0 0 0 82.183672,55.06092 H 77.955254 V 51.098202 A 0.92615261,0.92615261 0 0 0 77.036693,50.179641 H 73.081566 V 45.973997 A 0.82746421,0.82746421 0 0 0 72.254102,45.146533 H 70.90283 a 0.82746421,0.82746421 0 0 0 -0.797098,0.827464 v 4.228418 h -4.478935 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.835056,-0.827464 h -1.336089 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -4.448569 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.827464,-0.827464 h -1.351272 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -3.947536 a 0.92615261,0.92615261 0 0 0 -0.926153,0.895787 v 3.939944 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 4.440978 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.374046 a 0.82746421,0.82746421 0 0 0 0.827464,0.835056 h 4.213235 v 4.448566 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 3.932354 a 0.92615261,0.92615261 0 0 0 0.918561,0.918561 h 3.955128 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.448569 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.336089 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.486527 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 3.955127 a 0.92615261,0.92615261 0 0 0 0.888195,-0.918561 v -3.939945 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 70.790329 A 0.82746421,0.82746421 0 0 0 82.183672,69.962865 H 77.955254 V 65.52189 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.835056 v -1.34368 A 0.82746421,0.82746421 0 0 0 82.16849,62.485324 H 77.955254 V 58.067121 Z M 74.842774,74.76823 H 53.404619 V 53.299712 h 21.438155 z"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10194" />
     </g>
     <g
@@ -592,7 +622,7 @@
        inkscape:label="processes">
       <rect
          transform="matrix(0.81282896,0,0,0.58385092,716.88649,392.00625)"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
          id="rect10198"
          width="231.99153"
          height="125.52966"
@@ -726,6 +756,70 @@
        id="g4132"
        inkscape:label="pods"
        style="display:inline">
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,588.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
+         id="path10214" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,593.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
+         id="path10216" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1143.1428,593.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
+         id="path10218" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1084.0165"
+         y="674.76129"
+         id="text10222"><tspan
+           sodipodi:role="line"
+           id="tspan10220"
+           x="1084.0165"
+           y="674.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path910" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path912" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffaaaa;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path914" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1195.4893"
+         y="274.76129"
+         id="text1121"><tspan
+           sodipodi:role="line"
+           id="tspan1119"
+           x="1195.4893"
+           y="274.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
       <path
          id="path1123"
          d="m 1065.6051,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
@@ -791,6 +885,22 @@
            d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
            inkscape:connector-curvature="0" />
       </g>
+      <g
+         inkscape:label="gear kubelet bottom"
+         style="display:inline;fill:#000000;stroke:none"
+         transform="matrix(0.00664382,0,0,-0.00664382,1197.6781,433.7108)"
+         id="g15716">
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 3178,10980 c -109,-24 -156,-48 -202,-102 -77,-89 -98,-254 -77,-588 7,-116 7,-187 1,-211 -17,-59 -55,-87 -156,-110 -144,-33 -203,-54 -355,-125 -184,-85 -283,-124 -314,-124 -28,0 -28,0 -189,184 -206,237 -328,326 -458,334 -59,4 -75,0 -130,-25 -78,-37 -132,-86 -313,-280 -163,-175 -205,-241 -212,-337 -10,-130 39,-209 284,-452 106,-106 193,-196 193,-202 0,-5 -25,-50 -56,-98 -88,-141 -179,-338 -240,-521 -65,-195 -66,-197 -101,-221 -24,-15 -58,-17 -313,-17 -247,-1 -291,-3 -331,-18 C 150,8044 96,7999 64,7945 5,7844 -18,7561 15,7341 c 26,-171 62,-247 143,-301 88,-58 118,-63 451,-69 l 305,-6 32,-100 c 17,-55 44,-131 59,-170 42,-109 160,-334 211,-400 67,-87 78,-118 59,-155 -8,-16 -70,-82 -138,-147 -300,-287 -368,-369 -386,-466 -11,-59 2,-128 33,-181 110,-185 442,-493 569,-527 93,-25 201,14 309,110 35,31 140,139 234,241 95,102 188,200 208,219 l 35,34 118,-55 c 179,-84 294,-125 574,-202 93,-26 92,-21 79,-256 -13,-265 -13,-526 1,-592 21,-98 65,-165 130,-198 88,-45 152,-54 384,-54 402,2 489,31 562,191 55,120 64,260 37,632 -12,160 -13,230 -6,247 9,19 40,32 171,74 196,62 300,103 454,181 65,33 123,59 127,57 4,-2 93,-97 197,-213 311,-344 393,-405 552,-405 101,0 156,32 333,194 253,233 323,333 323,461 0,61 -5,79 -35,135 -41,76 -146,190 -310,333 -195,172 -220,199 -220,238 0,23 26,81 89,194 88,158 141,273 197,430 55,153 110,182 323,171 384,-19 419,-19 486,-1 87,23 137,61 169,127 40,83 51,177 50,433 -1,203 -3,239 -23,310 -29,110 -61,152 -141,192 -96,48 -177,57 -410,47 -265,-12 -300,-11 -338,5 -49,21 -70,58 -102,185 -32,123 -38,138 -147,346 -40,74 -79,162 -88,194 -28,96 -21,107 175,294 183,176 250,258 282,349 40,114 4,248 -98,363 -302,341 -390,409 -524,410 -136,0 -248,-84 -515,-385 -101,-114 -137,-143 -186,-151 -35,-6 -56,3 -229,99 -36,19 -135,57 -220,82 -187,57 -291,104 -321,146 -21,30 -21,34 -13,217 16,337 -1,480 -67,584 -66,102 -140,134 -342,149 -287,20 -346,20 -439,-1 z m 417,-2460 c 230,-33 421,-122 573,-265 176,-166 263,-357 279,-612 15,-258 -65,-503 -224,-682 -321,-360 -957,-435 -1393,-163 -189,117 -322,293 -386,509 -32,109 -44,319 -24,440 74,463 476,779 995,782 61,0 142,-4 180,-9 z"
+           id="path15712" />
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
+           id="path15714" />
+      </g>
       <g
          inkscape:label="gear kubelet top"
          id="g15722"
@@ -837,6 +947,13 @@
          id="path6537"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path1190"
+         d="m 1111.0371,563.36562 20.858,-81.27407"
+         style="display:inline;fill:#ff0000;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker1196);marker-end:url(#marker1984);paint-order:normal"
+         inkscape:label="node bottom left" />
       <path
          style="display:none;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(#marker3586);marker-end:url(#marker3758);paint-order:normal"
          d="m 1208.6771,562.24204 -20.5498,-80.96111"
@@ -858,6 +975,13 @@
          d="m 1111.0371,163.36562 20.858,-81.27407"
          style="display:inline;fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;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
+         style="display:inline;fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker2634);marker-end:url(#marker2794);paint-order:normal"
+         d="M 1208.6771,162.24204 1188.1273,81.28093"
+         id="path2050"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         inkscape:label="node top right" />
       <path
          inkscape:label="node top"
          style="display:inline;opacity:1;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"
@@ -976,6 +1100,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">CREATING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">CREATING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">CREATING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/18.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="18.svg"
+   sodipodi:docname="how-k8s-works-18.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="246.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="how-does-k8s-work"
+     inkscape:current-layer="g3409"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -146,6 +146,36 @@
          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:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1984"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1982"
+         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="marker1196"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1194"
+         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"
@@ -185,7 +215,7 @@
       <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"
+         style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
          transform="scale(0.2)" />
     </marker>
     <marker
@@ -199,7 +229,7 @@
       <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"
+         style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
          transform="scale(-0.2)" />
     </marker>
     <marker
@@ -558,12 +588,12 @@
       <path
          inkscape:connector-curvature="0"
          d="M 68.458394,58.765531 H 59.79659 a 0.92615261,0.92615261 0 0 0 -0.918561,0.918561 v 8.661804 a 0.92615261,0.92615261 0 0 0 0.918561,0.926153 h 8.661804 a 0.92615261,0.92615261 0 0 0 0.888196,-0.926153 v -8.661804 a 0.92615261,0.92615261 0 0 0 -0.918561,-0.918561"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10192" />
       <path
          inkscape:connector-curvature="0"
          d="m 82.16849,58.067121 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 55.888385 A 0.82746421,0.82746421 0 0 0 82.183672,55.06092 H 77.955254 V 51.098202 A 0.92615261,0.92615261 0 0 0 77.036693,50.179641 H 73.081566 V 45.973997 A 0.82746421,0.82746421 0 0 0 72.254102,45.146533 H 70.90283 a 0.82746421,0.82746421 0 0 0 -0.797098,0.827464 v 4.228418 h -4.478935 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.835056,-0.827464 h -1.336089 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -4.448569 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.827464,-0.827464 h -1.351272 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -3.947536 a 0.92615261,0.92615261 0 0 0 -0.926153,0.895787 v 3.939944 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 4.440978 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.374046 a 0.82746421,0.82746421 0 0 0 0.827464,0.835056 h 4.213235 v 4.448566 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 3.932354 a 0.92615261,0.92615261 0 0 0 0.918561,0.918561 h 3.955128 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.448569 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.336089 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.486527 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 3.955127 a 0.92615261,0.92615261 0 0 0 0.888195,-0.918561 v -3.939945 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 70.790329 A 0.82746421,0.82746421 0 0 0 82.183672,69.962865 H 77.955254 V 65.52189 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.835056 v -1.34368 A 0.82746421,0.82746421 0 0 0 82.16849,62.485324 H 77.955254 V 58.067121 Z M 74.842774,74.76823 H 53.404619 V 53.299712 h 21.438155 z"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10194" />
     </g>
     <g
@@ -592,7 +622,7 @@
        inkscape:label="processes">
       <rect
          transform="matrix(0.81282896,0,0,0.58385092,716.88649,392.00625)"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:2.78697062;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter-1)"
          id="rect10198"
          width="231.99153"
          height="125.52966"
@@ -726,6 +756,70 @@
        id="g4132"
        inkscape:label="pods"
        style="display:inline">
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,588.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
+         id="path10214" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,593.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
+         id="path10216" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1143.1428,593.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
+         id="path10218" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1084.0165"
+         y="674.76129"
+         id="text10222"><tspan
+           sodipodi:role="line"
+           id="tspan10220"
+           x="1084.0165"
+           y="674.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path910" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path912" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path914" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1195.4893"
+         y="274.76129"
+         id="text1121"><tspan
+           sodipodi:role="line"
+           id="tspan1119"
+           x="1195.4893"
+           y="274.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
       <path
          id="path1123"
          d="m 1065.6051,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
@@ -791,6 +885,22 @@
            d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
            inkscape:connector-curvature="0" />
       </g>
+      <g
+         inkscape:label="gear kubelet bottom"
+         style="display:inline;fill:#000000;stroke:none"
+         transform="matrix(0.00664382,0,0,-0.00664382,1197.6781,433.7108)"
+         id="g15716">
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 3178,10980 c -109,-24 -156,-48 -202,-102 -77,-89 -98,-254 -77,-588 7,-116 7,-187 1,-211 -17,-59 -55,-87 -156,-110 -144,-33 -203,-54 -355,-125 -184,-85 -283,-124 -314,-124 -28,0 -28,0 -189,184 -206,237 -328,326 -458,334 -59,4 -75,0 -130,-25 -78,-37 -132,-86 -313,-280 -163,-175 -205,-241 -212,-337 -10,-130 39,-209 284,-452 106,-106 193,-196 193,-202 0,-5 -25,-50 -56,-98 -88,-141 -179,-338 -240,-521 -65,-195 -66,-197 -101,-221 -24,-15 -58,-17 -313,-17 -247,-1 -291,-3 -331,-18 C 150,8044 96,7999 64,7945 5,7844 -18,7561 15,7341 c 26,-171 62,-247 143,-301 88,-58 118,-63 451,-69 l 305,-6 32,-100 c 17,-55 44,-131 59,-170 42,-109 160,-334 211,-400 67,-87 78,-118 59,-155 -8,-16 -70,-82 -138,-147 -300,-287 -368,-369 -386,-466 -11,-59 2,-128 33,-181 110,-185 442,-493 569,-527 93,-25 201,14 309,110 35,31 140,139 234,241 95,102 188,200 208,219 l 35,34 118,-55 c 179,-84 294,-125 574,-202 93,-26 92,-21 79,-256 -13,-265 -13,-526 1,-592 21,-98 65,-165 130,-198 88,-45 152,-54 384,-54 402,2 489,31 562,191 55,120 64,260 37,632 -12,160 -13,230 -6,247 9,19 40,32 171,74 196,62 300,103 454,181 65,33 123,59 127,57 4,-2 93,-97 197,-213 311,-344 393,-405 552,-405 101,0 156,32 333,194 253,233 323,333 323,461 0,61 -5,79 -35,135 -41,76 -146,190 -310,333 -195,172 -220,199 -220,238 0,23 26,81 89,194 88,158 141,273 197,430 55,153 110,182 323,171 384,-19 419,-19 486,-1 87,23 137,61 169,127 40,83 51,177 50,433 -1,203 -3,239 -23,310 -29,110 -61,152 -141,192 -96,48 -177,57 -410,47 -265,-12 -300,-11 -338,5 -49,21 -70,58 -102,185 -32,123 -38,138 -147,346 -40,74 -79,162 -88,194 -28,96 -21,107 175,294 183,176 250,258 282,349 40,114 4,248 -98,363 -302,341 -390,409 -524,410 -136,0 -248,-84 -515,-385 -101,-114 -137,-143 -186,-151 -35,-6 -56,3 -229,99 -36,19 -135,57 -220,82 -187,57 -291,104 -321,146 -21,30 -21,34 -13,217 16,337 -1,480 -67,584 -66,102 -140,134 -342,149 -287,20 -346,20 -439,-1 z m 417,-2460 c 230,-33 421,-122 573,-265 176,-166 263,-357 279,-612 15,-258 -65,-503 -224,-682 -321,-360 -957,-435 -1393,-163 -189,117 -322,293 -386,509 -32,109 -44,319 -24,440 74,463 476,779 995,782 61,0 142,-4 180,-9 z"
+           id="path15712" />
+        <path
+           style="fill:#000000"
+           inkscape:connector-curvature="0"
+           d="m 8755,7700 c -213,-13 -315,-58 -382,-169 -60,-100 -68,-159 -68,-504 0,-264 -2,-310 -15,-316 -8,-5 -51,-16 -95,-26 -201,-44 -451,-139 -671,-255 -134,-71 -173,-81 -217,-59 -12,6 -112,102 -222,212 -214,216 -271,259 -369,279 -73,16 -160,-5 -244,-58 -68,-43 -319,-288 -405,-394 -111,-138 -147,-256 -113,-372 28,-98 100,-189 320,-407 113,-111 206,-207 206,-212 0,-5 -29,-67 -64,-137 -111,-223 -195,-472 -222,-661 -11,-78 -18,-99 -39,-120 l -26,-26 -367,-1 c -376,-1 -392,-2 -494,-42 -39,-16 -107,-80 -127,-121 -85,-169 -78,-795 9,-936 55,-89 161,-141 309,-152 46,-3 238,0 428,7 294,11 346,11 357,-1 8,-8 24,-45 36,-84 56,-176 144,-367 269,-585 40,-70 71,-135 71,-151 0,-21 -14,-39 -62,-81 -115,-98 -452,-420 -511,-487 -66,-76 -113,-165 -123,-233 -19,-137 109,-320 405,-578 73,-63 153,-127 179,-142 181,-105 384,-23 638,258 49,55 147,166 217,247 112,129 131,147 158,147 18,0 86,-29 172,-74 192,-101 283,-140 477,-206 l 165,-55 v -115 c -1,-63 -5,-236 -9,-385 -8,-238 -7,-280 8,-355 22,-108 58,-179 116,-234 83,-78 147,-91 555,-113 106,-6 253,13 350,44 145,47 205,136 227,339 9,85 8,158 -6,397 -17,266 -17,296 -3,323 20,38 57,54 227,100 169,45 288,89 461,170 152,71 194,78 263,44 64,-31 132,-96 279,-267 150,-176 212,-232 305,-275 55,-26 71,-30 130,-26 42,2 84,12 112,25 67,33 200,143 335,278 189,189 275,317 283,425 11,147 -80,278 -375,537 -232,204 -243,235 -140,406 78,128 99,179 152,362 52,177 88,263 130,314 50,58 67,61 299,51 357,-16 507,11 621,111 81,72 112,165 126,379 22,361 22,349 0,453 -34,168 -93,243 -226,287 -88,29 -251,40 -440,28 -275,-17 -345,-16 -385,8 -46,27 -75,80 -100,185 -29,126 -42,157 -131,320 -45,82 -94,181 -110,221 -29,75 -37,154 -19,188 5,10 82,83 171,162 197,174 286,275 342,387 40,81 42,89 42,175 0,81 -3,98 -30,149 -50,99 -374,445 -487,520 -121,80 -220,91 -333,38 -116,-54 -220,-148 -438,-398 -117,-133 -156,-163 -211,-163 -48,0 -89,18 -178,78 -99,67 -103,68 -353,162 -228,86 -322,127 -344,154 -10,12 -10,43 0,163 18,213 16,481 -4,566 -34,137 -96,215 -206,259 -50,20 -76,22 -256,24 -110,1 -258,-2 -330,-6 z m 273,-2665 c 374,-61 734,-332 917,-690 221,-434 146,-893 -202,-1226 -223,-214 -467,-310 -751,-296 -509,25 -986,432 -1124,957 -28,110 -35,292 -14,404 47,248 190,477 402,642 236,184 494,254 772,209 z"
+           id="path15714" />
+      </g>
       <g
          inkscape:label="gear kubelet top"
          id="g15722"
@@ -837,6 +947,13 @@
          id="path6537"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path1190"
+         d="m 1111.0371,563.36562 20.858,-81.27407"
+         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(#marker1196);marker-end:url(#marker1984);paint-order:normal"
+         inkscape:label="node bottom left" />
       <path
          style="display:none;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(#marker3586);marker-end:url(#marker3758);paint-order:normal"
          d="m 1208.6771,562.24204 -20.5498,-80.96111"
@@ -850,7 +967,7 @@
          inkscape:connector-curvature="0"
          id="path10622"
          d="m 667.78448,388.64882 378.69472,37.60476"
-         style="display:inline;opacity:1;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(#marker2181);marker-end:url(#marker2327);paint-order:normal" />
+         style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:20;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#marker2181);marker-end:url(#marker2327);paint-order:normal" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
@@ -858,6 +975,13 @@
          d="m 1111.0371,163.36562 20.858,-81.27407"
          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
+         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(#marker2634);marker-end:url(#marker2794);paint-order:normal"
+         d="M 1208.6771,162.24204 1188.1273,81.28093"
+         id="path2050"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         inkscape:label="node top right" />
       <path
          inkscape:label="node top"
          style="display:inline;opacity:1;vector-effect:none;fill:#ff0000;fill-opacity:1;stroke:#ff0000;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"
@@ -976,6 +1100,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">RUNNING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">RUNNING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#ffaaaa;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">RUNNING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/images/kubectl-run-slideshow/19.svg

@@ -13,7 +13,7 @@
    viewBox="0 0 1600 900"
    version="1.1"
    id="svg696"
-   sodipodi:docname="19.svg"
+   sodipodi:docname="how-k8s-works-19.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"
    enable-background="new">
   <metadata
@@ -42,12 +42,12 @@
      id="namedview698"
      showgrid="false"
      inkscape:zoom="0.64"
-     inkscape:cx="246.38378"
+     inkscape:cx="796.38378"
      inkscape:cy="596.50212"
      inkscape:window-x="0"
-     inkscape:window-y="1098"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     inkscape:current-layer="how-does-k8s-work"
+     inkscape:current-layer="g4090"
      units="px"
      inkscape:snap-object-midpoints="true" />
   <title
@@ -146,6 +146,36 @@
          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:stockid="TriangleOutS"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="marker1984"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1982"
+         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="marker1196"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path1194"
+         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"
@@ -558,12 +588,12 @@
       <path
          inkscape:connector-curvature="0"
          d="M 68.458394,58.765531 H 59.79659 a 0.92615261,0.92615261 0 0 0 -0.918561,0.918561 v 8.661804 a 0.92615261,0.92615261 0 0 0 0.918561,0.926153 h 8.661804 a 0.92615261,0.92615261 0 0 0 0.888196,-0.926153 v -8.661804 a 0.92615261,0.92615261 0 0 0 -0.918561,-0.918561"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10192" />
       <path
          inkscape:connector-curvature="0"
          d="m 82.16849,58.067121 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 55.888385 A 0.82746421,0.82746421 0 0 0 82.183672,55.06092 H 77.955254 V 51.098202 A 0.92615261,0.92615261 0 0 0 77.036693,50.179641 H 73.081566 V 45.973997 A 0.82746421,0.82746421 0 0 0 72.254102,45.146533 H 70.90283 a 0.82746421,0.82746421 0 0 0 -0.797098,0.827464 v 4.228418 h -4.478935 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.835056,-0.827464 h -1.336089 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -4.448569 v -4.228418 a 0.82746421,0.82746421 0 0 0 -0.827464,-0.827464 h -1.351272 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 4.228418 h -3.947536 a 0.92615261,0.92615261 0 0 0 -0.926153,0.895787 v 3.939944 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 4.440978 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.374046 a 0.82746421,0.82746421 0 0 0 0.827464,0.835056 h 4.213235 v 4.448566 h -4.213235 a 0.82746421,0.82746421 0 0 0 -0.827464,0.827464 v 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 4.213235 v 3.932354 a 0.92615261,0.92615261 0 0 0 0.918561,0.918561 h 3.955128 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.448569 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.336089 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 4.486527 v 4.228419 a 0.82746421,0.82746421 0 0 0 0.827464,0.827464 h 1.351272 a 0.82746421,0.82746421 0 0 0 0.827464,-0.827464 v -4.228419 h 3.955127 a 0.92615261,0.92615261 0 0 0 0.888195,-0.918561 v -3.939945 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.827464 V 70.790329 A 0.82746421,0.82746421 0 0 0 82.183672,69.962865 H 77.955254 V 65.52189 h 4.213236 a 0.82746421,0.82746421 0 0 0 0.842647,-0.835056 v -1.34368 A 0.82746421,0.82746421 0 0 0 82.16849,62.485324 H 77.955254 V 58.067121 Z M 74.842774,74.76823 H 53.404619 V 53.299712 h 21.438155 z"
-         style="display:inline;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:none;opacity:1;vector-effect:none;fill:#96bbf9;fill-opacity:1;stroke:none;stroke-width:0.7591415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path10194" />
     </g>
     <g
@@ -726,6 +756,70 @@
        id="g4132"
        inkscape:label="pods"
        style="display:inline">
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,588.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
+         id="path10214" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1065.6051,593.25418 v 41.2523 l 36.1218,20.00898 0.1788,-50.46488 z"
+         id="path10216" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         d="m 1143.1428,593.25418 v 41.2523 l -36.1217,20.00898 -0.1788,-50.46488 z"
+         id="path10218" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1084.0165"
+         y="674.76129"
+         id="text10222"><tspan
+           sodipodi:role="line"
+           id="tspan10220"
+           x="1084.0165"
+           y="674.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path910" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path912" />
+      <path
+         inkscape:export-ydpi="376.57999"
+         inkscape:export-xdpi="376.57999"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:2.74113631;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="path914" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:22.02975464px;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.55074388"
+         x="1195.4893"
+         y="274.76129"
+         id="text1121"><tspan
+           sodipodi:role="line"
+           id="tspan1119"
+           x="1195.4893"
+           y="274.76129"
+           style="stroke-width:0.55074388">pod</tspan></text>
       <path
          id="path1123"
          d="m 1065.6051,188.949 38.7689,-11.2425 38.7688,11.2425 -38.7688,11.24254 z"
@@ -853,6 +947,13 @@
          id="path6537"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path1190"
+         d="m 1111.0371,563.36562 20.858,-81.27407"
+         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(#marker1196);marker-end:url(#marker1984);paint-order:normal"
+         inkscape:label="node bottom left" />
       <path
          style="display:none;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(#marker3586);marker-end:url(#marker3758);paint-order:normal"
          d="m 1208.6771,562.24204 -20.5498,-80.96111"
@@ -874,6 +975,13 @@
          d="m 1111.0371,163.36562 20.858,-81.27407"
          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
+         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(#marker2634);marker-end:url(#marker2794);paint-order:normal"
+         d="M 1208.6771,162.24204 1188.1273,81.28093"
+         id="path2050"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         inkscape:label="node top right" />
       <path
          inkscape:label="node top"
          style="display:inline;opacity:1;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"
@@ -992,6 +1100,78 @@
              y="125.23392"
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">RUNNING</tspan></text>
       </g>
+      <g
+         inkscape:label="pod 2"
+         id="g1233"
+         style="display:inline">
+        <rect
+           y="139.72913"
+           x="287.1362"
+           height="36.022667"
+           width="174.12718"
+           id="rect15580"
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)" />
+        <text
+           id="text15584"
+           y="166.5461"
+           x="292.32904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           xml:space="preserve"><tspan
+             style="stroke-width:0.69919914"
+             y="166.5461"
+             x="292.32904"
+             id="tspan15582"
+             sodipodi:role="line">Pod</tspan></text>
+        <text
+           id="text15598"
+           y="165.23392"
+           x="351.05563"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           xml:space="preserve"
+           inkscape:label="pod 2 status"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583"
+             y="165.23392"
+             x="351.05563"
+             id="tspan15596"
+             sodipodi:role="line">RUNNING</tspan></text>
+      </g>
+      <g
+         inkscape:label="pod 3"
+         id="g1226"
+         style="display:inline">
+        <rect
+           style="display:inline;opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:8.37233353;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter15564)"
+           id="rect15586"
+           width="174.12718"
+           height="36.022667"
+           x="287.1362"
+           y="179.72913"
+           inkscape:label="rectangle" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.96796608px;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;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69919914"
+           x="292.32904"
+           y="206.5461"
+           id="text15590"
+           inkscape:label="label"><tspan
+             sodipodi:role="line"
+             id="tspan15588"
+             x="292.32904"
+             y="206.5461"
+             style="stroke-width:0.69919914">Pod</tspan></text>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.49064583"
+           x="351.05563"
+           y="205.23392"
+           id="text15602"
+           inkscape:label="status"><tspan
+             sodipodi:role="line"
+             id="tspan15600"
+             x="351.05563"
+             y="205.23392"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:19.62533379px;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:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.49064583">RUNNING</tspan></text>
+      </g>
     </g>
   </g>
 </svg>

slides/index.py

@@ -7,7 +7,6 @@ FLAGS=dict(
   fr=u"🇫🇷",
   uk=u"🇬🇧",
   us=u"🇺🇸",
-  www=u"🌐",
 )
 
 TEMPLATE="""<html>
@@ -20,9 +19,9 @@ TEMPLATE="""<html>
   <div class="main">
     <table>
       <tr><td class="header" colspan="3">{{ title }}</td></tr>
-      <tr><td class="details" colspan="3">Note: while some workshops are delivered in other languages, slides are always in English.</td></tr>
+      <tr><td class="details" colspan="3">Note: while some workshops are delivered in French, slides are always in English.</td></tr>
 
-      <tr><td class="title" colspan="3">Free Kubernetes intro course</td></tr>
+      <tr><td class="title" colspan="3">Free video of our latest workshop</td></tr>
 
       <tr>
       	<td>Getting Started With Kubernetes and Container Orchestration</td>
@@ -36,11 +35,11 @@ TEMPLATE="""<html>
         <td class="details">If you're interested, we can deliver that workshop (or longer courses) to your team or organization.</td>
       </tr>
       <tr>
-        <td class="details">Contact <a href="mailto:jerome.petazzoni@gmail.com">Jérôme Petazzoni</a> to make that happen!</td>
+        <td class="details">Contact <a href="mailto:jerome.petazzoni@gmail.com">Jérôme Petazzoni</a> to make that happen!</a></td>
       </tr>
 
       {% if coming_soon %}
-        <tr><td class="title" colspan="3">Coming soon</td></tr>
+        <tr><td class="title" colspan="3">Coming soon near you</td></tr>
 
         {% for item in coming_soon %}
           <tr>
@@ -141,26 +140,13 @@ import yaml
 
 items = yaml.safe_load(open("index.yaml"))
 
-
-def prettyparse(date):
-    months = [
-      "January", "February", "March", "April", "May", "June",
-      "July", "August", "September", "October", "November", "December"
-    ]
-    month = months[date.month-1]
-    suffix = {
-            1: "st", 2: "nd", 3: "rd",
-            21: "st", 22: "nd", 23: "rd",
-            31: "st"}.get(date.day, "th")
-    return date.year, month, "{}{}".format(date.day, suffix)
-
-
 # Items with a date correspond to scheduled sessions.
 # Items without a date correspond to self-paced content.
 # The date should be specified as a string (e.g. 2018-11-26).
 # It can also be a list of two elements (e.g. [2018-11-26, 2018-11-28]).
 # The latter indicates an event spanning multiple dates.
-# The event will be considered "current" (shown in the list of
+# The first date will be used in the generated page, but the event
+# will be considered "current" (and therefore, shown in the list of
 # upcoming events) until the second date.
 
 for item in items:
@@ -170,23 +156,19 @@ for item in items:
             date_begin, date_end = date
         else:
             date_begin, date_end = date, date
-        y1, m1, d1 = prettyparse(date_begin)
-        y2, m2, d2 = prettyparse(date_end)
-        if (y1, m1, d1) == (y2, m2, d2):
-            # Single day event
-            pretty_date = "{} {}, {}".format(m1, d1, y1)
-        elif (y1, m1) == (y2, m2):
-            # Multi-day event within a single month
-            pretty_date = "{} {}-{}, {}".format(m1, d1, d2, y1)
-        elif y1 == y2:
-            # Multi-day event spanning more than a month
-            pretty_date = "{} {}-{} {}, {}".format(m1, d1, m2, d2, y1)
-        else:
-            # Event spanning the turn of the year (REALLY???)
-            pretty_date = "{} {}, {}-{} {}, {}".format(m1, d1, y1, m2, d2, y2)
+        suffix = {
+                1: "st", 2: "nd", 3: "rd",
+                21: "st", 22: "nd", 23: "rd",
+                31: "st"}.get(date_begin.day, "th")
+        # %e is a non-standard extension (it displays the day, but without a
+        # leading zero). If strftime fails with ValueError, try to fall back
+        # on %d (which displays the day but with a leading zero when needed).
+        try:
+            item["prettydate"] = date_begin.strftime("%B %e{}, %Y").format(suffix)
+        except ValueError:
+            item["prettydate"] = date_begin.strftime("%B %d{}, %Y").format(suffix)
         item["begin"] = date_begin
         item["end"] = date_end
-        item["prettydate"] = pretty_date
     item["flag"] = FLAGS.get(item.get("country"),"")
 
 today = datetime.date.today()

slides/index.yaml

@@ -1,81 +1,3 @@
-- date: [2020-07-07, 2020-07-09]
-  country: www
-  city: streaming
-  event: Ardan Live
-  speaker: jpetazzo
-  title: Intensive Docker Bootcamp
-  attend: https://www.eventbrite.com/e/livestream-intensive-docker-bootcamp-tickets-103258886108
-
-- date: [2020-06-15, 2020-06-16]
-  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/
-
-- date: [2020-06-17, 2020-06-19]
-  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/
-
-- date: 2020-06-22
-  country: www
-  city: streaming
-  event: ENIX SAS
-  speaker: jpetazzo
-  title: Packaging pour Kubernetes (en français)
-  lang: fr
-  attend: https://enix.io/fr/services/formation/online/
-
-- date: [2020-06-23, 2020-06-24]
-  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/
-
-- date: [2020-06-25, 2020-06-26]
-  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/
-
-- date: [2020-06-09, 2020-06-11]
-  country: www
-  city: streaming
-  event: Ardan Live
-  speaker: jpetazzo
-  title: Intensive Kubernetes Bootcamp
-  attend: https://www.eventbrite.com/e/livestream-intensive-kubernetes-bootcamp-tickets-103262336428
-
-- date: [2020-05-04, 2020-05-08]
-  country: www
-  city: streaming
-  event: Ardan Live
-  speaker: jpetazzo
-  title: Intensive Kubernetes - Advanced Concepts
-  attend: https://www.eventbrite.com/e/livestream-intensive-kubernetes-advanced-concepts-tickets-102358725704
-
-- date: [2020-03-30, 2020-04-02]
-  country: www
-  city: streaming
-  event: Ardan Live
-  speaker: jpetazzo
-  title: Intensive Docker and Kubernetes
-  attend: https://www.eventbrite.com/e/ardan-labs-live-worldwide-march-30-april-2-2020-tickets-100331129108#
-  slides: https://2020-03-ardan.container.training/
-
 - date: 2020-03-06
   country: uk
   city: London
@@ -83,7 +5,7 @@
   speaker: jpetazzo
   title: Kubernetes Intensive Course
   attend: https://qconlondon.com/london2020/workshop/kubernetes-intro
-  slides: https://2020-03-qcon.container.training/
+  #slides: https://qconuk2019.container.training/
 
 - date: 2020-03-05
   country: uk
@@ -92,7 +14,7 @@
   speaker: jpetazzo
   title: Docker Intensive Course
   attend: https://qconlondon.com/london2020/workshop/docker-intensive-course
-  slides: https://2020-03-qcon.container.training/
+  #slides: https://qconuk2019.container.training/
 
 - date: 2020-02-03
   country: fr
@@ -102,7 +24,6 @@
   title: Fondamentaux Conteneurs et Docker (in French)
   lang: fr
   attend: https://enix.io/fr/services/formation/
-  slides: https://2020-02-enix.container.training/
 
 - date: 2020-02-04
   country: fr
@@ -112,7 +33,6 @@
   title: Fondamentaux Orchestration et Kubernetes (in French)
   lang: fr
   attend: https://enix.io/fr/services/formation/
-  slides: https://2020-02-enix.container.training/
 
 - date: 2020-02-05
   country: fr
@@ -122,7 +42,6 @@
   title: Kubernetes et Méthodologies DevOps (in French)
   lang: fr
   attend: https://enix.io/fr/services/formation/
-  slides: https://2020-02-enix.container.training/
 
 - date: 2020-02-06
   country: fr
@@ -132,7 +51,6 @@
   title: Kubernetes Avancé (in French)
   lang: fr
   attend: https://enix.io/fr/services/formation/
-  slides: https://2020-02-enix.container.training/
 
 - date: 2020-02-07
   country: fr
@@ -142,7 +60,6 @@
   title: Opérer Kubernetes (in French)
   lang: fr
   attend: https://enix.io/fr/services/formation/
-  slides: https://2020-02-enix.container.training/
 
 - date: [2019-11-04, 2019-11-05]
   country: de

slides/k8s-bootcamp.yml

@@ -1,92 +0,0 @@
-title: |
-  Intensive
-  Kubernetes
-  Bootcamp
-
-chat: "[Gitter](https://gitter.im/jpetazzo/training-20200609-online)"
-
-gitrepo: github.com/jpetazzo/container.training
-
-slides: https://2020-06-ardan.container.training/
-
-#slidenumberprefix: "#SomeHashTag — "
-
-exclude:
-- self-paced
-
-content:
-- shared/title.md
-- logistics.md
-- k8s/intro.md
-- shared/about-slides.md
-- shared/chat-room-zoom-webinar.md
-- shared/toc.md
--
-  - shared/prereqs.md
-  - shared/webssh.md
-  - shared/connecting.md
-  - shared/sampleapp.md
-  #- shared/composescale.md
-  #- shared/hastyconclusions.md
-  - shared/composedown.md
-  - k8s/concepts-k8s.md
-  - k8s/kubectlget.md
-  - k8s/kubectl-run.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/batch-jobs.md
-  - k8s/labels-annotations.md
-  - k8s/kubectl-logs.md
-  - k8s/logs-cli.md
-  #- k8s/exercise-wordsmith.md
-  - k8s/yamldeploy.md
-  #- k8s/kubectlscale.md
-  - k8s/scalingdockercoins.md
-  - shared/hastyconclusions.md
-  - k8s/daemonset.md
--
-  #- k8s/dryrun.md
-  #- k8s/exercise-yaml.md
-  - k8s/rollout.md
-  #- k8s/record.md
-  - k8s/healthchecks.md
-  #- k8s/healthchecks-more.md
-  - k8s/setup-overview.md
-  - k8s/setup-devel.md
-  - k8s/setup-managed.md
-  #- k8s/setup-selfhosted.md
--
-  - k8s/namespaces.md
-  - k8s/localkubeconfig.md
-  - k8s/accessinternal.md
-  - k8s/kubectlproxy.md
-  - k8s/dashboard.md
-  - k8s/ingress.md
--
-  - k8s/volumes.md
-  #- k8s/exercise-configmap.md
-  #- k8s/build-with-docker.md
-  #- k8s/build-with-kaniko.md
-  - k8s/configuration.md
-  - k8s/whatsnext.md
-  - k8s/lastwords.md
-  - k8s/links.md
-  - shared/thankyou.md
--
-  - |
-    # (Extra material)
-  - 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
-

slides/k8s/accessinternal.md

@@ -129,8 +129,3 @@ installed and set up `kubectl` to communicate with your cluster.
   ```
 
 ]
-
-???
-
-:EN:- Securely accessing internal services
-:FR:- Accès sécurisé aux services internes

slides/k8s/apilb.md

@@ -87,8 +87,3 @@
 - Tunnels are also fine
 
   (e.g. [k3s](https://k3s.io/) uses a tunnel to allow each node to contact the API server)
-
-???
-
-:EN:- Ensuring API server availability
-:FR:- Assurer la disponibilité du serveur API

slides/k8s/architecture.md

@@ -352,7 +352,7 @@ We demonstrated *update* and *watch* semantics.
 
 - That's where the actual logic of Kubernetes lives
 
-- When we create a Deployment (e.g. with `kubectl create deployment web --image=nginx`),
+- When we create a Deployment (e.g. with `kubectl run web --image=nginx`),
 
   - we create a Deployment object
 
@@ -381,8 +381,3 @@ We demonstrated *update* and *watch* semantics.
   - if the pod has special constraints that can't be met
 
   - if the scheduler is not running (!)
-
-???
-
-:EN:- Kubernetes architecture review
-:FR:- Passage en revue de l'architecture de Kubernetes

slides/k8s/authn-authz.md

@@ -1,74 +1,6 @@
 # Authentication and authorization
 
-- In this section, we will:
-
-  - define authentication and authorization
-
-  - explain how they are implemented in Kubernetes
-
-  - talk about tokens, certificates, service accounts, RBAC ...
-
-- But first: why do we need all this?
-
----
-
-## The need for fine-grained security
-
-- The Kubernetes API should only be available for identified users
-
-  - we don't want "guest access" (except in very rare scenarios)
-
-  - we don't want strangers to use our compute resources, delete our apps ...
-
-  - our keys and passwords should not be exposed to the public
-
-- Users will often have different access rights
-
-  - cluster admin (similar to UNIX "root") can do everything
-
-  - developer might access specific resources, or a specific namespace
-
-  - supervision might have read only access to *most* resources
-
----
-
-## Example: custom HTTP load balancer
-
-- Let's imagine that we have a custom HTTP load balancer for multiple apps
-
-- Each app has its own *Deployment* resource
-
-- By default, the apps are "sleeping" and scaled to zero
-
-- When a request comes in, the corresponding app gets woken up
-
-- After some inactivity, the app is scaled down again
-
-- This HTTP load balancer needs API access (to scale up/down)
-
-- What if *a wild vulnerability appears*?
-
----
-
-## Consequences of vulnerability
-
-- If the HTTP load balancer has the same API access as we do:
-
-  *full cluster compromise (easy data leak, cryptojacking...)*
-
-- If the HTTP load balancer has `update` permissions on the Deployments:
-
-  *defacement (easy), MITM / impersonation (medium to hard)*
-
-- If the HTTP load balancer only has permission to `scale` the Deployments:
-
-  *denial-of-service*
-
-- All these outcomes are bad, but some are worse than others
-
----
-
-## Definitions
+*And first, a little refresher!*
 
 - Authentication = verifying the identity of a person
 
@@ -215,7 +147,7 @@ class: extra-details
 
   (if their key is compromised, or they leave the organization)
 
-- Option 1: re-create a new CA and re-issue everyone's certificates
+- Option 1: re-create a new CA and re-issue everyone's certificates 
   <br/>
   → Maybe OK if we only have a few users; no way otherwise
 
@@ -699,7 +631,7 @@ class: extra-details
 
 - Let's look for these in existing ClusterRoleBindings:
   ```bash
-  kubectl get clusterrolebindings -o yaml |
+  kubectl get clusterrolebindings -o yaml | 
     grep -e kubernetes-admin -e system:masters
   ```
 
@@ -744,17 +676,3 @@ class: extra-details
 - Both are available as standalone programs, or as plugins for `kubectl`
 
   (`kubectl` plugins can be installed and managed with `krew`)
-
-???
-
-:EN:- Authentication and authorization in Kubernetes
-:EN:- Authentication with tokens and certificates
-:EN:- Aithorization with RBAC (Role-Based Access Control)
-:EN:- Restricting permissions with Service Accounts
-:EN:- Working with Roles, Cluster Roles, Role Bindings, etc.
-
-:FR:- Identification et droits d'accès dans Kubernetes
-:FR:- Mécanismes d'identification par jetons et certificats
-:FR:- Le modèle RBAC *(Role-Based Access Control)*
-:FR:- Restreindre les permissions grâce aux *Service Accounts*
-:FR:- Comprendre les *Roles*, *Cluster Roles*, *Role Bindings*, etc.

slides/k8s/batch-jobs.md

@@ -1,194 +0,0 @@
-# Executing batch jobs
-
-- Deployments are great for stateless web apps
-
-  (as well as workers that keep running forever)
-
-- Pods are great for one-off execution that we don't care about
-
-  (because they don't get automatically restarted if something goes wrong)
-
-- Jobs are great for "long" background work
-
-  ("long" being at least minutes our hours)
-
-- CronJobs are great to schedule Jobs at regular intervals
-
-  (just like the classic UNIX `cron` daemon with its `crontab` files)
-
----
-
-## Creating a Job
-
-- A Job will create a Pod
-
-- If the Pod fails, the Job will create another one
-
-- The Job will keep trying until:
-
-  - either a Pod succeeds,
-
-  - or we hit the *backoff limit* of the Job (default=6)
-
-.exercise[
-
-- Create a Job that has a 50% chance of success:
-  ```bash
-    kubectl create job flipcoin --image=alpine -- sh -c 'exit $(($RANDOM%2))' 
-  ```
-
-]
-
----
-
-## Our Job in action
-
-- Our Job will create a Pod named `flipcoin-xxxxx`
-
-- If the Pod succeeds, the Job stops
-
-- If the Pod fails, the Job creates another Pod
-
-.exercise[
-
-- Check the status of the Pod(s) created by the Job:
-  ```bash
-  kubectl get pods --selector=job-name=flipcoin
-  ```
-
-]
-
----
-
-class: extra-details
-
-## More advanced jobs
-
-- We can specify a number of "completions" (default=1)
-
-- This indicates how many times the Job must be executed
-
-- We can specify the "parallelism" (default=1)
-
-- This indicates how many Pods should be running in parallel
-
-- These options cannot be specified with `kubectl create job`
-
-  (we have to write our own YAML manifest to use them)
-
----
-
-## Scheduling periodic background work
-
-- A Cron Job is a Job that will be executed at specific intervals
-
-  (the name comes from the traditional cronjobs executed by the UNIX crond)
-
-- It requires a *schedule*, represented as five space-separated fields:
-
-  - minute [0,59]
-  - hour [0,23]
-  - day of the month [1,31]
-  - month of the year [1,12]
-  - day of the week ([0,6] with 0=Sunday)
-
-- `*` means "all valid values"; `/N` means "every N"
-
-- Example: `*/3 * * * *` means "every three minutes"
-
----
-
-## Creating a Cron Job
-
-- Let's create a simple job to be executed every three minutes
-
-- Careful: make sure that the job terminates!
-
-  (The Cron Job will not hold if a previous job is still running)
-
-.exercise[
-
-- Create the Cron Job:
-  ```bash
-    kubectl create cronjob every3mins --schedule="*/3 * * * *" \
-            --image=alpine -- sleep 10
-  ```
-
-- Check the resource that was created:
-  ```bash
-  kubectl get cronjobs
-  ```
-
-]
-
----
-
-## Cron Jobs in action
-
-- At the specified schedule, the Cron Job will create a Job
-
-- The Job will create a Pod
-
-- The Job will make sure that the Pod completes
-
-  (re-creating another one if it fails, for instance if its node fails)
-
-.exercise[
-
-- Check the Jobs that are created:
-  ```bash
-  kubectl get jobs
-  ```
-
-]
-
-(It will take a few minutes before the first job is scheduled.)
-
----
-
-class: extra-details
-
-## What about `kubectl run` before v1.18?
-
-- Creating a Deployment:
-
-  `kubectl run`
-
-- Creating a Pod:
-
-  `kubectl run --restart=Never`
-
-- Creating a Job:
-
-  `kubectl run --restart=OnFailure`
-
-- Creating a Cron Job:
-
-  `kubectl run --restart=OnFailure --schedule=...`
-
-*Avoid using these forms, as they are deprecated since Kubernetes 1.18!*
-
----
-
-## Beyond `kubectl create`
-
-- As hinted earlier, `kubectl create` doesn't always expose all options
-
-  - can't express parallelism or completions of Jobs
-
-  - can't express Pods with multiple containers
-
-  - can't express healthchecks, resource limits
-
-  - etc.
-
-- `kubectl create` and `kubectl run` are *helpers* that generate YAML manifests
-
-- If we write these manifests ourselves, we can use all features and options
-
-- We'll see later how to do that!
-
-???
-
-:EN:- Running batch and cron jobs
-:FR:- Tâches périodiques *(cron)* et traitement par lots *(batch)*

slides/k8s/bootstrap.md

@@ -257,8 +257,3 @@ This is the TLS bootstrap mechanism, step by step.
   - [kubeadm token](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-token/) command
 
   - [kubeadm join](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-join/) command (has details about [the join workflow](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-join/#join-workflow))
-
-???
-
-:EN:- Leveraging TLS bootstrap to join nodes
-:FR:- Ajout de nœuds grâce au *TLS bootstrap*

slides/k8s/cloud-controller-manager.md

@@ -142,8 +142,3 @@ The list includes the following providers:
   - [configuration](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/) (mainly for OpenStack)
 
   - [deployment](https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/)
-
-???
-
-:EN:- The Cloud Controller Manager
-:FR:- Le *Cloud Controller Manager*

slides/k8s/cluster-backup.md

@@ -364,8 +364,3 @@ docker run --rm --net host -v $PWD:/vol \
 - [bivac](https://github.com/camptocamp/bivac) 
 
   Backup Interface for Volumes Attached to Containers 
-
-???
-
-:EN:- Backing up clusters
-:FR:- Politiques de sauvegarde

slides/k8s/cluster-sizing.md

@@ -165,12 +165,3 @@ class: extra-details
 - Security advantage (stronger isolation between pods)
 
 Check [this blog post](http://jpetazzo.github.io/2019/02/13/running-kubernetes-without-nodes-with-kiyot/) for more details.
-
-???
-
-:EN:- What happens when the cluster is at, or over, capacity
-:EN:- Cluster sizing and scaling
-
-:FR:- Ce qui se passe quand il n'y a plus assez de ressources
-:FR:- Dimensionner et redimensionner ses clusters
-

slides/k8s/cluster-upgrade.md

@@ -501,11 +501,3 @@ class: extra-details
 - Then upgrading kubeadm to 1.16.X, etc.
 
 - **Make sure to read the release notes before upgrading!**
-
-???
-
-:EN:- Best practices for cluster upgrades
-:EN:- Example: upgrading a kubeadm cluster
-
-:FR:- Bonnes pratiques pour la mise à jour des clusters
-:FR:- Exemple : mettre à jour un cluster kubeadm

slides/k8s/cni.md

@@ -574,8 +574,3 @@ done
 - This could be useful for embedded platforms with very limited resources
 
   (or lab environments for learning purposes)
-
-???
-
-:EN:- Configuring CNI plugins
-:FR:- Configurer des plugins CNI

slides/k8s/concepts-k8s.md

@@ -401,8 +401,3 @@ class: pic
   - IP addresses are associated with *pods*, not with individual containers
 
 Both diagrams used with permission.
-
-???
-
-:EN:- Kubernetes concepts
-:FR:- Kubernetes en théorie

slides/k8s/configuration.md

@@ -547,13 +547,3 @@ spec:
 - With RBAC, we can authorize a user to access configmaps, but not secrets
 
   (since they are two different kinds of resources)
-
-???
-
-:EN:- Managing application configuration
-:EN:- Exposing configuration with the downward API
-:EN:- Exposing configuration with Config Maps and Secrets
-
-:FR:- Gérer la configuration des applications
-:FR:- Configuration au travers de la *downward API*
-:FR:- Configuration via les *Config Maps* et *Secrets*

slides/k8s/control-plane-auth.md

@@ -263,8 +263,3 @@ spec:
     #name: web-xyz1234567-pqr89
 EOF
 ```
-
-???
-
-:EN:- Control plane authentication
-:FR:- Sécurisation du plan de contrôle

slides/k8s/csr-api.md

@@ -132,33 +132,11 @@ For a user named `jean.doe`, we will have:
 
 - ServiceAccount `jean.doe` in Namespace `users`
 
-- CertificateSigningRequest `user=jean.doe`
+- CertificateSigningRequest `users:jean.doe`
 
-- ClusterRole `user=jean.doe` giving read/write access to that CSR
+- ClusterRole `users:jean.doe` giving read/write access to that CSR
 
-- ClusterRoleBinding `user=jean.doe` binding ClusterRole and ServiceAccount
-
----
-
-class: extra-details
-
-## About resource name constraints
-
-- Most Kubernetes identifiers and names are fairly restricted
-
-- They generally are DNS-1123 *labels* or *subdomains* (from [RFC 1123](https://tools.ietf.org/html/rfc1123))
-
-- A label is lowercase letters, numbers, dashes; can't start or finish with a dash
-
-- A subdomain is one or multiple labels separated by dots
-
-- Some resources have more relaxed constraints, and can be "path segment names"
-
-  (uppercase are allowed, as well as some characters like `#:?!,_`)
-
-- This includes RBAC objects (like Roles, RoleBindings...) and CSRs
-
-- See the [Identifiers and Names](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/architecture/identifiers.md) design document and the [Object Names and IDs](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#path-segment-names) documentation page for more details
+- ClusterRoleBinding `users:jean.doe` binding ClusterRole and ServiceAccount
 
 ---
 
@@ -175,7 +153,7 @@ class: extra-details
 
 - Create the ServiceAccount, ClusterRole, ClusterRoleBinding for `jean.doe`:
   ```bash
-  kubectl apply -f ~/container.training/k8s/user=jean.doe.yaml
+  kubectl apply -f ~/container.training/k8s/users:jean.doe.yaml
   ```
 
 ]
@@ -217,13 +195,7 @@ class: extra-details
 
 - Add a new context using that identity:
   ```bash
-  kubectl config set-context jean.doe --user=token:jean.doe --cluster=`kubernetes`
-  ```
-  (Make sure to adapt the cluster name if yours is different!)
-
-- Use that context:
-  ```bash
-  kubectl config use-context jean.doe
+  kubectl config set-context jean.doe --user=token:jean.doe --cluster=kubernetes
   ```
 
 ]
@@ -244,7 +216,7 @@ class: extra-details
 
 - Try to access "our" CertificateSigningRequest:
   ```bash
-  kubectl get csr user=jean.doe
+  kubectl get csr users:jean.doe
   ```
   (This should tell us "NotFound")
 
@@ -301,7 +273,7 @@ The command above generates:
     apiVersion: certificates.k8s.io/v1beta1
     kind: CertificateSigningRequest
     metadata:
-      name: user=jean.doe
+      name: users:jean.doe
     spec:
       request: $(base64 -w0 < csr.pem)
       usages:
@@ -352,12 +324,12 @@ The command above generates:
 
 - Inspect the CSR:
   ```bash
-  kubectl describe csr user=jean.doe
+  kubectl describe csr users:jean.doe
   ```
 
 - Approve it:
   ```bash
-  kubectl certificate approve user=jean.doe
+  kubectl certificate approve users:jean.doe
   ```
 
 ]
@@ -375,7 +347,7 @@ The command above generates:
 
 - Retrieve the updated CSR object and extract the certificate:
   ```bash
-  kubectl get csr user=jean.doe \
+  kubectl get csr users:jean.doe \
           -o jsonpath={.status.certificate} \
           | base64 -d > cert.pem
   ```
@@ -452,8 +424,3 @@ To be usable in real environments, we would need to add:
   - we get strong security *and* convenience
 
 - Systems like Vault also have certificate issuance mechanisms
-
-???
-
-:EN:- Generating user certificates with the CSR API
-:FR:- Génération de certificats utilisateur avec la CSR API

slides/k8s/daemonset.md

@@ -688,8 +688,3 @@ class: extra-details
     (by setting their label accordingly)
 
 - This gives us building blocks for canary and blue/green deployments
-
-???
-
-:EN:- Scaling with Daemon Sets
-:FR:- Utilisation de Daemon Sets

slides/k8s/dashboard.md

@@ -105,23 +105,7 @@ The dashboard will then ask you which authentication you want to use.
 
 ---
 
-## Other dashboards
-
-- [Kube Web View](https://codeberg.org/hjacobs/kube-web-view)
-
-  - read-only dashboard
-
-  - optimized for "troubleshooting and incident response"
-
-  - see [vision and goals](https://kube-web-view.readthedocs.io/en/latest/vision.html#vision) for details
-
-- [Kube Ops View](https://github.com/hjacobs/kube-ops-view)
-
-  - "provides a common operational picture for multiple Kubernetes clusters"
-
----
-
-# Security implications of `kubectl apply`
+## Security implications of `kubectl apply`
 
 - When we do `kubectl apply -f <URL>`, we create arbitrary resources
 
@@ -172,8 +156,3 @@ The dashboard will then ask you which authentication you want to use.
 - It introduces new failure modes
 
   (for instance, if you try to apply YAML from a link that's no longer valid)
-
-???
-
-:EN:- The Kubernetes dashboard
-:FR:- Le *dashboard* Kubernetes

slides/k8s/declarative.md

@@ -26,8 +26,3 @@
 - When we want to change some resource, we update the *spec*
 
 - Kubernetes will then *converge* that resource
-
-???
-
-:EN:- Declarative vs imperative models
-:FR:- Modèles déclaratifs et impératifs

slides/k8s/deploymentslideshow.md

@@ -5,63 +5,63 @@ They say, "a picture is worth one thousand words."
 The following 19 slides show what really happens when we run:
 
 ```bash
-kubectl create deployment web --image=nginx
+kubectl run web --image=nginx --replicas=3
 ```
 
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/01.svg)
+![](images/kubectl-run-slideshow/01.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/02.svg)
+![](images/kubectl-run-slideshow/02.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/03.svg)
+![](images/kubectl-run-slideshow/03.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/04.svg)
+![](images/kubectl-run-slideshow/04.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/05.svg)
+![](images/kubectl-run-slideshow/05.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/06.svg)
+![](images/kubectl-run-slideshow/06.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/07.svg)
+![](images/kubectl-run-slideshow/07.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/08.svg)
+![](images/kubectl-run-slideshow/08.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/09.svg)
+![](images/kubectl-run-slideshow/09.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/10.svg)
+![](images/kubectl-run-slideshow/10.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/11.svg)
+![](images/kubectl-run-slideshow/11.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/12.svg)
+![](images/kubectl-run-slideshow/12.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/13.svg)
+![](images/kubectl-run-slideshow/13.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/14.svg)
+![](images/kubectl-run-slideshow/14.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/15.svg)
+![](images/kubectl-run-slideshow/15.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/16.svg)
+![](images/kubectl-run-slideshow/16.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/17.svg)
+![](images/kubectl-run-slideshow/17.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/18.svg)
+![](images/kubectl-run-slideshow/18.svg)
 ---
 class: pic
-![](images/kubectl-create-deployment-slideshow/19.svg)
+![](images/kubectl-run-slideshow/19.svg)

slides/k8s/dmuc.md

@@ -6,7 +6,7 @@
 
 - Our goal is to build a minimal cluster allowing us to:
 
-  - create a Deployment (with `kubectl create deployment`)
+  - create a Deployment (with `kubectl run` or `kubectl create deployment`)
   - expose it with a Service
   - connect to that service
 
@@ -823,8 +823,3 @@ class: extra-details
   (it could be as a bare process, or in a container/pod using the host network)
 
 - ... And it expects to be listening on port 6443 with TLS
-
-???
-
-:EN:- Building our own cluster from scratch
-:FR:- Construire son cluster à la main

slides/k8s/dryrun.md

@@ -172,7 +172,7 @@ Note: we don't need to specify `--validate=false` here.
 
 ## Advantage of YAML
 
-- Using YAML (instead of `kubectl create <kind>`) allows to be *declarative*
+- Using YAML (instead of `kubectl run`/`create`/etc.) allows to be *declarative*
 
 - The YAML describes the desired state of our cluster and applications
 
@@ -194,7 +194,7 @@ Note: we don't need to specify `--validate=false` here.
 
 ## YAML in practice
 
-- Get started with `kubectl create deployment` and `kubectl expose`
+- Get started with `kubectl run`/`create`/`expose`/etc.
 
 - Dump the YAML with `kubectl get -o yaml`
 

slides/k8s/extending-api.md

@@ -344,14 +344,3 @@ class: extra-details
 - [Dynamic Admission Controllers](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/)
 
 - [Aggregation Layer](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
-
-???
-
-:EN:- Extending the Kubernetes API
-:EN:- Custom Resource Definitions (CRDs)
-:EN:- The aggregation layer
-:EN:- Admission control and webhooks
-
-:FR:- Comment étendre l'API Kubernetes
-:FR:- Les CRDs *(Custom Resource Definitions)*
-:FR:- Extension via *aggregation layer*, *admission control*, *webhooks*

slides/k8s/gitworkflows.md

@@ -237,8 +237,3 @@
 - Gitkube can also deploy Helm charts
 
   (instead of raw YAML files)
-
-???
-
-:EN:- GitOps
-:FR:- GitOps

slides/k8s/healthchecks-more.md

@@ -154,9 +154,9 @@ It will use the default success threshold (1 successful attempt = alive).
 
 .exercise[
 
-- Edit `rng-deployment.yaml` and add the liveness probe
+- Edit `rng-daemonset.yaml` and add the liveness probe
   ```bash
-  vim rng-deployment.yaml
+  vim rng-daemonset.yaml
   ```
 
 - Load the YAML for all the resources of DockerCoins:
@@ -333,8 +333,3 @@ class: extra-details
   (and have gcr.io/pause take care of the reaping)
 
 - Discussion of this in [Video - 10 Ways to Shoot Yourself in the Foot with Kubernetes, #9 Will Surprise You](https://www.youtube.com/watch?v=QKI-JRs2RIE)
-
-???
-
-:EN:- Adding healthchecks to an app
-:FR:- Ajouter des *healthchecks* à une application

slides/k8s/healthchecks.md

@@ -282,8 +282,3 @@ If the Redis process becomes unresponsive, it will be killed.
   - check the timestamp of that file from an exec probe
 
 - Writing logs (and checking them from the probe) also works
-
-???
-
-:EN:- Using healthchecks to improve availability
-:FR:- Utiliser des *healthchecks* pour améliorer la disponibilité

slides/k8s/helm-chart-format.md

@@ -237,8 +237,3 @@ We see the components mentioned above: `Chart.yaml`, `templates/`, `values.yaml`
 - This can be use for database migrations, backups, notifications, smoke tests ...
 
 - Hooks named `test` are executed only when running `helm test RELEASE-NAME`
-
-???
-
-:EN:- Helm charts format
-:FR:- Le format des *Helm charts*

slides/k8s/helm-create-basic-chart.md

@@ -218,8 +218,3 @@ have details about recommended annotations and labels.
   ```
 
 ]
-
-???
-
-:EN:- Writing a basic Helm chart for the whole app
-:FR:- Écriture d'un *chart* Helm simplifié

slides/k8s/helm-create-better-chart.md

@@ -121,7 +121,7 @@ This creates a basic chart in the directory `helmcoins`.
   helm install COMPONENT-NAME CHART-DIRECTORY
   ```
 
-- We can also use the following command, which is *idempotent*:
+- We can also use the following command, which is idempotent:
   ```bash
   helm upgrade COMPONENT-NAME CHART-DIRECTORY --install
   ```
@@ -139,28 +139,6 @@ This creates a basic chart in the directory `helmcoins`.
 
 ---
 
-class: extra-details
-
-## "Idempotent"
-
-- Idempotent = that can be applied multiple times without changing the result
-
-  (the word is commonly used in maths and computer science)
-
-- In this context, this means:
-
-  - if the action (installing the chart) wasn't done, do it
-
-  - if the action was already done, don't do anything
-
-- Ideally, when such an action fails, it can be retried safely
-
-  (as opposed to, e.g., installing a new release each time we run it)
-
-- Other example: `kubectl -f some-file.yaml`
-
----
-
 ## Checking what we've done
 
 - Let's see if DockerCoins is working!
@@ -599,8 +577,3 @@ We can look at the definition, but it's fairly complex ...
 - We can change the number of workers with `replicaCount`
 
 - And much more!
-
-???
-
-:EN:- Writing better Helm charts for app components
-:FR:- Écriture de *charts* composant par composant

slides/k8s/helm-intro.md

@@ -18,25 +18,6 @@
 
 ---
 
-## CNCF graduation status
-
-- On April 30th 2020, Helm was the 10th project to *graduate* within the CNCF
-
-  .emoji[🎉]
-
-  (alongside Containerd, Prometheus, and Kubernetes itself)
-
-- This is an acknowledgement by the CNCF for projects that
-
-  *demonstrate thriving adoption, an open governance process,
-  <br/>
-  and a strong commitment to community, sustainability, and inclusivity.*
-
-- See [CNCF announcement](https://www.cncf.io/announcement/2020/04/30/cloud-native-computing-foundation-announces-helm-graduation/)
-  and [Helm announcement](https://helm.sh/blog/celebrating-helms-cncf-graduation/)
-
----
-
 ## Helm concepts
 
 - `helm` is a CLI tool
@@ -436,13 +417,3 @@ All unspecified values will take the default values defined in the chart.
   ```
 
 ]
-
-???
-
-:EN:- Helm concepts
-:EN:- Installing software with Helm
-:EN:- Helm 2, Helm 3, and the Helm Hub
-
-:FR:- Fonctionnement général de Helm
-:FR:- Installer des composants via Helm
-:FR:- Helm 2, Helm 3, et le *Helm Hub*

slides/k8s/helm-secrets.md

@@ -232,8 +232,3 @@ The chart is in a structured format, but it's entirely captured in this JSON.
   (including the full source of the chart, and the values used)
 
 - This allows arbitrary rollbacks, as well as tweaking values even without having access to the source of the chart (or the chart repo) used for deployment
-
-???
-
-:EN:- Deep dive into Helm internals
-:FR:- Fonctionnement interne de Helm

slides/k8s/horizontal-pod-autoscaler.md

@@ -306,8 +306,3 @@ This can also be set with `--cpu-percent=`.
 -->
 
 ]
-
-???
-
-:EN:- Auto-scaling resources
-:FR:- *Auto-scaling* (dimensionnement automatique) des ressources

slides/k8s/ingress.md

@@ -718,8 +718,3 @@ We also need:
   (create them, promote them, delete them ...)
 
 For inspiration, check [flagger by Weave](https://github.com/weaveworks/flagger).
-
-???
-
-:EN:- The Ingress resource
-:FR:- La ressource *ingress*

slides/k8s/interco.md

@@ -155,8 +155,3 @@ For critical services, we might want to precisely control the update process.
 - Even better if it's combined with DNS integration
 
   (to facilitate name → ClusterIP resolution)
-
-???
-
-:EN:- Interconnecting clusters
-:FR:- Interconnexion de clusters

slides/k8s/kubectl-logs.md

@@ -1,162 +0,0 @@
-# Revisiting `kubectl logs`
-
-- In this section, we assume that we have a Deployment with multiple Pods
-
-  (e.g. `pingpong` that we scaled to at least 3 pods)
-
-- We will highlights some of the limitations of `kubectl logs`
-
----
-
-## Streaming logs of multiple pods
-
-- By default, `kubectl logs` shows us the output of a single Pod
-
-.exercise[
-
-- Try to check the output of the Pods related to a Deployment:
-  ```bash
-  kubectl logs deploy/pingpong --tail 1 --follow
-  ```
-
-<!--
-```wait using pod/pingpong-```
-```keys ^C```
--->
-
-]
-
-`kubectl logs` only shows us the logs of one of the Pods.
-
----
-
-## Viewing logs of multiple pods
-
-- When we specify a deployment name, only one single pod's logs are shown
-
-- We can view the logs of multiple pods by specifying a *selector*
-
-- If we check the pods created by the deployment, they all have the label `app=pingpong`
-
-  (this is just a default label that gets added when using `kubectl create deployment`)
-
-.exercise[
-
-- View the last line of log from all pods with the `app=pingpong` label:
-  ```bash
-  kubectl logs -l app=pingpong --tail 1
-  ```
-
-]
-
----
-
-## Streaming logs of multiple pods
-
-- Can we stream the logs of all our `pingpong` pods?
-
-.exercise[
-
-- Combine `-l` and `-f` flags:
-  ```bash
-  kubectl logs -l app=pingpong --tail 1 -f
-  ```
-
-<!--
-```wait seq=```
-```key ^C```
--->
-
-]
-
-*Note: combining `-l` and `-f` is only possible since Kubernetes 1.14!*
-
-*Let's try to understand why ...*
-
----
-
-class: extra-details
-
-## Streaming logs of many pods
-
-- Let's see what happens if we try to stream the logs for more than 5 pods
-
-.exercise[
-
-- Scale up our deployment:
-  ```bash
-  kubectl scale deployment pingpong --replicas=8
-  ```
-
-- Stream the logs:
-  ```bash
-  kubectl logs -l app=pingpong --tail 1 -f
-  ```
-
-<!-- ```wait error:``` -->
-
-]
-
-We see a message like the following one:
-```
-error: you are attempting to follow 8 log streams,
-but maximum allowed concurency is 5,
-use --max-log-requests to increase the limit
-```
-
----
-
-class: extra-details
-
-## Why can't we stream the logs of many pods?
-
-- `kubectl` opens one connection to the API server per pod
-
-- For each pod, the API server opens one extra connection to the corresponding kubelet
-
-- If there are 1000 pods in our deployment, that's 1000 inbound + 1000 outbound connections on the API server
-
-- This could easily put a lot of stress on the API server
-
-- Prior Kubernetes 1.14, it was decided to *not* allow multiple connections
-
-- From Kubernetes 1.14, it is allowed, but limited to 5 connections
-
-  (this can be changed with `--max-log-requests`)
-
-- For more details about the rationale, see
-  [PR #67573](https://github.com/kubernetes/kubernetes/pull/67573)
-
----
-
-## Shortcomings of `kubectl logs`
-
-- We don't see which pod sent which log line
-
-- If pods are restarted / replaced, the log stream stops
-
-- If new pods are added, we don't see their logs
-
-- To stream the logs of multiple pods, we need to write a selector
-
-- There are external tools to address these shortcomings
-
-  (e.g.: [Stern](https://github.com/wercker/stern))
-
----
-
-class: extra-details
-
-## `kubectl logs -l ... --tail N`
-
-- If we run this with Kubernetes 1.12, the last command shows multiple lines
-
-- This is a regression when `--tail` is used together with `-l`/`--selector`
-
-- It always shows the last 10 lines of output for each container
-
-  (instead of the number of lines specified on the command line)
-
-- The problem was fixed in Kubernetes 1.13
-
-*See [#70554](https://github.com/kubernetes/kubernetes/issues/70554) for details.*

slides/k8s/kubectl-run.md

@@ -1,523 +0,0 @@
-# Running our first containers on Kubernetes
-
-- First things first: we cannot run a container
-
---
-
-- We are going to run a pod, and in that pod there will be a single container
-
---
-
-- In that container in the pod, we are going to run a simple `ping` command
-
---
-
-- Sounds simple enough, right?
-
---
-
-- Except ... that the `kubectl run` command changed in Kubernetes 1.18!
-
-- We'll explain what has changed, and why
-
----
-
-## Choose your own adventure
-
-- First, let's check which version of Kubernetes we're running
-
-.exercise[
-
-- Check our API server version:
-  ```bash
-  kubectl version
-  ```
-
-- Look at the **Server Version** in the second part of the output
-
-]
-
-- In the following slides, we will talk about 1.17- or 1.18+
-
-  (to indicate "up to Kubernetes 1.17" and "from Kubernetes 1.18")
-
----
-
-## Starting a simple pod with `kubectl run`
-
-- `kubectl run` is convenient to start a single pod
-
-- We need to specify at least a *name* and the image we want to use
-
-- Optionally, we can specify the command to run in the pod
-
-.exercise[
-
-- Let's ping the address of `localhost`, the loopback interface:
-  ```bash
-  kubectl run pingpong --image alpine ping 127.0.0.1
-  ```
-
-<!-- ```hide kubectl wait pod --selector=run=pingpong --for condition=ready``` -->
-
-]
-
----
-
-## What do we see?
-
-- In Kubernetes 1.18+, the output tells us that a Pod is created:
-  ```
-  pod/pingpong created
-  ```
-
-- In Kubernetes 1.17-, the output is much more verbose:
-  ```
-  kubectl run --generator=deployment/apps.v1 is DEPRECATED 
-  and will be removed in a future version. Use kubectl run 
-  --generator=run-pod/v1 or kubectl create instead.
-  deployment.apps/pingpong created
-  ```
-
-- There is a deprecation warning ...
-
-- ... And a Deployment was created instead of a Pod
-
-🤔 What does that mean?
-
----
-
-## Show me all you got!
-
-- What resources were created by `kubectl run`?
-
-.exercise[
-
-- Let's ask Kubernetes to show us *all* the resources:
-  ```bash
-  kubectl get all
-  ```
-
-]
-
-Note: `kubectl get all` is a lie. It doesn't show everything.
-
-(But it shows a lot of "usual suspects", i.e. commonly used resources.)
-
----
-
-## The situation with Kubernetes 1.18+
-
-```
-NAME           READY   STATUS    RESTARTS   AGE
-pod/pingpong   1/1     Running   0          9s
-
-NAME                 TYPE        CLUSTER-IP   EXTERNAL-IP   PORT(S)   AGE
-service/kubernetes   ClusterIP   10.96.0.1    <none>        443/TCP   3h30m
-```
-
-We wanted a pod, we got a pod, named `pingpong`. Great!
-
-(We can ignore `service/kubernetes`, it was already there before.)
-
----
-
-## The situation with Kubernetes 1.17-
-
-```
-NAME                            READY   STATUS        RESTARTS   AGE
-pod/pingpong-6ccbc77f68-kmgfn   1/1     Running       0          11s
-
-NAME                 TYPE        CLUSTER-IP   EXTERNAL-IP   PORT(S)   AGE
-service/kubernetes   ClusterIP   10.96.0.1    <none>        443/TCP   3h45
-
-NAME                       READY   UP-TO-DATE   AVAILABLE   AGE
-deployment.apps/pingpong   1/1     1            1           11s
-
-NAME                                  DESIRED   CURRENT   READY   AGE
-replicaset.apps/pingpong-6ccbc77f68   1         1         1       11s
-```
-
-Our pod is not named `pingpong`, but `pingpong-xxxxxxxxxxx-yyyyy`.
-
-We have a Deployment named `pingpong`, and an extra Replica Set, too. What's going on?
-
----
-
-## From Deployment to Pod
-
-We have the following resources:
-
-- `deployment.apps/pingpong`
-
-  This is the Deployment that we just created.
-
-- `replicaset.apps/pingpong-xxxxxxxxxx`
-
-  This is a Replica Set created by this Deployment.
-
-- `pod/pingpong-xxxxxxxxxx-yyyyy`
-
-  This is a *pod* created by the Replica Set.
-
-Let's explain what these things are.
-
----
-
-## Pod
-
-- Can have one or multiple containers
-
-- Runs on a single node
-
-  (Pod cannot "straddle" multiple nodes)
-
-- Pods cannot be moved
-
-  (e.g. in case of node outage)
-
-- Pods cannot be scaled
-
-  (except by manually creating more Pods)
-
----
-
-class: extra-details
-
-## Pod details
-
-- A Pod is not a process; it's an environment for containers
-
-  - it cannot be "restarted"
-
-  - it cannot "crash"
-
-- The containers in a Pod can crash
-
-- They may or may not get restarted
-
-  (depending on Pod's restart policy)
-
-- If all containers exit successfully, the Pod ends in "Succeeded" phase
-
-- If some containers fail and don't get restarted, the Pod ends in "Failed" phase
-
----
-
-## Replica Set
-
-- Set of identical (replicated) Pods
-
-- Defined by a pod template + number of desired replicas
-
-- If there are not enough Pods, the Replica Set creates more
-
-  (e.g. in case of node outage; or simply when scaling up)
-
-- If there are too many Pods, the Replica Set deletes some
-
-  (e.g. if a node was disconnected and comes back; or when scaling down)
-
-- We can scale up/down a Replica Set
-
-  - we update the manifest of the Replica Set
-
-  - as a consequence, the Replica Set controller creates/deletes Pods
-
----
-
-## Deployment
-
-- Replica Sets control *identical* Pods
-
-- Deployments are used to roll out different Pods
-
-  (different image, command, environment variables, ...)
-
-- When we update a Deployment with a new Pod definition:
-
-  - a new Replica Set is created with the new Pod definition
-
-  - that new Replica Set is progressively scaled up
-
-  - meanwhile, the old Replica Set(s) is(are) scaled down
-
-- This is a *rolling update*, minimizing application downtime
-
-- When we scale up/down a Deployment, it scales up/down its Replica Set
-
----
-
-## `kubectl run` through the ages
-
-- When we want to run an app on Kubernetes, we *generally* want a Deployment
-
-- Up to Kubernetes 1.17, `kubectl run` created a Deployment
-
-  - it could also create other things, by using special flags
-
-  - this was powerful, but potentially confusing
-
-  - creating a single Pod was done with `kubectl run --restart=Never`
-
-  - other resources could also be created with `kubectl create ...`
-
-- From Kubernetes 1.18, `kubectl run` creates a Pod
-
-  - other kinds of resources can still be created with `kubectl create`
-
----
-
-## Creating a Deployment the proper way
-
-- Let's destroy that `pingpong` app that we created
-
-- Then we will use `kubectl create deployment` to re-create it
-
-.exercise[
-
-- On Kubernetes 1.18+, delete the Pod named `pingpong`:
-  ```bash
-  kubectl delete pod pingpong
-  ```
-
-- On Kubernetes 1.17-, delete the Deployment named `pingpong`:
-  ```bash
-  kubectl delete deployment pingpong
-  ```
-
-]
-
----
-
-## Running `ping` in a Deployment
-
-<!-- ##VERSION## -->
-
-- When using `kubectl create deployment`, we cannot indicate the command to execute
-
-  (at least, not in Kubernetes 1.18)
-
-- We can:
-
-  - write a custom YAML manifest for our Deployment
-
---
-
-  - (yeah right ... too soon!)
-
---
-
-  - use an image that has the command to execute baked in
-
-  - (much easier!)
-
---
-
-- We will use the image `jpetazzo/ping`
-
-  (it has a default command of `ping 127.0.0.1`)
-
----
-
-## Creating a Deployment running `ping`
-
-- Let's create a Deployment named `pingpong`
-
-- It will use the image `jpetazzo/ping`
-
-.exercise[
-
-- Create the Deployment:
-  ```bash
-  kubectl create deployment pingpong --image=jpetazzo/ping
-  ```
-
-- Check the resources that were created:
-  ```bash
-  kubectl get all
-  ```
-
-<!-- ```hide kubectl wait pod --selector=run=pingpong --for condition=ready ``` -->
-
-]
-
----
-
-## Viewing container output
-
-- Let's use the `kubectl logs` command
-
-- We will pass either a *pod name*, or a *type/name*
-
-  (E.g. if we specify a deployment or replica set, it will get the first pod in it)
-
-- Unless specified otherwise, it will only show logs of the first container in the pod
-
-  (Good thing there's only one in ours!)
-
-.exercise[
-
-- View the result of our `ping` command:
-  ```bash
-  kubectl logs deploy/pingpong
-  ```
-
-]
-
----
-
-## Streaming logs in real time
-
-- Just like `docker logs`, `kubectl logs` supports convenient options:
-
-  - `-f`/`--follow` to stream logs in real time (à la `tail -f`)
-
-  - `--tail` to indicate how many lines you want to see (from the end)
-
-  - `--since` to get logs only after a given timestamp
-
-.exercise[
-
-- View the latest logs of our `ping` command:
-  ```bash
-  kubectl logs deploy/pingpong --tail 1 --follow
-  ```
-
-- Stop it with Ctrl-C
-
-<!--
-```wait seq=3```
-```keys ^C```
--->
-
-]
-
----
-
-## Scaling our application
-
-- We can create additional copies of our container (I mean, our pod) with `kubectl scale`
-
-.exercise[
-
-- Scale our `pingpong` deployment:
-  ```bash
-  kubectl scale deploy/pingpong --replicas 3
-  ```
-
-- Note that this command does exactly the same thing:
-  ```bash
-  kubectl scale deployment pingpong --replicas 3
-  ```
-
-- Check that we now have multiple pods:
-  ```bash
-  kubectl get pods
-  ```
-
-]
-
----
-
-class: extra-details
-
-## Scaling a Replica Set
-
-- What if we scale the Replica Set instead of the Deployment?
-
-- The Deployment would notice it right away and scale back to the initial level
-
-- The Replica Set makes sure that we have the right numbers of Pods
-
-- The Deployment makes sure that the Replica Set has the right size
-
-  (conceptually, it delegates the management of the Pods to the Replica Set)
-
-- This might seem weird (why this extra layer?) but will soon make sense
-
-  (when we will look at how rolling updates work!)
-
----
-
-## Streaming logs of multiple pods
-
-- What happens if we try `kubectl logs` now that we have multiple pods?
-
-.exercise[
-
-  ```bash
-  kubectl logs deploy/pingpong --tail 3
-  ```
-
-]
-
-`kubectl logs` will warn us that multiple pods were found.
-
-It is showing us only one of them.
-
-We'll see later how to address that shortcoming.
-
----
-
-## Resilience
-
-- The *deployment* `pingpong` watches its *replica set*
-
-- The *replica set* ensures that the right number of *pods* are running
-
-- What happens if pods disappear?
-
-.exercise[
-
-- In a separate window, watch the list of pods:
-  ```bash
-  watch kubectl get pods
-  ```
-
-<!--
-```wait Every 2.0s```
-```tmux split-pane -v```
--->
-
-- Destroy the pod currently shown by `kubectl logs`:
-  ```
-  kubectl delete pod pingpong-xxxxxxxxxx-yyyyy
-  ```
-
-<!--
-```tmux select-pane -t 0```
-```copy pingpong-[^-]*-.....```
-```tmux last-pane```
-```keys kubectl delete pod ```
-```paste```
-```key ^J```
-```check```
-```key ^D```
-```tmux select-pane -t 1```
-```key ^C```
-```key ^D```
--->
-
-]
-
----
-
-## What happened?
-
-- `kubectl delete pod` terminates the pod gracefully
-
-  (sending it the TERM signal and waiting for it to shutdown)
-
-- As soon as the pod is in "Terminating" state, the Replica Set replaces it
-
-- But we can still see the output of the "Terminating" pod in `kubectl logs`
-
-- Until 30 seconds later, when the grace period expires
-
-- The pod is then killed, and `kubectl logs` exits
-
-???
-
-:EN:- Running pods and deployments
-:FR:- Créer un pod et un déploiement