Skip to content

Commit e9ae68a

Browse files
sjbermansjberman
authored
Rename NGINX Kubernetes Gateway (#1070)
Renaming NGINX Kubernetes Gateway to NGINX Gateway Fabric. NKG is renamed to NGF
1 parent f55c94e commit e9ae68a

File tree

170 files changed

+1013
-1001
lines changed

Some content is hidden

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

170 files changed

+1013
-1001
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Steps to reproduce the behavior:
2020
A clear and concise description of what you expected to happen.
2121

2222
**Your environment**
23-
* Version of the NGINX Kubernetes Gateway - release version or a specific commit. The first line of the nginx-gateway container logs includes the commit info.
23+
* Version of the NGINX Gateway Fabric - release version or a specific commit. The first line of the nginx-gateway container logs includes the commit info.
2424
* Version of Kubernetes
2525
* Kubernetes platform (e.g. Mini-kube or GCP)
26-
* Details on how you expose the NGINX Gateway Pod (e.g. Service of type LoadBalancer or port-forward)
26+
* Details on how you expose the NGINX Gateway Fabric Pod (e.g. Service of type LoadBalancer or port-forward)
2727
* Logs of NGINX container: `kubectl -n nginx-gateway logs -l app=nginx-gateway -c nginx`
2828
* NGINX Configuration: `kubectl -n nginx-gateway exec <gateway-pod> -c nginx -- nginx -T`
2929

Diff for: ‎.github/ISSUE_TEMPLATE/enhancement.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels: 'enhancement'
66

77
<!--
88
WARNING: Prior to submitting an enhancement request, we ask that you create a discussion. If you have not yet
9-
created a discussion related to your request, please do so now: https://github.com/nginxinc/nginx-kubernetes-gateway/discussions/new?category=ideas
9+
created a discussion related to your request, please do so now: https://github.com/nginxinc/nginx-gateway-fabric/discussions/new?category=ideas
1010
-->
1111

1212
**Is your enhancement request related to a problem? Please describe.**
@@ -23,5 +23,5 @@ Add any other context or screenshots about the enhancement request here.
2323

2424
<!--
2525
NOTE: depending on the scope of the enhancement, you may be asked to use the Enhancement Proposal
26-
process to document your work: https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/eps/README.md
26+
process to document your work: https://github.com/nginxinc/nginx-gateway-fabric/blob/main/eps/README.md
2727
-->

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Closes #ISSUE
1919

2020
Before creating a PR, run through this checklist and mark each as complete.
2121

22-
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/CONTRIBUTING.md) doc
22+
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/CONTRIBUTING.md) doc
2323
- [ ] I have added tests that prove my fix is effective or that my feature works
2424
- [ ] I have checked that all unit tests pass after adding my changes
2525
- [ ] I have updated necessary documentation

Diff for: ‎.github/workflows/ci.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
collapse-after: 20
122122
notes-header: |
123123
*Below is the auto-generated changelog, which includes all PRs that went into the release.
124-
For a shorter version that highlights only important changes, see [CHANGELOG.md](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/{{version}}/CHANGELOG.md).*
124+
For a shorter version that highlights only important changes, see [CHANGELOG.md](https://github.com/nginxinc/nginx-gateway-fabric/blob/{{version}}/CHANGELOG.md).*
125125
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
126126

127127
- name: Download Syft
@@ -149,7 +149,7 @@ jobs:
149149
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
150150
with:
151151
path: ${{ github.workspace }}/dist
152-
key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
152+
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
153153

154154
helm-tests:
155155
name: Helm Tests
@@ -163,17 +163,17 @@ jobs:
163163
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
164164
with:
165165
path: ${{ github.workspace }}/dist
166-
key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
166+
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
167167

168168
- name: Docker Buildx
169169
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
170170

171-
- name: NKG Docker meta
172-
id: nkg-meta
171+
- name: NGF Docker meta
172+
id: ngf-meta
173173
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
174174
with:
175175
images: |
176-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway
176+
name=ghcr.io/nginxinc/nginx-gateway-fabric
177177
tags: |
178178
type=semver,pattern={{version}}
179179
type=edge
@@ -185,23 +185,23 @@ jobs:
185185
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
186186
with:
187187
images: |
188-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
188+
name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
189189
tags: |
190190
type=semver,pattern={{version}}
191191
type=edge
192192
type=ref,event=pr
193193
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
194194
195-
- name: Build NKG Docker Image
195+
- name: Build NGF Docker Image
196196
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
197197
with:
198198
file: build/Dockerfile
199-
tags: ${{ steps.nkg-meta.outputs.tags }}
199+
tags: ${{ steps.ngf-meta.outputs.tags }}
200200
context: "."
201201
target: goreleaser
202202
load: true
203-
cache-from: type=gha,scope=nkg
204-
cache-to: type=gha,scope=nkg,mode=max
203+
cache-from: type=gha,scope=ngf
204+
cache-to: type=gha,scope=ngf,mode=max
205205
pull: true
206206

207207
- name: Build NGINX Docker Image
@@ -224,19 +224,19 @@ jobs:
224224
kube_config=${{ github.workspace }}/deploy/helm-chart/kube-${{ github.run_id }}-helm
225225
make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
226226
echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
227-
kind load docker-image ${{ steps.nkg-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }}
227+
kind load docker-image ${{ steps.ngf-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }}
228228
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
229229
kubectl wait --for=condition=complete job/gateway-api-admission-patch job/gateway-api-admission -n gateway-system
230230
231231
- name: Install Chart
232232
run: >
233233
helm install
234-
helm-$(echo ${{ steps.nkg-meta.outputs.tags }} | tr '.' '-' | cut -d ":" -f 2)
234+
helm-$(echo ${{ steps.ngf-meta.outputs.tags }} | tr '.' '-' | cut -d ":" -f 2)
235235
.
236236
--wait
237237
--create-namespace
238-
--set nginxGateway.image.repository=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
239-
--set nginxGateway.image.tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
238+
--set nginxGateway.image.repository=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
239+
--set nginxGateway.image.tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
240240
--set nginxGateway.image.pullPolicy=Never
241241
--set nginx.image.repository=$(echo ${{ steps.nginx-meta.outputs.tags }} | cut -d ":" -f 1)
242242
--set nginx.image.tag=$(echo ${{ steps.nginx-meta.outputs.tags }} | cut -d ":" -f 2)
@@ -252,7 +252,7 @@ jobs:
252252
strategy:
253253
fail-fast: false
254254
matrix:
255-
container: [nkg, nginx]
255+
container: [ngf, nginx]
256256
permissions:
257257
contents: read # for docker/build-push-action to read repo content
258258
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -265,7 +265,7 @@ jobs:
265265
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
266266
with:
267267
path: ${{ github.workspace }}/dist
268-
key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
268+
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
269269

270270
- name: Docker Buildx
271271
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
@@ -288,7 +288,7 @@ jobs:
288288
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
289289
with:
290290
images: |
291-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '/nginx' || '' }}
291+
name=ghcr.io/nginxinc/nginx-gateway-fabric${{ matrix.container == 'nginx' && '/nginx' || '' }}
292292
tags: |
293293
type=semver,pattern={{version}}
294294
type=edge
@@ -300,7 +300,7 @@ jobs:
300300
with:
301301
file: ${{ matrix.container == 'nginx' && 'build/Dockerfile.nginx' || 'build/Dockerfile' }}
302302
context: "."
303-
target: ${{ matrix.container == 'nkg' && 'goreleaser' || '' }}
303+
target: ${{ matrix.container == 'ngf' && 'goreleaser' || '' }}
304304
tags: ${{ steps.meta.outputs.tags }}
305305
labels: ${{ steps.meta.outputs.labels }}
306306
load: ${{ github.event_name == 'pull_request' }}
@@ -320,23 +320,23 @@ jobs:
320320
uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f # 0.12.0
321321
continue-on-error: true
322322
with:
323-
image-ref: ghcr.io/nginxinc/nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '/nginx' || '' }}:${{ steps.meta.outputs.version }}
323+
image-ref: ghcr.io/nginxinc/nginx-gateway-fabric${{ matrix.container == 'nginx' && '/nginx' || '' }}:${{ steps.meta.outputs.version }}
324324
format: "sarif"
325-
output: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
325+
output: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
326326
ignore-unfixed: "true"
327327

