chore(deps): bump sigs.k8s.io/gateway-api (#7371)

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Jul 27, 2023 · 6978252 · 6978252
1 parent 73768bf
commit 6978252
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -88,7 +88,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.15.0
 	sigs.k8s.io/controller-tools v0.12.1
 	// When updating this also update version in: test/framework/k8s.go
-	sigs.k8s.io/gateway-api v0.7.1-0.20230613222957-c9540a9cf448
+	sigs.k8s.io/gateway-api v0.7.1-0.20230727082008-1764e458047d
 	sigs.k8s.io/yaml v1.3.0
 )
 

diff --git a/go.sum b/go.sum
@@ -1053,8 +1053,8 @@ sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0
 sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
 sigs.k8s.io/controller-tools v0.12.1 h1:GyQqxzH5wksa4n3YDIJdJJOopztR5VDM+7qsyg5yE4U=
 sigs.k8s.io/controller-tools v0.12.1/go.mod h1:rXlpTfFHZMpZA8aGq9ejArgZiieHd+fkk/fTatY8A2M=
-sigs.k8s.io/gateway-api v0.7.1-0.20230613222957-c9540a9cf448 h1:ir9lD9qmbQ/oc84fw2u276xqQqAz6222zBrfoY4a0mw=
-sigs.k8s.io/gateway-api v0.7.1-0.20230613222957-c9540a9cf448/go.mod h1:ZGCdTDdW6pxVk9eAnHqXt8wPnbSLzlEFN/XXj8AA3ho=
+sigs.k8s.io/gateway-api v0.7.1-0.20230727082008-1764e458047d h1:X7hnnkKtL6VyE5VcC/QH+uY6wVbYybZbPtmVSvDlSDE=
+sigs.k8s.io/gateway-api v0.7.1-0.20230727082008-1764e458047d/go.mod h1:eilE0qyBTXs7VhQuGtUa3ji4IMM7TNtVCWR3+IdPosI=
 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/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

diff --git a/pkg/plugins/runtime/k8s/controllers/gatewayapi/gateway_status.go b/pkg/plugins/runtime/k8s/controllers/gatewayapi/gateway_status.go
@@ -42,26 +42,26 @@ func (r *GatewayReconciler) updateStatus(
 	return nil
 }
 
-func gatewayAddresses(instance *mesh_k8s.MeshGatewayInstance) []gatewayapi.GatewayAddress {
+func gatewayAddresses(instance *mesh_k8s.MeshGatewayInstance) []gatewayapi.GatewayStatusAddress {
 	if instance == nil {
 		return nil
 	}
 
 	ipType := gatewayapi.IPAddressType
 	hostnameType := gatewayapi.HostnameAddressType
 
-	var addrs []gatewayapi.GatewayAddress
+	var addrs []gatewayapi.GatewayStatusAddress
 
 	if lb := instance.Status.LoadBalancer; lb != nil {
 		for _, addr := range instance.Status.LoadBalancer.Ingress {
 			if addr.IP != "" {
-				addrs = append(addrs, gatewayapi.GatewayAddress{
+				addrs = append(addrs, gatewayapi.GatewayStatusAddress{
 					Type:  &ipType,
 					Value: addr.IP,
 				})
 			}
 			if addr.Hostname != "" {
-				addrs = append(addrs, gatewayapi.GatewayAddress{
+				addrs = append(addrs, gatewayapi.GatewayStatusAddress{
 					Type:  &hostnameType,
 					Value: addr.Hostname,
 				})

diff --git a/test/e2e/gateway/gatewayapi/conformance_test.go b/test/e2e/gateway/gatewayapi/conformance_test.go
@@ -81,7 +81,6 @@ func TestConformance(t *testing.T) {
 		SupportedFeatures: sets.New(
 			suite.SupportGateway,
 			suite.SupportHTTPRoute,
-			suite.SupportGatewayClassObservedGenerationBump,
 			suite.SupportHTTPRouteQueryParamMatching,
 			suite.SupportHTTPRouteMethodMatching,
 			suite.SupportHTTPResponseHeaderModification,