Merge branch 'main' into hpa

nowjean · web-flow · commit 8f82fbea1157 · 2025-06-20T16:50:20.000+09:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
           key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
       - name: Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         with:
           driver-opts: network=host
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -165,7 +165,7 @@ jobs:
         if: github.ref_type == 'tag'
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
+        uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
         if: github.ref_type == 'tag'
 
       - name: Build binary
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -48,7 +48,7 @@ jobs:
         run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
 
       - name: Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: NGF Docker meta
         id: ngf-meta
diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -42,7 +42,7 @@ jobs:
         run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
 
       - name: Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: NGF Docker meta
         id: ngf-meta
diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -31,7 +31,7 @@ jobs:
           key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
       - name: Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: NGF Docker meta
         id: ngf-meta
diff --git a/.github/workflows/renovate-build.yml b/.github/workflows/renovate-build.yml
@@ -67,7 +67,7 @@ jobs:
 
       - name: Commit changes
         id: commit
-        uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
+        uses: stefanzweifel/git-auto-commit-action@778341af668090896ca464160c2def5d1d1a3eb0 # v6.0.1
         with:
           commit_message: "Update files for renovate"
           commit_author: "renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>"
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
 
 | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
 |----------------------|-------------|------------|-----------|------------|-------------|
-| Edge                 | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.1      |
+| Edge                 | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.2      |
 | 2.0.1                | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.1      |
 | 2.0.0                | 1.3.0       | 1.25+      | 1.28.0    | R34        | v3.0.0      |
 | 1.6.2                | 1.2.1       | 1.25+      | 1.27.4    | R33        | ---         |
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 FROM golang:1.24 AS builder
 
 WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric
diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 FROM scratch AS nginx-files
 
 # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
@@ -7,7 +7,7 @@ ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.p
 FROM nginx:1.28.0-alpine-otel
 
 # renovate: datasource=github-tags depName=nginx/agent
-ARG NGINX_AGENT_VERSION=v3.0.1
+ARG NGINX_AGENT_VERSION=v3.0.2
 ARG NJS_DIR
 ARG NGINX_CONF_DIR
 ARG BUILD_AGENT
diff --git a/build/Dockerfile.nginxplus b/build/Dockerfile.nginxplus
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 FROM scratch AS nginx-files
 
 # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
@@ -8,7 +8,7 @@ FROM alpine:3.21
 
 ARG NGINX_PLUS_VERSION=R34
 # renovate: datasource=github-tags depName=nginx/agent
-ARG NGINX_AGENT_VERSION=v3.0.1
+ARG NGINX_AGENT_VERSION=v3.0.2
 ARG NJS_DIR
 ARG NGINX_CONF_DIR
 ARG BUILD_AGENT
diff --git a/charts/nginx-gateway-fabric/README.md b/charts/nginx-gateway-fabric/README.md
@@ -309,6 +309,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
 | `nginxGateway.metrics.enable` | Enable exposing metrics in the Prometheus format. | bool | `true` |
 | `nginxGateway.metrics.port` | Set the port where the Prometheus metrics are exposed. | int | `9113` |
 | `nginxGateway.metrics.secure` | Enable serving metrics via https. By default metrics are served via http. Please note that this endpoint will be secured with a self-signed certificate. | bool | `false` |
+| `nginxGateway.name` | The name of the NGINX Gateway Fabric deployment - if not present, then by default uses release name given during installation. | string | `""` |
 | `nginxGateway.nodeSelector` | The nodeSelector of the NGINX Gateway Fabric control plane pod. | object | `{}` |
 | `nginxGateway.podAnnotations` | Set of custom annotations for the NGINX Gateway Fabric pods. | object | `{}` |
 | `nginxGateway.productTelemetry.enable` | Enable the collection of product telemetry. | bool | `true` |
diff --git a/charts/nginx-gateway-fabric/templates/_helpers.tpl b/charts/nginx-gateway-fabric/templates/_helpers.tpl
@@ -2,8 +2,12 @@
 Expand the name of the chart.
 */}}
 {{- define "nginx-gateway.name" -}}
