Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,330 changes: 1,882 additions & 448 deletions charts/gateway-helm/crds/gatewayapi-crds.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion internal/status/conditions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions internal/status/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}
Expand Down
8 changes: 4 additions & 4 deletions internal/status/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down