✨ Minor improvements

slides/k8s/architecture.md

@@ -20,25 +20,67 @@ The control plane can run:
 
 - in containers, on the same nodes that run other application workloads
 
-  (example: [Minikube](https://github.com/kubernetes/minikube); 1 node runs everything, [kind](https://kind.sigs.k8s.io/))
+  (default behavior for local clusters like [Minikube](https://github.com/kubernetes/minikube), [kind](https://kind.sigs.k8s.io/)...)
 
 - on a dedicated node
 
-  (example: a cluster installed with kubeadm)
+  (default behavior when deploying with kubeadm)
 
 - on a dedicated set of nodes
 
-  (example: [Kubernetes The Hard Way](https://github.com/kelseyhightower/kubernetes-the-hard-way); [kops](https://github.com/kubernetes/kops))
+  ([Kubernetes The Hard Way](https://github.com/kelseyhightower/kubernetes-the-hard-way); [kops](https://github.com/kubernetes/kops); also kubeadm)
 
 - outside of the cluster
 
-  (example: most managed clusters like AKS, EKS, GKE)
+  (most managed clusters like AKS, DOK, EKS, GKE, Kapsule, LKE, OKE...)
 
 ---
 
 class: pic
 
-![Kubernetes architecture diagram: control plane and nodes](images/k8s-arch2.png)
+![](images/control-planes/single-node-dev.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/managed-kubernetes.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/single-control-and-workers.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/stacked-control-plane.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/non-dedicated-stacked-nodes.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/advanced-control-plane.svg)
+
+---
+
+class: pic
+
+![](images/control-planes/advanced-control-plane-split-events.svg)
+
+---
+
+class: pic
+
+![Kubernetes architecture diagram: communication between components](images/k8s-arch4-thanks-luxas.png)
 
 ---
 
@@ -115,12 +157,6 @@ The kubelet agent uses a number of special-purpose protocols and interfaces, inc
 
 ---
 
-class: pic
-
-![Kubernetes architecture diagram: communication between components](images/k8s-arch4-thanks-luxas.png)
-
----
-
 # The Kubernetes API
 
 [

slides/k8s/multinode.md

@@ -179,14 +179,14 @@ class: extra-details
 
 .exercise[
 
-- Create a Deployment running NGINX:
+- Create a Deployment running `jpetazzo/color`:
   ```bash
-  kubectl create deployment web --image=nginx
+  kubectl create deployment blue --image=jpetazzo/color
   ```
 
 - Scale it:
   ```bash
-  kubectl scale deployment web --replicas=5
+  kubectl scale deployment blue --replicas=5
   ```
 
 ]
@@ -197,7 +197,7 @@ class: extra-details
 
 - The pods will be scheduled on the nodes
 
-- The nodes will pull the `nginx` image, and start the pods
+- The nodes will pull the `jpetazzo/color` image, and start the pods
 
 - What are the IP addresses of our pods?
 
@@ -403,7 +403,7 @@ class: extra-details
 
 - Expose our Deployment:
   ```bash
-  kubectl expose deployment web --port=80
+  kubectl expose deployment blue --port=80
   ```
 
 ]
@@ -416,7 +416,7 @@ class: extra-details
 
 - Retrieve the ClusterIP address:
   ```bash
-  kubectl get svc web
+  kubectl get svc blue
   ```
 
 - Send a few requests to the ClusterIP address (with `curl`)