328328
- name: Upload Trivy scan results to GitHub Security tab
329329
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
330330
continue-on-error: true
331331
with:
332-
sarif_file: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
332+
sarif_file: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
333333

334334
- name: Upload Scan Results
335335
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
336336
continue-on-error: true
337337
with:
338-
name: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
339-
path: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
338+
name: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
339+
path: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
340340
if: always()
341341

342342
publish-helm:

Diff for: ‎.github/workflows/conformance.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
- name: Docker Buildx
4646
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
4747

48-
- name: NKG Docker meta
49-
id: nkg-meta
48+
- name: NGF Docker meta
49+
id: ngf-meta
5050
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
5151
with:
5252
images: |
53-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway
53+
name=ghcr.io/nginxinc/nginx-gateway-fabric
5454
tags: |
5555
type=semver,pattern={{version}}
5656
type=edge
@@ -62,18 +62,18 @@ jobs:
6262
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
6363
with:
6464
images: |
65-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
65+
name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
6666
tags: |
6767
type=semver,pattern={{version}}
6868
type=edge
6969
type=ref,event=pr
7070
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
7171
72-
- name: Prepare NKG files
72+
- name: Prepare NGF files
7373
run: |
74-
nkg_prefix=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
75-
nkg_tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
76-
make update-nkg-manifest NKG_PREFIX=${nkg_prefix} NKG_TAG=${nkg_tag}
74+
ngf_prefix=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
75+
ngf_tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
76+
make update-ngf-manifest NGF_PREFIX=${ngf_prefix} NGF_TAG=${ngf_tag}
7777
working-directory: ./conformance
7878

7979
- name: Build binary
@@ -82,16 +82,16 @@ jobs:
8282
version: latest
8383
args: build --snapshot --clean
8484

85-
- name: Build NKG Docker Image
85+
- name: Build NGF Docker Image
8686
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
8787
with:
8888
file: build/Dockerfile
89-
tags: ${{ steps.nkg-meta.outputs.tags }}
89+
tags: ${{ steps.ngf-meta.outputs.tags }}
9090
context: "."
9191
target: goreleaser
9292
load: true
93-
cache-from: type=gha,scope=nkg
94-
cache-to: type=gha,scope=nkg,mode=max
93+
cache-from: type=gha,scope=ngf
94+
cache-to: type=gha,scope=ngf,mode=max
9595
pull: true
9696

9797
- name: Build NGINX Docker Image
@@ -142,12 +142,12 @@ jobs:
142142

143143
- name: Setup conformance tests
144144
run: |
145-
nkg_prefix=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
146-
nkg_tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
145+
ngf_prefix=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
146+
ngf_tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
147147
if [ ${{ github.event_name }} == "schedule" ]; then
148148
export GW_API_VERSION=main
149149
fi
150-
make install-nkg-local-no-build NKG_PREFIX=${nkg_prefix} NKG_TAG=${nkg_tag}
150+
make install-ngf-local-no-build NGF_PREFIX=${ngf_prefix} NGF_TAG=${ngf_tag}
151151
working-directory: ./conformance
152152

153153
- name: Run conformance tests

Diff for: ‎.github/workflows/mend.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ jobs:
3131
run: jarsigner -verify wss-unified-agent.jar
3232
- name: Scan and upload
3333
env:
34-
PRODUCT_NAME: nginx-kubernetes-gateway_${{ github.ref_name }}
35-
PROJECT_NAME: nginx-kubernetes-gateway
34+
PRODUCT_NAME: nginx-gateway-fabric_${{ github.ref_name }}
35+
PROJECT_NAME: nginx-gateway-fabric
3636
run: java -jar wss-unified-agent.jar -noConfig true -wss.url ${{ secrets.WSS_URL }} -apiKey ${{ secrets.WSS_NGINX_TOKEN }} -product $PRODUCT_NAME -project $PROJECT_NAME -d .

