Merge branch v3.4 into master

2025-05-14 09:55:58 +02:00 · 2025-05-14 09:55:58 +02:00 · 8c6ed23c5f
commit 8c6ed23c5f
parent c5f7381c80 9ee0e43eac
13 changed files with 26 additions and 12 deletions
--- a/3
+++ b/3
@ -13,6 +13,7 @@ DATE := $(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
 # Default build target
 GOOS := $(shell go env GOOS)
 GOARCH := $(shell go env GOARCH)
+GOGC ?=

 LINT_EXECUTABLES = misspell shellcheck

@ -56,7 +57,7 @@ generate:
 #? binary: Build the binary
 binary: generate-webui dist
 	@echo SHA: $(VERSION) $(CODENAME) $(DATE)
-	CGO_ENABLED=0 GOGC=off GOOS=${GOOS} GOARCH=${GOARCH} go build ${FLAGS[*]} -ldflags "-s -w \
+	CGO_ENABLED=0 GOGC=${GOGC} GOOS=${GOOS} GOARCH=${GOARCH} go build ${FLAGS[*]} -ldflags "-s -w \
    -X github.com/traefik/traefik/v3/pkg/version.Version=$(VERSION) \
    -X github.com/traefik/traefik/v3/pkg/version.Codename=$(CODENAME) \
    -X github.com/traefik/traefik/v3/pkg/version.BuildDate=$(DATE)" \
--- a/docs/content/migration/v3.md
+++ b/docs/content/migration/v3.md
@ -239,6 +239,18 @@ In `v3.4`, a new `rootCAs` option has been added to the `ServersTransport` and `
 It allows the configuration of CA certificates from both `ConfigMaps` and `Secrets`,
 and replaces the `rootCAsSecrets` option, as shown below:

+CRDs can be updated with this command:
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.4/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
+```
+
+RBACs need to be updated with this command:
+
+```shell
+kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.4/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml
+```
+
 ```yaml
 ---
 apiVersion: traefik.io/v1alpha1
--- a/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
+++ b/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
@ -89,7 +89,7 @@ spec:
                    observability:
                      description: |-
                        Observability defines the observability configuration for a router.
-                        More info: https://doc.traefik.io/traefik/v3.2/routing/routers/#observability
+                        More info: https://doc.traefik.io/traefik/v3.4/routing/routers/#observability
                      properties:
                        accessLogs:
                          type: boolean
--- a/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml
+++ b/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml
@ -10,6 +10,7 @@ rules:
      - services
      - secrets
      - nodes
+      - configmaps
    verbs:
      - get
      - list
--- a/docs/content/reference/dynamic-configuration/traefik.io_ingressroutes.yaml
+++ b/docs/content/reference/dynamic-configuration/traefik.io_ingressroutes.yaml
@ -89,7 +89,7 @@ spec:
                    observability:
                      description: |-
                        Observability defines the observability configuration for a router.
-                        More info: https://doc.traefik.io/traefik/v3.2/routing/routers/#observability
+                        More info: https://doc.traefik.io/traefik/v3.4/routing/routers/#observability
                      properties:
                        accessLogs:
                          type: boolean
--- a/docs/content/reference/install-configuration/observability/logs-and-accesslogs.md
+++ b/docs/content/reference/install-configuration/observability/logs-and-accesslogs.md
@ -203,7 +203,7 @@ version: "3.7"

 services:
  traefik:
-    image: traefik:v3.2
+    image: traefik:v3.4
    environment:
      - TZ=US/Alaska
    command:
--- a/docs/content/reference/install-configuration/providers/kubernetes/kubernetes-crd.md
+++ b/docs/content/reference/install-configuration/providers/kubernetes/kubernetes-crd.md
@ -20,10 +20,10 @@ When you install Traefik without using the Helm Chart, or when you are upgrading

 ```bash
 # Install Traefik Resource Definitions:
-kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.2/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
+kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.4/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml

 # Install RBAC for Traefik:
-kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.2/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml
+kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.4/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml
 ```

 ## Configuration Example
--- a/docs/content/reference/install-configuration/providers/kubernetes/kubernetes-gateway.md
+++ b/docs/content/reference/install-configuration/providers/kubernetes/kubernetes-gateway.md
@ -34,7 +34,7 @@ For more details, check out the conformance [report](https://github.com/kubernet

    ```bash
    # Install Traefik RBACs.
-    kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.2/docs/content/reference/dynamic-configuration/kubernetes-gateway-rbac.yml
+    kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.4/docs/content/reference/dynamic-configuration/kubernetes-gateway-rbac.yml
    ```

 ## Configuration Example
--- a/docs/content/reference/routing-configuration/kubernetes/crd/http/ingressroute.md
+++ b/docs/content/reference/routing-configuration/kubernetes/crd/http/ingressroute.md
@ -33,7 +33,7 @@ spec:
      namespace: apps
    # Enable Router observability
    observability:
-      accesslogs: true
+      accessLogs: true
      metrics: true
      tracing: true
    # Set a pirority
--- a/docs/content/reference/routing-configuration/kubernetes/ingress.md
+++ b/docs/content/reference/routing-configuration/kubernetes/ingress.md
@ -402,7 +402,7 @@ This way, any Ingress attached to this Entrypoint will have TLS termination by d
          serviceAccountName: traefik-ingress-controller
          containers:
            - name: traefik
-              image: traefik:v3.2
+              image: traefik:v3.4
              args:
                - --entryPoints.websecure.address=:443
                - --entryPoints.websecure.http.tls
--- a/docs/content/user-guides/crd-acme/k3s.yml
+++ b/docs/content/user-guides/crd-acme/k3s.yml
@ -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:v3.2 image.
+    # 'docker save'), if you want to use it, instead of the traefik:v3.4 image.
    - /somewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images
--- a/integration/fixtures/k8s/01-traefik-crd.yml
+++ b/integration/fixtures/k8s/01-traefik-crd.yml
@ -89,7 +89,7 @@ spec:
                    observability:
                      description: |-
                        Observability defines the observability configuration for a router.
-                        More info: https://doc.traefik.io/traefik/v3.2/routing/routers/#observability
+                        More info: https://doc.traefik.io/traefik/v3.4/routing/routers/#observability
                      properties:
                        accessLogs:
                          type: boolean
--- a/pkg/provider/kubernetes/crd/traefikio/v1alpha1/ingressroute.go
+++ b/pkg/provider/kubernetes/crd/traefikio/v1alpha1/ingressroute.go
@ -46,7 +46,7 @@ type Route struct {
 	// More info: https://doc.traefik.io/traefik/v3.4/routing/providers/kubernetes-crd/#kind-middleware
 	Middlewares []MiddlewareRef `json:"middlewares,omitempty"`
 	// Observability defines the observability configuration for a router.
-	// More info: https://doc.traefik.io/traefik/v3.2/routing/routers/#observability
+	// More info: https://doc.traefik.io/traefik/v3.4/routing/routers/#observability
 	Observability *dynamic.RouterObservabilityConfig `json:"observability,omitempty"`
 }