Skip to content

Commit 838358a

Browse files
sjbermansjberman
authored
Merge branch 'main' into tests/nfr-tests-edge
2 parents 472364e + d68a7d5 commit 838358a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+727
-345
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
ref: ${{ inputs.tag != '' && format('refs/tags/v{0}', inputs.tag) || github.ref }}
4141

4242
- name: Fetch Cached Artifacts
43-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
43+
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
4444
with:
4545
path: ${{ github.workspace }}/dist
4646
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
@@ -103,8 +103,8 @@ jobs:
103103
with:
104104
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
105105
images: |
106-
name=ghcr.io/nginx/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }}
107-
name=ghcr.io/nginx/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }}
106+
name=ghcr.io/${{ github.repository_owner }}/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }}
107+
name=ghcr.io/${{ github.repository_owner }}/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }}
108108
name=docker-mgmt.nginx.com/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }}
109109
name=us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }}
110110
name=localhost:5000/nginx-gateway-fabric/${{ inputs.image }}
@@ -132,7 +132,7 @@ jobs:
132132
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
133133

134134
- name: Build Docker Image
135-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
135+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
136136
with:
137137
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
138138
context: "."
@@ -171,15 +171,15 @@ jobs:
171171
fail-build: false
172172

173173
- name: Upload scan result to GitHub Security tab
174-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
174+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}
178178
category: build-${{ inputs.image }}
179179
if: always()
180180

181181
- name: Upload Scan Results
182-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
182+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
183183
continue-on-error: true
184184
with:
185185
name: scan-results-${{ inputs.image }}

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
token: ${{ secrets.CODECOV_TOKEN }}
100100

101101
- name: Upload Coverage Report
102-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
102+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
103103
with:
104104
name: cover-${{ github.run_id }}.html
105105
path: ${{ github.workspace }}/cover.html
@@ -165,13 +165,13 @@ jobs:
165165
if: github.ref_type == 'tag'
166166

167167
- name: Install Cosign
168-
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
168+
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
169169
if: github.ref_type == 'tag'
170170

171171
- name: Build binary
172172
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
173173
with:
174-
version: v2.6.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
174+
version: v2.7.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
175175
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
176176
env:
177177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -184,7 +184,7 @@ jobs:
184184
TELEMETRY_ENDPOINT_INSECURE: "false"
185185

186186
- name: Cache Artifacts
187-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
187+
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
188188
with:
189189
path: ${{ github.workspace }}/dist
190190
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
47+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4848
with:
4949
languages: ${{ matrix.language }}
5050
build-mode: ${{ matrix.build-mode }}
5151
queries: security-and-quality
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
54+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
5555
with:
5656
category: "/language:${{matrix.language}}"

‎.github/workflows/conformance.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ jobs:
8686
- name: Build binary
8787
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
8888
with:
89-
version: v2.6.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
89+
version: v2.7.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
9090
args: build --single-target --snapshot --clean
9191
env:
9292
TELEMETRY_ENDPOINT: "" # disables sending telemetry
9393
TELEMETRY_ENDPOINT_INSECURE: "false"
9494

9595
- name: Build NGF Docker Image
96-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
96+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
9797
with:
9898
file: build/Dockerfile
9999
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -104,7 +104,7 @@ jobs:
104104
pull: true
105105

106106
- name: Build NGINX Docker Image
107-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
107+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
108108
with:
109109
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
110110
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -123,7 +123,7 @@ jobs:
123123
working-directory: ./tests
124124

125125
- name: Build Test Docker Image
126-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
126+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
127127
with:
128128
file: tests/conformance/Dockerfile
129129
tags: conformance-test-runner:${{ github.sha }}
@@ -164,7 +164,7 @@ jobs:
164164

165165
- name: Upload profile to GitHub
166166
if: ${{ inputs.enable-experimental }}
167-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
167+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
168168
with:
169169
name: conformance-profile-${{ inputs.image }}-${{ inputs.k8s-version }}
170170
path: ./tests/conformance-profile.yaml

‎.github/workflows/functional.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ jobs:
7373
- name: Build binary
7474
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
7575
with:
76-
version: v2.6.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
76+
version: v2.7.0 # renovate: datasource=github-tags depName=goreleaser/goreleaser
7777
args: build --single-target --snapshot --clean
7878
env:
7979
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317
8080
TELEMETRY_ENDPOINT_INSECURE: "true"
8181