Diff for: ‎.github/workflows/update-docker-images.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@ jobs:
2323
name: Get versions of base images
2424
runs-on: ubuntu-22.04
2525
outputs:
26-
nkg_tag: ${{ steps.nkg.outputs.tag }}
26+
ngf_tag: ${{ steps.ngf.outputs.tag }}
2727
nginx_version: ${{ steps.nginx.outputs.nginx_version }}
2828
steps:
2929
- name: Checkout Repository
3030
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
3131
with:
3232
fetch-depth: 0
3333

34-
- name: Set NKG version
35-
id: nkg
34+
- name: Set NGF version
35+
id: ngf
3636
run: |
3737
tag="$(git tag --sort=-version:refname | head -n1)"
3838
echo "tag=${tag//v}" >> $GITHUB_OUTPUT
3939
40-
- name: Checkout Repository at ${{ steps.nkg.outputs.tag }}
40+
- name: Checkout Repository at ${{ steps.ngf.outputs.tag }}
4141
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
4242
with:
43-
ref: refs/tags/v${{ steps.nkg.outputs.tag }}
43+
ref: refs/tags/v${{ steps.ngf.outputs.tag }}
4444

4545
- name: Set NGINX version
4646
id: nginx
@@ -60,7 +60,7 @@ jobs:
6060
uses: lucacome/docker-image-update-checker@f50d56412b948cfdbb842c5419372681e0db3df1 # v1.2.1
6161
with:
6262
base-image: ${{ needs.variables.outputs.nginx_version }}
63-
image: ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx:${{ needs.variables.outputs.nkg_tag }}
63+
image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
6464
platforms: ${{ env.platforms }}
6565

6666
- id: needs
@@ -101,9 +101,9 @@ jobs:
101101
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
102102
with:
103103
images: |
104-
name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
104+
name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
105105
tags: |
106-
${{ needs.variables.outputs.nkg_tag }}
106+
${{ needs.variables.outputs.ngf_tag }}
107107
108108
- name: Build Docker Image
109109
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
@@ -126,21 +126,21 @@ jobs:
126126
uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f # 0.12.0
127127
continue-on-error: true
128128
with:
129-
image-ref: ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx:${{ needs.variables.outputs.nkg_tag }}
129+
image-ref: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
130130
format: "sarif"
131-
output: trivy-results-nginx-kubernetes-gateway-nginx
131+
output: trivy-results-nginx-gateway-fabric-nginx
132132
ignore-unfixed: "true"
133133

134134
- name: Upload Trivy scan results to GitHub Security tab
135135
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
136136
continue-on-error: true
137137
with:
138-
sarif_file: trivy-results-nginx-kubernetes-gateway-nginx
138+
sarif_file: trivy-results-nginx-gateway-fabric-nginx
139139

140140
- name: Upload Scan Results
141141
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
142142
continue-on-error: true
143143
with:
144-
name: trivy-results-nginx-kubernetes-gateway-nginx
145-
path: trivy-results-nginx-kubernetes-gateway-nginx
144+
name: trivy-results-nginx-gateway-fabric-nginx
145+
path: trivy-results-nginx-gateway-fabric-nginx
146146
if: always()

Diff for: ‎.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
linters-settings:
22
goimports:
3-
local-prefixes: github.com/nginxinc/nginx-kubernetes-gateway
3+
local-prefixes: github.com/nginxinc/nginx-gateway-fabric
44
misspell:
55
locale: US
66
revive:

Diff for: ‎.goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ announce:
4848
slack:
4949
enabled: true
5050
channel: '#announcements'
51-
message_template: 'NGINX Kubernetes Gateway {{ .Tag }} is out! Check it out: {{ .ReleaseURL }}'
51+
message_template: 'NGINX Gateway Fabric {{ .Tag }} is out! Check it out: {{ .ReleaseURL }}'
5252

5353
milestones:
5454
- close: true

0 commit comments

Comments
 (0)