627 Commits

Author	SHA1	Message	Date
Jerome Petazzoni	5f0380af79	fix-redirects.sh: adding forced redirect	2020-04-07 16:49:31 -05:00
Jerome Petazzoni	c825b97058	update final words	2018-09-30 20:38:57 -05:00
Jerome Petazzoni	7af11d3120	update final words	2018-09-30 20:38:16 -05:00
Jerome Petazzoni	454e8b8f23	Merge branch 'master' into k8s2d	2018-09-30 19:15:29 -05:00
Bridget Kromhout	86e35480a4	Wording edits	2018-10-01 02:14:50 +02:00
Jerome Petazzoni	d1609845a9	Merge branch 'kube-ps1' into k8s2d	2018-09-30 17:43:48 -05:00
Jerome Petazzoni	1020a8ff86	kube-ps1 is cool and we should mention it	2018-09-30 17:43:18 -05:00
Jerome Petazzoni	ec3476173a	Merge branch 'master' into k8s2d	2018-09-30 17:31:27 -05:00
Bridget Kromhout	20b1079a22	Update whatsnext.md ... typo fix	2018-09-30 16:48:29 -04:00
Jerome Petazzoni	4c1169c785	add wifi info	2018-09-30 15:03:18 +02:00
Jerome Petazzoni	8b9ee3ecbb	Merge branch 'cleanup-after-netpol' into k8s2d	2018-09-29 20:40:31 -05:00
Jerome Petazzoni	e4251cfa8f	Clean up network policies ... We should tell people to clean up network policies at the end of the chapter, otherwise further exercises will fail.	2018-09-29 20:39:32 -05:00
Jerome Petazzoni	b6dd55b21c	Use loop4 instead of loop0	2018-09-29 20:16:35 -05:00
Jerome Petazzoni	53d1a68765	Adapt autopilot for new deployment scripts	2018-09-29 20:15:38 -05:00
Jerome Petazzoni	724753b8b9	For this workshop, deploy portworx to 4 nodes, using loop4	2018-09-29 18:56:05 -05:00
Jerome Petazzoni	5c4267afda	Merge branch 'enixlogo' into k8s2d	2018-09-29 18:54:15 -05:00
Jerome Petazzoni	f01bc2a7a9	Fix overlapsing slide number and pics	2018-09-29 18:54:00 -05:00
Jerome Petazzoni	8f89953d25	Fix typo in logistics	2018-09-29 18:53:33 -05:00
Jerome Petazzoni	e3b71d35a6	Merge branch 'master' into k8s2d	2018-09-29 10:06:37 -05:00
Bret Fisher	35614714c8	added portainer setup and gui options	2018-09-29 16:54:42 +02:00
Bret Fisher	100c6b46cf	oops, updated slide versions	2018-09-29 16:53:59 +02:00
Bridget Kromhout	4a655db1ba	Merge pull request #362 from jpetazzo/kubectl-run-deprecation ... Add explanation about the kubectl run deprecation warning	2018-09-28 21:34:11 -05:00
Bridget Kromhout	0a942118c1	Update kubectlrun.md ... slight wording change	2018-09-28 21:32:23 -05:00
Jerome Petazzoni	2f1ad67fb3	Add explanation about the kubectl run deprecation warning	2018-09-28 20:54:11 -05:00
Jerome Petazzoni	4b0ac6d0e3	Add a couple of slides about kubens and kubectx	2018-09-28 19:49:08 -05:00
Jerome Petazzoni	a32d4132f9	Merge branch 'master' into k8s2d	2018-09-28 19:36:01 -05:00
Jerome Petazzoni	ac273da46c	Merge branch 'master' of github.com:jpetazzo/container.training	2018-09-28 19:35:41 -05:00
Jerome Petazzoni	7a6594c96d	Update container.training index	2018-09-28 19:35:35 -05:00
Jerome Petazzoni	3e1fac323c	Timing and location of breaks	2018-09-28 19:29:23 -05:00
Bret Fisher	657b7465c6	updating bridge network diags	2018-09-29 02:18:03 +02:00
Bret Fisher	08059a845f	remove compose teaser	2018-09-29 02:16:52 +02:00
Jerome Petazzoni	5bb8c2a6c2	Merge branch 'master' into k8s2d	2018-09-28 19:14:17 -05:00
Jerome Petazzoni	24e2042c9d	Explain why revocation is important	2018-09-28 19:14:07 -05:00
Jerome Petazzoni	739c20fa4c	Merge branch 'master' into k8s2d	2018-09-28 19:05:12 -05:00
Jerome Petazzoni	9771f054ea	Add slide about lack of cert revocation	2018-09-28 19:04:57 -05:00
Jerome Petazzoni	3200de3bea	Merge branch 'master' into k8s2d	2018-09-28 18:49:13 -05:00
Jerome Petazzoni	bde5db49a7	Bump a few more k8s version numbers from 1.11 to 1.12	2018-09-28 18:48:52 -05:00
Jerome Petazzoni	4e0ec722bc	Merge branch 'master' into k8s2d	2018-09-28 18:36:42 -05:00
Jerome Petazzoni	fadecd52ee	Replace registry:2 with registry ... registry used to be registry v1, but now it defaults to v2. We can therefore drop the tag.	2018-09-28 18:36:29 -05:00
Jerome Petazzoni	10e6891dca	Merge branch 'master' into k8s2d	2018-09-28 18:31:50 -05:00
Jerome Petazzoni	524d6e4fc1	Minor updates to load balancing example	2018-09-28 18:31:39 -05:00
Bridget Kromhout	51f5f5393c	Merge pull request #356 from bridgetkromhout/link-update ... Updating links	2018-09-28 16:49:41 -05:00
Bridget Kromhout	f574afa9d2	Updating links	2018-09-28 16:46:10 -05:00
Bridget Kromhout	4f49015a6e	Link to experimental multi-master	2018-09-28 23:42:55 +02:00
Bridget Kromhout	78259c3eb6	Clarifying version	2018-09-28 16:28:20 -05:00
Bridget Kromhout	adc922e4cd	Updating versions	2018-09-28 16:25:38 -05:00
Jerome Petazzoni	a9e99e3bae	merge master	2018-09-28 16:19:23 -05:00
Bridget Kromhout	f68194227c	Update whatsnext.md ... Typo fix, and clarity since it's not always being delivered by only one person.	2018-09-28 23:16:24 +02:00
Jerome Petazzoni	29a3ce0ba2	Update last chapter (what's next)	2018-09-28 23:16:24 +02:00
Jerome Petazzoni	ee9b775f01	Merge branch 'enixlogo' into k8s2d	2018-09-28 16:14:32 -05:00