chore: report name changed

Signed-off-by: Mattia Lavacca <[email protected]>
Kong · Jun 11, 2024 · a561f49 · a561f49
1 parent 22fd4b7
commit a561f49
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,4 @@ go.work
 go.work.sum
 
 # Conformance tests report
-kong-gateway-operator.yaml
+*-report.yaml
diff --git a/Makefile b/Makefile
@@ -402,7 +402,7 @@ GATEWAY_API_VERSION ?= $(shell go list -m -f '{{ .Version }}' $(GATEWAY_API_PACK
 GATEWAY_API_CRDS_LOCAL_PATH = $(shell go env GOPATH)/pkg/mod/$(GATEWAY_API_PACKAGE)@$(GATEWAY_API_VERSION)/config/crd
 GATEWAY_API_REPO ?= kubernetes-sigs/gateway-api
 GATEWAY_API_RAW_REPO ?= https://raw.githubusercontent.com/$(GATEWAY_API_REPO)
-GATEWAY_API_CRDS_STANDARD_URL = github.com/$(GATEWAY_API_REPO)/config/crd/standard?ref=$(GATEWAY_API_VERSION)
+GATEWAY_API_CRDS_STANDARD_URL = github.com/$(GATEWAY_API_REPO)/config/crd?ref=$(GATEWAY_API_VERSION)
 GATEWAY_API_CRDS_EXPERIMENTAL_URL = github.com/$(GATEWAY_API_REPO)/config/crd/experimental?ref=$(GATEWAY_API_VERSION)
 GATEWAY_API_RAW_REPO_URL = $(GATEWAY_API_RAW_REPO)/$(GATEWAY_API_VERSION)
 

diff --git a/pkg/utils/test/setup_helpers.go b/pkg/utils/test/setup_helpers.go
@@ -189,7 +189,7 @@ func DeployCRDs(ctx context.Context, crdPath string, operatorClient *operatorcli
 	if err := clusters.KustomizeDeployForCluster(ctx, env.Cluster(), crdPath, kubectlFlags...); err != nil {
 		return err
 	}
-	if err := clusters.KustomizeDeployForCluster(ctx, env.Cluster(), GatewayExperimentalCRDsKustomizeURL); err != nil {
+	if err := clusters.KustomizeDeployForCluster(ctx, env.Cluster(), GatewayStandardCRDsKustomizeURL); err != nil {
 		return err
 	}
 	if err := clusters.KustomizeDeployForCluster(ctx, env.Cluster(), kicCRDsKustomizeURL); err != nil {

diff --git a/pkg/utils/test/zz_generated_gateway_api.go b/pkg/utils/test/zz_generated_gateway_api.go
diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
@@ -87,7 +87,7 @@ func TestGatewayConformance(t *testing.T) {
 	// Currently mode only relies on the KongRouterFlavor, but in the future
 	// we may want to add more modes.
 	mode := string(config.KongRouterFlavor)
-	reportFileName := fmt.Sprintf("kong-gateway-operator-%s.yaml", mode) // TODO: https://github.com/Kong/gateway-operator/issues/268
+	reportFileName := fmt.Sprintf("standard-%s-%s-report.yaml", metadata.Release, mode)
 
 	opts := conformance.DefaultOptions(t)
 	opts.ReportOutputPath = "../../" + reportFileName