From 95312d5324a5256ef8ec21e0cae4e2d89f85faa5 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 19 Apr 2024 11:26:05 +0200 Subject: [PATCH] Adds the missing circuit-breaker response code for CRD --- .../dynamic-configuration/kubernetes-crd-definition-v1.yml | 4 ++++ .../dynamic-configuration/traefik.io_middlewares.yaml | 4 ++++ integration/fixtures/k8s/01-traefik-crd.yml | 4 ++++ pkg/provider/kubernetes/crd/kubernetes.go | 4 ++++ pkg/provider/kubernetes/crd/traefikio/v1alpha1/middleware.go | 2 ++ 5 files changed, 18 insertions(+) diff --git a/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml b/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml index 56257f335..a7bd8b184 100644 --- a/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml +++ b/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml @@ -814,6 +814,10 @@ spec: breaker will try to recover (as soon as it is in recovering state). x-kubernetes-int-or-string: true + responseCode: + description: ResponseCode is the status code that the circuit + breaker will return while it is in the open state. + type: integer type: object compress: description: |- diff --git a/docs/content/reference/dynamic-configuration/traefik.io_middlewares.yaml b/docs/content/reference/dynamic-configuration/traefik.io_middlewares.yaml index fb6ff1246..281e70369 100644 --- a/docs/content/reference/dynamic-configuration/traefik.io_middlewares.yaml +++ b/docs/content/reference/dynamic-configuration/traefik.io_middlewares.yaml @@ -172,6 +172,10 @@ spec: breaker will try to recover (as soon as it is in recovering state). x-kubernetes-int-or-string: true + responseCode: + description: ResponseCode is the status code that the circuit + breaker will return while it is in the open state. + type: integer type: object compress: description: |- diff --git a/integration/fixtures/k8s/01-traefik-crd.yml b/integration/fixtures/k8s/01-traefik-crd.yml index 56257f335..a7bd8b184 100644 --- a/integration/fixtures/k8s/01-traefik-crd.yml +++ b/integration/fixtures/k8s/01-traefik-crd.yml @@ -814,6 +814,10 @@ spec: breaker will try to recover (as soon as it is in recovering state). x-kubernetes-int-or-string: true + responseCode: + description: ResponseCode is the status code that the circuit + breaker will return while it is in the open state. + type: integer type: object compress: description: |- diff --git a/pkg/provider/kubernetes/crd/kubernetes.go b/pkg/provider/kubernetes/crd/kubernetes.go index 6c18f3024..1559e44e9 100644 --- a/pkg/provider/kubernetes/crd/kubernetes.go +++ b/pkg/provider/kubernetes/crd/kubernetes.go @@ -645,6 +645,10 @@ func createCircuitBreakerMiddleware(circuitBreaker *traefikv1alpha1.CircuitBreak } } + if circuitBreaker.ResponseCode != 0 { + cb.ResponseCode = circuitBreaker.ResponseCode + } + return cb, nil } diff --git a/pkg/provider/kubernetes/crd/traefikio/v1alpha1/middleware.go b/pkg/provider/kubernetes/crd/traefikio/v1alpha1/middleware.go index f4ade76a0..0d68552f2 100644 --- a/pkg/provider/kubernetes/crd/traefikio/v1alpha1/middleware.go +++ b/pkg/provider/kubernetes/crd/traefikio/v1alpha1/middleware.go @@ -88,6 +88,8 @@ type CircuitBreaker struct { FallbackDuration *intstr.IntOrString `json:"fallbackDuration,omitempty" toml:"fallbackDuration,omitempty" yaml:"fallbackDuration,omitempty" export:"true"` // RecoveryDuration is the duration for which the circuit breaker will try to recover (as soon as it is in recovering state). RecoveryDuration *intstr.IntOrString `json:"recoveryDuration,omitempty" toml:"recoveryDuration,omitempty" yaml:"recoveryDuration,omitempty" export:"true"` + // ResponseCode is the status code that the circuit breaker will return while it is in the open state. + ResponseCode int `json:"responseCode,omitempty" toml:"responseCode,omitempty" yaml:"responseCode,omitempty" export:"true"` } // +k8s:deepcopy-gen=true