From a30d8e7819a077df76e8b6fe5fac96f127101b2f Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Thu, 6 Oct 2016 12:24:52 +0200 Subject: [PATCH] Add Ed's video at ContainerCamp Signed-off-by: Emile Vauge --- README.md | 7 ++++++- examples/{k8s.namespace.sh => k8s.namespace.yaml} | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) rename examples/{k8s.namespace.sh => k8s.namespace.yaml} (51%) diff --git a/README.md b/README.md index 15e223166..fac43fbfa 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,11 @@ Run it and forget it! You can have a quick look at Træfɪk in this [Katacoda tutorial](https://www.katacoda.com/courses/traefik/deploy-load-balancer) that shows how to load balance requests between multiple Docker containers. +Here is a talk given by [Ed Robinson](https://github.com/errm) at the [ContainerCamp UK](https://container.camp) conference. +You will learn fundamental Træfɪk features and see some demos with Kubernetes. + +[![Traefik ContainerCamp UK](http://img.youtube.com/vi/aFtpIShV60I/0.jpg)](https://www.youtube.com/watch?v=aFtpIShV60I) + Here is a talk (in French) given by [Emile Vauge](https://github.com/emilevauge) at the [Devoxx France 2016](http://www.devoxx.fr) conference. You will learn fundamental Træfɪk features and see some demos with Docker, Mesos/Marathon and Let's Encrypt. @@ -86,7 +91,7 @@ You can access to a simple HTML frontend of Træfik. - [Manners](https://github.com/mailgun/manners): graceful shutdown of http.Handler servers - [Lego](https://github.com/xenolf/lego): the best [Let's Encrypt](https://letsencrypt.org) library in go -## Quick start +## Test it - The simple way: grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and just run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): diff --git a/examples/k8s.namespace.sh b/examples/k8s.namespace.yaml similarity index 51% rename from examples/k8s.namespace.sh rename to examples/k8s.namespace.yaml index 235beee0a..64e53ec0d 100755 --- a/examples/k8s.namespace.sh +++ b/examples/k8s.namespace.yaml @@ -1,10 +1,6 @@ -#!/bin/bash - -kubectl create -f - << EOF kind: Namespace apiVersion: v1 metadata: name: kube-system labels: - name: kube-system -EOF + name: kube-system \ No newline at end of file