From adc922e4cdae2ef2dc981c0490f0454823b7189a Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 28 Sep 2018 16:25:38 -0500 Subject: [PATCH 1/5] Updating versions --- slides/k8s/versions-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index 08a46684..ffcce1fc 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -1,7 +1,7 @@ ## Versions installed -- Kubernetes 1.11.0 -- Docker Engine 18.03.1-ce +- Kubernetes 1.12.0 +- Docker Engine 18.06.1-ce - Docker Compose 1.21.1 From 78259c3eb62e8202ef54984a7563bcf576ea6a3d Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 28 Sep 2018 16:28:20 -0500 Subject: [PATCH 2/5] Clarifying version --- slides/k8s/versions-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index ffcce1fc..1607f07e 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -22,7 +22,7 @@ class: extra-details ## Kubernetes and Docker compatibility -- Kubernetes 1.11.x only validates Docker Engine versions [1.11.2 to 1.13.1 and 17.03.x](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#external-dependencies) +- Kubernetes 1.12.x only validates Docker Engine versions [1.11.2 to 1.13.1 and 17.03.x](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.12.md#external-dependencies) -- From 4f49015a6e30cad166562cf28b12996119bbd228 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 28 Sep 2018 16:40:58 -0500 Subject: [PATCH 3/5] Link to experimental multi-master --- slides/k8s/setup-k8s.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index 2d0c5419..5b6b1ecc 100644 --- a/slides/k8s/setup-k8s.md +++ b/slides/k8s/setup-k8s.md @@ -34,7 +34,7 @@ -- - (At least ... not yet!) + (At least ... not yet! Though it's [experimental in 1.12](https://kubernetes.io/docs/setup/independent/high-availability/).) -- From f574afa9d21a9d4fbf8278c49023b5eb6625cd9d Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Fri, 28 Sep 2018 16:46:10 -0500 Subject: [PATCH 4/5] Updating links --- slides/k8s/setup-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/k8s/setup-k8s.md b/slides/k8s/setup-k8s.md index 2d0c5419..cd97a4a9 100644 --- a/slides/k8s/setup-k8s.md +++ b/slides/k8s/setup-k8s.md @@ -45,7 +45,7 @@ ## Other deployment options - If you are on Azure: - [AKS](https://azure.microsoft.com/services/container-service/) + [AKS](https://azure.microsoft.com/services/kubernetes-service/) - If you are on Google Cloud: [GKE](https://cloud.google.com/kubernetes-engine/) @@ -56,7 +56,7 @@ [kops](https://github.com/kubernetes/kops) - On a local machine: - [minikube](https://kubernetes.io/docs/getting-started-guides/minikube/), + [minikube](https://kubernetes.io/docs/setup/minikube/), [kubespawn](https://github.com/kinvolk/kube-spawn), [Docker4Mac](https://docs.docker.com/docker-for-mac/kubernetes/) From 524d6e4fc1d541acdf85466772ebfb98cea3b916 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Fri, 28 Sep 2018 18:31:39 -0500 Subject: [PATCH 5/5] Minor updates to load balancing example --- slides/k8s/configuration.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/slides/k8s/configuration.md b/slides/k8s/configuration.md index 39c30b04..d1e57a6a 100644 --- a/slides/k8s/configuration.md +++ b/slides/k8s/configuration.md @@ -407,20 +407,22 @@ spec: - half of the connections to Google - - the other half to Bing + - the other half to IBM .exercise[ - Access the load balancer a few times: ```bash - curl -I $IP - curl -I $IP - curl -I $IP + curl $IP + curl $IP + curl $IP ``` ] -We should see connections served by Google (look for the `Location` header) and others served by Bing (indicated by the `X-MSEdge-Ref` header). +We should see connections served by Google, and others served by IBM. +
+(Each server sends us a redirect page. Look at the URL that they send us to!) ---