Compare commits

...

16 Commits

Author SHA1 Message Date
Jerome Petazzoni
d5a680426d fix-redirects.sh: adding forced redirect 2020-04-07 16:57:24 -05:00
Jérôme Petazzoni
33431aebc5 Merge pull request #162 from frankfarmer/patch-1
Small typo
2018-03-28 10:25:15 -07:00
Frank Farmer
54a06a4807 Small typo 2018-03-27 16:14:06 -07:00
Bridget Kromhout
77244586ed Merge pull request #161 from bridgetkromhout/srecon2018
Adding TAs!
2018-03-27 13:02:52 -07:00
Bridget Kromhout
63a5cdb960 Adding TAs! 2018-03-27 12:57:11 -07:00
Bridget Kromhout
a790a619f9 Merge pull request #160 from bridgetkromhout/srecon2018
Correcting Slack name
2018-03-27 12:59:03 -05:00
Bridget Kromhout
e98dbb72a1 Correcting Slack name 2018-03-27 10:56:01 -07:00
Bridget Kromhout
cc2c422309 Merge pull request #159 from bridgetkromhout/srecon2018
Adding Slack
2018-03-27 12:50:36 -05:00
Bridget Kromhout
59a559fd9c Adding Slack 2018-03-27 10:47:44 -07:00
Bridget Kromhout
54dc640d51 Merge pull request #158 from bridgetkromhout/srecon2018
Srecon2018 update
2018-03-27 11:57:09 -05:00
Bridget Kromhout
febeed00fb Version 1.10 is out 2018-03-27 09:54:14 -07:00
Bridget Kromhout
3345f044a1 Merge branch 'master' into srecon2018 2018-03-27 09:50:33 -07:00
Bridget Kromhout
d76b4fbaac Merge pull request #154 from bridgetkromhout/srecon2018
Adding redirect file
2018-03-27 11:02:07 -05:00
Bridget Kromhout
e63e6c1d01 Adding redirect file 2018-03-27 08:58:23 -07:00
Bridget Kromhout
6878b876dd Merge pull request #153 from bridgetkromhout/srecon2018
Event-specific changes for srecon 2018
2018-03-27 05:18:48 -05:00
Bridget Kromhout
028f9b2e8c Event-specific changes for srecon 2018 2018-03-27 03:05:39 -07:00
5 changed files with 14 additions and 14 deletions

1
slides/_redirects Normal file
View File

@@ -0,0 +1 @@
/ /kube-halfday.yml.html 200!

View File

@@ -1,18 +1,17 @@
title: |
Deploying and Scaling Microservices
with Kubernetes
Kubernetes 101
#chat: "[Slack](https://dockercommunity.slack.com/messages/C7GKACWDV)"
chat: "[SREcon slack #k8s_101](https://usenix-srecon.slack.com/messages/C9XR4F5NJ/) ([get invitation](http://sreconinvite.herokuapp.com/))"
#chat: "[Gitter](https://gitter.im/jpetazzo/workshop-yyyymmdd-city)"
chat: "In person!"
#chat: "In person!"
exclude:
- self-paced
chapters:
- common/title.md
- logistics.md
- logistics-bridget.md
- kube/intro.md
- common/about-slides.md
- common/toc.md
@@ -36,4 +35,4 @@ chapters:
- kube/rollout.md
- kube/whatsnext.md
- common/thankyou.md
- kube/links.md
- kube/links-bridget.md

View File

@@ -142,7 +142,7 @@ We all knew this couldn't be that easy, right!
- We could also tell Kubernetes to ignore these errors and try anyway
- The `--force` flag actual name is `--validate=false`
- The `--force` flag's actual name is `--validate=false`
.exercise[

View File

@@ -1,6 +1,6 @@
## Versions installed
- Kubernetes 1.9.6 (but 1.10 is about to come out!)
- Kubernetes 1.9.6 ([1.10 just came out](http://blog.kubernetes.io/2018/03/kubernetes-1.10-stabilizing-storage-security-networking.html)!)
- Docker Engine 18.03.0-ce
- Docker Compose 1.18.0

View File

@@ -1,16 +1,16 @@
## Intros
- Hello! We are:
- .emoji[✨] Bridget ([@bridgetkromhout](https://twitter.com/bridgetkromhout))
- .emoji[🚂] Tanya ([@whereistanya](https://twitter.com/whereistanya))
- .emoji[🤖] Gabe ([@gabe_ochoa](https://twitter.com/gabe_ochoa))
- .emoji[🌟] Joe ([@joelaha](https://twitter.com/joelaha))
- The workshop will run from 13:30-16:45
- The workshop will run from 2:00pm-5:30pm
- There will be a break from 15:00-15:15
- There will be a break with refreshments from 3:30pm-4pm
- Feel free to interrupt for questions at any time
- Feel free to interrupt for questions at any time
- *Especially when you see full screen container pictures!*
- *Especially when you see full screen container pictures!*