Update engine-api to fix versions issues (#383 )

Updating an engine-api that has fixed some versioning issues (filters json marshalling) Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Merge pull request #380 from errm/k8s-ref-ports-by-name
2016-05-19 21:11:30 +02:00 · 2016-05-19 15:00:12 +02:00 · 2016-05-19 13:36:19 +01:00 · 2016-05-19 14:08:53 +02:00 · 2016-05-18 17:38:47 +01:00 · 2016-05-18 17:19:11 +02:00
32 changed files with 1144 additions and 105 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -76,3 +76,34 @@ ok      github.com/containous/traefik   0.005s  coverage: 4.1% of statements

 Test success
 ```
+
+### Documentation
+
+The [documentation site](http://docs.traefik.io/) is built with [mkdocs](http://mkdocs.org/)
+
+First make sure you have python and pip installed
+
+```
+$ python --version
+Python 2.7.2
+$ pip --version
+pip 1.5.2
+```
+
+Then install mkdocs with pip
+
+```
+$ pip install mkdocs
+```
+
+To test documentaion localy run `mkdocs serve` in the root directory, this should start a server localy to preview your changes.
+
+```
+$ mkdocs serve
+INFO    -  Building documentation... 
+WARNING -  Config value: 'theme'. Warning: The theme 'united' will be removed in an upcoming MkDocs release. See http://www.mkdocs.org/about/release-notes/ for more details 
+INFO    -  Cleaning site directory 
+[I 160505 22:31:24 server:281] Serving on http://127.0.0.1:8000
+[I 160505 22:31:24 handlers:59] Start watching changes
+[I 160505 22:31:24 handlers:61] Start detecting changes
+```
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,18 @@ env:
    - secure: btt4r13t09gQlHb6gYrvGC2yGCMMHfnp1Mz1RQedc4Mpf/FfT8aE6xmK2a2i9CCvskjrP0t/BFaS4yxIURjnFRn+ugQIEa0pLspB9UJArW/vgOSpIWM9/OQ/fg8z5XuMxN6Md4DL1/iLypMNSageA1x0TRdt89+D1N1dALpg5XRCXLFbC84TLi0gjlFuib9ibPKzEhLT+anCRJ6iZMzeupDSoaCVbAtJMoDvXw4+4AcRZ1+k4MybBLyCib5boaEOt4pTT88mz4Kk0YaMwPVJyg9Qv36VqyUcPS09Yd95LuyVQ4+tZt8Y1ccbIzULsK+sLM3hLCzxlmlpN3dQBlZJiiRtQde0mgGAKyC0P0A1XjuDTywcsa5edB+fTk1Dsewz9xZ9V0NmMz8t+UNZnaSsAPga9i86jULbXUUwMVSzVRc+Xgx02liB/8qI1xYC9FM6ilStt7rn7mF0k3KbiWhcptgeXjO6Lah9FjEKd5w4MXsdUSTi/86rQaLo+kj+XdaTrXCTulKHyRyQEUj+8V1w0oVz7pcGjePHd7y5oU9ByifVQy6sytuFBfRZvugM5bKHo+i0pcWvixrZS42DrzwxZJsspANOvqSe5ifVbvOkfUppQdCBIwptxV5N1b49XPKU3W/w34QJ8xGmKp3TFA7WwVCztriFHjPgiRpB3EG99Bg=
    - REPO: $TRAVIS_REPO_SLUG
    - VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER
+  matrix:
+    - DOCKER_VERSION=1.9.1
+    - DOCKER_VERSION=1.10.1
 sudo: required
 services:
 - docker
 install:
 - sudo service docker stop
- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker
+- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} -o /usr/bin/docker
 - sudo chmod +x /usr/bin/docker
 - sudo service docker start
+- docker version
 - pip install --user mkdocs
 - pip install --user pymdown-extensions
 before_script:
--- a/2
+++ b/2
@@ -46,7 +46,7 @@ validate: build  ## validate gofmt, golint and go vet
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh  validate-gofmt validate-govet validate-golint 

 build: dist
-	docker build -t "$(TRAEFIK_DEV_IMAGE)" -f build.Dockerfile .
+	docker build --build-arg=DOCKER_VERSION=${DOCKER_VERSION} -t "$(TRAEFIK_DEV_IMAGE)" -f build.Dockerfile .

 build-webui:
 	docker build -t traefik-webui -f webui/Dockerfile webui
--- a/README.md
+++ b/README.md
@@ -63,9 +63,11 @@ Run it and forget it!

 ## Demo

-Here is a demo of Træfɪk using Docker backend, showing a load-balancing between two servers, hot reloading of configuration, and graceful shutdown.

-[![asciicast](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko.png)](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko)
+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 Lets'Encrypt. 
+
+[![Traefik Devoxx France](http://img.youtube.com/vi/QvAz9mVx5TI/0.jpg)](http://www.youtube.com/watch?v=QvAz9mVx5TI)

 ## Web UI

@@ -110,6 +112,11 @@ You can find the complete documentation [here](https://docs.traefik.io).

 Please refer to [this section](.github/CONTRIBUTING.md).

+## Support
+
+You can join [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com) to get basic support.
+If you prefer a commercial support, please contact [containo.us](https://containo.us) by mail: <mailto:support@containo.us>.
+
 ## Træfɪk here and there

 These projects use Træfɪk internally. If your company uses Træfɪk, we would be glad to get your feedback :) Contact us on [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com)
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -1,17 +1,12 @@
-FROM golang:1.6.1-alpine
+FROM golang:1.6.2

-RUN apk update && apk add git bash gcc musl-dev \
-&& go get github.com/Masterminds/glide \
-&& go get github.com/mitchellh/gox \
+RUN go get github.com/Masterminds/glide \
 && go get github.com/jteeuwen/go-bindata/... \
 && go get github.com/golang/lint/golint \
 && go get github.com/kisielk/errcheck

 # Which docker version to test on
-ENV DOCKER_VERSION 1.10.1
-
-# enable GO15VENDOREXPERIMENT
-ENV GO15VENDOREXPERIMENT 1
+ARG DOCKER_VERSION=1.10.1

 # Download docker
 RUN set -ex; \
--- a/cmd.go
+++ b/cmd.go
@@ -172,6 +172,7 @@ func init() {

 	traefikCmd.PersistentFlags().BoolVar(&arguments.kubernetes, "kubernetes", false, "Enable Kubernetes backend")
 	traefikCmd.PersistentFlags().StringVar(&arguments.Kubernetes.Endpoint, "kubernetes.endpoint", "127.0.0.1:8080", "Kubernetes server endpoint")
+	traefikCmd.PersistentFlags().StringSliceVar(&arguments.Kubernetes.Namespaces, "kubernetes.namespaces", []string{}, "Kubernetes namespaces")

 	_ = viper.BindPFlag("configFile", traefikCmd.PersistentFlags().Lookup("configFile"))
 	_ = viper.BindPFlag("graceTimeOut", traefikCmd.PersistentFlags().Lookup("graceTimeOut"))
--- a/docs/index.md
+++ b/docs/index.md
@@ -38,9 +38,10 @@ Run it and forget it!

 ## Demo

-Here is a demo of Træfɪk using Docker backend, showing a load-balancing between two servers, hot reloading of configuration, and graceful shutdown.
+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 Lets'Encrypt. 

-[![asciicast](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko.png)](https://asciinema.org/a/4tcyde7riou5vxulo6my3mtko)
+[![Traefik Devoxx France](https://img.youtube.com/vi/QvAz9mVx5TI/0.jpg)](https://www.youtube.com/watch?v=QvAz9mVx5TI)

 ## Get it

--- a/docs/toml.md
+++ b/docs/toml.md
@@ -619,7 +619,7 @@ Labels can be used on containers to override default behaviour:
 - `traefik.frontend.rule=Host:test.traefik.io`: override the default frontend rule (Default: `Host:{containerName}.{domain}`).
 - `traefik.frontend.passHostHeader=true`: forward client `Host` header to the backend.
 - `traefik.frontend.entryPoints=http,https`: assign this frontend to entry points `http` and `https`. Overrides `defaultEntryPoints`.
-* `traefik.domain=traefik.localhost`: override the default domain
+- `traefik.domain=traefik.localhost`: override the default domain


 ## Kubernetes Ingress backend
@@ -648,8 +648,13 @@ Træfɪk can be configured to use Kubernetes Ingress as a backend configuration:
 # Optional
 #
 # endpoint = "http://localhost:8080"
+# namespaces = ["default","production"]
 ```

+Annotations can be used on containers to override default behaviour for the whole Ingress resource:
+
+- `traefik.frontend.rule.type: PathPrefixStrip`: override the default frontend rule (Default: `Host:{containerName}.{domain}`).
+
 You can find here an example [ingress](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.ingress.yaml) and [replication controller](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.rc.yaml).

 ## Consul backend
--- a/examples/k8s.ingress.yaml
+++ b/examples/k8s.ingress.yaml
@@ -91,3 +91,21 @@ spec:
      - backend:
          serviceName: service3
          servicePort: 80
+
+---
+# Another Ingress with PathPrefixStrip
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: whoami-ingress-stripped
+  annotations:
+    traefik.frontend.rule.type: "PathPrefixStrip"
+spec:
+  rules:
+  - host: foo.localhost
+    http:
+      paths:
+      - path: /prefixWillBeStripped
+        backend:
+          serviceName: service1
+          servicePort: 80
--- a/generate.go
+++ b/generate.go
@@ -3,6 +3,7 @@ Copyright
 */

 //go:generate rm -vf autogen/gen.go
+//go:generate mkdir -p static
 //go:generate go-bindata -pkg autogen -o autogen/gen.go ./static/... ./templates/...

 //go:generate mkdir -p vendor/github.com/docker/docker/autogen/dockerversion
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: a9f41b9fe89ac3028da27ac9cbe31db9a79ae89082f42507d4d0c58290517ee2
-updated: 2016-04-27T17:14:45.61228359Z
+hash: da7239dce8bda69f6e10b2f2bfae57dd4fd95b817055dca1379a72af42939b97
+updated: 2016-05-12T11:48:22.158455011+02:00
 imports:
 - name: github.com/alecthomas/template
  version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0
@@ -42,11 +42,12 @@ imports:
  subpackages:
  - spew
 - name: github.com/docker/distribution
-  version: ff6f38ccb69afa96214c7ee955359465d1fc767a
+  version: 467fc068d88aa6610691b7f1a677271a3fac4aac
  subpackages:
  - reference
+  - digest
 - name: github.com/docker/docker
-  version: f39987afe8d611407887b3094c03d6ba6a766a67
+  version: 9837ec4da53f15f9120d53a6e1517491ba8b0261
  subpackages:
  - autogen
  - api
@@ -85,7 +86,7 @@ imports:
  - utils
  - volume
 - name: github.com/docker/engine-api
-  version: 8924d6900370b4c7e7984be5adc61f50a80d7537
+  version: 3d3d0b6c9d2651aac27f416a6da0224c1875b3eb
  subpackages:
  - client
  - types
@@ -96,11 +97,13 @@ imports:
  - client/transport
  - client/transport/cancellable
  - types/network
+  - types/reference
  - types/registry
  - types/time
+  - types/versions
  - types/blkiodev
 - name: github.com/docker/go-connections
-  version: f549a9393d05688dff0992ef3efd8bbe6c628aeb
+  version: 5b7154ba2efe13ff86ae8830a9e7cb120b080d6e
  subpackages:
  - nat
  - sockets
@@ -108,7 +111,7 @@ imports:
 - name: github.com/docker/go-units
  version: 5d2041e26a699eaca682e2ea41c8f891e1060444
 - name: github.com/docker/libcompose
-  version: e290a513ba909ca3afefd5cd611f3a3fe56f6a3a
+  version: 8ee7bcc364f7b8194581a3c6bd9fa019467c7873
 - name: github.com/docker/libkv
  version: 7283ef27ed32fe267388510a91709b307bb9942c
  subpackages:
@@ -121,12 +124,6 @@ imports:
  version: 9cbd2a1374f46905c68a4eb3694a130610adc62a
 - name: github.com/donovanhide/eventsource
  version: d8a3071799b98cacd30b6da92f536050ccfe6da4
- name: github.com/eapache/go-resiliency
-  version: b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-  subpackages:
-  - breaker
- name: github.com/eapache/queue
-  version: ded5959c0d4e360646dc9e9908cff48666781367
 - name: github.com/elazarl/go-bindata-assetfs
  version: d5cac425555ca5cf00694df246e04f05e6a55150
 - name: github.com/flynn/go-shlex
@@ -137,8 +134,6 @@ imports:
  version: 11d3bc7aa68e238947792f30573146a3231fc0f1
 - name: github.com/golang/glog
  version: fca8c8854093a154ff1eb580aae10276ad6b1b5f
- name: github.com/golang/snappy
-  version: ec642410cd033af63620b66a91ccbd3c69c2c59a
 - name: github.com/google/go-querystring
  version: 9235644dd9e52eeae6fa48efd539fdc351a0af53
  subpackages:
@@ -150,13 +145,13 @@ imports:
 - name: github.com/gorilla/mux
  version: f15e0c49460fd49eebe2bcc8486b05d1bef68d3a
 - name: github.com/gorilla/websocket
-  version: e2e3d8414d0fbae04004f151979f4e27c6747fe7
+  version: 1f512fc3f05332ba7117626cdfb4e07474e58e60
 - name: github.com/hashicorp/consul
  version: de080672fee9e6104572eeea89eccdca135bb918
  subpackages:
  - api
 - name: github.com/hashicorp/hcl
-  version: 2604f3bda7e8960c1be1063709e7d7f0765048d0
+  version: 9a905a34e6280ce905da1a32344b25e81011197a
  subpackages:
  - hcl/ast
  - hcl/parser
@@ -168,12 +163,14 @@ imports:
  - json/token
 - name: github.com/inconshreveable/mousetrap
  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
- name: github.com/klauspost/crc32
-  version: 19b0b332c9e4516a6370a0456e6182c3b5036720
 - name: github.com/kr/pretty
  version: add1dbc86daf0f983cd4a48ceb39deb95c729b67
 - name: github.com/kr/text
-  version: bb797dc4fb8320488f47bf11de07a733d7233e1f
+  version: 7cafcd837844e784b526369c9bce262804aebc60
+- name: github.com/libkermit/docker
+  version: 3b5eb2973efff7af33cfb65141deaf4ed25c6d02
+- name: github.com/libkermit/docker-check
+  version: bb75a86b169c6c5d22c0ee98278124036f272d7b
 - name: github.com/magiconair/properties
  version: c265cfa48dda6474e208715ca93e987829f572f8
 - name: github.com/mailgun/log
@@ -187,19 +184,19 @@ imports:
 - name: github.com/mattn/go-shellwords
  version: 525bedee691b5a8df547cb5cf9f86b7fb1883e24
 - name: github.com/Microsoft/go-winio
-  version: 862b6557927a5c5c81e411c12aa6de7e566cbb7a
+  version: 3b8b3c98b207f95fe0cd6c7c311a9ac497ba7c0f
 - name: github.com/miekg/dns
-  version: dd83d5cbcfd986f334b2747feeb907e281318fdf
+  version: 48ab6605c66ac797e07f615101c3e9e10e932b66
 - name: github.com/mitchellh/mapstructure
  version: d2dd0262208475919e1a362f675cfc0e7c10e905
 - name: github.com/moul/http2curl
  version: 1812aee76a1ce98d604a44200c6a23c689b17a89
 - name: github.com/opencontainers/runc
-  version: 4ab132458fc3e9dbeea624153e0331952dc4c8d5
+  version: 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
  subpackages:
  - libcontainer/user
 - name: github.com/parnurzeal/gorequest
-  version: 91b42fce877cc6af96c45818665a4c615cc5f4ee
+  version: a39a2f8d0463091df7344dbf586a9986e9f7184f
 - name: github.com/pmezard/go-difflib
  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
  subpackages:
@@ -208,28 +205,26 @@ imports:
  version: fa6674abf3f4580b946a01bf7a1ce4ba8766205b
  subpackages:
  - zk
- name: github.com/Shopify/sarama
-  version: 92a286e4dde1688175cff3d2ec9b49a02838b447
 - name: github.com/Sirupsen/logrus
  version: 418b41d23a1bf978c06faea5313ba194650ac088
 - name: github.com/spf13/cast
  version: ee7b3e0353166ab1f3a605294ac8cd2b77953778
 - name: github.com/spf13/cobra
-  version: 4c05eb1145f16d0e6bb4a3e1b6d769f4713cb41f
+  version: 0f866a6211e33cde2091d9290c08f6afd6c9ebbc
  subpackages:
  - cobra
 - name: github.com/spf13/jwalterweatherman
  version: 33c24e77fb80341fe7130ee7c594256ff08ccc46
 - name: github.com/spf13/pflag
-  version: 1f296710f879815ad9e6d39d947c828c3e4b4c3d
+  version: cb88ea77998c3f024757528e3305022ab50b43be
 - name: github.com/spf13/viper
  version: a212099cbe6fbe8d07476bfda8d2d39b6ff8f325
 - name: github.com/streamrail/concurrent-map
-  version: 788b276dc7eabf20890ea3fa280956664d58b329
+  version: 1ce4642e5a162df67825d273a86b87e6cc8a076b
 - name: github.com/stretchr/objx
  version: cbeaeb16a013161a98496fad62933b1d21786672
 - name: github.com/stretchr/testify
-  version: bcd9e3389dd03b0b668d11f4d462a6af6c2dfd60
+  version: 6cb3b85ef5a0efef77caef88363ec4d4b5c0976d
  subpackages:
  - mock
  - assert
@@ -242,9 +237,7 @@ imports:
 - name: github.com/unrolled/render
  version: 26b4e3aac686940fe29521545afad9966ddfc80c
 - name: github.com/vdemeester/docker-events
-  version: 6ea3f28df37f29a47498bc8b32b36ad8491dbd37
- name: github.com/vdemeester/libkermit
-  version: 7e4e689a6fa9281e0fb9b7b9c297e22d5342a5ec
+  version: ce5347b72aafad4e3bebd966f15e4183839d5172
 - name: github.com/vdemeester/shakers
  version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
 - name: github.com/vulcand/oxy
@@ -265,11 +258,11 @@ imports:
 - name: github.com/wendal/errors
  version: f66c77a7882b399795a8987ebf87ef64a427417e
 - name: github.com/xenolf/lego
-  version: 23e88185c255e95a106835d80e76e5a3a66d7c54
+  version: 948483535f53c34d144419869ecbed86251a30f6
  subpackages:
  - acme
 - name: golang.org/x/crypto
-  version: d68c3ecb62c850b645dc072a8d78006286bf81ca
+  version: b76c864ef1dca1d8f271f917c290cddcce3d9e0d
  subpackages:
  - ocsp
 - name: golang.org/x/net
@@ -291,7 +284,7 @@ imports:
  subpackages:
  - bson
 - name: gopkg.in/square/go-jose.v1
-  version: 40d457b439244b546f023d056628e5184136899b
+  version: e3f973b66b91445ec816dd7411ad1b6495a5a2fc
  subpackages:
  - cipher
  - json
--- a/glide.yaml
+++ b/glide.yaml
@@ -59,7 +59,7 @@ import:
  subpackages:
  - bson
 - package: github.com/docker/docker
-  version: f39987afe8d611407887b3094c03d6ba6a766a67
+  version: 9837ec4da53f15f9120d53a6e1517491ba8b0261
  subpackages:
  - autogen
  - api
@@ -104,7 +104,7 @@ import:
 - package: gopkg.in/yaml.v2
  version: 7ad95dd0798a40da1ccdff6dff35fd177b5edf
 - package: github.com/opencontainers/runc
-  version: 4ab132458fc3e9dbeea624153e0331952dc4c8d5
+  version: 2441732d6fcc0fb0a542671a4372e0c7bc99c19e
  subpackages:
  - libcontainer/user
 - package: github.com/gorilla/mux
@@ -157,16 +157,18 @@ import:
  subpackages:
  - mock
 - package: github.com/xenolf/lego
- package: github.com/vdemeester/libkermit
-  version: 7e4e689a6fa9281e0fb9b7b9c297e22d5342a5ec
+- package: github.com/libkermit/docker-check
+  version: bb75a86b169c6c5d22c0ee98278124036f272d7b
+- package: github.com/libkermit/docker
+  version: 3b5eb2973efff7af33cfb65141deaf4ed25c6d02
 - package: github.com/docker/libcompose
-  version: e290a513ba909ca3afefd5cd611f3a3fe56f6a3a
+  version: 8ee7bcc364f7b8194581a3c6bd9fa019467c7873
 - package: github.com/docker/distribution
-  version: ff6f38ccb69afa96214c7ee955359465d1fc767a
+  version: 467fc068d88aa6610691b7f1a677271a3fac4aac
  subpackages:
  - reference
 - package: github.com/docker/engine-api
-  version: 8924d6900370b4c7e7984be5adc61f50a80d7537
+  version: 3d3d0b6c9d2651aac27f416a6da0224c1875b3eb
  subpackages:
  - client
  - types
--- a/integration/docker_test.go
+++ b/integration/docker_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/go-check/check"

-	d "github.com/vdemeester/libkermit/docker"
-	docker "github.com/vdemeester/libkermit/docker/check"
+	d "github.com/libkermit/docker"
+	docker "github.com/libkermit/docker-check"
 	checker "github.com/vdemeester/shakers"
 )

