DRY the conformance test flag definitions so they can be shared

The "make conformance" target runs several suites and they all
receive the same command-line flags so they all need to parse them,
even if they don't use them.

This commit moves the flag definitions into their own package so they
can be shared among all of the suites.

Author: caboteria

conformance/conformance_test.go

@@ -18,22 +18,18 @@ limitations under the License.
 package conformance_test
 
 import (
-	"flag"
 	"testing"
 
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 	"sigs.k8s.io/gateway-api/conformance/tests"
+	"sigs.k8s.io/gateway-api/conformance/utils/flags"
 	"sigs.k8s.io/gateway-api/conformance/utils/suite"
 
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
-var gatewayClassName = flag.String("gateway-class", "gateway-conformance", "Name of GatewayClass to use for tests")
-var showDebug = flag.Bool("debug", false, "Whether to print debug logs")
-var cleanupBaseResources = flag.Bool("cleanup-base-resources", true, "Whether to cleanup base test resources after the run")
-
 func TestConformance(t *testing.T) {
 	cfg, err := config.GetConfig()
 	if err != nil {
@@ -45,13 +41,13 @@ func TestConformance(t *testing.T) {
 	}
 	v1alpha2.AddToScheme(client.Scheme())
 
-	t.Logf("Running conformance tests with %s GatewayClass", *gatewayClassName)
+	t.Logf("Running conformance tests with %s GatewayClass", *flags.GatewayClassName)
 
 	cSuite := suite.New(suite.Options{
 		Client:               client,
-		GatewayClassName:     *gatewayClassName,
-		Debug:                *showDebug,
-		CleanupBaseResources: *cleanupBaseResources,
+		GatewayClassName:     *flags.GatewayClassName,
+		Debug:                *flags.ShowDebug,
+		CleanupBaseResources: *flags.CleanupBaseResources,
 	})
 	cSuite.Setup(t)
 	cSuite.Run(t, tests.ConformanceTests)

conformance/utils/flags/flags.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// flags contains command-line flag definitions for the conformance
+// tests. They're in this package so they can be shared among the
+// various suites that are all run by the same Makefile invocation.
+package flags
+
+import (
+	"flag"
+)
+
+var (
+	GatewayClassName     = flag.String("gateway-class", "gateway-conformance", "Name of GatewayClass to use for tests")
+	ShowDebug            = flag.Bool("debug", false, "Whether to print debug logs")
+	CleanupBaseResources = flag.Bool("cleanup-base-resources", true, "Whether to cleanup base test resources after the run")
+)

conformance/utils/kubernetes/apply_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package kubernetes
 
 import (
-	"flag"
 	"strings"
 	"testing"
 
@@ -26,15 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
-)
-
-var (
-	// These aren't used by this test but since this test is run using
-	// the same invocation as the conformance test it needs to parse the
-	// same set of flags.
-	_ = flag.String("gateway-class", "", "unused")
-	_ = flag.Bool("debug", false, "unused")
-	_ = flag.Bool("cleanup-base-resources", true, "unused")
+	_ "sigs.k8s.io/gateway-api/conformance/utils/flags"
 )
 
 func TestPrepareResources(t *testing.T) {