fix: reuse gc name in GatewayClassObservedGenerationBump conformance …

…test Signed-off-by: bitliu <bitliu@tencent.com>
envoyproxy · Jan 16, 2023 · a86ccdd · a86ccdd
1 parent 545702c
commit a86ccdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/internal/provider/kubernetes/config/samples/gatewayclass.yaml b/internal/provider/kubernetes/config/samples/gatewayclass.yaml
@@ -1,6 +1,6 @@
 kind: GatewayClass
 apiVersion: gateway.networking.k8s.io/v1beta1
 metadata:
-  name: envoy-gateway
+  name: gatewayclass-observed-generation-bump
 spec:
   controllerName: gateway.envoyproxy.io/gatewayclass-controller
diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go
@@ -54,11 +54,12 @@ func TestGatewayAPIConformance(t *testing.T) {
 		CleanupBaseResources:     *flags.CleanupBaseResources,
 		ValidUniqueListenerPorts: validUniqueListenerPorts,
 		SupportedFeatures: map[suite.SupportedFeature]bool{
-			suite.SupportHTTPRouteQueryParamMatching:    true,
-			suite.SupportReferenceGrant:                 true,
-			suite.SupportHTTPResponseHeaderModification: true,
-			suite.SupportHTTPRouteMethodMatching:        true,
-			suite.SupportRouteDestinationPortMatching:   true,
+			suite.SupportHTTPRouteQueryParamMatching:        true,
+			suite.SupportReferenceGrant:                     true,
+			suite.SupportHTTPResponseHeaderModification:     true,
+			suite.SupportHTTPRouteMethodMatching:            true,
+			suite.SupportRouteDestinationPortMatching:       true,
+			suite.SupportGatewayClassObservedGenerationBump: true,
 		},
 	})
 	cSuite.Setup(t)
@@ -84,6 +85,7 @@ func TestGatewayAPIConformance(t *testing.T) {
 		tests.GatewaySecretInvalidReferenceGrant,
 		tests.GatewayInvalidTLSConfiguration,
 		tests.GatewayInvalidRouteKind,
+		tests.GatewayClassObservedGenerationBump,
 		tests.HTTPRouteReferenceGrant,
 		tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant,
 		tests.HTTPRouteInvalidParentRefNotMatchingListenerPort,

diff --git a/tools/make/kube.mk b/tools/make/kube.mk
@@ -94,7 +94,7 @@ run-conformance: ## Run Gateway API conformance.
 	kubectl wait --timeout=5m -n envoy-gateway-system deployment/envoy-gateway --for=condition=Available
 	kubectl wait --timeout=5m -n gateway-system job/gateway-api-admission --for=condition=Complete
 	kubectl apply -f internal/provider/kubernetes/config/samples/gatewayclass.yaml
-	go test -v -tags conformance ./test/conformance --gateway-class=envoy-gateway --debug=true --use-unique-ports=$(CONFORMANCE_UNIQUE_PORTS)
+	go test -v -tags conformance ./test/conformance --gateway-class=gatewayclass-observed-generation-bump --debug=true --use-unique-ports=$(CONFORMANCE_UNIQUE_PORTS)
 
 .PHONY: delete-cluster
 delete-cluster: $(tools/kind) ## Delete kind cluster.