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 diff --git a/glide.lock b/glide.lock index 0ec63fe12..96ae7f6b0 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ hash: 39ff28cc1d13d5915a870b14491ece1849c4eaf5a56cecd50a7676ecee6c6143 -updated: 2016-09-30T11:27:29.529525636+02:00 +updated: 2016-10-06T14:06:39.455848971+02:00 imports: - name: github.com/abbot/go-http-auth version: cb4372376e1e00e9f6ab9ec142e029302c9e7140 - name: github.com/boltdb/bolt - version: 5cc10bbbc5c141029940133bb33c9e969512a698 + version: f4c032d907f61f08dba2d719c58f108a1abb8e81 - name: github.com/BurntSushi/toml version: 99064174e013895bbd9b025c31100bd1d9b590ca - name: github.com/BurntSushi/ty @@ -18,7 +18,7 @@ imports: - name: github.com/codegangsta/cli version: 1efa31f08b9333f1bd4882d61f9d668a70cd902e - name: github.com/codegangsta/negroni - version: dc6b9d037e8dab60cbfc09c61d6932537829be8b + version: 3f7ce7b928e14ff890b067e5bbbc80af73690a9c - name: github.com/containous/flaeg version: a731c034dda967333efce5f8d276aeff11f8ff87 - name: github.com/containous/mux @@ -32,11 +32,11 @@ imports: - pkg/pathutil - pkg/types - name: github.com/davecgh/go-spew - version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d + version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 subpackages: - spew - name: github.com/docker/distribution - version: 87917f30529e6a7fca8eaff2932424915fb11225 + version: 99cb7c0946d2f5a38015443e515dc916295064d7 subpackages: - context - digest @@ -116,15 +116,15 @@ imports: - types/time - types/versions - name: github.com/docker/go-connections - version: 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a + version: 988efe982fdecb46f01d53465878ff1f2ff411ce subpackages: - nat - sockets - tlsconfig - name: github.com/docker/go-units - version: f2d77a61e3c169b43402a0a1e84f06daf29b8190 + version: f2145db703495b2e525c59662db69a7344b00bb8 - name: github.com/docker/leadership - version: bfc7753dd48af19513b29deec23c364bf0f274eb + version: 0a913e2d71a12fd14a028452435cb71ac8d82cb6 - name: github.com/docker/libcompose version: d1876c1d68527a49c0aac22a0b161acc7296b740 subpackages: @@ -143,7 +143,7 @@ imports: - version - yaml - name: github.com/docker/libkv - version: 35d3e2084c650109e7bcc7282655b1bc8ba924ff + version: 3fce6a0f26e07da3eac45796a8e255547a47a750 subpackages: - store - store/boltdb @@ -153,13 +153,13 @@ imports: - name: github.com/donovanhide/eventsource version: fd1de70867126402be23c306e1ce32828455d85b - name: github.com/elazarl/go-bindata-assetfs - version: 57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2 + version: 9a6736ed45b44bf3835afeebb3034b57ed329f3e - name: github.com/gambol99/go-marathon version: a558128c87724cd7430060ef5aedf39f83937f55 - name: github.com/go-check/check version: 4f90aeace3a26ad7021961c297b22c42160c7b25 - name: github.com/gogo/protobuf - version: e33835a643a970c11ac74f6333f5f6866387a101 + version: 99cb9b23110011cc45571c901ecae6f6f5e65cd3 subpackages: - proto - name: github.com/golang/glog @@ -169,18 +169,17 @@ imports: subpackages: - query - name: github.com/gorilla/context - version: aed02d124ae4a0e94fea4541c8effd05bf0c8296 + version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 - name: github.com/hashicorp/consul - version: fce7d75609a04eeb9d4bf41c8dc592aac18fc97d + version: d8e2fb7dd594163e25a89bc52c1a4613f5c5bfb8 subpackages: - api - name: github.com/hashicorp/go-cleanhttp - version: 875fb671b3ddc66f8e2f0acc33829c8cb989a38d + version: ad28ea4487f05916463e2423a55166280e8254b5 - name: github.com/hashicorp/serf - version: 6c4672d66fc6312ddde18399262943e21175d831 + version: b03bf85930b2349eb04b97c8fac437495296e3e7 subpackages: - coordinate - - serf - name: github.com/jarcoal/httpmock version: 145b10d659265440f062c31ea15326166bae56ee - name: github.com/libkermit/compose @@ -190,7 +189,7 @@ imports: - name: github.com/libkermit/docker version: 55e3595409924fcfbb850811e5a7cdbe8960a0b7 - name: github.com/mailgun/manners - version: fada45142db3f93097ca917da107aa3fad0ffcb5 + version: a585afd9d65c0e05f6c003f921e71ebc05074f4f - name: github.com/mailgun/timetools version: fd192d755b00c968d312d23f521eb0cdc6f66bd0 - name: github.com/mattn/go-shellwords @@ -222,7 +221,7 @@ imports: - name: github.com/miekg/dns version: 5d001d020961ae1c184f9f8152fdc73810481677 - name: github.com/mitchellh/mapstructure - version: d2dd0262208475919e1a362f675cfc0e7c10e905 + version: ca63d7c062ee3c9f34db231e352b60012b4fd0c1 - name: github.com/moul/http2curl version: b1479103caacaa39319f75e7f57fc545287fca0d - name: github.com/NYTimes/gziphandler @@ -230,11 +229,11 @@ imports: - name: github.com/ogier/pflag version: 45c278ab3607870051a2ea9040bb85fcb8557481 - name: github.com/opencontainers/runc - version: 1a81e9ab1f138c091fe5c86d0883f87716088527 + version: 02f8fa7863dd3f82909a73e2061897828460d52f subpackages: - libcontainer/user - name: github.com/parnurzeal/gorequest - version: 045012d33ef41ea146c1b675df9296d0dc1a212d + version: e30af16d4e485943aab0b0885ad6bdbb8c0d3dc7 - name: github.com/pmezard/go-difflib version: d8ed2627bdf02c080bf22230dbb337003b7aba2d subpackages: @@ -242,24 +241,24 @@ imports: - name: github.com/ryanuber/go-glob version: 572520ed46dbddaed19ea3d9541bdd0494163693 - name: github.com/samuel/go-zookeeper - version: e64db453f3512cade908163702045e0f31137843 + version: 87e1bca4477a3cc767ca71be023ced183d74e538 subpackages: - zk - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/Sirupsen/logrus - version: a283a10442df8dc09befd873fab202bf8a253d6a + version: 3ec0642a7fb6488f65b06f9040adc67e3990296a - name: github.com/streamrail/concurrent-map - version: 65a174a3a4188c0b7099acbc6cfa0c53628d3287 + version: 8bf1e9bacbf65b10c81d0f4314cf2b1ebef728b5 - name: github.com/stretchr/objx version: cbeaeb16a013161a98496fad62933b1d21786672 - name: github.com/stretchr/testify - version: d77da356e56a7428ad25149ca77381849a6a5232 + version: 976c720a22c8eb4eb6a0b4348ad85ad12491a506 subpackages: - assert - mock - name: github.com/thoas/stats - version: 79b768ff1780f4e5b0ed132e192bfeefe9f85a9c + version: 152b5d051953fdb6e45f14b6826962aadc032324 - name: github.com/tv42/zbase32 version: 03389da7e0bf9844767f82690f4d68fc097a1306 - name: github.com/ugorji/go @@ -267,7 +266,7 @@ imports: subpackages: - codec - name: github.com/unrolled/render - version: 198ad4d8b8a4612176b804ca10555b222a086b40 + version: 526faf80cd4b305bb8134abea8d20d5ced74faa6 - name: github.com/vdemeester/docker-events version: be74d4929ec1ad118df54349fda4b0cba60f849b - name: github.com/vdemeester/shakers @@ -289,7 +288,7 @@ imports: - name: github.com/vulcand/route version: cb89d787ddbb1c5849a7ac9f79004c1fd12a4a32 - name: github.com/vulcand/vulcand - version: 28a4e5c0892167589737b95ceecbcef00295be50 + version: bed092e10989250b48bdb6aa3b0557b207f05c80 subpackages: - conntracker - plugin @@ -317,13 +316,13 @@ imports: - unix - windows - name: gopkg.in/fsnotify.v1 - version: a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb + version: 944cff21b3baf3ced9a880365682152ba577d348 - name: gopkg.in/mgo.v2 - version: 29cc868a5ca65f401ff318143f9408d02f4799cc + version: 22287bab4379e1fbf6002fb4eb769888f3fb224c subpackages: - bson - name: gopkg.in/square/go-jose.v1 - version: e3f973b66b91445ec816dd7411ad1b6495a5a2fc + version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d subpackages: - cipher - json @@ -341,9 +340,9 @@ testImports: - name: github.com/libkermit/docker-check version: cbe0ef03b3d23070eac4d00ba8828f2cc7f7e5a3 - name: github.com/spf13/pflag - version: 5644820622454e71517561946e3d94b9f9db6842 + version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5 - name: github.com/vbatts/tar-split - version: 6810cedb21b2c3d0b9bb8f9af12ff2dc7a2f14df + version: bd4c5d64c3e9297f410025a3b1bd0c58f659e721 subpackages: - archive/tar - tar/asm