diff --git a/docs/content/migration/v1-to-v2.md b/docs/content/migration/v1-to-v2.md index 121ba375b..00fe99fe9 100644 --- a/docs/content/migration/v1-to-v2.md +++ b/docs/content/migration/v1-to-v2.md @@ -961,7 +961,7 @@ Supported [providers](../providers/overview.md), for now: * [ ] Azure Service Fabric * [ ] BoltDB * [ ] Consul -* [ ] Consul Catalog +* [x] Consul Catalog * [x] Docker * [ ] DynamoDB * [ ] ECS diff --git a/docs/content/providers/consul-catalog.yml b/docs/content/providers/consul-catalog.yml index dfa4f9954..734886c0b 100644 --- a/docs/content/providers/consul-catalog.yml +++ b/docs/content/providers/consul-catalog.yml @@ -2,6 +2,9 @@ providers: consulcatalog: + # Expose Consul Catalog services by default in Traefik. + exposedByDefault: true + # Defines the consul address endpoint. address: 127.0.0.1:8500 diff --git a/docs/content/providers/overview.md b/docs/content/providers/overview.md index e2376cce8..8fedf55de 100644 --- a/docs/content/providers/overview.md +++ b/docs/content/providers/overview.md @@ -26,13 +26,14 @@ Even if each provider is different, we can categorize them in four groups: Below is the list of the currently supported providers in Traefik. -| Provider | Type | Configuration Type | -|-----------------------------------|--------------|--------------------| -| [Docker](./docker.md) | Orchestrator | Label | -| [Kubernetes](./kubernetes-crd.md) | Orchestrator | Custom Resource | -| [Marathon](./marathon.md) | Orchestrator | Label | -| [Rancher](./rancher.md) | Orchestrator | Label | -| [File](./file.md) | Manual | TOML/YAML format | +| Provider | Type | Configuration Type | +|---------------------------------------|--------------|--------------------| +| [Docker](./docker.md) | Orchestrator | Label | +| [Kubernetes](./kubernetes-crd.md) | Orchestrator | Custom Resource | +| [Consul Catalog](./consul-catalog.md) | Orchestrator | Label | +| [Marathon](./marathon.md) | Orchestrator | Label | +| [Rancher](./rancher.md) | Orchestrator | Label | +| [File](./file.md) | Manual | TOML/YAML format | !!! info "More Providers" @@ -90,6 +91,7 @@ or with a finer granularity mechanism based on constraints. List of providers that support that feature: - [Docker](./docker.md#exposedbydefault) +- [Consul Catalog](./consul-catalog.md#exposedbydefault) - [Rancher](./rancher.md#exposedbydefault) - [Marathon](./marathon.md#exposedbydefault) @@ -98,6 +100,7 @@ List of providers that support that feature: List of providers that support constraints: - [Docker](./docker.md#constraints) +- [Consul Catalog](./consul-catalog.md#constraints) - [Rancher](./rancher.md#constraints) - [Marathon](./marathon.md#constraints) - [Kubernetes CRD](./kubernetes-crd.md#labelselector)