chore: bump GWAPI to v0.6.0-rc1

Signed-off-by: bitliu <[email protected]>

Author: Xunzhuo

go.mod

@@ -19,7 +19,7 @@ require (
 	k8s.io/client-go v0.24.2
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 	sigs.k8s.io/controller-runtime v0.12.3
-	sigs.k8s.io/gateway-api v0.5.1
+	sigs.k8s.io/gateway-api v0.6.0-rc1
 )
 
 require (

go.sum

@@ -1017,8 +1017,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
 sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
 sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
-sigs.k8s.io/gateway-api v0.5.1 h1:EqzgOKhChzyve9rmeXXbceBYB6xiM50vDfq0kK5qpdw=
-sigs.k8s.io/gateway-api v0.5.1/go.mod h1:x0AP6gugkFV8fC/oTlnOMU0pnmuzIR8LfIPRVUjxSqA=
+sigs.k8s.io/gateway-api v0.6.0-rc1 h1:ierhK6SIK8pSibB+gkr+aG8cWLez/M7iD9dQIqLALxU=
+sigs.k8s.io/gateway-api v0.6.0-rc1/go.mod h1:+3QMzP775JFKArHqiwk/kzItMRXW9CKPXcO8QcuXvvk=
 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
 sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

internal/gatewayapi/helpers_v1alpha2.go

@@ -68,7 +68,7 @@ func UpgradeParentReference(old v1alpha2.ParentReference) v1beta1.ParentReferenc
 		upgraded.Namespace = NamespacePtr(string(*old.Namespace))
 	}
 
-	upgraded.Name = v1beta1.ObjectName(old.Name)
+	upgraded.Name = old.Name
 
 	if old.SectionName != nil {
 		upgraded.SectionName = SectionNamePtr(string(*old.SectionName))
@@ -96,7 +96,7 @@ func DowngradeParentReference(old v1beta1.ParentReference) v1alpha2.ParentRefere
 		downgraded.Namespace = NamespacePtrV1Alpha2(string(*old.Namespace))
 	}
 
-	downgraded.Name = v1alpha2.ObjectName(old.Name)
+	downgraded.Name = old.Name
 
 	if old.SectionName != nil {
 		downgraded.SectionName = SectionNamePtrV1Alpha2(string(*old.SectionName))
@@ -115,7 +115,7 @@ func UpgradeRouteParentStatuses(routeParentStatuses []v1alpha2.RouteParentStatus
 	for _, rps := range routeParentStatuses {
 		res = append(res, v1beta1.RouteParentStatus{
 			ParentRef:      UpgradeParentReference(rps.ParentRef),
-			ControllerName: v1beta1.GatewayController(rps.ControllerName),
+			ControllerName: rps.ControllerName,
 			Conditions:     rps.Conditions,
 		})
 	}
@@ -129,7 +129,7 @@ func DowngradeRouteParentStatuses(routeParentStatuses []v1beta1.RouteParentStatu
 	for _, rps := range routeParentStatuses {
 		res = append(res, v1alpha2.RouteParentStatus{
 			ParentRef:      DowngradeParentReference(rps.ParentRef),
-			ControllerName: v1alpha2.GatewayController(rps.ControllerName),
+			ControllerName: rps.ControllerName,
 			Conditions:     rps.Conditions,
 		})
 	}
@@ -153,7 +153,7 @@ func UpgradeBackendRef(old v1alpha2.BackendRef) v1beta1.BackendRef {
 		upgraded.Namespace = NamespacePtr(string(*old.Namespace))
 	}
 
-	upgraded.Name = v1beta1.ObjectName(old.Name)
+	upgraded.Name = old.Name
 
 	if old.Port != nil {
 		upgraded.Port = PortNumPtr(int32(*old.Port))
@@ -177,7 +177,7 @@ func DowngradeBackendRef(old v1beta1.BackendRef) v1alpha2.BackendRef {
 		downgraded.Namespace = NamespacePtrV1Alpha2(string(*old.Namespace))
 	}
 
-	downgraded.Name = v1alpha2.ObjectName(old.Name)
+	downgraded.Name = old.Name
 
 	if old.Port != nil {
 		downgraded.Port = PortNumPtrV1Alpha2(int(*old.Port))

internal/provider/kubernetes/kubernetes_test.go

@@ -628,7 +628,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour
 							Filters: []gwapiv1b1.HTTPRouteFilter{
 								{
 									Type: gwapiv1b1.HTTPRouteFilterType("RequestHeaderModifier"),
-									RequestHeaderModifier: &gwapiv1b1.HTTPRequestHeaderFilter{
+									RequestHeaderModifier: &gwapiv1b1.HTTPHeaderFilter{
 										Add: []gwapiv1b1.HTTPHeader{
 											{
 												Name:  gwapiv1b1.HTTPHeaderName("header-1"),
@@ -691,7 +691,7 @@ func testHTTPRoute(ctx context.Context, t *testing.T, provider *Provider, resour
 							Filters: []gwapiv1b1.HTTPRouteFilter{
 								{
 									Type: gwapiv1b1.HTTPRouteFilterType("RequestHeaderModifier"),
-									RequestHeaderModifier: &gwapiv1b1.HTTPRequestHeaderFilter{
+									RequestHeaderModifier: &gwapiv1b1.HTTPHeaderFilter{
 										Remove: []string{
 											"example-header-1",
 											"test-header",