Bump sigs.k8s.io/gateway-api to v1.4.0

integration/fixtures/k8s_gateway_conformance.toml

@@ -1,21 +0,0 @@
-[global]
-  checkNewVersion = false
-  sendAnonymousUsage = false
-
-[log]
-  level = "DEBUG"
-  noColor = true
-
-[api]
-  insecure = true
-
-[experimental]
-  kubernetesGateway = true
-
-[entryPoints]
-  [entryPoints.web]
-    address = ":80"
-  [entryPoints.websecure]
-    address = ":443"
-
-[providers.kubernetesGateway]

integration/gateway-api-conformance-reports/v1.4.0/experimental-v3.6-default-report.yaml

@@ -1,14 +1,14 @@
 apiVersion: gateway.networking.k8s.io/v1
 date: '-'
 gatewayAPIChannel: experimental
-gatewayAPIVersion: v1.3.0
+gatewayAPIVersion: v1.4.0
 implementation:
   contact:
   - '@traefik/maintainers'
   organization: traefik
   project: traefik
   url: https://traefik.io/
-  version: v3.5
+  version: v3.6
 kind: ConformanceReport
 mode: default
 profiles:
@@ -16,7 +16,7 @@ profiles:
     result: success
     statistics:
       Failed: 0
-      Passed: 12
+      Passed: 13
       Skipped: 0
   name: GATEWAY-GRPC
   summary: Core tests succeeded.
@@ -52,6 +52,8 @@ profiles:
     - GatewayStaticAddresses
     - HTTPRouteBackendRequestHeaderModification
     - HTTPRouteBackendTimeout
+    - HTTPRouteCORS
+    - HTTPRouteNamedRouteRule
     - HTTPRouteParentRefPort
     - HTTPRouteRequestMirror
     - HTTPRouteRequestMultipleMirrors

integration/gateway_api_conformance_test.go

@@ -1,3 +1,5 @@
+//go:build gatewayAPIConformance
+
 package integration
 
 import (
@@ -37,8 +39,8 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-// K8sConformanceSuite tests suite.
-type K8sConformanceSuite struct {
+// GatewayAPIConformanceSuite tests suite.
+type GatewayAPIConformanceSuite struct {
 	BaseSuite
 
 	k3sContainer *k3s.K3sContainer
@@ -47,15 +49,11 @@ type K8sConformanceSuite struct {
 	clientSet    *kclientset.Clientset
 }
 
-func TestK8sConformanceSuite(t *testing.T) {
-	suite.Run(t, new(K8sConformanceSuite))
+func TestGatewayAPIConformanceSuite(t *testing.T) {
+	suite.Run(t, new(GatewayAPIConformanceSuite))
 }
 
-func (s *K8sConformanceSuite) SetupSuite() {
-	if !*k8sConformance {
-		s.T().Skip("Skip because it can take a long time to execute. To enable pass the `k8sConformance` flag.")
-	}
-
+func (s *GatewayAPIConformanceSuite) SetupSuite() {
 	s.BaseSuite.SetupSuite()
 
 	// Avoid panic.
@@ -82,9 +80,9 @@ func (s *K8sConformanceSuite) SetupSuite() {
 
 	s.k3sContainer, err = k3s.Run(ctx,
 		k3sImage,
-		k3s.WithManifest("./fixtures/k8s-conformance/00-experimental-v1.3.0.yml"),
-		k3s.WithManifest("./fixtures/k8s-conformance/01-rbac.yml"),
-		k3s.WithManifest("./fixtures/k8s-conformance/02-traefik.yml"),
+		k3s.WithManifest("./fixtures/gateway-api-conformance/00-experimental-v1.4.0.yml"),
+		k3s.WithManifest("./fixtures/gateway-api-conformance/01-rbac.yml"),
+		k3s.WithManifest("./fixtures/gateway-api-conformance/02-traefik.yml"),
 		network.WithNetwork(nil, s.network),
 	)
 	if err != nil {
@@ -137,7 +135,7 @@ func (s *K8sConformanceSuite) SetupSuite() {
 	}
 }
 
-func (s *K8sConformanceSuite) TearDownSuite() {
+func (s *GatewayAPIConformanceSuite) TearDownSuite() {
 	ctx := s.T().Context()
 
 	if s.T().Failed() || *showLog {
@@ -163,7 +161,7 @@ func (s *K8sConformanceSuite) TearDownSuite() {
 	s.BaseSuite.TearDownSuite()
 }
 
-func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() {
+func (s *GatewayAPIConformanceSuite) TestK8sGatewayAPIConformance() {
 	// Wait for traefik to start
 	k3sContainerIP, err := s.k3sContainer.ContainerIP(s.T().Context())
 	require.NoError(s.T(), err)
@@ -181,12 +179,12 @@ func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() {
 		TimeoutConfig:              config.DefaultTimeoutConfig(),
 		ManifestFS:                 []fs.FS{&conformance.Manifests},
 		EnableAllSupportedFeatures: false,
-		RunTest:                    *k8sConformanceRunTest,
+		RunTest:                    *gatewayAPIConformanceRunTest,
 		Implementation: v1.Implementation{
 			Organization: "traefik",
 			Project:      "traefik",
 			URL:          "https://traefik.io/",
-			Version:      *k8sConformanceTraefikVersion,
+			Version:      *traefikVersion,
 			Contact:      []string{"@traefik/maintainers"},
 		},
 		ConformanceProfiles: sets.New(
@@ -220,8 +218,8 @@ func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() {
 	require.NoError(s.T(), err)
 	s.T().Logf("Conformance report:\n%s", string(rawReport))
 
-	require.NoError(s.T(), os.MkdirAll("./conformance-reports/"+report.GatewayAPIVersion, 0o755))
-	outFile := filepath.Join("conformance-reports/"+report.GatewayAPIVersion, fmt.Sprintf("%s-%s-%s-report.yaml", report.GatewayAPIChannel, report.Version, report.Mode))
+	require.NoError(s.T(), os.MkdirAll("./gateway-api-conformance-reports/"+report.GatewayAPIVersion, 0o755))
+	outFile := filepath.Join("gateway-api-conformance-reports/"+report.GatewayAPIVersion, fmt.Sprintf("%s-%s-%s-report.yaml", report.GatewayAPIChannel, report.Version, report.Mode))
 	require.NoError(s.T(), os.WriteFile(outFile, rawReport, 0o600))
 	s.T().Logf("Report written to: %s", outFile)
 }

integration/integration_test.go

@@ -37,9 +37,8 @@ import (
 
 var (
 	showLog                      = flag.Bool("tlog", false, "always show Traefik logs")
-	k8sConformance               = flag.Bool("k8sConformance", false, "run K8s Gateway API conformance test")
-	k8sConformanceRunTest        = flag.String("k8sConformanceRunTest", "", "run a specific K8s Gateway API conformance test")
-	k8sConformanceTraefikVersion = flag.String("k8sConformanceTraefikVersion", "dev", "specify the Traefik version for the K8s Gateway API conformance report")
+	gatewayAPIConformanceRunTest = flag.String("gatewayAPIConformanceRunTest", "", "runs a specific Gateway API conformance test")
+	traefikVersion               = flag.String("traefikVersion", "dev", "defines the Traefik version")
 )
 
 const (