Merge branch v2.4 into master

This commit is contained in:
kevinpollet 2021-01-20 10:50:21 +01:00
commit 2747e240c1
No known key found for this signature in database
GPG key ID: 0C9A5DDD1B292453
17 changed files with 90 additions and 28 deletions

View file

@ -11,12 +11,12 @@ You can install Traefik with the following flavors:
Choose one of the [official Docker images](https://hub.docker.com/_/traefik) and run it with one sample configuration file:
* [TOML](https://raw.githubusercontent.com/traefik/traefik/v2.3/traefik.sample.toml)
* [YAML](https://raw.githubusercontent.com/traefik/traefik/v2.3/traefik.sample.yml)
* [TOML](https://raw.githubusercontent.com/traefik/traefik/v2.4/traefik.sample.toml)
* [YAML](https://raw.githubusercontent.com/traefik/traefik/v2.4/traefik.sample.yml)
```bash
docker run -d -p 8080:8080 -p 80:80 \
-v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.3
-v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik:v2.4
```
For more details, go to the [Docker provider documentation](../providers/docker.md)

View file

@ -15,7 +15,7 @@ version: '3'
services:
reverse-proxy:
# The official v2 Traefik docker image
image: traefik:v2.3
image: traefik:v2.4
# Enables the web UI and tells Traefik to listen to docker
command: --api.insecure=true --providers.docker
ports:

View file

@ -264,7 +264,7 @@ See the sections [Docker API Access](#docker-api-access) and [Docker Swarm API A
services:
traefik:
image: traefik:v2.3 # The official v2 Traefik docker image
image: traefik:v2.4 # The official v2 Traefik docker image
ports:
- "80:80"
volumes:

View file

@ -368,4 +368,4 @@ providers:
### Further
If one wants to know more about the various aspects of the Ingress spec that Traefik supports,
many examples of Ingresses definitions are located in the tests [data](https://github.com/traefik/traefik/tree/v2.3/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository.
many examples of Ingresses definitions are located in the tests [data](https://github.com/traefik/traefik/tree/v2.4/pkg/provider/kubernetes/ingress/fixtures) of the Traefik repository.

View file

@ -43,7 +43,7 @@ The Kubernetes Ingress Controller, The Custom Resource Way.
serviceAccountName: traefik-ingress-controller
containers:
- name: traefik
image: traefik:v2.3
image: traefik:v2.4
args:
- --log.level=DEBUG
- --api

View file

@ -112,7 +112,7 @@ which in turn will create the resulting routers, services, handlers, etc.
serviceAccountName: traefik-ingress-controller
containers:
- name: traefik
image: traefik:v2.3
image: traefik:v2.4
args:
- --entrypoints.web.address=:80
- --providers.kubernetesingress
@ -461,7 +461,7 @@ This way, any Ingress attached to this Entrypoint will have TLS termination by d
serviceAccountName: traefik-ingress-controller
containers:
- name: traefik
image: traefik:v2.3
image: traefik:v2.4
args:
- --entrypoints.websecure.address=:443
- --entrypoints.websecure.http.tls
@ -640,7 +640,7 @@ For more options, please refer to the available [annotations](#on-ingress).
serviceAccountName: traefik-ingress-controller
containers:
- name: traefik
image: traefik:v2.3
image: traefik:v2.4
args:
- --entrypoints.websecure.address=:443
- --providers.kubernetesingress

View file

@ -26,7 +26,7 @@ spec:
serviceAccountName: traefik-ingress-controller
containers:
- name: traefik
image: traefik:v2.3
image: traefik:v2.4
args:
- --api.insecure
- --accesslog

View file

@ -26,5 +26,5 @@ node:
- K3S_CLUSTER_SECRET=somethingtotallyrandom
volumes:
# this is where you would place a alternative traefik image (saved as a .tar file with
# 'docker save'), if you want to use it, instead of the traefik:v2.3 image.
# 'docker save'), if you want to use it, instead of the traefik:v2.4 image.
- /sowewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images

View file

@ -3,7 +3,7 @@ version: "3.3"
services:
traefik:
image: "traefik:v2.3"
image: "traefik:v2.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"

View file

@ -13,7 +13,7 @@ secrets:
services:
traefik:
image: "traefik:v2.3"
image: "traefik:v2.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"

View file

@ -3,7 +3,7 @@ version: "3.3"
services:
traefik:
image: "traefik:v2.3"
image: "traefik:v2.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"

View file

@ -3,7 +3,7 @@ version: "3.3"
services:
traefik:
image: "traefik:v2.3"
image: "traefik:v2.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"

View file

@ -3,7 +3,7 @@ version: "3.3"
services:
traefik:
image: "traefik:v2.3"
image: "traefik:v2.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"