Rich Lafferty
7ea740f647
Fix typo: compiler -> container
2018-03-10 15:09:32 -05:00
Jerome Petazzoni
cc4d1fd1c7
Slight rewording
2018-03-07 15:47:38 -08:00
Jerome Petazzoni
17ec6441a0
Merge branch 'attribute-authorship' of git://github.com/bridgetkromhout/container.training into bridgetkromhout-attribute-authorship
2018-03-07 15:42:49 -08:00
Jerome Petazzoni
a1b107cecb
Add Paris sessions
2018-03-07 15:39:23 -08:00
Aleksey Tsalolikhin
af0a239bd9
Fix tiny typo (missing "o" in "outbound"
2018-03-06 09:22:42 -08:00
Jerome Petazzoni
aca51901a1
Tag images properly
...
This tags the first build with v0.1, allowing for a smoother, more
logical rollback. Also adds a slide explaining why to stay away
from latest. @kelseyhightower would be proud :-)
2018-03-05 16:13:30 -08:00
Bridget Kromhout
7f72ee1296
Credit to multiple contributors
2018-03-05 15:53:42 -06:00
Jérôme Petazzoni
1981ac0b93
Merge pull request #135 from bridgetkromhout/bridget-specific
...
Adding Bridget-specific files
2018-03-05 13:36:06 -08:00
Jérôme Petazzoni
a8f2fb4586
Merge pull request #134 from bridgetkromhout/dedup-thanks
...
De-dup thanks; add comma
2018-03-05 13:35:45 -08:00
Bridget Kromhout
b64b16dd67
Adding Bridget-specific files
2018-03-05 14:54:28 -06:00
Bridget Kromhout
8c2c9bc5df
De-dup thanks; add comma
2018-03-05 14:51:26 -06:00
Bridget Kromhout
3a21cbc72b
Makes more sense for "in person" chat
2018-03-05 14:37:10 -06:00
Bridget Kromhout
5438fca35a
Attribute authorship
2018-03-05 14:34:41 -06:00
Aleksey Tsalolikhin
c25f7a119b
Fix very small typo -- remove extra "v" in "code"
2018-03-04 19:58:27 -08:00
Aleksey Tsalolikhin
1958c85a96
Fix noun plural tense (change "instructions" -> "instruction")
...
"An" means one. So "an instruction" rather than "an instructions". (Small grammar fix.)
2018-03-04 19:56:03 -08:00
Jerome Petazzoni
34e9cc1944
Don't assume 5 nodes
2018-03-01 14:55:02 -06:00
Jerome Petazzoni
2a7498e30e
A bit of rewording, and a couple of links about dashboard security
2018-03-01 14:51:00 -06:00
Jerome Petazzoni
4689d09e1f
One typo and two minor tweaks
2018-03-01 14:18:48 -06:00
Jerome Petazzoni
22dfbab09b
Minor formatting
2018-02-28 13:41:22 -06:00
Jérôme Petazzoni
37f595c480
Merge pull request #120 from bridgetkromhout/clarify-kube-public
...
Clarify kube-public; define kube-system
2018-02-27 17:42:11 -06:00
Bridget Kromhout
1fc951037d
Slight clarification per request
2018-02-27 17:39:52 -06:00
Jérôme Petazzoni
affd46dd88
Merge pull request #121 from bridgetkromhout/obviate-https
...
Remove need for https in the workshop dashboard
2018-02-27 17:34:27 -06:00
Bridget Kromhout
cfaff3df04
Remove need for https in the workshop dashboard
2018-02-27 17:31:14 -06:00
Jérôme Petazzoni
ce2451971d
Merge pull request #118 from bridgetkromhout/twice-the-steps
...
Proper attribution
2018-02-27 16:57:52 -06:00
Bridget Kromhout
f61d61223d
Clarify kube-public; define kube-system
2018-02-27 16:31:36 -06:00
Bridget Kromhout
6b6eb50f9a
Naming things is hard; considering scope here
2018-02-27 15:26:43 -06:00
Jerome Petazzoni
89ab66335f
... and trim down kube half-day
2018-02-27 14:49:39 -06:00
Jerome Petazzoni
5bc4e95515
Clarify service discovery
2018-02-27 14:45:08 -06:00
Jerome Petazzoni
893f05e401
Move docker-compose logs to the composescale.md chapter
2018-02-27 14:38:41 -06:00
Bridget Kromhout
4abc8ce34c
Proper attribution
2018-02-27 14:38:32 -06:00
Jérôme Petazzoni
34d2c610bf
Merge pull request #117 from bridgetkromhout/self-deprecating-humor
...
Attributing humor so it doesn't sound negative
2018-02-27 14:06:58 -06:00
Jerome Petazzoni
1492a8a0bc
Rephrase daemon set intro to fit even without the entropy spiel
2018-02-27 13:53:34 -06:00
Bridget Kromhout
388d616048
Attributing humor so it doesn't sound negative
2018-02-27 13:46:19 -06:00
Jerome Petazzoni
28589f5a83
Remove cluster-size specific reference
2018-02-27 13:40:52 -06:00
Jerome Petazzoni
e7a80f7bfb
Merge branch 'master' of github.com:jpetazzo/container.training
2018-02-27 13:39:55 -06:00
Jerome Petazzoni
ea47e0ac05
Add link to brigade
2018-02-27 13:39:50 -06:00
Jérôme Petazzoni
09d204038f
Merge pull request #116 from bridgetkromhout/versions-installed
...
Clarify that these are the installed versions
2018-02-27 13:36:40 -06:00
Jérôme Petazzoni
47cb0afac2
Merge pull request #115 from bridgetkromhout/any-cloud
...
More cloud-provider generic
2018-02-27 13:36:10 -06:00
Jerome Petazzoni
8e2e7f44d3
Break out 'scale things on a single node' section
2018-02-27 13:35:03 -06:00
Bridget Kromhout
8c7702deda
Clarify that these are the installed versions
...
* "Brand new" is a moving target
2018-02-27 13:29:40 -06:00
Bridget Kromhout
bdc1ca01cd
More cloud-provider generic
2018-02-27 13:27:11 -06:00
Jerome Petazzoni
dca58d6663
Merge Lucas awesome diagram
2018-02-27 12:22:02 -06:00
Jerome Petazzoni
a0cf4b97c0
Add Lucas' amazing diagram
2018-02-27 12:17:10 -06:00
Jerome Petazzoni
a1c239260f
Add Lucas' amazing diagram
2018-02-27 12:17:02 -06:00
Jerome Petazzoni
a8a2cf54a5
Factor out links in separate files
2018-02-27 12:01:53 -06:00
Jerome Petazzoni
d5ba80da55
Replace 'five VMs' with 'a cluster of VMs'
2018-02-27 11:53:01 -06:00
Jerome Petazzoni
3f2da04763
CSS is hard but it's not an excuse
2018-02-27 09:44:32 -06:00
Jerome Petazzoni
e092f50645
Branch out intro/intro.md into per-workshop variants
2018-02-27 09:40:54 -06:00
Bridget Kromhout
7fe04b9944
Adding upcoming events
2018-02-27 09:26:03 -06:00
Jerome Petazzoni
2671714df3
Move indexconf2018 to past workshops section
2018-02-27 09:11:09 -06:00