Merge branch 'master' of https://github.com/AlmogBaku/traefik into AlmogBaku-master

This commit is contained in:
Emile Vauge 2016-06-07 20:19:21 +02:00
commit 2a96ae9ec2
No known key found for this signature in database
GPG key ID: D808B4C167352E59

View file

@ -712,7 +712,7 @@ Træfɪk can be configured to use Kubernetes Ingress as a backend configuration:
Annotations can be used on containers to override default behaviour for the whole Ingress resource: 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}`). - `traefik.frontend.rule.type: PathPrefixStrip`: override the default frontend rule type (Default: `PathPrefix`).
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). 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).