+{{- if .Values.nginxGateway.name }}
+{{- .Values.nginxGateway.name | trunc 63 | trimSuffix "-" }}
+{{- else }}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
+{{- end }}
 
 {{/*
 Create a default fully qualified app name.
@@ -14,7 +18,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- $name := default (include "nginx-gateway.name" .) }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -27,23 +31,23 @@ If release name contains chart name it will be used as a full name.
 Create control plane config name.
 */}}
 {{- define "nginx-gateway.config-name" -}}
-{{- $name := default .Release.Name .Values.nameOverride }}
+{{- $name := .Values.nginxGateway.name | default .Values.nameOverride | default .Release.Name }}
 {{- printf "%s-config" $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create data plane config name.
 */}}
 {{- define "nginx-gateway.proxy-config-name" -}}
-{{- $name := default .Release.Name .Values.nameOverride }}
+{{- $name := .Values.nginxGateway.name | default .Values.nameOverride | default .Release.Name }}
 {{- printf "%s-proxy-config" $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Create security context constraints name.
 */}}
 {{- define "nginx-gateway.scc-name" -}}
-{{- $name := default .Release.Name .Values.nameOverride }}
+{{- $name := .Values.nginxGateway.name | default .Values.nameOverride | default .Release.Name }}
 {{- printf "%s-scc" $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
diff --git a/charts/nginx-gateway-fabric/values.schema.json b/charts/nginx-gateway-fabric/values.schema.json
@@ -829,6 +829,13 @@
           "title": "metrics",
           "type": "object"
         },
+        "name": {
+          "default": "",
+          "description": "The name of the NGINX Gateway Fabric deployment - if not present, then by default uses release name given during installation.",
+          "required": [],
+          "title": "name",
+          "type": "string"
+        },
         "nodeSelector": {
           "description": "The nodeSelector of the NGINX Gateway Fabric control plane pod.",
           "required": [],
diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml
@@ -13,6 +13,9 @@ nginxGateway:
   # -- The kind of the NGINX Gateway Fabric installation - currently, only deployment is supported.
   kind: deployment
 
+  # -- The name of the NGINX Gateway Fabric deployment - if not present, then by default uses release name given during installation.
+  name: ""
+
   # @schema
   # required: true
   # type: string
diff --git a/debug/Dockerfile b/debug/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 # This Dockerfile builds an image with the dlv debugger. See the debugging guide in the developer docs for details
 # on how to use it.
 FROM golang:1.24-alpine AS builder
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/go-logr/logr v1.4.3
 	github.com/google/go-cmp v0.7.0
 	github.com/google/uuid v1.6.0
-	github.com/nginx/agent/v3 v3.0.1
+	github.com/nginx/agent/v3 v3.0.2
 	github.com/nginx/telemetry-exporter v0.1.4
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0
diff --git a/go.sum b/go.sum
@@ -137,8 +137,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nginx/agent/v3 v3.0.1 h1:AH8WLGjqbpM3VimoIN1pW3r6iCcl7gZTPkXnJws3eGQ=
-github.com/nginx/agent/v3 v3.0.1/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs=
+github.com/nginx/agent/v3 v3.0.2 h1:beO5qFeAVWOiZDkYRyElctbhnjz+g3JDsH2yKZjoRjY=
+github.com/nginx/agent/v3 v3.0.2/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs=
 github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w=
 github.com/nginx/telemetry-exporter v0.1.4/go.mod h1:bl6qmsxgk4a9D0X8R5E3sUNXN2iECPEK1JNbRLhN5C4=
 github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=
diff --git a/internal/controller/nginx/modules/package-lock.json b/internal/controller/nginx/modules/package-lock.json
diff --git a/internal/controller/nginx/modules/package.json b/internal/controller/nginx/modules/package.json
diff --git a/scripts/generate-manifests.sh b/scripts/generate-manifests.sh
diff --git a/tests/Makefile b/tests/Makefile
diff --git a/tests/conformance/Dockerfile b/tests/conformance/Dockerfile
diff --git a/tests/framework/crossplane/Dockerfile b/tests/framework/crossplane/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# syntax=docker/dockerfile:1.16`
	`1`	`+# syntax=docker/dockerfile:1.17`
`2`	`2`	`FROM golang:1.24 AS builder`
`3`	`3`
`4`	`4`	`WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric`