From 2a0cfda90b28e27384a0a4368b7f2a67a47ec3aa Mon Sep 17 00:00:00 2001 From: Kevin Pollet Date: Mon, 1 Jul 2024 14:10:03 +0200 Subject: [PATCH] Do not disable Gateway API provider if not enabled in experimental --- integration/fixtures/k8s-conformance/02-traefik.yml | 1 - pkg/config/static/static_config.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/integration/fixtures/k8s-conformance/02-traefik.yml b/integration/fixtures/k8s-conformance/02-traefik.yml index 6f780affb..c03c7d852 100644 --- a/integration/fixtures/k8s-conformance/02-traefik.yml +++ b/integration/fixtures/k8s-conformance/02-traefik.yml @@ -50,7 +50,6 @@ spec: - --entrypoints.websecure.address=:443 - --entrypoints.web8080.address=:8080 - --entrypoints.traefik.address=:9000 - - --experimental.kubernetesgateway - --providers.kubernetesgateway.experimentalChannel - --providers.kubernetesgateway.statusaddress.service.namespace=traefik - --providers.kubernetesgateway.statusaddress.service.name=traefik diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index c16633a5d..2dae73cfc 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -280,14 +280,8 @@ func (c *Configuration) SetEffectiveConfiguration() { } } - // Disable Gateway API provider if not enabled in experimental. - if c.Experimental == nil || !c.Experimental.KubernetesGateway { - c.Providers.KubernetesGateway = nil - } - // Configure Gateway API provider if c.Providers.KubernetesGateway != nil { - log.Debug().Msg("Experimental Kubernetes Gateway provider has been activated") entryPoints := make(map[string]gateway.Entrypoint) for epName, entryPoint := range c.EntryPoints { entryPoints[epName] = gateway.Entrypoint{Address: entryPoint.GetAddress(), HasHTTPTLSConf: entryPoint.HTTP.TLS != nil}