api: bump gwapi to v0.8.0-rc1 (#1778)

Signed-off-by: bitliu <bitliu@tencent.com>
envoyproxy · Aug 9, 2023 · a076f59 · a076f59
1 parent 9acbd5d
commit a076f59
Show file tree

Hide file tree

Showing 6 changed files with 1,893 additions and 459 deletions.
diff --git a/charts/gateway-helm/crds/gatewayapi-crds.yaml b/charts/gateway-helm/crds/gatewayapi-crds.yaml
diff --git a/go.mod b/go.mod
@@ -37,7 +37,7 @@ require (
 	k8s.io/kubectl v0.27.4
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 	sigs.k8s.io/controller-runtime v0.15.1
-	sigs.k8s.io/gateway-api v0.7.1
+	sigs.k8s.io/gateway-api v0.8.0-rc1
 	sigs.k8s.io/yaml v1.3.0
 )
 

diff --git a/go.sum b/go.sum
@@ -370,8 +370,8 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPB
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
 sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
-sigs.k8s.io/gateway-api v0.7.1 h1:Tts2jeepVkPA5rVG/iO+S43s9n7Vp7jCDhZDQYtPigQ=
-sigs.k8s.io/gateway-api v0.7.1/go.mod h1:Xv0+ZMxX0lu1nSSDIIPEfbVztgNZ+3cfiYrJsa2Ooso=
+sigs.k8s.io/gateway-api v0.8.0-rc1 h1:oRbzkElX4Ku/6FMslkIshAactoOn2nPSgU34hkvnnlw=
+sigs.k8s.io/gateway-api v0.8.0-rc1/go.mod h1:6ndvKYt0iPrSovsFJzUBxEd9pzcsBroaQH3E/04iwUk=
 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/kustomize/api v0.13.2 h1:kejWfLeJhUsTGioDoFNJET5LQe/ajzXhJGYoU+pJsiA=

diff --git a/internal/status/conditions_test.go b/internal/status/conditions_test.go
@@ -323,7 +323,7 @@ func TestGatewayReadyCondition(t *testing.T) {
 			gtw := &gwapiv1b1.Gateway{}
 			if tc.serviceAddress {
 				gtw.Status = gwapiv1b1.GatewayStatus{
-					Addresses: []gwapiv1b1.GatewayAddress{
+					Addresses: []gwapiv1b1.GatewayStatusAddress{
 						{
 							Type:  ptr.To(gwapiv1b1.IPAddressType),
 							Value: "1.1.1.1",

diff --git a/internal/status/gateway.go b/internal/status/gateway.go
@@ -64,17 +64,17 @@ func UpdateGatewayStatusProgrammedCondition(gw *gwapiv1b1.Gateway, svc *corev1.S
 			}
 		}
 
-		var gwAddresses []gwapiv1b1.GatewayAddress
+		var gwAddresses []gwapiv1b1.GatewayStatusAddress
 		for i := range addresses {
-			addr := gwapiv1b1.GatewayAddress{
+			addr := gwapiv1b1.GatewayStatusAddress{
 				Type:  ptr.To(gwapiv1b1.IPAddressType),
 				Value: addresses[i],
 			}
 			gwAddresses = append(gwAddresses, addr)
 		}
 
 		for i := range hostnames {
-			addr := gwapiv1b1.GatewayAddress{
+			addr := gwapiv1b1.GatewayStatusAddress{
 				Type:  ptr.To(gwapiv1b1.HostnameAddressType),
 				Value: hostnames[i],
 			}

diff --git a/internal/status/gateway_test.go b/internal/status/gateway_test.go
@@ -23,7 +23,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) {
 		gw         *gwapiv1b1.Gateway
 		svc        *corev1.Service
 		deployment *appsv1.Deployment
-		addresses  []gwapiv1b1.GatewayAddress
+		addresses  []gwapiv1b1.GatewayStatusAddress
 	}
 	tests := []struct {
 		name string
@@ -58,7 +58,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) {
 						},
 					},
 				},
-				addresses: []gwapiv1b1.GatewayAddress{
+				addresses: []gwapiv1b1.GatewayStatusAddress{
 					{
 						Type:  ptr.To(gwapiv1b1.IPAddressType),
 						Value: "127.0.0.1",
@@ -87,7 +87,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) {
 						},
 					},
 				},
-				addresses: []gwapiv1b1.GatewayAddress{
+				addresses: []gwapiv1b1.GatewayStatusAddress{
 					{
 						Type:  ptr.To(gwapiv1b1.IPAddressType),
 						Value: "127.0.0.1",
@@ -111,7 +111,7 @@ func TestUpdateGatewayStatusProgrammedCondition(t *testing.T) {
 						Type:       corev1.ServiceTypeClusterIP,
 					},
 				},
-				addresses: []gwapiv1b1.GatewayAddress{
+				addresses: []gwapiv1b1.GatewayStatusAddress{
 					{
 						Type:  ptr.To(gwapiv1b1.IPAddressType),
 						Value: "127.0.0.1",