--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/containous/traefik/integration/utils"
 	"github.com/go-check/check"

-	compose "github.com/vdemeester/libkermit/compose/check"
+	"github.com/libkermit/docker-check/compose"
 	checker "github.com/vdemeester/shakers"
 )

--- a/middlewares/logger.go
+++ b/middlewares/logger.go
@@ -1,6 +1,7 @@
 package middlewares

 import (
+	"bufio"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/streamrail/concurrent-map"
@@ -167,6 +168,10 @@ func (lirw *logInfoResponseWriter) Flush() {
 	}
 }

+func (lirw *logInfoResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	return lirw.rw.(http.Hijacker).Hijack()
+}
+
 func (lirw *logInfoResponseWriter) GetStatus() int {
 	return lirw.status
 }
--- a/provider/consul_catalog.go
+++ b/provider/consul_catalog.go
@@ -133,9 +133,11 @@ func (provider *ConsulCatalog) getBackendAddress(node *api.ServiceEntry) string

 func (provider *ConsulCatalog) getBackendName(node *api.ServiceEntry, index int) string {
 	serviceName := node.Service.Service + "--" + node.Service.Address + "--" + strconv.Itoa(node.Service.Port)
-	if len(node.Service.Tags) > 0 {
-		serviceName += "--" + strings.Join(node.Service.Tags, "--")
+
+	for _, tag := range node.Service.Tags {
+		serviceName += "--" + normalize(tag)
 	}
+
 	serviceName = strings.Replace(serviceName, ".", "-", -1)
 	serviceName = strings.Replace(serviceName, "=", "-", -1)

--- a/provider/consul_catalog_test.go
+++ b/provider/consul_catalog_test.go
@@ -154,6 +154,17 @@ func TestConsulCatalogGetBackendName(t *testing.T) {
 			},
 			expected: "api--10-0-0-1--80--traefik-weight-42--traefik-enable-true--1",
 		},
+		{
+			node: &api.ServiceEntry{
+				Service: &api.AgentService{
+					Service: "api",
+					Address: "10.0.0.1",
+					Port:    80,
+					Tags:    []string{"a funny looking tag"},
+				},
+			},
+			expected: "api--10-0-0-1--80--a-funny-looking-tag--2",
+		},
 	}

 	for i, e := range services {
@@ -225,7 +236,8 @@ func TestConsulCatalogBuildConfig(t *testing.T) {
 			},
 			expectedFrontends: map[string]*types.Frontend{
 				"frontend-test": {
-					Backend: "backend-test",
+					Backend:        "backend-test",
+					PassHostHeader: true,
 					Routes: map[string]types.Route{
 						"route-host-test": {
 							Rule: "Host:test.localhost",
--- a/provider/docker.go
+++ b/provider/docker.go
@@ -279,7 +279,7 @@ func (provider *Docker) getPassHostHeader(container dockertypes.ContainerJSON) s
 	if passHostHeader, err := getLabel(container, "traefik.frontend.passHostHeader"); err == nil {
 		return passHostHeader
 	}
-	return "false"
+	return "true"
 }

 func (provider *Docker) getEntryPoints(container dockertypes.ContainerJSON) []string {
--- a/provider/docker_test.go
+++ b/provider/docker_test.go
@@ -401,7 +401,6 @@ func TestDockerGetProtocol(t *testing.T) {

 func TestDockerGetPassHostHeader(t *testing.T) {
 	provider := &Docker{}
-
 	containers := []struct {
 		container docker.ContainerJSON
 		expected  string
@@ -413,7 +412,7 @@ func TestDockerGetPassHostHeader(t *testing.T) {
 				},
 				Config: &container.Config{},
 			},
-			expected: "false",
+			expected: "true",
 		},
 		{
 			container: docker.ContainerJSON{
@@ -422,11 +421,11 @@ func TestDockerGetPassHostHeader(t *testing.T) {
 				},
 				Config: &container.Config{
 					Labels: map[string]string{
-						"traefik.frontend.passHostHeader": "true",
+						"traefik.frontend.passHostHeader": "false",
 					},
 				},
 			},
-			expected: "true",
+			expected: "false",
 		},
 	}

@@ -744,8 +743,9 @@ func TestDockerLoadDockerConfig(t *testing.T) {
 			},
 			expectedFrontends: map[string]*types.Frontend{
 				"frontend-Host-test-docker-localhost": {
-					Backend:     "backend-test",
-					EntryPoints: []string{},
+					Backend:        "backend-test",
+					PassHostHeader: true,
+					EntryPoints:    []string{},
 					Routes: map[string]types.Route{
 						"route-frontend-Host-test-docker-localhost": {
 							Rule: "Host:test.docker.localhost",
@@ -816,8 +816,9 @@ func TestDockerLoadDockerConfig(t *testing.T) {
 			},
 			expectedFrontends: map[string]*types.Frontend{
 				"frontend-Host-test1-docker-localhost": {
-					Backend:     "backend-foobar",
-					EntryPoints: []string{"http", "https"},
+					Backend:        "backend-foobar",
+					PassHostHeader: true,
+					EntryPoints:    []string{"http", "https"},
 					Routes: map[string]types.Route{
 						"route-frontend-Host-test1-docker-localhost": {
 							Rule: "Host:test1.docker.localhost",
@@ -825,8 +826,9 @@ func TestDockerLoadDockerConfig(t *testing.T) {
 					},
 				},
 				"frontend-Host-test2-docker-localhost": {
-					Backend:     "backend-foobar",
-					EntryPoints: []string{},
+					Backend:        "backend-foobar",
+					PassHostHeader: true,
+					EntryPoints:    []string{},
 					Routes: map[string]types.Route{
 						"route-frontend-Host-test2-docker-localhost": {
 							Rule: "Host:test2.docker.localhost",
--- a/provider/k8s/client.go
+++ b/provider/k8s/client.go
@@ -49,7 +49,7 @@ func NewClient(baseURL string, caCert []byte, token string) (Client, error) {
 	}, nil
 }

-// GetIngresses returns all services in the cluster
+// GetIngresses returns all ingresses in the cluster
 func (c *clientImpl) GetIngresses(predicate func(Ingress) bool) ([]Ingress, error) {
 	getURL := c.endpointURL + extentionsEndpoint + defaultIngress

--- a/provider/kubernetes.go
+++ b/provider/kubernetes.go
@@ -9,6 +9,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"strconv"
 	"strings"
 	"text/template"
 	"time"
@@ -21,8 +22,10 @@ const (

 // Kubernetes holds configurations of the Kubernetes provider.
 type Kubernetes struct {
-	BaseProvider `mapstructure:",squash"`
-	Endpoint     string
+	BaseProvider           `mapstructure:",squash"`
+	Endpoint               string
+	disablePassHostHeaders bool
+	Namespaces             []string
 }

 func (provider *Kubernetes) createClient() (k8s.Client, error) {
@@ -123,7 +126,15 @@ func (provider *Kubernetes) Provide(configurationChan chan<- types.ConfigMessage

 func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configuration, error) {
 	ingresses, err := k8sClient.GetIngresses(func(ingress k8s.Ingress) bool {
-		return true
+		if len(provider.Namespaces) == 0 {
+			return true
+		}
+		for _, n := range provider.Namespaces {
+			if ingress.ObjectMeta.Namespace == n {
+				return true
+			}
+		}
+		return false
 	})
 	if err != nil {
 		log.Errorf("Error retrieving ingresses: %+v", err)
@@ -133,6 +144,7 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 		map[string]*types.Backend{},
 		map[string]*types.Frontend{},
 	}
+	PassHostHeader := provider.getPassHostHeader()
 	for _, i := range ingresses {
 		for _, r := range i.Spec.Rules {
 			for _, pa := range r.HTTP.Paths {
@@ -143,8 +155,9 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 				}
 				if _, exists := templateObjects.Frontends[r.Host+pa.Path]; !exists {
 					templateObjects.Frontends[r.Host+pa.Path] = &types.Frontend{
-						Backend: r.Host + pa.Path,
-						Routes:  make(map[string]types.Route),
+						Backend:        r.Host + pa.Path,
+						PassHostHeader: PassHostHeader,
+						Routes:         make(map[string]types.Route),
 					}
 				}
 				if _, exists := templateObjects.Frontends[r.Host+pa.Path].Routes[r.Host]; !exists {
@@ -153,12 +166,28 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 					}
 				}
 				if len(pa.Path) > 0 {
+					ruleType := i.Annotations["traefik.frontend.rule.type"]
+
+					switch strings.ToLower(ruleType) {
+					case "pathprefixstrip":
+						ruleType = "PathPrefixStrip"
+					case "pathstrip":
+						ruleType = "PathStrip"
+					case "path":
+						ruleType = "Path"
+					case "pathprefix":
+						ruleType = "PathPrefix"
+					default:
+						log.Warnf("Unknown RuleType `%s`, falling back to `PathPrefix", ruleType)
+						ruleType = "PathPrefix"
+					}
+
 					templateObjects.Frontends[r.Host+pa.Path].Routes[pa.Path] = types.Route{
-						Rule: "PathPrefixStrip:" + pa.Path,
+						Rule: ruleType + ":" + pa.Path,
 					}
 				}
 				services, err := k8sClient.GetServices(func(service k8s.Service) bool {
-					return service.Name == pa.Backend.ServiceName
+					return service.ObjectMeta.Namespace == i.ObjectMeta.Namespace && service.Name == pa.Backend.ServiceName
 				})
 				if err != nil {
 					log.Errorf("Error retrieving services: %v", err)
@@ -172,12 +201,12 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 				for _, service := range services {
 					protocol := "http"
 					for _, port := range service.Spec.Ports {
-						if port.Port == pa.Backend.ServicePort.IntValue() {
+						if equalPorts(port, pa.Backend.ServicePort) {
 							if port.Port == 443 {
 								protocol = "https"
 							}
 							templateObjects.Backends[r.Host+pa.Path].Servers[string(service.UID)] = types.Server{
-								URL:    protocol + "://" + service.Spec.ClusterIP + ":" + pa.Backend.ServicePort.String(),
+								URL:    protocol + "://" + service.Spec.ClusterIP + ":" + strconv.Itoa(port.Port),
 								Weight: 1,
 							}
 							break
@@ -190,6 +219,23 @@ func (provider *Kubernetes) loadIngresses(k8sClient k8s.Client) (*types.Configur
 	return &templateObjects, nil
 }

+func equalPorts(servicePort k8s.ServicePort, ingressPort k8s.IntOrString) bool {
+	if servicePort.Port == ingressPort.IntValue() {
+		return true
+	}
+	if servicePort.Name != "" && servicePort.Name == ingressPort.String() {
+		return true
+	}
+	return false
+}
+
+func (provider *Kubernetes) getPassHostHeader() bool {
+	if provider.disablePassHostHeaders {
+		return false
+	}
+	return true
+}
+
 func (provider *Kubernetes) loadConfig(templateObjects types.Configuration) *types.Configuration {
 	var FuncMap = template.FuncMap{}
 	configuration, err := provider.getConfiguration("templates/kubernetes.tmpl", FuncMap, templateObjects)
--- a/provider/kubernetes_test.go
+++ b/provider/kubernetes_test.go
@@ -21,7 +21,7 @@ func TestLoadIngresses(t *testing.T) {
 									Path: "/bar",
 									Backend: k8s.IngressBackend{
 										ServiceName: "service1",
-										ServicePort: k8s.FromInt(801),
+										ServicePort: k8s.FromString("http"),
 									},
 								},
 							},
@@ -139,10 +139,11 @@ func TestLoadIngresses(t *testing.T) {
 		},
 		Frontends: map[string]*types.Frontend{
 			"foo/bar": {
-				Backend: "foo/bar",
+				Backend:        "foo/bar",
+				PassHostHeader: true,
 				Routes: map[string]types.Route{
 					"/bar": {
-						Rule: "PathPrefixStrip:/bar",
+						Rule: "PathPrefix:/bar",
 					},
 					"foo": {
 						Rule: "Host:foo",
@@ -150,7 +151,8 @@ func TestLoadIngresses(t *testing.T) {
 				},
 			},
 			"bar": {
-				Backend: "bar",
+				Backend:        "bar",
+				PassHostHeader: true,
 				Routes: map[string]types.Route{
 					"bar": {
 						Rule: "Host:bar",
@@ -167,6 +169,897 @@ func TestLoadIngresses(t *testing.T) {
 	}
 }

+func TestRuleType(t *testing.T) {
+	ingresses := []k8s.Ingress{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Annotations: map[string]string{"traefik.frontend.rule.type": "PathPrefixStrip"}, //camel case
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo1",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar1",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Annotations: map[string]string{"traefik.frontend.rule.type": "path"}, //lower case
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo1",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar2",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Annotations: map[string]string{"traefik.frontend.rule.type": "PathPrefix"}, //path prefix
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo2",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar1",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Annotations: map[string]string{"traefik.frontend.rule.type": "PathStrip"}, //path strip
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo2",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar2",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Annotations: map[string]string{"traefik.frontend.rule.type": "PathXXStrip"}, //wrong rule
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo1",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar3",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	services := []k8s.Service{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name: "service1",
+				UID:  "1",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+	}
+	watchChan := make(chan interface{})
+	client := clientMock{
+		ingresses: ingresses,
+		services:  services,
+		watchChan: watchChan,
+	}
+	provider := Kubernetes{disablePassHostHeaders: true}
+	actualConfig, err := provider.loadIngresses(client)
+	actual := actualConfig.Frontends
+	if err != nil {
+		t.Fatalf("error %+v", err)
+	}
+
+	expected := map[string]*types.Frontend{
+		"foo1/bar1": {
+			Backend: "foo1/bar1",
+			Routes: map[string]types.Route{
+				"/bar1": {
+					Rule: "PathPrefixStrip:/bar1",
+				},
+				"foo1": {
+					Rule: "Host:foo1",
+				},
+			},
+		},
+		"foo1/bar2": {
+			Backend: "foo1/bar2",
+			Routes: map[string]types.Route{
+				"/bar2": {
+					Rule: "Path:/bar2",
+				},
+				"foo1": {
+					Rule: "Host:foo1",
+				},
+			},
+		},
+		"foo2/bar1": {
+			Backend: "foo2/bar1",
+			Routes: map[string]types.Route{
+				"/bar1": {
+					Rule: "PathPrefix:/bar1",
+				},
+				"foo2": {
+					Rule: "Host:foo2",
+				},
+			},
+		},
+		"foo2/bar2": {
+			Backend: "foo2/bar2",
+			Routes: map[string]types.Route{
+				"/bar2": {
+					Rule: "PathStrip:/bar2",
+				},
+				"foo2": {
+					Rule: "Host:foo2",
+				},
+			},
+		},
+		"foo1/bar3": {
+			Backend: "foo1/bar3",
+			Routes: map[string]types.Route{
+				"/bar3": {
+					Rule: "PathPrefix:/bar3",
+				},
+				"foo1": {
+					Rule: "Host:foo1",
+				},
+			},
+		},
+	}
+	actualJSON, _ := json.Marshal(actual)
+	expectedJSON, _ := json.Marshal(expected)
+
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("expected %+v, got %+v", string(expectedJSON), string(actualJSON))
+	}
+}
+
+func TestGetPassHostHeader(t *testing.T) {
+	ingresses := []k8s.Ingress{{
+		ObjectMeta: k8s.ObjectMeta{
+			Namespace: "awesome",
+		},
+		Spec: k8s.IngressSpec{
+			Rules: []k8s.IngressRule{
+				{
+					Host: "foo",
+					IngressRuleValue: k8s.IngressRuleValue{
+						HTTP: &k8s.HTTPIngressRuleValue{
+							Paths: []k8s.HTTPIngressPath{
+								{
+									Path: "/bar",
+									Backend: k8s.IngressBackend{
+										ServiceName: "service1",
+										ServicePort: k8s.FromInt(801),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}}
+	services := []k8s.Service{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service1",
+				Namespace: "awesome",
+				UID:       "1",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+	}
+	watchChan := make(chan interface{})
+	client := clientMock{
+		ingresses: ingresses,
+		services:  services,
+		watchChan: watchChan,
+	}
+	provider := Kubernetes{disablePassHostHeaders: true}
+	actual, err := provider.loadIngresses(client)
+	if err != nil {
+		t.Fatalf("error %+v", err)
+	}
+
+	expected := &types.Configuration{
+		Backends: map[string]*types.Backend{
+			"foo/bar": {
+				Servers: map[string]types.Server{
+					"1": {
+						URL:    "http://10.0.0.1:801",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+		},
+		Frontends: map[string]*types.Frontend{
+			"foo/bar": {
+				Backend: "foo/bar",
+				Routes: map[string]types.Route{
+					"/bar": {
+						Rule: "PathPrefix:/bar",
+					},
+					"foo": {
+						Rule: "Host:foo",
+					},
+				},
+			},
+		},
+	}
+	actualJSON, _ := json.Marshal(actual)
+	expectedJSON, _ := json.Marshal(expected)
+
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("expected %+v, got %+v", string(expectedJSON), string(actualJSON))
+	}
+}
+
+func TestOnlyReferencesServicesFromOwnNamespace(t *testing.T) {
+	ingresses := []k8s.Ingress{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Backend: k8s.IngressBackend{
+											ServiceName: "service",
+											ServicePort: k8s.FromInt(80),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	services := []k8s.Service{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service",
+				UID:       "1",
+				Namespace: "awesome",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 80,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service",
+				UID:       "2",
+				Namespace: "not-awesome",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.2",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 80,
+					},
+				},
+			},
+		},
+	}
+	watchChan := make(chan interface{})
+	client := clientMock{
+		ingresses: ingresses,
+		services:  services,
+		watchChan: watchChan,
+	}
+	provider := Kubernetes{}
+	actual, err := provider.loadIngresses(client)
+	if err != nil {
+		t.Fatalf("error %+v", err)
+	}
+
+	expected := &types.Configuration{
+		Backends: map[string]*types.Backend{
+			"foo": {
+				Servers: map[string]types.Server{
+					"1": {
+						URL:    "http://10.0.0.1:80",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+		},
+		Frontends: map[string]*types.Frontend{
+			"foo": {
+				Backend:        "foo",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"foo": {
+						Rule: "Host:foo",
+					},
+				},
+			},
+		},
+	}
+	actualJSON, _ := json.Marshal(actual)
+	expectedJSON, _ := json.Marshal(expected)
+
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("expected %+v, got %+v", string(expectedJSON), string(actualJSON))
+	}
+}
+
+func TestLoadNamespacedIngresses(t *testing.T) {
+	ingresses := []k8s.Ingress{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+					{
+						Host: "bar",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Backend: k8s.IngressBackend{
+											ServiceName: "service3",
+											ServicePort: k8s.FromInt(443),
+										},
+									},
+									{
+										Backend: k8s.IngressBackend{
+											ServiceName: "service2",
+											ServicePort: k8s.FromInt(802),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "not-awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "baz",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/baz",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	services := []k8s.Service{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+				Name:      "service1",
+				UID:       "1",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service1",
+				Namespace: "not-awesome",
+				UID:       "1",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service2",
+				Namespace: "awesome",
+				UID:       "2",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.2",
+				Ports: []k8s.ServicePort{
+					{
+						Port: 802,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service3",
+				Namespace: "awesome",
+				UID:       "3",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.3",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 443,
+					},
+				},
+			},
+		},
+	}
+	watchChan := make(chan interface{})
+	client := clientMock{
+		ingresses: ingresses,
+		services:  services,
+		watchChan: watchChan,
+	}
+	provider := Kubernetes{
+		Namespaces: []string{"awesome"},
+	}
+	actual, err := provider.loadIngresses(client)
+	if err != nil {
+		t.Fatalf("error %+v", err)
+	}
+
+	expected := &types.Configuration{
+		Backends: map[string]*types.Backend{
+			"foo/bar": {
+				Servers: map[string]types.Server{
+					"1": {
+						URL:    "http://10.0.0.1:801",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+			"bar": {
+				Servers: map[string]types.Server{
+					"2": {
+						URL:    "http://10.0.0.2:802",
+						Weight: 1,
+					},
+					"3": {
+						URL:    "https://10.0.0.3:443",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+		},
+		Frontends: map[string]*types.Frontend{
+			"foo/bar": {
+				Backend:        "foo/bar",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"/bar": {
+						Rule: "PathPrefix:/bar",
+					},
+					"foo": {
+						Rule: "Host:foo",
+					},
+				},
+			},
+			"bar": {
+				Backend:        "bar",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"bar": {
+						Rule: "Host:bar",
+					},
+				},
+			},
+		},
+	}
+	actualJSON, _ := json.Marshal(actual)
+	expectedJSON, _ := json.Marshal(expected)
+
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("expected %+v, got %+v", string(expectedJSON), string(actualJSON))
+	}
+}
+
+func TestLoadMultipleNamespacedIngresses(t *testing.T) {
+	ingresses := []k8s.Ingress{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "foo",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/bar",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+					{
+						Host: "bar",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Backend: k8s.IngressBackend{
+											ServiceName: "service3",
+											ServicePort: k8s.FromInt(443),
+										},
+									},
+									{
+										Backend: k8s.IngressBackend{
+											ServiceName: "service2",
+											ServicePort: k8s.FromInt(802),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "somewhat-awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "awesome",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/quix",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "not-awesome",
+			},
+			Spec: k8s.IngressSpec{
+				Rules: []k8s.IngressRule{
+					{
+						Host: "baz",
+						IngressRuleValue: k8s.IngressRuleValue{
+							HTTP: &k8s.HTTPIngressRuleValue{
+								Paths: []k8s.HTTPIngressPath{
+									{
+										Path: "/baz",
+										Backend: k8s.IngressBackend{
+											ServiceName: "service1",
+											ServicePort: k8s.FromInt(801),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	services := []k8s.Service{
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Name:      "service1",
+				Namespace: "awesome",
+				UID:       "1",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.1",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "somewhat-awesome",
+				Name:      "service1",
+				UID:       "17",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.4",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 801,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+				Name:      "service2",
+				UID:       "2",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.2",
+				Ports: []k8s.ServicePort{
+					{
+						Port: 802,
+					},
+				},
+			},
+		},
+		{
+			ObjectMeta: k8s.ObjectMeta{
+				Namespace: "awesome",
+				Name:      "service3",
+				UID:       "3",
+			},
+			Spec: k8s.ServiceSpec{
+				ClusterIP: "10.0.0.3",
+				Ports: []k8s.ServicePort{
+					{
+						Name: "http",
+						Port: 443,
+					},
+				},
+			},
+		},
+	}
+	watchChan := make(chan interface{})
+	client := clientMock{
+		ingresses: ingresses,
+		services:  services,
+		watchChan: watchChan,
+	}
+	provider := Kubernetes{
+		Namespaces: []string{"awesome", "somewhat-awesome"},
+	}
+	actual, err := provider.loadIngresses(client)
+	if err != nil {
+		t.Fatalf("error %+v", err)
+	}
+
+	expected := &types.Configuration{
+		Backends: map[string]*types.Backend{
+			"foo/bar": {
+				Servers: map[string]types.Server{
+					"1": {
+						URL:    "http://10.0.0.1:801",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+			"bar": {
+				Servers: map[string]types.Server{
+					"2": {
+						URL:    "http://10.0.0.2:802",
+						Weight: 1,
+					},
+					"3": {
+						URL:    "https://10.0.0.3:443",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+			"awesome/quix": {
+				Servers: map[string]types.Server{
+					"17": {
+						URL:    "http://10.0.0.4:801",
+						Weight: 1,
+					},
+				},
+				CircuitBreaker: nil,
+				LoadBalancer:   nil,
+			},
+		},
+		Frontends: map[string]*types.Frontend{
+			"foo/bar": {
+				Backend:        "foo/bar",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"/bar": {
+						Rule: "PathPrefix:/bar",
+					},
+					"foo": {
+						Rule: "Host:foo",
+					},
+				},
+			},
+			"bar": {
+				Backend:        "bar",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"bar": {
+						Rule: "Host:bar",
+					},
+				},
+			},
+			"awesome/quix": {
+				Backend:        "awesome/quix",
+				PassHostHeader: true,
+				Routes: map[string]types.Route{
+					"/quix": {
+						Rule: "PathPrefix:/quix",
+					},
+					"awesome": {
+						Rule: "Host:awesome",
+					},
+				},
+			},
+		},
+	}
+	actualJSON, _ := json.Marshal(actual)
+	expectedJSON, _ := json.Marshal(expected)
+
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("expected %+v, got %+v", string(expectedJSON), string(actualJSON))
+	}
+}
+
 type clientMock struct {
 	ingresses []k8s.Ingress
 	services  []k8s.Service
@@ -174,13 +1067,25 @@ type clientMock struct {
 }

 func (c clientMock) GetIngresses(predicate func(k8s.Ingress) bool) ([]k8s.Ingress, error) {
-	return c.ingresses, nil
+	var ingresses []k8s.Ingress
+	for _, ingress := range c.ingresses {
+		if predicate(ingress) {
+			ingresses = append(ingresses, ingress)
+		}
+	}
+	return ingresses, nil
 }
 func (c clientMock) WatchIngresses(predicate func(k8s.Ingress) bool, stopCh <-chan bool) (chan interface{}, chan error, error) {
 	return c.watchChan, make(chan error), nil
 }
 func (c clientMock) GetServices(predicate func(k8s.Service) bool) ([]k8s.Service, error) {
-	return c.services, nil
+	var services []k8s.Service
+	for _, service := range c.services {
+		if predicate(service) {
+			services = append(services, service)
+		}
+	}
+	return services, nil
 }
 func (c clientMock) WatchAll(stopCh <-chan bool) (chan interface{}, chan error, error) {
 	return c.watchChan, make(chan error), nil
--- a/provider/kv_test.go
+++ b/provider/kv_test.go
@@ -430,7 +430,7 @@ func TestKVLoadConfig(t *testing.T) {
 		Frontends: map[string]*types.Frontend{
 			"frontend.with.dot": {
 				Backend:        "backend.with.dot.too",
-				PassHostHeader: false,
+				PassHostHeader: true,
 				EntryPoints:    []string{},
 				Routes: map[string]types.Route{
 					"route.with.dot": {
--- a/provider/marathon.go
+++ b/provider/marathon.go
@@ -316,7 +316,7 @@ func (provider *Marathon) getPassHostHeader(application marathon.Application) st
 	if passHostHeader, err := provider.getLabel(application, "traefik.frontend.passHostHeader"); err == nil {
 		return passHostHeader
 	}
-	return "false"
+	return "true"
 }

 func (provider *Marathon) getEntryPoints(application marathon.Application) []string {
--- a/provider/marathon_test.go
+++ b/provider/marathon_test.go
@@ -82,8 +82,9 @@ func TestMarathonLoadConfig(t *testing.T) {
 			},
 			expectedFrontends: map[string]*types.Frontend{
 				`frontend-test`: {
-					Backend:     "backend-test",
-					EntryPoints: []string{},
+					Backend:        "backend-test",
+					PassHostHeader: true,
+					EntryPoints:    []string{},
 					Routes: map[string]types.Route{
 						`route-host-test`: {
 							Rule: "Host:test.docker.localhost",
@@ -780,15 +781,15 @@ func TestMarathonGetPassHostHeader(t *testing.T) {
 	}{
 		{
 			application: marathon.Application{},
-			expected:    "false",
+			expected:    "true",
 		},
 		{
 			application: marathon.Application{
 				Labels: map[string]string{
-					"traefik.frontend.passHostHeader": "true",
+					"traefik.frontend.passHostHeader": "false",
 				},
 			},
-			expected: "true",
+			expected: "false",
 		},
 	}

--- a/script/crossbinary
+++ b/script/crossbinary
@@ -9,13 +9,13 @@ fi
 if [ -z "$1" ]; then
    # Remove windows platform because of
    # https://github.com/mailgun/log/issues/10
-    OS_PLATFORM_ARG=(-os="darwin linux")
+    OS_PLATFORM_ARG=(linux)
 else
    OS_PLATFORM_ARG=($1)
 fi

 if [ -z "$2" ]; then
-    OS_ARCH_ARG=(-arch="386 amd64 arm")
+    OS_ARCH_ARG=(386 amd64 arm)
 else
    OS_ARCH_ARG=($2)
 fi
@@ -32,5 +32,9 @@ fi
 rm -f dist/traefik_*

 # Build binaries
-GOGC=off gox -ldflags "-X main.Version=$VERSION -X main.BuildDate=$DATE" "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \
-    -output="dist/traefik_{{.OS}}-{{.Arch}}"
+for OS in ${OS_PLATFORM_ARG[@]}; do
+  for ARCH in ${OS_ARCH_ARG[@]}; do
+    echo "Building binary for $OS/$ARCH..."
+    GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 go build -ldflags "-s -w -X main.Version=$VERSION -X main.BuildDate=$DATE" -o "dist/traefik_$OS-$ARCH" .
+  done
+done
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e

-if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then
  echo "Deploying..."
 else
  echo "Skipping deploy"
--- a/script/test-integration
+++ b/script/test-integration
@@ -11,4 +11,6 @@ if [ -n "$VERBOSE" ]; then
 fi

 cd integration
+echo "Testing against…"
+docker version
 CGO_ENABLED=0 go test $TESTFLAGS
--- a/templates/consul_catalog.tmpl
+++ b/templates/consul_catalog.tmpl
@@ -29,7 +29,7 @@
 {{range .Services}}
  [frontends.frontend-{{.ServiceName}}]
  backend = "backend-{{.ServiceName}}"
-  passHostHeader = {{getAttribute "frontend.passHostHeader" .Attributes "false"}}
+  passHostHeader = {{getAttribute "frontend.passHostHeader" .Attributes "true"}}
  {{$entryPoints := getAttribute "frontend.entrypoints" .Attributes ""}}
  {{with $entryPoints}}
    entrypoints = [{{range getEntryPoints $entryPoints}}
--- a/templates/kubernetes.tmpl
+++ b/templates/kubernetes.tmpl
@@ -9,6 +9,7 @@
 [frontends]{{range $frontendName, $frontend := .Frontends}}
  [frontends."{{$frontendName}}"]
  backend = "{{$frontend.Backend}}"
+  passHostHeader = {{$frontend.PassHostHeader}}
    {{range $routeName, $route := $frontend.Routes}}
    [frontends."{{$frontendName}}".routes."{{$routeName}}"]
    rule = "{{$route.Rule}}"
--- a/templates/kv.tmpl
+++ b/templates/kv.tmpl
@@ -39,7 +39,7 @@
    {{$entryPoints := SplitGet . "/entrypoints"}}
    [frontends."{{$frontend}}"]
    backend = "{{Get "" . "/backend"}}"
-    passHostHeader = {{Get "false" . "/passHostHeader"}}
+    passHostHeader = {{Get "true" . "/passHostHeader"}}
    entryPoints = [{{range $entryPoints}}
      "{{.}}",
    {{end}}]
--- a/traefik.sample.toml
+++ b/traefik.sample.toml
@@ -343,6 +343,7 @@
 # Optional
 #
 # endpoint = "http://localhost:8080"
+# namespaces = ["default"]

 ################################################################
 # Consul KV configuration backend
Author	SHA1	Message	Date
Vincent Demeester	153ab8f0fa	Update engine-api to fix versions issues (#383 ) Updating an engine-api that has fixed some versioning issues (filters json marshalling) Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2016-05-19 21:11:30 +02:00
Vincent Demeester	f6c860afc0	Merge pull request #380 from errm/k8s-ref-ports-by-name Allow k8s ports to be referenced by name as well as number	2016-05-19 15:00:12 +02:00
Ed Robinson	d13b755df2	Allow k8s ports to be referenced by name as well as number	2016-05-19 13:36:19 +01:00
Vincent Demeester	6bacbf6cac	Merge pull request #379 from errm/k8s-services-from-same-namespace The referenced k8s service(s) must be in namespace	2016-05-19 14:08:53 +02:00
Ed Robinson	5923d22379	The referenced k8s service(s) must be in namespace By design k8s ingress is only designed to ballance services from within the namespace of the ingress. This is disscuessed a little in https://github.com/kubernetes/kubernetes/issues/17088. For now traefik should only reference the services in the current namespace. For me this was a confusing change of behaviour from the reference implimentations, as I have services with the same name in each namespace.	2016-05-18 17:38:47 +01:00
Vincent Demeester	70494117d1	Merge pull request #373 from AlmogBaku/master K8s: add an option to configure "PathPrefixStrip" for the ingress-resource using annotation	2016-05-18 17:19:11 +02:00
AlmogBaku	8210743dad	change log error of "ruleType" to warning	2016-05-17 16:54:40 +03:00
AlmogBaku	895f3cc109	fixes golint error	2016-05-17 16:22:37 +03:00
AlmogBaku	71f160dddc	Following up to the conversation on Slack & GitHub: - Change the annotation to define the rule type in `traefik.frontend.rule.type` - Update tests - Add documentation - Add example	2016-05-17 13:50:06 +03:00
AlmogBaku	92abaa0d47	fixes wrong actual on unit-test	2016-05-16 01:24:23 +03:00
AlmogBaku	47710c1385	fixes wrong names on tests - make it pass	2016-05-16 01:06:30 +03:00
AlmogBaku	df3abcbc9a	gofmt to tests..	2016-05-15 20:01:26 +03:00
AlmogBaku	dbb7ad41e5	Add tests for k8s PathPrefixStrip annotation	2016-05-15 12:16:27 +03:00
AlmogBaku	9773d4e409	K8s: add an option to configure "PathPrefixStrip" for the ingress-resource using annotation	2016-05-15 12:00:20 +03:00
Emile Vauge	993165fa66	Added Devoxx Video & support (#371 ) Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-13 17:32:39 +02:00
Emile Vauge	c49f5dad05	Merge pull request #368 from vdemeester/update-docker-deps Update docker dependencies to fix issues	2016-05-13 08:21:09 +02:00
Vincent Demeester	c0bdedfed3	Add travis matrix for 1.9.1 and 1.10.1 Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2016-05-12 17:18:58 +02:00
Vincent Demeester	061107b65f	Update docker dependencies to fix issues Update engine-api, libcompose and related dependencies (including libkermit), to fix issues with docker v1.9.1 and lower. Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2016-05-12 17:10:42 +02:00
Vincent Demeester	7bf421f847	Merge pull request #369 from containous/fix-hijack-logger fix hijack logger middleware	2016-05-12 17:06:15 +02:00
Emile Vauge	cb0c1d34a2	fix hijack logger middleware Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-12 16:32:12 +02:00
Vincent Demeester	749b381f26	Merge pull request #355 from containous/change-PathPrefixStrip-k8s Replace PathPrefixStrip by PathPrefix in k8s	2016-05-12 13:56:43 +02:00
Emile Vauge	d89279d708	Replace PathPrefixStrip by PathPrefix in k8s Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-12 12:44:26 +02:00
Marcus Stong	be209ed30c	#216 : sets passHostHeader to true by default (#351 )	2016-05-10 13:43:24 +02:00
Emile Vauge	4a4ba2791d	Merge pull request #357 from s7anley/generate-fix Create static folder on first generate	2016-05-09 23:47:23 +02:00
Ján Koščo	c61d9776e7	Create static folder on first generate	2016-05-09 23:13:22 +02:00
Vincent Demeester	b5716abd3e	Merge pull request #347 from keis/consul-catalog-replace-space-in-tags Replace whitespace in tags in consul_catalog	2016-05-07 17:26:17 +02:00
David Keijser	b9bb78d04b	Normalise tags in backend name of consul_catalog Another fun thing consul lets you do is use spaces in your tags. This means when including tags in backend name it's possible to generate invalid names.	2016-05-07 16:30:38 +02:00
Vincent Demeester	8a39ee65cd	Merge pull request #341 from errm/k8s-namespacing Adds option to namespace k8s ingresses	2016-05-07 13:30:35 +02:00
Ed Robinson	301a463aeb	Adds option to namespace k8s ingresses If the flag kubernetes.namespaces is set... Then we only select ingresses from that/those namespace(s) This allows multiple instances of traefik to independently load balance for each namespace. This could be for logical or security reasons. Addresses #336	2016-05-06 11:36:53 +01:00
Vincent Demeester	d1b0bece47	Merge pull request #356 from errm/documentation-documentation Adds some documentation about adding documentation	2016-05-05 23:33:35 +02:00
Ed Robinson	63fd7d1d63	Adds some documentation about adding documentation	2016-05-05 21:45:57 +01:00
Vincent Demeester	f4fb2518a1	Merge pull request #352 from containous/remove-alpine-from-build Go back to standard golang image	2016-05-05 19:45:12 +02:00
Emile Vauge	ee486de947	Go back to standard golang image Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-05 18:31:55 +02:00