Creates a consts for common values in conformance

Author: carmal891

conformance/tests/backendtlspolicy-conflict-resolution.go

@@ -25,15 +25,15 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	h "sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicyConflictResolution)
 }
 
-var BackendTLSPolicyConflictResolution = suite.ConformanceTest{
+var BackendTLSPolicyConflictResolution = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicyConflictResolution",
 	Description: "Verifies that when multiple BackendTLSPolicies target the same Service, only one policy is accepted while conflicting policies are rejected, and traffic continues to route successfully.",
 	Features: []features.FeatureName{
@@ -42,8 +42,8 @@ var BackendTLSPolicyConflictResolution = suite.ConformanceTest{
 		features.SupportBackendTLSPolicy,
 	},
 	Manifests: []string{"tests/backendtlspolicy-conflict-resolution.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 		routeNN := types.NamespacedName{Name: "backendtlspolicy-conflict-resolution", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 

conformance/tests/backendtlspolicy-invalid-ca-certificate-ref.go

@@ -25,15 +25,15 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	h "sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicyInvalidCACertificateRef)
 }
 
-var BackendTLSPolicyInvalidCACertificateRef = suite.ConformanceTest{
+var BackendTLSPolicyInvalidCACertificateRef = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicyInvalidCACertificateRef",
 	Description: "A BackendTLSPolicy that specifies a single invalid CACertificateRef should have the Accepted and ResolvedRefs status condition set False with appropriate reasons, and HTTP requests to a backend targeted by this policy should fail with a 5xx response.",
 	Features: []features.FeatureName{
@@ -42,8 +42,8 @@ var BackendTLSPolicyInvalidCACertificateRef = suite.ConformanceTest{
 		features.SupportBackendTLSPolicy,
 	},
 	Manifests: []string{"tests/backendtlspolicy-invalid-ca-certificate-ref.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 		routeNN := types.NamespacedName{Name: "backendtlspolicy-invalid-ca-certificate-ref", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 

conformance/tests/backendtlspolicy-invalid-kind.go

@@ -25,15 +25,15 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	h "sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicyInvalidKind)
 }
 
-var BackendTLSPolicyInvalidKind = suite.ConformanceTest{
+var BackendTLSPolicyInvalidKind = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicyInvalidKind",
 	Description: "A BackendTLSPolicy that specifies a single CACertificateRef with an invalid kind should have the Accepted and ResolvedRefs status condition set False with appropriate reasons, and HTTP requests to a backend targeted by this policy should fail with a 5xx response.",
 	Features: []features.FeatureName{
@@ -42,8 +42,8 @@ var BackendTLSPolicyInvalidKind = suite.ConformanceTest{
 		features.SupportBackendTLSPolicy,
 	},
 	Manifests: []string{"tests/backendtlspolicy-invalid-kind.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 		routeNN := types.NamespacedName{Name: "backendtlspolicy-invalid-kind-test", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 

conformance/tests/backendtlspolicy-observed-generation-bump.go

@@ -29,15 +29,15 @@ import (
 
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicyObservedGenerationBump)
 }
 
-var BackendTLSPolicyObservedGenerationBump = suite.ConformanceTest{
+var BackendTLSPolicyObservedGenerationBump = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicyObservedGenerationBump",
 	Description: "A BackendTLSPolicy in the gateway-conformance-infra namespace should update the observedGeneration in all of its Status.Conditions after an update to the spec",
 	Features: []features.FeatureName{
@@ -46,16 +46,16 @@ var BackendTLSPolicyObservedGenerationBump = suite.ConformanceTest{
 		features.SupportBackendTLSPolicy,
 	},
 	Manifests: []string{"tests/backendtlspolicy-observed-generation-bump.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 		policyNN := types.NamespacedName{Name: "observed-generation-bump", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 
 		t.Run("observedGeneration should increment", func(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), suite.TimeoutConfig.LatestObservedGenerationSet)
 			defer cancel()
 
-			namespaces := []string{"gateway-conformance-infra"}
+			namespaces := []string{confsuite.InfrastructureNamespace}
 			kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, namespaces)
 
 			original := &gatewayv1.BackendTLSPolicy{}

conformance/tests/backendtlspolicy-san.go

@@ -25,15 +25,15 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	h "sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicySANValidation)
 }
 
-var BackendTLSPolicySANValidation = suite.ConformanceTest{
+var BackendTLSPolicySANValidation = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicySANValidation",
 	Description: "BackendTLSPolicySANValidation extend BackendTLSPolicy with SubjectAltNames validation",
 	Features: []features.FeatureName{
@@ -43,8 +43,8 @@ var BackendTLSPolicySANValidation = suite.ConformanceTest{
 		features.SupportBackendTLSPolicySANValidation,
 	},
 	Manifests: []string{"tests/backendtlspolicy-san.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 		routeNN := types.NamespacedName{Name: "backendtlspolicy-san-test", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}
 

conformance/tests/backendtlspolicy.go

@@ -29,7 +29,7 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	h "sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/conformance/utils/tls"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
@@ -38,7 +38,7 @@ func init() {
 	ConformanceTests = append(ConformanceTests, BackendTLSPolicy)
 }
 
-var BackendTLSPolicy = suite.ConformanceTest{
+var BackendTLSPolicy = confsuite.ConformanceTest{
 	ShortName:   "BackendTLSPolicy",
 	Description: "BackendTLSPolicy must be used to configure TLS connection between gateway and backend",
 	Features: []features.FeatureName{
@@ -47,8 +47,8 @@ var BackendTLSPolicy = suite.ConformanceTest{
 		features.SupportBackendTLSPolicy,
 	},
 	Manifests: []string{"tests/backendtlspolicy.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 
 		acceptedCond := metav1.Condition{
 			Type:   string(gatewayv1.PolicyConditionAccepted),

conformance/tests/gateway-http-listener-isolation.go

@@ -23,15 +23,15 @@ import (
 
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
 
 func init() {
 	ConformanceTests = append(ConformanceTests, GatewayHTTPListenerIsolation)
 }
 
-var GatewayHTTPListenerIsolation = suite.ConformanceTest{
+var GatewayHTTPListenerIsolation = confsuite.ConformanceTest{
 	ShortName:   "GatewayHTTPListenerIsolation",
 	Description: "Listener isolation for HTTP listeners with multiple listeners and HTTPRoutes",
 	Features: []features.FeatureName{
@@ -43,8 +43,8 @@ var GatewayHTTPListenerIsolation = suite.ConformanceTest{
 		"tests/gateway-http-listener-isolation.yaml",
 		"tests/gateway-http-listener-isolation-with-hostname-intersection.yaml",
 	},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 
 		kubernetes.NamespacesMustBeReady(t, suite.Client, suite.TimeoutConfig, []string{ns})
 

conformance/tests/gateway-invalid-default-frontend-client-certificate-validation.go

@@ -27,7 +27,7 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/conformance/utils/http"
 	"sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
-	"sigs.k8s.io/gateway-api/conformance/utils/suite"
+	confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
 	"sigs.k8s.io/gateway-api/conformance/utils/tls"
 	"sigs.k8s.io/gateway-api/pkg/features"
 )
@@ -36,7 +36,7 @@ func init() {
 	ConformanceTests = append(ConformanceTests, GatewayFrontendInvalidDefaultClientCertificateValidation)
 }
 
-var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.ConformanceTest{
+var GatewayFrontendInvalidDefaultClientCertificateValidation = confsuite.ConformanceTest{
 	ShortName:   "GatewayFrontendInvalidDefaultClientCertificateValidation",
 	Description: "Invalid Gateway's default Client Certificate Validation Config should only affect HTTPS traffic",
 	Features: []features.FeatureName{
@@ -45,8 +45,8 @@ var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.Conformance
 		features.SupportGatewayFrontendClientCertificateValidation,
 	},
 	Manifests: []string{"tests/gateway-invalid-default-frontend-client-certificate-validation.yaml"},
-	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
-		ns := "gateway-conformance-infra"
+	Test: func(t *testing.T, suite *confsuite.ConformanceTestSuite) {
+		ns := confsuite.InfrastructureNamespace
 
 		gwNN := types.NamespacedName{Name: "invalid-default-client-validation-config", Namespace: ns}
 
@@ -90,7 +90,7 @@ var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.Conformance
 				Request:   http.Request{Host: "example.org", Path: "/"},
 				Response:  http.Response{StatusCode: 200},
 				Backend:   "infra-backend-v1",
-				Namespace: "gateway-conformance-infra",
+				Namespace: confsuite.InfrastructureNamespace,
 			}
 			// send request to the first listener and validate that it is passing
 			http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, httpAddr, expectedSuccess)
@@ -119,7 +119,7 @@ var GatewayFrontendInvalidDefaultClientCertificateValidation = suite.Conformance
 			httpsAddr := gwAddr + ":443"
 			expectedFailure := http.ExpectedResponse{
 				Request:   http.Request{Host: "example.org", Path: "/"},
-				Namespace: "gateway-conformance-infra",
+				Namespace: confsuite.InfrastructureNamespace,
 			}
 			// send request to the second listener and validate that it is failing
 			tls.MakeTLSRequestAndExpectFailureResponse(t, suite.RoundTripper, httpsAddr, serverCertPem, nil, nil, "example.org", expectedFailure)

conformance/tests/gateway-invalid-route-kind.go

@@ -41,7 +41,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
 	Manifests: []string{"tests/gateway-invalid-route-kind.yaml"},
 	Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
 		t.Run("Gateway listener should have a false ResolvedRefs condition with reason InvalidRouteKinds and no supportedKinds", func(t *testing.T) {
-			gwNN := types.NamespacedName{Name: "gateway-only-invalid-route-kind", Namespace: "gateway-conformance-infra"}
+			gwNN := types.NamespacedName{Name: "gateway-only-invalid-route-kind", Namespace: suite.InfrastructureNamespace}
 			listeners := []v1.ListenerStatus{{
 				Name:           v1.SectionName("http"),
 				SupportedKinds: []v1.RouteGroupKind{},
@@ -57,7 +57,7 @@ var GatewayInvalidRouteKind = suite.ConformanceTest{
 		})
 
 		t.Run("Gateway listener should have a false ResolvedRefs condition with reason InvalidRouteKinds and HTTPRoute must be put in the supportedKinds", func(t *testing.T) {
-			gwNN := types.NamespacedName{Name: "gateway-supported-and-invalid-route-kind", Namespace: "gateway-conformance-infra"}
+			gwNN := types.NamespacedName{Name: "gateway-supported-and-invalid-route-kind", Namespace: suite.InfrastructureNamespace}
 			listeners := []v1.ListenerStatus{{
 				Name: v1.SectionName("http"),
 				SupportedKinds: []v1.RouteGroupKind{{

conformance/tests/gateway-invalid-tls-backend-configuration.go

@@ -50,27 +50,27 @@ var GatewayInvalidTLSBackendConfiguration = suite.ConformanceTest{
 		}{
 			{
 				name:                  "Nonexistent secret referenced as ClientCertificateRef in Gateway backend TLS configuration",
-				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-nonexistent-secret", Namespace: "gateway-conformance-infra"},
+				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-nonexistent-secret", Namespace: suite.InfrastructureNamespace},
 				resolveRefsReason:     gatewayv1.GatewayReasonInvalidClientCertificateRef,
 			},
 			{
 				name:                  "Unsupported group resource referenced as ClientCertificateRef in Gateway backend TLS configuration",
-				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-unsupported-group", Namespace: "gateway-conformance-infra"},
+				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-unsupported-group", Namespace: suite.InfrastructureNamespace},
 				resolveRefsReason:     gatewayv1.GatewayReasonInvalidClientCertificateRef,
 			},
 			{
 				name:                  "Unsupported kind resource referenced as ClientCertificateRef inGateway backend TLS configuration",
-				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-unsupported-kind", Namespace: "gateway-conformance-infra"},
+				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-unsupported-kind", Namespace: suite.InfrastructureNamespace},
 				resolveRefsReason:     gatewayv1.GatewayReasonInvalidClientCertificateRef,
 			},
 			{
 				name:                  "Malformed secret referenced as ClientCertificateRef in Gateway backend TLS configuration",
-				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-malformed-secret", Namespace: "gateway-conformance-infra"},
+				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-malformed-secret", Namespace: suite.InfrastructureNamespace},
 				resolveRefsReason:     gatewayv1.GatewayReasonInvalidClientCertificateRef,
 			},
 			{
 				name:                  "Secret referenced from another namespace without any ReferenceGrant as ClientCertificateRef in Gateway backend TLS configuration",
-				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-missing-reference-grant", Namespace: "gateway-conformance-infra"},
+				gatewayNamespacedName: types.NamespacedName{Name: "gateway-client-certificate-missing-reference-grant", Namespace: suite.InfrastructureNamespace},
 				resolveRefsReason:     gatewayv1.GatewayReasonRefNotPermitted,
 			},
 		}