diff --git a/go.mod b/go.mod index 9b823e97d..9b12bf084 100644 --- a/go.mod +++ b/go.mod @@ -99,6 +99,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 sigs.k8s.io/controller-runtime v0.18.0 sigs.k8s.io/gateway-api v1.1.0 + sigs.k8s.io/yaml v1.4.0 ) require ( @@ -355,7 +356,6 @@ require ( nhooyr.io/websocket v1.8.7 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect ) // Containous forks diff --git a/integration/k8s_conformance_test.go b/integration/k8s_conformance_test.go index 275ef6409..562bdcbe8 100644 --- a/integration/k8s_conformance_test.go +++ b/integration/k8s_conformance_test.go @@ -18,7 +18,6 @@ import ( "github.com/testcontainers/testcontainers-go/network" "github.com/traefik/traefik/v3/integration/try" "github.com/traefik/traefik/v3/pkg/version" - "gopkg.in/yaml.v3" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/util/sets" kclientset "k8s.io/client-go/kubernetes" @@ -35,6 +34,7 @@ import ( "sigs.k8s.io/gateway-api/conformance/utils/config" ksuite "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/gateway-api/pkg/features" + "sigs.k8s.io/yaml" ) const ( @@ -230,7 +230,7 @@ func (s *K8sConformanceSuite) TestK8sGatewayAPIConformance() { s.T().Logf("Conformance report:\n%s", string(rawReport)) require.NoError(s.T(), os.MkdirAll("./conformance-reports", 0o755)) - outFile := filepath.Join("conformance-reports", fmt.Sprintf("traefik-traefik-%d.yaml", time.Now().UnixNano())) + outFile := filepath.Join("conformance-reports", 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) }