From dca58d66631551ce81094ec6f77edf324e3e3be1 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 27 Feb 2018 12:22:02 -0600 Subject: [PATCH] Merge Lucas awesome diagram --- slides/kube/concepts-k8s.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/slides/kube/concepts-k8s.md b/slides/kube/concepts-k8s.md index 7d8d7f10..eea033ae 100644 --- a/slides/kube/concepts-k8s.md +++ b/slides/kube/concepts-k8s.md @@ -210,12 +210,24 @@ class: pic ![Node, pod, container](images/k8s-arch3-thanks-weave.png) -(Diagram courtesy of Weave Works, used with permission.) - --- class: pic ![One of the best Kubernetes architecture diagrams available](images/k8s-arch4-thanks-luxas.png) -(Diagram courtesy of Lucas Käldström, in [this presentation](https://speakerdeck.com/luxas/kubeadm-cluster-creation-internals-from-self-hosting-to-upgradability-and-ha).) +--- + +## Credits + +- The first diagram is courtesy of Weave Works + + - a *pod* can have multiple containers working together + + - IP addresses are associated with *pods*, not with individual containers + +- The second diagram is courtesy of Lucas Käldström, in [this presentation](https://speakerdeck.com/luxas/kubeadm-cluster-creation-internals-from-self-hosting-to-upgradability-and-ha) + + - it's one of the best Kubernetes architecture diagrams available! + +Both diagrams used with permission.