8282
- name: Build NGF Docker Image
83-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
83+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
8484
with:
8585
file: build/Dockerfile
8686
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -91,7 +91,7 @@ jobs:
9191
target: goreleaser
9292

9393
- name: Build NGINX Docker Image
94-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
94+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
9595
with:
9696
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
9797
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -112,7 +112,7 @@ jobs:
112112

113113
- name: Install cloud-provider-kind
114114
run: |
115-
CLOUD_PROVIDER_KIND_VERSION=v0.5.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
115+
CLOUD_PROVIDER_KIND_VERSION=v0.6.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
116116
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
117117
118118
- name: Run cloud-provider-kind

‎.github/workflows/helm.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Fetch Cached Artifacts
28-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
28+
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
2929
with:
3030
path: ${{ github.workspace }}/dist
3131
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
@@ -60,7 +60,7 @@ jobs:
6060
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
6161
6262
- name: Build NGF Docker Image
63-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
63+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
6464
with:
6565
file: build/Dockerfile
6666
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -71,7 +71,7 @@ jobs:
7171
pull: true
7272

7373
- name: Build NGINX Docker Image
74-
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
74+
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
7575
with:
7676
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
7777
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -86,7 +86,7 @@ jobs:
8686
8787
- name: Install cloud-provider-kind
8888
run: |
89-
CLOUD_PROVIDER_KIND_VERSION=v0.5.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
89+
CLOUD_PROVIDER_KIND_VERSION=v0.6.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
9090
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
9191
9292
- name: Run cloud-provider-kind
@@ -139,7 +139,7 @@ jobs:
139139

140140
- name: Install cloud-provider-kind
141141
run: |
142-
CLOUD_PROVIDER_KIND_VERSION=v0.5.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
142+
CLOUD_PROVIDER_KIND_VERSION=v0.6.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
143143
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
144144
145145
- name: Run cloud-provider-kind

‎.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
go-version: stable
3838

3939
- name: Lint Go
40-
uses: golangci/golangci-lint-action@818ec4d51a1feacefc42ff1b3ec25d4962690f39 # v6.4.1
40+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
4141
with:
4242
working-directory: ${{ matrix.directory }}
43-
version: v1.64.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
43+
version: v1.64.5 # renovate: datasource=github-tags depName=golangci/golangci-lint
4444

4545
njs-lint:
4646
name: NJS Lint
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979

8080
- name: Lint Actions
81-
uses: reviewdog/action-actionlint@abd537417cf4991e1ba8e21a67b1119f4f53b8e0 # v1.64.1
81+
uses: reviewdog/action-actionlint@db58217885f9a6570da9c71be4e40ec33fe44a1f # v1.65.0
8282
with:
8383
actionlint_flags: -shellcheck ""
8484

‎.github/workflows/nfr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
fi
148148
149149
- name: Upload Artifacts
150-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
150+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
151151
with:
152152
name: results-${{ matrix.type }}
153153
path: tests/results/**/*-${{ matrix.type }}.*
@@ -178,7 +178,7 @@ jobs:
178178
merge-multiple: true
179179

180180
- name: Open a PR with the results
181-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
181+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
182182
with:
183183
token: ${{ secrets.NGINX_PAT }}
184184
commit-message: NFR Test Results for NGF version ${{ needs.vars.outputs.version }}

‎.github/workflows/release-pr.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ jobs:
4646
# TODO(lucacome): improve this and maybe use appVersion instead of version if we switch to tags
4747
echo "current_version=$(yq '.version' <charts/nginx-gateway-fabric/Chart.yaml)" >> $GITHUB_OUTPUT
4848
49-
- name: Find and Replace
50-
uses: jacobtomlinson/gha-find-replace@f1069b438f125e5395d84d1c6fd3b559a7880cb5 # 3.0.5
51-
with:
52-
find: ${{ steps.vars.outputs.current_version }}
53-
replace: ${{ inputs.version }}
54-
include: "site/content/**/*.md"
55-
regex: false
56-
5749
- name: Find and Replace
5850
uses: jacobtomlinson/gha-find-replace@f1069b438f125e5395d84d1c6fd3b559a7880cb5 # 3.0.5
5951
with:
@@ -89,7 +81,7 @@ jobs:
8981
make generate-all
9082
9183
- name: Create Pull Request
92-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
84+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
9385
with:
9486
token: ${{ secrets.NGINX_PAT }}
9587
commit-message: Release ${{ inputs.version }}

