From 2798e18e1893b2cc4c1f38e231e85cb7f15e1c6e Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Fri, 21 Jun 2024 11:10:04 +0200 Subject: [PATCH 1/3] Update maintainers --- docs/content/contributing/maintainers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/contributing/maintainers.md b/docs/content/contributing/maintainers.md index e91bfcc89..a340156fc 100644 --- a/docs/content/contributing/maintainers.md +++ b/docs/content/contributing/maintainers.md @@ -9,7 +9,6 @@ description: "Traefik Proxy is an open source software with a thriving community * Emile Vauge [@emilevauge](https://github.com/emilevauge) * Manuel Zapf [@SantoDE](https://github.com/SantoDE) -* Ludovic Fernandez [@ldez](https://github.com/ldez) * Julien Salleyron [@juliens](https://github.com/juliens) * Nicolas Mengin [@nmengin](https://github.com/nmengin) * Michaël Matur [@mmatur](https://github.com/mmatur) @@ -33,6 +32,7 @@ People who have had an incredibly positive impact on the project, and are now fo * Daniel Tomcej [@dtomcej](https://github.com/dtomcej) * Timo Reimann [@timoreimann](https://github.com/timoreimann) * Marco Jantke [@mjantke](https://github.com/mjeri) +* Ludovic Fernandez [@ldez](https://github.com/ldez) ## Maintainer's Guidelines From 6f1bd54d8655a4638f48c379cf226400e798213e Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 24 Jun 2024 11:22:03 +0200 Subject: [PATCH 2/3] Fix some documentation links Co-authored-by: Kevin Pollet --- docs/content/contributing/documentation.md | 2 +- docs/content/migration/v2-to-v3-details.md | 2 +- docs/content/migration/v2-to-v3.md | 2 +- docs/content/migration/v2.md | 4 ++-- docs/content/providers/kubernetes-crd.md | 2 +- docs/content/providers/kubernetes-ingress.md | 2 +- docs/content/providers/overview.md | 4 ++-- docs/content/routing/providers/kubernetes-ingress.md | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/content/contributing/documentation.md b/docs/content/contributing/documentation.md index 3911abe4a..5a2974ff8 100644 --- a/docs/content/contributing/documentation.md +++ b/docs/content/contributing/documentation.md @@ -15,7 +15,7 @@ Let's see how. ### General -This [documentation](https://doc.traefik.io/traefik/ "Link to the official Traefik documentation") is built with [MkDocs](https://mkdocs.org/ "Link to website of MkDocs"). +This [documentation](../../ "Link to the official Traefik documentation") is built with [MkDocs](https://mkdocs.org/ "Link to website of MkDocs"). ### Method 1: `Docker` and `make` diff --git a/docs/content/migration/v2-to-v3-details.md b/docs/content/migration/v2-to-v3-details.md index 57d221913..ad6f04dfb 100644 --- a/docs/content/migration/v2-to-v3-details.md +++ b/docs/content/migration/v2-to-v3-details.md @@ -135,7 +135,7 @@ It is now unsupported and would prevent Traefik to start. ##### Remediation The `http3` option should be removed from the static configuration experimental section. -To configure `http3`, please checkout the [entrypoint configuration documentation](https://doc.traefik.io/traefik/v3.0/routing/entrypoints/#http3_1). +To configure `http3`, please checkout the [entrypoint configuration documentation](../routing/entrypoints.md#http3_1). ### Consul provider diff --git a/docs/content/migration/v2-to-v3.md b/docs/content/migration/v2-to-v3.md index 1c548f7eb..2b88ce294 100644 --- a/docs/content/migration/v2-to-v3.md +++ b/docs/content/migration/v2-to-v3.md @@ -29,7 +29,7 @@ core: defaultRuleSyntax: v2 ``` -This snippet in the static configuration makes the [v2 format](https://doc.traefik.io/traefik/v3.0/migration/v2-to-v3/?ref=traefik.io#configure-the-default-syntax-in-static-configuration "Link to configure default syntax in static config") the default rule matchers syntax. +This snippet in the static configuration makes the [v2 format](../migration/v2-to-v3-details.md#configure-the-default-syntax-in-static-configuration "Link to configure default syntax in static config") the default rule matchers syntax. Start Traefik v3 with this new configuration to test it. diff --git a/docs/content/migration/v2.md b/docs/content/migration/v2.md index 4689e204d..aa803fc81 100644 --- a/docs/content/migration/v2.md +++ b/docs/content/migration/v2.md @@ -553,7 +553,7 @@ The following ciphers have been removed from the default list: - `TLS_RSA_WITH_AES_128_GCM_SHA256` - `TLS_RSA_WITH_AES_256_GCM_SHA384` -To enable these ciphers, please set the option `CipherSuites` in your [TLS configuration](https://doc.traefik.io/traefik/https/tls/#cipher-suites) or set the environment variable `GODEBUG=tlsrsakex=1`. +To enable these ciphers, please set the option `CipherSuites` in your [TLS configuration](../https/tls.md#cipher-suites) or set the environment variable `GODEBUG=tlsrsakex=1`. ### Minimum TLS Version @@ -562,7 +562,7 @@ To enable these ciphers, please set the option `CipherSuites` in your [TLS confi > This change can be reverted with the `tls10server=1 GODEBUG` setting. > (https://go.dev/doc/go1.22#crypto/tls) -To enable TLS 1.0, please set the option `MinVersion` to `VersionTLS10` in your [TLS configuration](https://doc.traefik.io/traefik/https/tls/#cipher-suites) or set the environment variable `GODEBUG=tls10server=1`. +To enable TLS 1.0, please set the option `MinVersion` to `VersionTLS10` in your [TLS configuration](../https/tls.md#cipher-suites) or set the environment variable `GODEBUG=tls10server=1`. ## v2.11.1 diff --git a/docs/content/providers/kubernetes-crd.md b/docs/content/providers/kubernetes-crd.md index 2f60a5868..eaefb45a1 100644 --- a/docs/content/providers/kubernetes-crd.md +++ b/docs/content/providers/kubernetes-crd.md @@ -58,7 +58,7 @@ For this reason, users can run multiple instances of Traefik at the same time to When using a single instance of Traefik with Let's Encrypt, you should encounter no issues. However, this could be a single point of failure. Unfortunately, it is not possible to run multiple instances of Traefik Proxy 2.0 with Let's Encrypt enabled, because there is no way to ensure that the correct instance of Traefik will receive the challenge request and subsequent responses. -Previous versions of Traefik used a [KV store](https://doc.traefik.io/traefik/v1.7/configuration/acme/#storage) to attempt to achieve this, but due to sub-optimal performance that feature was dropped in 2.0. +Early versions (v1.x) of Traefik used a [KV store](https://doc.traefik.io/traefik/v1.7/configuration/acme/#storage) to attempt to achieve this, but due to sub-optimal performance that feature was dropped in 2.0. If you need Let's Encrypt with HA in a Kubernetes environment, we recommend using [Traefik Enterprise](https://traefik.io/traefik-enterprise/), which includes distributed Let's Encrypt as a supported feature. diff --git a/docs/content/providers/kubernetes-ingress.md b/docs/content/providers/kubernetes-ingress.md index f60ed243a..8a357445e 100644 --- a/docs/content/providers/kubernetes-ingress.md +++ b/docs/content/providers/kubernetes-ingress.md @@ -80,7 +80,7 @@ When using a single instance of Traefik Proxy with Let's Encrypt, you should enc However, this could be a single point of failure. Unfortunately, it is not possible to run multiple instances of Traefik 2.0 with Let's Encrypt enabled, because there is no way to ensure that the correct instance of Traefik receives the challenge request, and subsequent responses. -Previous versions of Traefik used a [KV store](https://doc.traefik.io/traefik/v1.7/configuration/acme/#storage) to attempt to achieve this, +Early versions (v1.x) of Traefik used a [KV store](https://doc.traefik.io/traefik/v1.7/configuration/acme/#storage) to attempt to achieve this, but due to sub-optimal performance that feature was dropped in 2.0. If you need Let's Encrypt with high availability in a Kubernetes environment, diff --git a/docs/content/providers/overview.md b/docs/content/providers/overview.md index 02d2ec22f..1aba0f932 100644 --- a/docs/content/providers/overview.md +++ b/docs/content/providers/overview.md @@ -150,8 +150,8 @@ Below is the list of the currently supported providers in Traefik. !!! info "More Providers" - The current version of Traefik does not yet support every provider that Traefik v1.7 did. - See the [previous version (v1.7)](https://doc.traefik.io/traefik/v1.7/) for more providers. + The current version of Traefik does not yet support every provider that Traefik v2.11 did. + See the [previous version (v2.11)](https://doc.traefik.io/traefik/v2.11/) for more information. ### Configuration Reload Frequency diff --git a/docs/content/routing/providers/kubernetes-ingress.md b/docs/content/routing/providers/kubernetes-ingress.md index 6c2342ccb..df75908c1 100644 --- a/docs/content/routing/providers/kubernetes-ingress.md +++ b/docs/content/routing/providers/kubernetes-ingress.md @@ -822,7 +822,7 @@ TLS certificates can be managed in Secrets objects. whether the LB's children are directly the pods IPs or if the only child is the Kubernetes Service clusterIP. One alternative is to use an `ExternalName` service to forward requests to the Kubernetes service through DNS. - To do so, one must [allow external name services](https://doc.traefik.io/traefik/providers/kubernetes-ingress/#allowexternalnameservices "Link to docs about allowing external name services"). + To do so, one must [allow external name services](../providers/kubernetes-ingress/#allowexternalnameservices "Link to docs about allowing external name services"). Traefik automatically requests endpoint information based on the service provided in the ingress spec. Although Traefik will connect directly to the endpoints (pods), From 2090baa938137907e15fdb63f22b76c1f30edcf1 Mon Sep 17 00:00:00 2001 From: Dylan Rodgers <94392934+tomatokoolaid@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:30:04 -0600 Subject: [PATCH 3/3] Update Advanced Capabilities Callout --- .../traefik-for-business-applications.md | 16 ++++++---------- docs/content/index.md | 6 ++---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/docs/content/includes/traefik-for-business-applications.md b/docs/content/includes/traefik-for-business-applications.md index 236efaf52..97a3512c0 100644 --- a/docs/content/includes/traefik-for-business-applications.md +++ b/docs/content/includes/traefik-for-business-applications.md @@ -1,14 +1,10 @@ --- -!!! question "Using Traefik for Business Applications?" +!!! question "Using Traefik OSS in Production? Consider Adding Advanced Capabilities." - If you are using Traefik in your organization, consider our enterprise-grade solutions: + Add API Gateway or API Management capabilities seamlessly to your existing Traefik deployments. + No rip and replace. No learning curve. - - API Management - [Explore](https://traefik.io/solutions/api-management/) // [Watch Demo Video](https://info.traefik.io/watch-traefik-hub-demo) - - API Gateway - [Explore](https://traefik.io/solutions/api-gateway/) // [Watch Demo Video](https://info.traefik.io/watch-traefikee-demo) - - Ingress Controller - [Kubernetes](https://traefik.io/solutions/kubernetes-ingress/) // [Docker Swarm](https://traefik.io/solutions/docker-swarm-ingress/) - - These tools help businesses discover, deploy, secure, and manage microservices and APIs easily, at scale, across any environment. + - [Explore our API Gateway](https://traefik.io/traefik-hub-api-gateway/) + - [Explore our API Management](https://traefik.io/traefik-hub/) + - [Get 24/7/365 Commercial Support for Traefik OSS](https://info.traefik.io/request-commercial-support) diff --git a/docs/content/index.md b/docs/content/index.md index f4b16c8ff..a79085f55 100644 --- a/docs/content/index.md +++ b/docs/content/index.md @@ -24,8 +24,6 @@ Developing Traefik, our main goal is to make it effortless to use, and we're sur !!! info - Join our user friendly and active [Community Forum](https://community.traefik.io "Link to Traefik Community Forum") to discuss, learn, and connect with the traefik community. + Join our user friendly and active [Community Forum](https://community.traefik.io "Link to Traefik Community Forum") to discuss, learn, and connect with the Traefik community. - Using Traefik in your organization? Consider [Traefik Enterprise](https://traefik.io/traefik-enterprise/ "Lino to Traefik Enterprise"), our unified API Gateway and Ingress that simplifies the discovery, security, and deployment of APIs and microservices across any environment. - - See it in action in [this short video walkthrough](https://info.traefik.io/watch-traefikee-demo "Link to video walkthrough"). + Using Traefik OSS in Production? Add enterprise-grade API Gateway and API Management capabilities to your existing deployments seamlessly. No rip and replace. No learning curve. Learn more from [this short video](https://info.traefik.io/traefik-upgrade-walkthrough)