Skip to content

Commit 0a69101

Browse files
sjbermansjberman
authored
Merge branch 'main' into proposal/inference-extension
2 parents d9124e0 + 2649f89 commit 0a69101

26 files changed

+180
-40
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
85+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Output Variables
5959
id: vars
6060
run: |
61-
K8S_KIND_VERSION=v1.33.2 # renovate: datasource=docker depName=kindest/node
61+
K8S_KIND_VERSION=v1.34.0 # renovate: datasource=docker depName=kindest/node
6262
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
6363
echo "min_k8s_version=v1.25.16" >> $GITHUB_OUTPUT
6464
echo "k8s_latest=${K8S_KIND_VERSION}" >> $GITHUB_OUTPUT

‎.github/workflows/nfr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- name: Authenticate to Google Cloud
8888
id: auth
89-
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
89+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
9090
with:
9191
token_format: access_token
9292
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
@@ -100,7 +100,7 @@ jobs:
100100
password: ${{ steps.auth.outputs.access_token }}
101101

102102
- name: Set up Cloud SDK
103-
uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368 # v3.0.0
103+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db # v3.0.1
104104
with:
105105
project_id: ${{ secrets.GCP_PROJECT_ID }}
106106
install_components: kubectl

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2525
# renovate: datasource=github-tags depName=golangci/golangci-lint
2626
GOLANGCI_LINT_VERSION = v2.4.0
2727
# renovate: datasource=docker depName=kindest/node
28-
KIND_K8S_VERSION = v1.33.2
28+
KIND_K8S_VERSION = v1.34.0
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs
3030
HELM_DOCS_VERSION = v1.14.2
3131
# renovate: datasource=github-tags depName=ahmetb/gen-crd-api-reference-docs
3232
GEN_CRD_API_REFERENCE_DOCS_VERSION = v0.3.0
3333
# renovate: datasource=go depName=sigs.k8s.io/controller-tools
34-
CONTROLLER_TOOLS_VERSION = v0.18.0
34+
CONTROLLER_TOOLS_VERSION = v0.19.0
3535
# renovate: datasource=docker depName=node
3636
NODE_VERSION = 22
3737
# renovate: datasource=docker depName=quay.io/helmpack/chart-testing

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6868

6969
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
7070
|----------------------|-------------|------------|-----------|------------|-------------|
71-
| Edge | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.2.1 |
71+
| Edge | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.0 |
7272
| 2.1.0 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.2.1 |
7373
| 2.0.2 | 1.3.0 | 1.25+ | 1.28.0 | R34 | v3.0.1 |
7474
| 2.0.1 | 1.3.0 | 1.25+ | 1.28.0 | R34 | v3.0.1 |

‎build/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.p
77
FROM nginx:1.29.1-alpine-otel
88

99
# renovate: datasource=github-tags depName=nginx/agent
10-
ARG NGINX_AGENT_VERSION=v3.2.1
10+
ARG NGINX_AGENT_VERSION=v3.3.0
1111
ARG NJS_DIR
1212
ARG NGINX_CONF_DIR
1313
ARG BUILD_AGENT

‎build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM alpine:3.22
88

99
ARG NGINX_PLUS_VERSION=R35
1010
# renovate: datasource=github-tags depName=nginx/agent
11-
ARG NGINX_AGENT_VERSION=v3.2.1
11+
ARG NGINX_AGENT_VERSION=v3.3.0
1212
ARG NJS_DIR
1313
ARG NGINX_CONF_DIR
1414
ARG BUILD_AGENT

‎config/crd/bases/gateway.nginx.org_clientsettingspolicies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
labels:
88
gateway.networking.k8s.io/policy: inherited
99
name: clientsettingspolicies.gateway.nginx.org

‎config/crd/bases/gateway.nginx.org_nginxgateways.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: nginxgateways.gateway.nginx.org
88
spec:
99
group: gateway.nginx.org

‎config/crd/bases/gateway.nginx.org_nginxproxies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.18.0
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: nginxproxies.gateway.nginx.org
88
spec:
99
group: gateway.nginx.org

0 commit comments

Comments
 (0)