github/container.training
1
0
Fork 0
mirror of https://github.com/jpetazzo/container.training.git synced 2026-09-06 03:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
815 Commits 176 Branches 28 Tags
253aaaad97ec393151b9130bee9a26d796bb1cfc
Commit Graph
200 Commits
Author SHA1 Message Date
Jérôme Petazzoni 253aaaad97 Merge pull request #169 from jpetazzo/what-is-cni 
Add slide about CNI
 2018-04-08 14:32:17 -07:00
Bridget Kromhout e038797875 Update concepts-k8s.md 
A few suggested clarifications to your (excellent) clarifications
 2018-04-08 15:16:42 -05:00
Jerome Petazzoni 01d062a68f Add slide about CNI 2018-04-08 10:31:17 -05:00
Jerome Petazzoni a66dfb5faf Clarify control plane 
Explain better that the control plane can run outside
of the cluster, and that the word master can be
confusing (does it designate the control plane, or
the node running the control plane? What if there is
no node running the control plane, because the control
plane is external?)
 2018-04-08 09:57:51 -05:00
Bridget Kromhout 2d397c5cb8 Adding more k8s 101 dates 2018-03-29 09:39:20 -07:00
Jérôme Petazzoni 08004caa5d Merge pull request #163 from BretFisher/bret-dates-2018q2 
adding more dates
 2018-03-28 10:26:07 -07:00
Frank Farmer 522358a004 Small typo 2018-03-28 12:23:47 -05:00
Bret Fisher 6be424bde5 adding more dates 2018-03-28 03:27:18 -04:00
Bridget Kromhout 6af9385c5f Merge pull request #155 from bridgetkromhout/update-index 
Updating index
 2018-03-27 11:08:14 -05:00
Bridget Kromhout 29398ac33b Updating index 2018-03-27 09:06:03 -07:00
Jérôme Petazzoni 7525739b24 Merge pull request #151 from sadiqkhoja/patch-1 
corrected number of containers
 2018-03-27 05:50:50 -07:00
Bridget Kromhout 70a9215c9d Updating versions 2018-03-27 03:02:17 -07:00
Sadiq Khoja 9c1a5d9a7d corrected number of containers 2018-03-17 14:39:05 +05:00
Jone Marius Vignes e5502c724e Fix: Kubicorn URL 
Kubicorn has moved permanently to https://github.com/kubicorn/kubicorn
 2018-03-14 14:50:56 +01:00
Bridget Kromhout b4c1498ca1 Clarifying instructions 2018-03-13 20:55:11 +01:00
Bridget Kromhout 88d534a7f2 Clarifying how to find the port needed. 2018-03-13 20:36:19 +01:00
Bridget Kromhout 1b9ba62dc8 Versions updated 2018-03-13 19:27:42 +01:00
Jérôme Petazzoni 2807de2123 Merge pull request #144 from wlonkly/patch-2 
Remove duplicate line
 2018-03-10 14:55:39 -08:00
Rich Lafferty 815aaefad9 Remove duplicate line 2018-03-10 15:43:40 -05:00
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