1
0
Fork 0

Merge branch v3.4 into master

This commit is contained in:
mmatur 2025-05-14 09:55:58 +02:00
commit 8c6ed23c5f
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
13 changed files with 26 additions and 12 deletions

View file

@ -13,6 +13,7 @@ DATE := $(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
# Default build target # Default build target
GOOS := $(shell go env GOOS) GOOS := $(shell go env GOOS)
GOARCH := $(shell go env GOARCH) GOARCH := $(shell go env GOARCH)
GOGC ?=
LINT_EXECUTABLES = misspell shellcheck LINT_EXECUTABLES = misspell shellcheck
@ -56,7 +57,7 @@ generate:
#? binary: Build the binary #? binary: Build the binary
binary: generate-webui dist binary: generate-webui dist
@echo SHA: $(VERSION) $(CODENAME) $(DATE) @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.Version=$(VERSION) \
-X github.com/traefik/traefik/v3/pkg/version.Codename=$(CODENAME) \ -X github.com/traefik/traefik/v3/pkg/version.Codename=$(CODENAME) \
-X github.com/traefik/traefik/v3/pkg/version.BuildDate=$(DATE)" \ -X github.com/traefik/traefik/v3/pkg/version.BuildDate=$(DATE)" \

View file

@ -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`, It allows the configuration of CA certificates from both `ConfigMaps` and `Secrets`,
and replaces the `rootCAsSecrets` option, as shown below: 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 ```yaml
--- ---
apiVersion: traefik.io/v1alpha1 apiVersion: traefik.io/v1alpha1

View file

@ -89,7 +89,7 @@ spec:
observability: observability:
description: |- description: |-
Observability defines the observability configuration for a router. 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: properties:
accessLogs: accessLogs:
type: boolean type: boolean

View file

@ -10,6 +10,7 @@ rules:
- services - services
- secrets - secrets
- nodes - nodes
- configmaps
verbs: verbs:
- get - get
- list - list

View file

@ -89,7 +89,7 @@ spec:
observability: observability:
description: |- description: |-
Observability defines the observability configuration for a router. 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: properties:
accessLogs: accessLogs:
type: boolean type: boolean

View file

@ -203,7 +203,7 @@ version: "3.7"
services: services:
traefik: traefik:
image: traefik:v3.2 image: traefik:v3.4
environment: environment:
- TZ=US/Alaska - TZ=US/Alaska
command: command:

View file

@ -20,10 +20,10 @@ When you install Traefik without using the Helm Chart, or when you are upgrading
```bash ```bash
# Install Traefik Resource Definitions: # 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: # 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 ## Configuration Example

View file

@ -34,7 +34,7 @@ For more details, check out the conformance [report](https://github.com/kubernet
```bash ```bash
# Install Traefik RBACs. # 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 ## Configuration Example

View file

@ -33,7 +33,7 @@ spec:
namespace: apps namespace: apps
# Enable Router observability # Enable Router observability
observability: observability:
accesslogs: true accessLogs: true
metrics: true metrics: true
tracing: true tracing: true
# Set a pirority # Set a pirority

View file

@ -402,7 +402,7 @@ This way, any Ingress attached to this Entrypoint will have TLS termination by d
serviceAccountName: traefik-ingress-controller serviceAccountName: traefik-ingress-controller
containers: containers:
- name: traefik - name: traefik
image: traefik:v3.2 image: traefik:v3.4
args: args:
- --entryPoints.websecure.address=:443 - --entryPoints.websecure.address=:443
- --entryPoints.websecure.http.tls - --entryPoints.websecure.http.tls

View file

@ -26,5 +26,5 @@ node:
- K3S_CLUSTER_SECRET=somethingtotallyrandom - K3S_CLUSTER_SECRET=somethingtotallyrandom
volumes: volumes:
# this is where you would place a alternative traefik image (saved as a .tar file with # 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 - /somewhere/on/your/host/custom-image:/var/lib/rancher/k3s/agent/images

View file

@ -89,7 +89,7 @@ spec:
observability: observability:
description: |- description: |-
Observability defines the observability configuration for a router. 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: properties:
accessLogs: accessLogs:
type: boolean type: boolean

View file

@ -46,7 +46,7 @@ type Route struct {
// More info: https://doc.traefik.io/traefik/v3.4/routing/providers/kubernetes-crd/#kind-middleware // More info: https://doc.traefik.io/traefik/v3.4/routing/providers/kubernetes-crd/#kind-middleware
Middlewares []MiddlewareRef `json:"middlewares,omitempty"` Middlewares []MiddlewareRef `json:"middlewares,omitempty"`
// Observability defines the observability configuration for a router. // 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"` Observability *dynamic.RouterObservabilityConfig `json:"observability,omitempty"`
} }