homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge current v2.6 into master

Browse source
This commit is contained in:
Tom Moulard 2022-02-21 14:05:28 +01:00
commit 25725e9b2f
No known key found for this signature in database
GPG key ID: 521ABE0C1A0DEAF6
45 changed files with 155 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/content/contributing/building-testing.md
View file

@ -102,7 +102,7 @@ Once you've set up your go environment and cloned the source repository, you can
```bash
# Generate UI static files
rm -rf ./webui/static/; make generate-webui
make clean-webui generate-webui
# required to merge non-code components into the final binary,
# such as the web dashboard/UI

2
docs/content/user-guides/crd-acme/k3s.yml
View file

@ -27,4 +27,4 @@ node:
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.6 image.
- /sowewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images
- /somewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images

2
docs/content/user-guides/marathon.md
View file

@ -93,7 +93,7 @@ There are two mitigation efforts:
The Marathon health check makes sure that applications once deemed dysfunctional are being rescheduled to different slaves.
However, they might take a while to get triggered and the follow-up processes to complete.
For that reason, the Treafik health check provides an additional check that responds more rapidly and does not require a configuration reload to happen.
For that reason, the Traefik health check provides an additional check that responds more rapidly and does not require a configuration reload to happen.
Additionally, it protects from cases that the Marathon health check may not be able to cover, such as a network split.
### (Non-)Alternatives