From 9c1a5d9a7d9c482e4a919634e372c3dc77b06454 Mon Sep 17 00:00:00 2001 From: Sadiq Khoja Date: Sat, 17 Mar 2018 14:39:05 +0500 Subject: [PATCH 1/3] corrected number of containers --- slides/intro/Container_Networking_Basics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/intro/Container_Networking_Basics.md b/slides/intro/Container_Networking_Basics.md index b0e612f1..9cd7fed3 100644 --- a/slides/intro/Container_Networking_Basics.md +++ b/slides/intro/Container_Networking_Basics.md @@ -128,7 +128,7 @@ $ docker run -d -p 8000:80 nginx $ docker run -d -p 8080:80 -p 8888:80 nginx ``` -* We are running two NGINX web servers. +* We are running three NGINX web servers. * The first one is exposed on port 80. * The second one is exposed on port 8000. * The third one is exposed on ports 8080 and 8888. From 29398ac33bc17630d44d9cd2cf1efe93e3926bba Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 27 Mar 2018 09:06:03 -0700 Subject: [PATCH 2/3] Updating index --- slides/index.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/slides/index.html b/slides/index.html index e6692aa9..99c982d4 100644 --- a/slides/index.html +++ b/slides/index.html @@ -66,19 +66,14 @@ Coming soon near you - - March 14, 2018: Boosterconf — Kubernetes 101 - - - March 27, 2018: SREcon Americas — Kubernetes 101 -   + @@ -96,6 +91,10 @@ thing for now (stay tuned...) Past workshops + + Boosterconf: Kubernetes 101 + + IndexConf: Kubernetes 101 From febeed00fb345c97469034db742744b2afdc232e Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 27 Mar 2018 09:54:14 -0700 Subject: [PATCH 3/3] Version 1.10 is out --- slides/kube/versions-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/kube/versions-k8s.md b/slides/kube/versions-k8s.md index 2938c5fa..45c4668b 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.9.6 (but 1.10 is about to come out!) +- Kubernetes 1.9.6 ([1.10 just came out](http://blog.kubernetes.io/2018/03/kubernetes-1.10-stabilizing-storage-security-networking.html)!) - Docker Engine 18.03.0-ce - Docker Compose 1.18.0