Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Consume v0.4.1 of kubernetes-sigs/gateway-api #105

Merged
merged 2 commits into from
Feb 17, 2022
Merged

Consume v0.4.1 of kubernetes-sigs/gateway-api #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5545cf
Consume v0.4.1 of kubernetes-sigs/gateway-api
nathancoleman Feb 17, 2022
13a4adf
Use new `PreciseHostname` introduced with v0.4.1
nathancoleman Feb 17, 2022
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
4 changes: 2 additions & 2 deletions config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.0
- bases/api-gateway.consul.hashicorp.com_gatewayclassconfigs.yaml
- github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.1
- bases/api-gateway.consul.hashicorp.com_gatewayclassconfigs.yaml
2 changes: 1 addition & 1 deletion dev/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ createCluster() {

installGatewayCRDs() {
echo "Installing Gateway CRDs"
kubectl apply -k "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.0" 2>&1 > /dev/null
kubectl apply -k "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.1" 2>&1 > /dev/null
}

createServiceAccountForRBAC() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ require (
k8s.io/klog/v2 v2.10.0
sigs.k8s.io/controller-runtime v0.9.6
sigs.k8s.io/e2e-framework v0.0.3
sigs.k8s.io/gateway-api v0.4.0
sigs.k8s.io/gateway-api v0.4.1
)
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,8 @@ sigs.k8s.io/e2e-framework v0.0.3 h1:OShxX6BXwsEpP077MP/rjrDmt1YF9l/27D1heQeuNTo=
sigs.k8s.io/e2e-framework v0.0.3/go.mod h1:C4T2QK8Hs+o89wQSz3cnAiDjzJnC50bqbSLuKbp0DQY=
sigs.k8s.io/gateway-api v0.4.0 h1:07IJkTt21NetZTHtPKJk2I4XIgDN4BAlTIq1wK7V11o=
sigs.k8s.io/gateway-api v0.4.0/go.mod h1:r3eiNP+0el+NTLwaTfOrCNXy8TukC+dIM3ggc+fbNWk=
sigs.k8s.io/gateway-api v0.4.1 h1:Tof9/PNSZXyfDuTTe1XFvaTlvBRE6bKq1kmV6jj6rQE=
sigs.k8s.io/gateway-api v0.4.1/go.mod h1:r3eiNP+0el+NTLwaTfOrCNXy8TukC+dIM3ggc+fbNWk=
sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
Expand Down
5 changes: 3 additions & 2 deletions internal/k8s/reconciler/http_route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"encoding/json"
"testing"

"github.com/hashicorp/consul-api-gateway/internal/k8s/service"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/types"
gw "sigs.k8s.io/gateway-api/apis/v1alpha2"

"github.com/hashicorp/consul-api-gateway/internal/k8s/service"
)

func TestHTTPRouteID(t *testing.T) {
Expand All @@ -26,7 +27,7 @@ func TestConvertHTTPRoute(t *testing.T) {
headerMatchType := gw.HeaderMatchExact
weight := int32(10)
protocol := "https"
hostname := gw.Hostname("example.com")
hostname := gw.PreciseHostname("example.com")
Copy link
Member Author

@nathancoleman nathancoleman Feb 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This requirement was introduced by kubernetes-sigs/gateway-api#956

Copy link
Contributor

@andrewstucki andrewstucki Feb 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a love-hate relationship with all that type aliasing...

port := gw.PortNumber(8443)
statusCode := 302
for _, test := range []struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/testing/e2e/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type k8sTokenContext struct{}

var k8sTokenContextKey = k8sTokenContext{}

const gatewayCRDs = "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.0"
const gatewayCRDs = "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.1"

func InstallGatewayCRDs(ctx context.Context, cfg *envconf.Config) (context.Context, error) {
log.Print("Installing Gateway CRDs")
Expand Down