From 254cc944fedcd2ce88fd427d4cad10a570b9b1f5 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Mon, 21 Oct 2019 15:06:23 -0500 Subject: [PATCH] Update deck to fit timing etc --- slides/k8s/localkubeconfig.md | 6 +++--- slides/k8s/versions-k8s.md | 2 +- slides/kube-fullday.yml | 8 ++++---- slides/logistics.md | 24 ++++-------------------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/slides/k8s/localkubeconfig.md b/slides/k8s/localkubeconfig.md index efcae788..b380c1ab 100644 --- a/slides/k8s/localkubeconfig.md +++ b/slides/k8s/localkubeconfig.md @@ -34,11 +34,11 @@ - Download the `kubectl` binary from one of these links: - [Linux](https://storage.googleapis.com/kubernetes-release/release/v1.15.3/bin/linux/amd64/kubectl) + [Linux](https://storage.googleapis.com/kubernetes-release/release/v1.15.5/bin/linux/amd64/kubectl) | - [macOS](https://storage.googleapis.com/kubernetes-release/release/v1.15.3/bin/darwin/amd64/kubectl) + [macOS](https://storage.googleapis.com/kubernetes-release/release/v1.15.5/bin/darwin/amd64/kubectl) | - [Windows](https://storage.googleapis.com/kubernetes-release/release/v1.15.3/bin/windows/amd64/kubectl.exe) + [Windows](https://storage.googleapis.com/kubernetes-release/release/v1.15.5/bin/windows/amd64/kubectl.exe) - On Linux and macOS, make the binary executable with `chmod +x kubectl` diff --git a/slides/k8s/versions-k8s.md b/slides/k8s/versions-k8s.md index 8f28c203..7557a298 100644 --- a/slides/k8s/versions-k8s.md +++ b/slides/k8s/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.15.3 +- Kubernetes 1.15.5 - Docker Engine 19.03.1 - Docker Compose 1.24.1 diff --git a/slides/kube-fullday.yml b/slides/kube-fullday.yml index d8af50bf..151481e8 100644 --- a/slides/kube-fullday.yml +++ b/slides/kube-fullday.yml @@ -37,6 +37,7 @@ chapters: - k8s/deploymentslideshow.md - k8s/kubenet.md - k8s/kubectlexpose.md +- - k8s/shippingimages.md #- k8s/buildshiprun-selfhosted.md - k8s/buildshiprun-dockerhub.md @@ -44,16 +45,15 @@ chapters: #- k8s/kubectlproxy.md #- k8s/localkubeconfig.md #- k8s/accessinternal.md -- - - k8s/setup-k8s.md - - k8s/dashboard.md + #- k8s/setup-k8s.md + #- k8s/dashboard.md #- k8s/kubectlscale.md - k8s/scalingdockercoins.md - shared/hastyconclusions.md - k8s/daemonset.md #- k8s/dryrun.md - k8s/rollout.md - #- k8s/healthchecks.md + - k8s/healthchecks.md #- k8s/healthchecks-more.md #- k8s/record.md - diff --git a/slides/logistics.md b/slides/logistics.md index 33388a06..b70333e7 100644 --- a/slides/logistics.md +++ b/slides/logistics.md @@ -1,30 +1,14 @@ ## Intros -- This slide should be customized by the tutorial instructor(s). - - Hello! We are: - - .emoji[👩🏻‍🏫] Ann O'Nymous ([@...](https://twitter.com/...), Megacorp Inc) + - Jérôme Petazzoni ([@jpetazzo](https://twitter.com/jpetazzo), Tiny Shell Script LLC) - - .emoji[👨🏾‍🎓] Stu Dent ([@...](https://twitter.com/...), University of Wakanda) + - Polina Jastrzebska ([@jastr945](https://twitter.com/jastr945), SWCA Environmental Consultants) - - -- The workshop will run from ... - -- There will be a lunch break at ... +- There will be a lunch break at 12:30pm (And coffee breaks!)