From f79193681da03c53bcc566476fb2e724fed32169 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 11 Jun 2018 08:53:53 -0700 Subject: [PATCH 1/6] Adding Velocity SJ 2018 --- slides/index.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/slides/index.yaml b/slides/index.yaml index 1dcde4ad..51755b2d 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -4,6 +4,7 @@ event: Velocity title: Kubernetes 101 speaker: bridgetkromhout + slides: https://velocitysj2018.container.training attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66286 - date: 2018-06-27 From be3c78bf545a7e344637341076a6ae3b93cc9475 Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Mon, 11 Jun 2018 09:40:30 -0700 Subject: [PATCH 2/6] Reordering --- slides/index.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/slides/index.yaml b/slides/index.yaml index 51755b2d..2d65d2aa 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -1,19 +1,10 @@ -- date: 2018-06-12 - city: San Jose, CA +- date: 2018-10-01 + city: New York, NY country: us event: Velocity title: Kubernetes 101 speaker: bridgetkromhout - slides: https://velocitysj2018.container.training - attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66286 - -- date: 2018-06-27 - city: Amsterdam - country: nl - event: devopsdays - title: Kubernetes 101 - speaker: bridgetkromhout - attend: https://www.devopsdays.org/events/2018-amsterdam/registration/ + attend: https://conferences.oreilly.com/velocity/vl-ny/public/schedule/detail/70102 - date: 2018-07-17 city: Portland, OR @@ -23,13 +14,22 @@ speaker: bridgetkromhout attend: https://conferences.oreilly.com/oscon/oscon-or/public/schedule/detail/66287 -- date: 2018-10-01 - city: New York, NY +- date: 2018-06-27 + city: Amsterdam + country: nl + event: devopsdays + title: Kubernetes 101 + speaker: bridgetkromhout + attend: https://www.devopsdays.org/events/2018-amsterdam/registration/ + +- date: 2018-06-12 + city: San Jose, CA country: us event: Velocity title: Kubernetes 101 speaker: bridgetkromhout - attend: https://conferences.oreilly.com/velocity/vl-ny/public/schedule/detail/70102 + slides: https://velocitysj2018.container.training + attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66286 - date: 2018-05-17 city: Virginia Beach, FL From e9d1db56fab397e261ff5ef4c45aaa878f0c733b Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 12 Jun 2018 02:09:54 -0700 Subject: [PATCH 3/6] Adding VelNY bootcamp (#283) * Adding VelNY bootcamp * Colon not good here --- slides/index.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index 2d65d2aa..4f2bece6 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -6,6 +6,14 @@ speaker: bridgetkromhout attend: https://conferences.oreilly.com/velocity/vl-ny/public/schedule/detail/70102 +- date: 2018-09-30 + city: New York, NY + country: us + event: Velocity + title: Kubernetes Bootcamp - Deploying and Scaling Microservices + speaker: jpetazzo + attend: https://conferences.oreilly.com/velocity/vl-ny/public/schedule/detail/69875 + - date: 2018-07-17 city: Portland, OR country: us From 2d95f4177a942734c34534320849786f76df32be Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 12 Jun 2018 04:25:00 -0500 Subject: [PATCH 4/6] Remove extraneous python invocation --- 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 0c538deb..d88e7a38 100644 --- a/prepare-vms/lib/commands.sh +++ b/prepare-vms/lib/commands.sh @@ -48,7 +48,7 @@ _cmd_cards() { rm -f ips.html ips.pdf # This will generate two files in the base dir: ips.pdf and ips.html - python lib/ips-txt-to-html.py $SETTINGS + lib/ips-txt-to-html.py $SETTINGS for f in ips.html ips.pdf; do # Remove old versions of cards if they exist From 0fed34600be0df5e9bdeed4953f9751cf78f5ade Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 12 Jun 2018 08:55:53 -0700 Subject: [PATCH 5/6] Adding Erik and Brian's two-day --- slides/index.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/slides/index.yaml b/slides/index.yaml index 4f2bece6..a40ad701 100644 --- a/slides/index.yaml +++ b/slides/index.yaml @@ -39,6 +39,24 @@ slides: https://velocitysj2018.container.training attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66286 +- date: 2018-06-12 + city: San Jose, CA + country: us + event: Velocity + title: "Kubernetes two-day kickstart: Deploying and Scaling Microservices with Kubernetes" + speaker: "bketelsen, erikstmartin" + slides: http://kubernetes.academy/kube-fullday.yml.html#1 + attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66932 + +- date: 2018-06-11 + city: San Jose, CA + country: us + event: Velocity + title: "Kubernetes two-day kickstart: Introduction to Docker and Containers" + speaker: "bketelsen, erikstmartin" + slides: http://kubernetes.academy/intro-fullday.yml.html#1 + attend: https://conferences.oreilly.com/velocity/vl-ca/public/schedule/detail/66932 + - date: 2018-05-17 city: Virginia Beach, FL country: us From 690ed5595330dfef060a3a1249850e6e9a60838f Mon Sep 17 00:00:00 2001 From: Bridget Kromhout Date: Tue, 12 Jun 2018 10:12:04 -0700 Subject: [PATCH 6/6] Updating version --- 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 6d3903b6..d215336d 100644 --- a/slides/kube/versions-k8s.md +++ b/slides/kube/versions-k8s.md @@ -1,6 +1,6 @@ ## Versions installed -- Kubernetes 1.10.3 +- Kubernetes 1.10.4 - Docker Engine 18.03.1-ce - Docker Compose 1.21.1