Skip to content

Commit 44cefeb

Browse files
sjbermansjberman
authored
Update Gateway API SDK to 0.8.0 (#1008)
Updates module, code, and docs to latest Gateway API release. Also removed the webhook-specific error message since the webhook is no longer necessary with the introduction of CEL. Validation error is still printed.
1 parent d6a8623 commit 44cefeb

File tree

16 files changed

+131
-127
lines changed

16 files changed

+131
-127
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
231231
echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
232232
kind load docker-image ${{ steps.nkg-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }}
233-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
233+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
234234
kubectl wait --for=condition=complete job/gateway-api-admission-patch job/gateway-api-admission -n gateway-system
235235
236236
- name: Install Chart

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following table lists the software versions NGINX Kubernetes Gateway support
6060

6161
| NGINX Kubernetes Gateway | Gateway API | Kubernetes | NGINX OSS |
6262
|--------------------------|-------------|------------|-----------|
63-
| Edge | 0.7.1 | 1.21+ | 1.25.2 |
63+
| Edge | 0.8.0 | 1.22+ | 1.25.2 |
6464
| 0.5.0 | 0.7.1 | 1.21+ | 1.25.x * |
6565
| 0.4.0 | 0.7.1 | 1.21+ | 1.25.x * |
6666
| 0.3.0 | 0.6.2 | 1.21+ | 1.23.x * |

‎cmd/gateway/validation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
const (
1515
// nolint:lll
16-
// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.7.1/apis/v1beta1/shared_types.go#L495
16+
// Regex from: https://github.com/kubernetes-sigs/gateway-api/blob/v0.8.0/apis/v1beta1/shared_types.go#L551
1717
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
1818
)
1919

‎conformance/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NKG_TAG = edge
22
NKG_PREFIX = nginx-kubernetes-gateway
33
NGINX_IMAGE_NAME = $(NKG_PREFIX)/nginx
4-
GW_API_VERSION ?= 0.7.1
4+
GW_API_VERSION ?= 0.8.0
55
GATEWAY_CLASS = nginx
66
SUPPORTED_FEATURES = HTTPRoute,HTTPRouteQueryParamMatching,HTTPRouteMethodMatching,HTTPRoutePortRedirect,HTTPRouteSchemeRedirect,GatewayClassObservedGenerationBump
77
KIND_KUBE_CONFIG=$${HOME}/.kube/kind/config

‎conformance/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ update-nkg-manifest Update the NKG deployment manifest image names an
4444
| PREFIX | conformance-test-runner | The prefix for the conformance test image |
4545
| NKG_TAG | edge | The tag for the locally built NKG image |
4646
| NKG_PREFIX | nginx-kubernetes-gateway | The prefix for the locally built NKG image |
47-
| GW_API_VERSION | 0.7.1 | Tag for the Gateway API version to check out. Set to `main` to get the latest version |
47+
| GW_API_VERSION | 0.8.0 | Tag for the Gateway API version to check out. Set to `main` to get the latest version |
4848
| KIND_KUBE_CONFIG | ~/.kube/kind/config | The location of the kubeconfig |
4949
| GATEWAY_CLASS | nginx | The gateway class that should be used for the tests |
5050
| SUPPORTED_FEATURES | HTTPRoute,HTTPRouteQueryParamMatching, HTTPRouteMethodMatching,HTTPRoutePortRedirect, HTTPRouteSchemeRedirect | The supported features that should be tested by the conformance tests. Ensure the list is comma separated with no spaces. |

‎deploy/helm-chart/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ correct version as supported by the NGINX Kubernetes Gateway -
1919
To install the Gateway resources from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run:
2020

2121
```shell
22-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
22+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
2323
```
2424

2525
## Installing the Chart
@@ -60,7 +60,7 @@ Kubernetes Gateway - [see the Technical Specifications](../../README.md#technica
6060
To upgrade the Gateway resources from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run:
6161

6262
```shell
63-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
63+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
6464
```
6565

6666
### Upgrading the CRDs
@@ -116,7 +116,7 @@ running in the cluster!**
116116
To delete the Gateway resources using [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run:
117117

118118
```shell
119-
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
119+
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
120120
```
121121

122122
## Configuration

‎docs/developer/quickstart.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ This will build the docker images `nginx-kubernetes-gateway:<your-user>` and `ng
8787
3. Install Gateway API Resources
8888
8989
```shell
90-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
90+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
9191
```
9292
9393
4. Install NKG using your custom image and expose NKG with a NodePort Service:

‎docs/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ page.
2727
1. Install the Gateway API resources from the standard channel (the CRDs and the validating webhook):
2828

2929
```shell
30-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
30+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
3131
```
3232

3333
1. Deploy the NGINX Kubernetes Gateway CRDs:
@@ -135,7 +135,7 @@ Create a Service with type `LoadBalancer` using the appropriate manifest for you
135135
running in the cluster!**
136136

137137
```shell
138-
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.7.1/standard-install.yaml
138+
kubectl delete -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
139139
```
140140

141141
### Uninstall NGINX Kubernetes Gateway using Helm

‎go.mod‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ require (
1313
github.com/onsi/gomega v1.27.10
1414
github.com/spf13/cobra v1.7.0
1515
go.uber.org/zap v1.25.0
16-
k8s.io/api v0.28.0
17-
k8s.io/apimachinery v0.28.0
18-
k8s.io/client-go v0.28.0
19-
sigs.k8s.io/controller-runtime v0.15.1
16+
k8s.io/api v0.28.1
17+
k8s.io/apimachinery v0.28.1
18+
k8s.io/client-go v0.28.1
19+
sigs.k8s.io/controller-runtime v0.16.0
2020
sigs.k8s.io/controller-tools v0.13.0
21-
sigs.k8s.io/gateway-api v0.7.1
21+
sigs.k8s.io/gateway-api v0.8.0
2222
)
2323

2424
require (
@@ -62,8 +62,9 @@ require (
6262
github.com/prometheus/common v0.44.0 // indirect
6363
github.com/prometheus/procfs v0.10.1 // indirect
6464
github.com/spf13/pflag v1.0.5 // indirect
65-
github.com/stretchr/testify v1.8.2 // indirect
65+
github.com/stretchr/testify v1.8.4 // indirect
6666
go.uber.org/multierr v1.11.0 // indirect
67+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
6768
golang.org/x/mod v0.12.0 // indirect
6869
golang.org/x/net v0.14.0 // indirect
6970
golang.org/x/oauth2 v0.8.0 // indirect
@@ -72,14 +73,14 @@ require (
7273
golang.org/x/text v0.12.0 // indirect
7374
golang.org/x/time v0.3.0 // indirect
7475
golang.org/x/tools v0.12.0 // indirect
75-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
76+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7677
google.golang.org/appengine v1.6.7 // indirect
7778
google.golang.org/protobuf v1.30.0 // indirect
7879
gopkg.in/inf.v0 v0.9.1 // indirect
7980
gopkg.in/yaml.v2 v2.4.0 // indirect
8081
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/apiextensions-apiserver v0.28.0 // indirect
82-
k8s.io/component-base v0.28.0 // indirect
82+
k8s.io/apiextensions-apiserver v0.28.1 // indirect
83+
k8s.io/component-base v0.28.1 // indirect
8384
k8s.io/klog/v2 v2.100.1 // indirect
8485
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
8586
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect

0 commit comments

Comments
 (0)