From 8e57fe86d311d6a618afa109999d80439d5ca9e9 Mon Sep 17 00:00:00 2001 From: Saylor Berman Date: Fri, 22 Sep 2023 11:10:20 -0600 Subject: [PATCH] Update GW API to 0.8.1 (#1093) --- .github/workflows/ci.yml | 2 +- README.md | 2 +- cmd/gateway/validation.go | 2 +- conformance/Makefile | 2 +- conformance/README.md | 2 +- deploy/helm-chart/README.md | 6 +++--- docs/developer/quickstart.md | 2 +- docs/installation.md | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- internal/mode/static/state/change_processor.go | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7e58f845..3d84c66e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,7 +225,7 @@ jobs: make create-kind-cluster KIND_KUBE_CONFIG=${kube_config} echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV" kind load docker-image ${{ steps.ngf-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }} - kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml + kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.1/standard-install.yaml kubectl wait --for=condition=complete job/gateway-api-admission-patch job/gateway-api-admission -n gateway-system - name: Install Chart diff --git a/README.md b/README.md index fb7cafb30..b97b43aad 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ The following table lists the software versions NGINX Gateway Fabric supports. | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | |--------------------------|-------------|------------|-----------| -| Edge | 0.8.0 | 1.23+ | 1.25.2 | +| Edge | 0.8.1 | 1.23+ | 1.25.2 | | 0.6.0 | 0.8.0 | 1.23+ | 1.25.2 | | 0.5.0 | 0.7.1 | 1.21+ | 1.25.x * | | 0.4.0 | 0.7.1 | 1.21+ | 1.25.x * | diff --git a/cmd/gateway/validation.go b/cmd/gateway/validation.go index 46b0c56ae..736921d36 100644 --- a/cmd/gateway/validation.go +++ b/cmd/gateway/validation.go @@ -13,7 +13,7 @@ import ( const ( // nolint:lll - // Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.8.0/apis/v1beta1/shared_types.go#L551 + // Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.8.1/apis/v1beta1/shared_types.go#L551 controllerNameRegex = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$` //nolint:lll ) diff --git a/conformance/Makefile b/conformance/Makefile index 6998b9f4d..9894ee2da 100644 --- a/conformance/Makefile +++ b/conformance/Makefile @@ -1,7 +1,7 @@ NGF_TAG = edge NGF_PREFIX = nginx-gateway-fabric NGINX_IMAGE_NAME = $(NGF_PREFIX)/nginx -GW_API_VERSION ?= 0.8.0 +GW_API_VERSION ?= 0.8.1 GATEWAY_CLASS = nginx SUPPORTED_FEATURES = HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect,GatewayClassObservedGenerationBump KIND_IMAGE ?= $(shell grep -m1 'FROM kindest/node' ` and `nginx- 3. Install Gateway API Resources ```shell - kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml + kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.1/standard-install.yaml ``` 4. Install NGF using your custom image and expose NGF with a NodePort Service: diff --git a/docs/installation.md b/docs/installation.md index b3bfacf14..6a8d508fe 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -35,7 +35,7 @@ page. 1. Install the Gateway API resources from the standard channel (the CRDs and the validating webhook): ```shell - kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml + kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.1/standard-install.yaml ``` 1. Deploy the NGINX Gateway Fabric CRDs: @@ -130,14 +130,14 @@ Create a Service with type `LoadBalancer` using the appropriate manifest for you Before you upgrade, ensure the Gateway API resources are the correct version as supported by the NGINX Gateway Fabric - [see the Technical Specifications](/README.md#technical-specifications). - The [release notes](https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.0) of the new version of the + The [release notes](https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.1) of the new version of the Gateway API might include important upgrade-specific notes and instructions. We advise to check the release notes of all versions between the one you're using and the new one. To upgrade the Gateway resources from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run: ```shell - kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml + kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.1/standard-install.yaml ``` 1. Upgrade the NGINX Gateway Fabric CRDs @@ -182,7 +182,7 @@ To upgrade NGINX Gateway Fabric when the deployment method is Helm, please follo running in the cluster!** ```shell - kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml + kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.1/standard-install.yaml ``` ### Uninstall NGINX Gateway Fabric using Helm diff --git a/go.mod b/go.mod index 656886bbe..87e6e29e8 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( k8s.io/client-go v0.28.2 sigs.k8s.io/controller-runtime v0.16.2 sigs.k8s.io/controller-tools v0.13.0 - sigs.k8s.io/gateway-api v0.8.0 + sigs.k8s.io/gateway-api v0.8.1 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index fb404aefb..c3b5b41a3 100644 --- a/go.sum +++ b/go.sum @@ -262,8 +262,8 @@ sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQ sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU= sigs.k8s.io/controller-tools v0.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI= sigs.k8s.io/controller-tools v0.13.0/go.mod h1:5vw3En2NazbejQGCeWKRrE7q4P+CW8/klfVqP8QZkgA= -sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg= -sigs.k8s.io/gateway-api v0.8.0/go.mod h1:okOnjPNBFbIS/Rw9kAhuIUaIkLhTKEu+ARIuXk2dgaM= +sigs.k8s.io/gateway-api v0.8.1 h1:Bo4NMAQFYkQZnHXOfufbYwbPW7b3Ic5NjpbeW6EJxuU= +sigs.k8s.io/gateway-api v0.8.1/go.mod h1:0PteDrsrgkRmr13nDqFWnev8tOysAVrwnvfFM55tSVg= 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/internal/mode/static/state/change_processor.go b/internal/mode/static/state/change_processor.go index cbce3340f..368556a42 100644 --- a/internal/mode/static/state/change_processor.go +++ b/internal/mode/static/state/change_processor.go @@ -173,7 +173,7 @@ func NewChangeProcessorImpl(cfg ChangeProcessorConfig) *ChangeProcessorImpl { // the webhook doesn't validate them. // It only validates a GatewayClass update that requires the previous version of the resource, // which NGF cannot reliably provide - for example, after NGF restarts). - // https://github.com/kubernetes-sigs/gateway-api/blob/v0.8.0/apis/v1beta1/validation/gatewayclass.go#L28 + // https://github.com/kubernetes-sigs/gateway-api/blob/v0.8.1/apis/v1beta1/validation/gatewayclass.go#L28 case *v1beta1.Gateway: err = gwapivalidation.ValidateGateway(o).ToAggregate() case *v1beta1.HTTPRoute: