From 7ea740f6474ec5f8ee4efadaf2cfdb53bee2fb8b Mon Sep 17 00:00:00 2001 From: Rich Lafferty Date: Sat, 10 Mar 2018 15:09:32 -0500 Subject: [PATCH 1/6] Fix typo: compiler -> container --- slides/intro/Copying_Files_During_Build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/intro/Copying_Files_During_Build.md b/slides/intro/Copying_Files_During_Build.md index 6348cdc1..4bf5ffe8 100644 --- a/slides/intro/Copying_Files_During_Build.md +++ b/slides/intro/Copying_Files_During_Build.md @@ -93,7 +93,7 @@ Success! * Older Dockerfiles also have the `ADD` instruction.
It is similar but can automatically extract archives. -* If we really wanted to compile C code in a compiler, we would: +* If we really wanted to compile C code in a container, we would: * Place it in a different directory, with the `WORKDIR` instruction. From 815aaefad92ef5600596e98f0f91a9d3f6297026 Mon Sep 17 00:00:00 2001 From: Rich Lafferty Date: Sat, 10 Mar 2018 15:43:40 -0500 Subject: [PATCH 2/6] Remove duplicate line --- slides/intro/Advanced_Dockerfiles.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/slides/intro/Advanced_Dockerfiles.md b/slides/intro/Advanced_Dockerfiles.md index ca9c8ccb..85d917a8 100644 --- a/slides/intro/Advanced_Dockerfiles.md +++ b/slides/intro/Advanced_Dockerfiles.md @@ -94,8 +94,6 @@ RUN apt-get update && apt-get install -y wget && apt-get clean It is also possible to break a command onto multiple lines: -It is possible to execute multiple commands in a single step: - ```dockerfile RUN apt-get update \ && apt-get install -y wget \ From 1fe56cf4011339542ab65e5af33655a22e2ed636 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 12 Mar 2018 21:41:47 +0100 Subject: [PATCH 3/6] Increasing timeout for slow mirrors --- prepare-vms/lib/commands.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-vms/lib/commands.sh b/prepare-vms/lib/commands.sh index 6e7a6f68..3d5754d3 100644 --- a/prepare-vms/lib/commands.sh +++ b/prepare-vms/lib/commands.sh @@ -132,7 +132,7 @@ _cmd_kube() { sudo apt-key add - && echo deb http://apt.kubernetes.io/ kubernetes-xenial main | sudo tee /etc/apt/sources.list.d/kubernetes.list" - pssh " + pssh --timeout 200 " sudo apt-get update -q && sudo apt-get install -qy kubelet kubeadm kubectl kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl" From 1b9ba62dc878d162f07f753cda74df6a8da06554 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 13 Mar 2018 19:27:42 +0100 Subject: [PATCH 4/6] Versions updated --- slides/kube/versions-k8s.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/kube/versions-k8s.md b/slides/kube/versions-k8s.md index 4c49de8b..b6b6face 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,7 +1,7 @@ ## Versions installed -- Kubernetes 1.9.3 -- Docker Engine 18.02.0-ce +- Kubernetes 1.9.4 +- Docker Engine 18.03.0-ce-rc3 - Docker Compose 1.18.0 From 88d534a7f2d3006ce929deae7620b5ceb8e883b4 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 13 Mar 2018 20:36:19 +0100 Subject: [PATCH 5/6] Clarifying how to find the port needed. --- slides/kube/dashboard.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/slides/kube/dashboard.md b/slides/kube/dashboard.md index 2d527126..c4c9e71a 100644 --- a/slides/kube/dashboard.md +++ b/slides/kube/dashboard.md @@ -87,6 +87,17 @@ The goo.gl URL expands to: ## Connecting to the dashboard +.exercise[ + +- Check which port the dashboard is on: + ```bash + kubectl -n kube-system get svc socat + ``` + +] + +You'll want the `3xxxx` port. + .exercise[ From b4c1498ca1428eacf4f85be3359f544e1b552aa5 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 13 Mar 2018 20:55:11 +0100 Subject: [PATCH 6/6] Clarifying instructions --- slides/kube/dashboard.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/slides/kube/dashboard.md b/slides/kube/dashboard.md index c4c9e71a..bdfa2b18 100644 --- a/slides/kube/dashboard.md +++ b/slides/kube/dashboard.md @@ -175,7 +175,7 @@ The dashboard will then ask you which authentication you want to use. ## Editing the `kubernetes-dashboard` service -- If we look at the YAML that we loaded just before, we'll get a hint +- If we look at the [YAML](https://goo.gl/Qamqab) that we loaded before, we'll get a hint -- @@ -194,6 +194,8 @@ The dashboard will then ask you which authentication you want to use. - Check the port that was assigned with `kubectl -n kube-system get services` +- Connect to https://oneofournodes:3xxxx/ (yes, https) + ] ---