fix grpc protocol

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

.github/workflows/_linters.yaml

@@ -32,5 +32,5 @@ jobs:
       - name: Verify generators consistency
         env:
           # The new version of GWAPI has not been released yet, and we have used a specific commit.
-          GATEWAY_API_VERSION: 1f401c5e2448b918e3e2d9da27302d598e488974
+          GATEWAY_API_VERSION: 1646f69cd9f53482da1157d9a843e32d3a921fbf
         run: make verify.generators

go.mod

@@ -55,7 +55,7 @@ require (
 	k8s.io/client-go v0.29.3
 	k8s.io/component-base v0.29.3
 	sigs.k8s.io/controller-runtime v0.17.3
-	sigs.k8s.io/gateway-api v1.0.1-0.20240328211832-1f401c5e2448
+	sigs.k8s.io/gateway-api v1.0.1-0.20240405150747-1646f69cd9f5
 	sigs.k8s.io/kustomize/api v0.17.1
 	sigs.k8s.io/kustomize/kyaml v0.17.0
 	sigs.k8s.io/yaml v1.4.0

go.sum

@@ -675,8 +675,8 @@ sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9
 sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 sigs.k8s.io/e2e-framework v0.3.1-0.20231113122213-262cac32d35e h1:lJqSZb2bAyfkPpBhUbzXsoAHKJn+3/KzBpvktR1wlMQ=
 sigs.k8s.io/e2e-framework v0.3.1-0.20231113122213-262cac32d35e/go.mod h1:VIozg+of0zhkVGZcCWvKqH7vn7GTDDAa3h+w1OfH7Co=
-sigs.k8s.io/gateway-api v1.0.1-0.20240328211832-1f401c5e2448 h1:AIl37wrNnGlVMn/q1GrUdZ7CVaCTEew75ZlgJt8lK/c=
-sigs.k8s.io/gateway-api v1.0.1-0.20240328211832-1f401c5e2448/go.mod h1:KpckYqmi8L0CE8CJ2b6njSFtNZnhbRcHn3fdPRhKjxo=
+sigs.k8s.io/gateway-api v1.0.1-0.20240405150747-1646f69cd9f5 h1:Ee8fc1GrFynZ0PkEd8gWyIPYHHtnBCIdDzJqyV/ESoA=
+sigs.k8s.io/gateway-api v1.0.1-0.20240405150747-1646f69cd9f5/go.mod h1:o/RZAEw04U5bQyTX3bA0KA23EEf+NK9HNLHJK/f8I/w=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kind v0.22.0 h1:z/+yr/azoOfzsfooqRsPw1wjJlqT/ukXP0ShkHwNlsI=

internal/dataplane/translator/translate_grpcroute.go

@@ -56,7 +56,7 @@ func (t *Translator) ingressRulesFromGRPCRoute(result *ingressRules, grpcroute *
 		// Create a service and attach the routes to it. Protocol for Service can be set via K8s object annotation
 		// "konghq.com/protocol", by default use "grpcs" to not break existing behavior when annotation is not specified.
 		service, err := generateKongServiceFromBackendRefWithRuleNumber(
-			t.logger, t.storer, result, grpcroute, ruleNumber, "grpcs", grpcBackendRefsToBackendRefs(rule.BackendRefs)...,
+			t.logger, t.storer, result, grpcroute, ruleNumber, "grpc", grpcBackendRefsToBackendRefs(rule.BackendRefs)...,
 		)
 		if err != nil {
 			return err
@@ -124,7 +124,7 @@ func (t *Translator) ingressRulesFromGRPCRouteWithPriority(
 		rules,
 		serviceName,
 		grpcRoute,
-		"grpcs",
+		"grpc",
 		grpcBackendRefsToBackendRefs(grpcRouteRule.BackendRefs)...,
 	)
 	kongService.Routes = append(

test/conformance/gateway_conformance_test.go

@@ -32,7 +32,7 @@ var traditionalRoutesSupportedFeatures = []suite.SupportedFeature{
 	suite.SupportHTTPRouteResponseHeaderModification,
 	suite.SupportHTTPRouteBackendTimeout,
 	// experimental features
-	// suite.SupportGRPCRoute,
+	suite.SupportGRPCRoute,
 }
 
 var expressionRoutesSupportedFeatures = []suite.SupportedFeature{
@@ -45,7 +45,7 @@ var expressionRoutesSupportedFeatures = []suite.SupportedFeature{
 	suite.SupportHTTPRouteResponseHeaderModification,
 	suite.SupportHTTPRouteBackendTimeout,
 	// experimental features
-	// suite.SupportGRPCRoute,
+	suite.SupportGRPCRoute,
 }
 
 func TestGatewayConformance(t *testing.T) {
@@ -94,7 +94,7 @@ func TestGatewayConformance(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Log("starting the gateway conformance test suite")
-	cSuite.Setup(t)
+	cSuite.Setup(t, tests.ConformanceTests)
 
 	go patchGatewayClassToPassTestGatewayClassObservedGenerationBump(ctx, t, k8sClient)