Merge branch 'master' into k8s2d

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.
+<br/>
+(Each server sends us a redirect page. Look at the URL that they send us to!)
 
 ---
 

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/).)
 
 --
 
@@ -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/)
 

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
 
 
@@ -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)
 
 --