From 60f68351c60ff61e584f686901b55912d8c83b8d Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 10 Apr 2018 04:45:41 -0500 Subject: [PATCH] Add demos by @jgarrouste --- slides/intro-fullday.yml | 1 + slides/intro/CI_Pipeline.md | 3 +++ slides/kube/whatsnext.md | 14 ++++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 slides/intro/CI_Pipeline.md diff --git a/slides/intro-fullday.yml b/slides/intro-fullday.yml index 37af57cc..f1e93ddf 100644 --- a/slides/intro-fullday.yml +++ b/slides/intro-fullday.yml @@ -41,6 +41,7 @@ chapters: - intro/Working_With_Volumes.md - intro/Compose_For_Dev_Stacks.md - intro/Docker_Machine.md + - intro/CI_Pipeline.md - intro/Advanced_Dockerfiles.md - intro/Application_Configuration.md - intro/Logging.md diff --git a/slides/intro/CI_Pipeline.md b/slides/intro/CI_Pipeline.md new file mode 100644 index 00000000..19f22804 --- /dev/null +++ b/slides/intro/CI_Pipeline.md @@ -0,0 +1,3 @@ +# Building a CI pipeline + +.center[![Demo](images/demo.jpg)] diff --git a/slides/kube/whatsnext.md b/slides/kube/whatsnext.md index b77c9538..3de0fcce 100644 --- a/slides/kube/whatsnext.md +++ b/slides/kube/whatsnext.md @@ -74,6 +74,12 @@ And *then* it is time to look at orchestration! --- +## Stateful services (demo!) + +.center[![Demo](images/demo.jpg)] + +--- + ## HTTP traffic handling - *Services* are layer 4 constructs @@ -93,13 +99,9 @@ And *then* it is time to look at orchestration! --- -## Logging and metrics +## Ingress with Træfik (demo!) -- Logging is delegated to the container engine - -- Metrics are typically handled with Prometheus - - (Heapster is a popular add-on) +.center[![Demo](images/demo.jpg)] ---