primal/traefik
1
0
Fork 0
mirror of https://github.com/traefik/traefik synced 2026-02-03 10:00:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge v2.11 into v3.6

Browse Source
This commit is contained in:
mmatur
2026-02-02 05:27:50 +01:00
parent 75ac25bb31 c320bb4adb
commit f2b68f29a1
17 changed files with 50 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yaml
+1 -1
View File
@@ -10,7 +10,7 @@ on:
- 'script/gcg/**'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
.github/workflows/experimental.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ on:
- v*
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
.github/workflows/release.yaml
+3 -3
View File
@@ -6,7 +6,7 @@ on:
- 'v*.*.*'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
VERSION: ${{ github.ref_name }}
TRAEFIKER_EMAIL: "traefiker@traefik.io"
@@ -128,9 +128,9 @@ jobs:
--exclude .idea \
--exclude .github \
--exclude dist .
chown -R "$(id -u)":"$(id -g)" dist/
gh release create ${VERSION} ./dist/**/traefik*.{zip,tar.gz} ./dist/traefik*.{tar.gz,txt} --repo traefik/traefik --title ${VERSION} --notes ${VERSION} --latest=false
./script/deploy.sh
.github/workflows/test-gateway-api-conformance.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ on:
- 'integration/integration_test.go'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
.github/workflows/test-integration.yaml
+1 -1
View File
@@ -10,7 +10,7 @@ on:
- 'script/gcg/**'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
.github/workflows/test-knative-conformance.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ on:
- 'integration/integration_test.go'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CGO_ENABLED: 0
jobs:
.github/workflows/test-unit.yaml
+1 -1
View File
@@ -10,7 +10,7 @@ on:
- 'script/gcg/**'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
jobs:
generate-packages:
.github/workflows/validate.yaml
+1 -1
View File
@@ -6,7 +6,7 @@ on:
- '*'
env:
GO_VERSION: '1.24'
GO_VERSION: '1.25'
GOLANGCI_LINT_VERSION: v2.8.0
MISSPELL_VERSION: v0.7.0
go.mod
+3 -3
View File
@@ -1,6 +1,6 @@
module github.com/traefik/traefik/v3
go 1.24.0
go 1.25.0
require (
github.com/BurntSushi/toml v1.6.0
@@ -215,7 +215,7 @@ require (
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.21.2 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
@@ -391,7 +391,7 @@ require (
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/arch v0.4.0 // indirect
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/term v0.39.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
go.sum
+4 -3
View File
@@ -464,8 +464,9 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.21.2 h1:AqQaNADVwq/VnkCmQg6ogE+M3FOsKTytwges0JdwVuA=
github.com/go-openapi/jsonpointer v0.21.2/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
@@ -1524,8 +1525,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 h1:Y/Mj/94zIQQGHVSv1tTtQBDaQaJe62U9bkDZKKyhPCU=
golang.org/x/exp v0.0.0-20241210194714-1829a127f884/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
pkg/healthcheck/healthcheck_tcp_test.go
+2 -5
View File
@@ -571,12 +571,9 @@ func TestServiceTCPHealthChecker_differentIntervals(t *testing.T) {
hc := NewServiceTCPHealthChecker(ctx, config, lb, serviceInfo, targets, "test-service")
wg := sync.WaitGroup{}
wg.Add(1)
go func() {
wg.Go(func() {
hc.Launch(ctx)
wg.Done()
}()
})
// Let it run for 2 seconds to see the different check frequencies
select {
pkg/healthcheck/healthcheck_test.go
+4 -9
View File
@@ -439,12 +439,9 @@ func TestServiceHealthChecker_Launch(t *testing.T) {
hc := NewServiceHealthChecker(ctx, &MetricsMock{gauge}, config, lb, serviceInfo, http.DefaultTransport, map[string]*url.URL{"test": targetURL}, "foobar")
wg := sync.WaitGroup{}
wg.Add(1)
go func() {
wg.Go(func() {
hc.Launch(ctx)
wg.Done()
}()
})
// Wait for expected health check events using channel synchronization.
for i := range expectedEvents {
@@ -508,12 +505,10 @@ func TestDifferentIntervals(t *testing.T) {
hc := NewServiceHealthChecker(ctx, &MetricsMock{gauge}, config, lb, serviceInfo, http.DefaultTransport, map[string]*url.URL{"healthy": healthyURL, "unhealthy": unhealthyURL}, "foobar")
wg := sync.WaitGroup{}
wg.Add(1)
go func() {
wg.Go(func() {
hc.Launch(ctx)
wg.Done()
}()
})
select {
case <-time.After(2 * time.Second):
pkg/middlewares/accesslog/logger.go
+2 -4
View File
@@ -157,13 +157,11 @@ func NewHandler(ctx context.Context, config *otypes.AccessLog) (*Handler, error)
}
if config.BufferingSize > 0 {
logHandler.wg.Add(1)
go func() {
defer logHandler.wg.Done()
logHandler.wg.Go(func() {
for handlerParams := range logHandler.logHandlerChan {
logHandler.logTheRoundTrip(handlerParams.ctx, handlerParams.logDataTable)
}
}()
})
}
return logHandler, nil
pkg/middlewares/forwardedheaders/forwarded_header.go
+6 -8
View File
@@ -95,16 +95,14 @@ func isWebsocketRequest(req *http.Request) bool {
containsHeader := func(name, value string) bool {
h := unsafeHeader(req.Header).Get(name)
for {
pos := strings.Index(h, ",")
if pos == -1 {
return strings.EqualFold(value, strings.TrimSpace(h))
}
if strings.EqualFold(value, strings.TrimSpace(h[:pos])) {
before, after, found := strings.Cut(h, ",")
if strings.EqualFold(value, strings.TrimSpace(before)) {
return true
}
h = h[pos+1:]
if !found {
return false
}
h = after
}
}
pkg/server/server_entrypoint_tcp.go
+9 -19
View File
@@ -147,16 +147,12 @@ func (eps TCPEntryPoints) Stop() {
var wg sync.WaitGroup
for epn, ep := range eps {
wg.Add(1)
go func(entryPointName string, entryPoint *TCPEntryPoint) {
defer wg.Done()
logger := log.With().Str(logs.EntryPointName, entryPointName).Logger()
entryPoint.Shutdown(logger.WithContext(context.Background()))
wg.Go(func() {
logger := log.With().Str(logs.EntryPointName, epn).Logger()
ep.Shutdown(logger.WithContext(context.Background()))
logger.Debug().Msg("Entrypoint closed")
}(epn, ep)
})
}
wg.Wait()
@@ -313,7 +309,6 @@ func (e *TCPEntryPoint) Shutdown(ctx context.Context) {
var wg sync.WaitGroup
shutdownServer := func(server stoppable) {
defer wg.Done()
err := server.Shutdown(ctx)
if err == nil {
return
@@ -334,24 +329,19 @@ func (e *TCPEntryPoint) Shutdown(ctx context.Context) {
}
if e.httpServer.Server != nil {
wg.Add(1)
go shutdownServer(e.httpServer.Server)
wg.Go(func() { shutdownServer(e.httpServer.Server) })
}
if e.httpsServer.Server != nil {
wg.Add(1)
go shutdownServer(e.httpsServer.Server)
wg.Go(func() { shutdownServer(e.httpsServer.Server) })
if e.http3Server != nil {
wg.Add(1)
go shutdownServer(e.http3Server)
wg.Go(func() { shutdownServer(e.http3Server) })
}
}
if e.tracker != nil {
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
err := e.tracker.Shutdown(ctx)
if err == nil {
return
@@ -360,7 +350,7 @@ func (e *TCPEntryPoint) Shutdown(ctx context.Context) {
logger.Debug().Err(err).Msg("Server failed to shutdown before deadline")
}
e.tracker.Close()
}()
})
}
wg.Wait()
pkg/server/server_entrypoint_udp.go
+4 -6
View File
@@ -50,16 +50,14 @@ func (eps UDPEntryPoints) Stop() {
var wg sync.WaitGroup
for epn, ep := range eps {
wg.Add(1)
go func(entryPointName string, entryPoint *UDPEntryPoint) {
wg.Go(func() {
defer wg.Done()
logger := log.With().Str(logs.EntryPointName, entryPointName).Logger()
entryPoint.Shutdown(logger.WithContext(context.Background()))
logger := log.With().Str(logs.EntryPointName, epn).Logger()
ep.Shutdown(logger.WithContext(context.Background()))
logger.Debug().Msg("Entry point closed")
}(epn, ep)
})
}
wg.Wait()
pkg/server/service/loadbalancer/leasttime/leasttime_test.go
+6 -12
View File
@@ -592,9 +592,7 @@ func TestConcurrentInflightTracking(t *testing.T) {
numRequests := 50
for range numRequests {
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
handler.inflightCount.Add(1)
defer handler.inflightCount.Add(-1)
@@ -608,7 +606,7 @@ func TestConcurrentInflightTracking(t *testing.T) {
}
time.Sleep(1 * time.Millisecond)
}()
})
}
wg.Wait()
@@ -661,12 +659,10 @@ func TestConcurrentRequestsRespectInflight(t *testing.T) {
inflightRequests := 5
for range inflightRequests {
wg.Add(1)
go func() {
defer wg.Done()
wg.Go(func() {
recorder := httptest.NewRecorder()
balancer.ServeHTTP(recorder, httptest.NewRequest(http.MethodGet, "/", nil))
}()
})
}
// Wait for goroutines to start and increment inflight counters.
@@ -687,9 +683,7 @@ func TestConcurrentRequestsRespectInflight(t *testing.T) {
// Launch new requests in background so they don't block.
var newWg sync.WaitGroup
for range newRequests {
newWg.Add(1)
go func() {
defer newWg.Done()
newWg.Go(func() {
rec := httptest.NewRecorder()
balancer.ServeHTTP(rec, httptest.NewRequest(http.MethodGet, "/", nil))
server := rec.Header().Get("server")
@@ -698,7 +692,7 @@ func TestConcurrentRequestsRespectInflight(t *testing.T) {
save[server]++
saveMu.Unlock()
}
}()
})
}
// Wait for new requests to start and see the inflight counts.