diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 9598359da..d43a961ff 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -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 \ No newline at end of file +- github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.4.1 +- bases/api-gateway.consul.hashicorp.com_gatewayclassconfigs.yaml diff --git a/dev/run b/dev/run index 2cb3416af..99154b50e 100755 --- a/dev/run +++ b/dev/run @@ -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() { diff --git a/go.mod b/go.mod index aa6757dd4..1b26de6d7 100644 --- a/go.mod +++ b/go.mod @@ -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 ) diff --git a/go.sum b/go.sum index 90f0d255a..71ae0f3af 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/k8s/reconciler/http_route_test.go b/internal/k8s/reconciler/http_route_test.go index 30a4b8ac3..947644e78 100644 --- a/internal/k8s/reconciler/http_route_test.go +++ b/internal/k8s/reconciler/http_route_test.go @@ -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) { @@ -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") port := gw.PortNumber(8443) statusCode := 302 for _, test := range []struct { diff --git a/internal/testing/e2e/kubernetes.go b/internal/testing/e2e/kubernetes.go index 78fea3374..1f55c8d76 100644 --- a/internal/testing/e2e/kubernetes.go +++ b/internal/testing/e2e/kubernetes.go @@ -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")