‎.github/workflows/scorecards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
37+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -52,14 +52,14 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
55+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
5656
with:
5757
name: SARIF file
5858
path: results.sarif
5959
retention-days: 5
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
63+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
6464
with:
6565
sarif_file: results.sarif

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ repos:
2727
exclude: (^examples/|^docs/|.*_test.go$)
2828

2929
- repo: https://github.com/gitleaks/gitleaks
30-
rev: v8.23.3
30+
rev: v8.24.0
3131
hooks:
3232
- id: gitleaks
3333

3434
- repo: https://github.com/rbubley/mirrors-prettier
35-
rev: v3.5.0
35+
rev: v3.5.2
3636
hooks:
3737
- id: prettier
3838
types:
3939
- javascript
4040

4141
- repo: https://github.com/golangci/golangci-lint
42-
rev: v1.64.2
42+
rev: v1.64.5
4343
hooks:
4444
- id: golangci-lint-full
4545
name: golangci-lint-root

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2323

2424
# tools versions
2525
# renovate: datasource=github-tags depName=golangci/golangci-lint
26-
GOLANGCI_LINT_VERSION = v1.64.2
26+
GOLANGCI_LINT_VERSION = v1.64.5
2727
# renovate: datasource=docker depName=kindest/node
2828
KIND_K8S_VERSION = v1.32.0
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs

‎build/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# syntax=docker/dockerfile:1.13
2-
FROM golang:1.23 AS builder
1+
# syntax=docker/dockerfile:1.14
2+
FROM golang:1.24 AS builder
33

44
WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric
55

@@ -9,7 +9,7 @@ RUN go mod download
99
COPY . /go/src/github.com/nginx/nginx-gateway-fabric
1010
RUN make build
1111

12-
FROM golang:1.23 AS ca-certs-provider
12+
FROM golang:1.24 AS ca-certs-provider
1313

1414
FROM alpine:3.21 AS capabilizer
1515
RUN apk add --no-cache libcap

‎build/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.13
1+
# syntax=docker/dockerfile:1.14
22
FROM nginx:1.27.4-alpine-otel
33

44
ARG NJS_DIR

‎build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax=docker/dockerfile:1.13
1+
# syntax=docker/dockerfile:1.14
22
FROM scratch AS nginx-files
33

44
# the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>

‎debug/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# syntax=docker/dockerfile:1.13
1+
# syntax=docker/dockerfile:1.14
22
# This Dockerfile builds an image with the dlv debugger. See the debugging guide in the developer docs for details
33
# on how to use it.
4-
FROM golang:1.23-alpine AS builder
4+
FROM golang:1.24-alpine AS builder
55

66
RUN go install github.com/go-delve/delve/cmd/dlv@latest
77

‎docs/developer/release-process.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ To create a new release, follow these steps:
6666
4. `GW_API_PREV_VERSION` in tests Makefile, if necessary.
6767
5. Any references in the docs to the previous release.
6868
6. Any installation instructions to ensure that the supported Gateway API and NGF versions are correct. Specifically, helm README.
69-
8. Run the [docs workflow](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/docs-build-push.yml) for **prod** on the **release branch**. Open a PR to the release branch to turn auto-deploy on for the docs workflow in this branch. See [this README](https://github.com/nginxinc/docs-actions/tree/v1.0.4?tab=readme-ov-file#caller-example) for how to do this. Docs should only be auto-published when changes to the `site/` directory are made.
69+
8. Prepare and merge a PR into the main branch of the [documentation repository](https://github.com/nginx/documentation) from the relevant release branch, such as `ngf-release-2.0`.
70+
- Update the HTML file located at `layouts/shortcodes/version-ngf.html` with the latest version. Ensure you do not add an empty line to the file.
71+
- Documentation is built and deployed automatically from `main`, and will trigger when merging to it.
72+
- Create a new branch for the next release version, in the format `ngf-release-<i>.<i>`, substituting the *i* placeholders for major and minor version numbers.
7073
9. Close the issue created in Step 1.
7174
10. Ensure that the [associated milestone](https://github.com/nginx/nginx-gateway-fabric/milestones) is closed.
7275
11. Verify that published artifacts in the release can be installed properly.

0 commit comments

Comments
 (0)