nginxinc · ciarams87 · Sep 20, 2023 · Sep 18, 2023
@@ -20,10 +20,10 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Your environment**
-* 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.
+* 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.
 * Version of Kubernetes
 * Kubernetes platform (e.g. Mini-kube or GCP)
-* Details on how you expose the NGINX Gateway Pod (e.g. Service of type LoadBalancer or port-forward)
+* Details on how you expose the NGINX Gateway Fabric Pod (e.g. Service of type LoadBalancer or port-forward)
 * Logs of NGINX container: `kubectl -n nginx-gateway logs -l app=nginx-gateway -c nginx`
 * NGINX Configuration: `kubectl -n nginx-gateway exec <gateway-pod> -c nginx -- nginx -T`
 

@@ -6,7 +6,7 @@ labels: 'enhancement'
 
 <!--
 WARNING: Prior to submitting an enhancement request, we ask that you create a discussion. If you have not yet
-created a discussion related to your request, please do so now: https://github.com/nginxinc/nginx-kubernetes-gateway/discussions/new?category=ideas
+created a discussion related to your request, please do so now: https://github.com/nginxinc/nginx-gateway-fabric/discussions/new?category=ideas
 -->
 
 **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.
 
 <!--
 NOTE: depending on the scope of the enhancement, you may be asked to use the Enhancement Proposal
-process to document your work: https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/eps/README.md
+process to document your work: https://github.com/nginxinc/nginx-gateway-fabric/blob/main/eps/README.md
 -->
@@ -19,7 +19,7 @@ Closes #ISSUE
 
 Before creating a PR, run through this checklist and mark each as complete.
 
-- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/CONTRIBUTING.md) doc
+- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/CONTRIBUTING.md) doc
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have checked that all unit tests pass after adding my changes
 - [ ] I have updated necessary documentation

@@ -121,7 +121,7 @@ jobs:
           collapse-after: 20
           notes-header: |
             *Below is the auto-generated changelog, which includes all PRs that went into the release.
-            For a shorter version that highlights only important changes, see [CHANGELOG.md](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/{{version}}/CHANGELOG.md).*
+            For a shorter version that highlights only important changes, see [CHANGELOG.md](https://github.com/nginxinc/nginx-gateway-fabric/blob/{{version}}/CHANGELOG.md).*
         if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
 
       - name: Download Syft
@@ -149,7 +149,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ${{ github.workspace }}/dist
-          key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
+          key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
   helm-tests:
     name: Helm Tests
@@ -163,17 +163,17 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ${{ github.workspace }}/dist
-          key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
+          key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
       - name: Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
-      - name: NKG Docker meta
-        id: nkg-meta
+      - name: NGF Docker meta
+        id: ngf-meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway
+            name=ghcr.io/nginxinc/nginx-gateway-fabric
           tags: |
             type=semver,pattern={{version}}
             type=edge
@@ -185,23 +185,23 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
+            name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
           tags: |
             type=semver,pattern={{version}}
             type=edge
             type=ref,event=pr
             type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
 
-      - name: Build NKG Docker Image
+      - name: Build NGF Docker Image
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           file: build/Dockerfile
-          tags: ${{ steps.nkg-meta.outputs.tags }}
+          tags: ${{ steps.ngf-meta.outputs.tags }}
           context: "."
           target: goreleaser
           load: true
-          cache-from: type=gha,scope=nkg
-          cache-to: type=gha,scope=nkg,mode=max
+          cache-from: type=gha,scope=ngf
+          cache-to: type=gha,scope=ngf,mode=max
           pull: true
 
       - name: Build NGINX Docker Image
@@ -224,19 +224,19 @@ jobs:
           kube_config=${{ github.workspace }}/deploy/helm-chart/kube-${{ github.run_id }}-helm
           make create-kind-cluster KIND_KUBE_CONFIG=${kube_config}
           echo "KUBECONFIG=${kube_config}" >> "$GITHUB_ENV"
-          kind load docker-image ${{ steps.nkg-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }}
+          kind load docker-image ${{ steps.ngf-meta.outputs.tags }} ${{ steps.nginx-meta.outputs.tags }}
           kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v0.8.0/standard-install.yaml
           kubectl wait --for=condition=complete job/gateway-api-admission-patch job/gateway-api-admission -n gateway-system
 
       - name: Install Chart
         run: >
           helm install
-          helm-$(echo ${{ steps.nkg-meta.outputs.tags }} | tr '.' '-' | cut -d ":" -f 2)
+          helm-$(echo ${{ steps.ngf-meta.outputs.tags }} | tr '.' '-' | cut -d ":" -f 2)
           .
           --wait
           --create-namespace
-          --set nginxGateway.image.repository=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
-          --set nginxGateway.image.tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
+          --set nginxGateway.image.repository=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
+          --set nginxGateway.image.tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
           --set nginxGateway.image.pullPolicy=Never
           --set nginx.image.repository=$(echo ${{ steps.nginx-meta.outputs.tags }} | cut -d ":" -f 1)
           --set nginx.image.tag=$(echo ${{ steps.nginx-meta.outputs.tags }} | cut -d ":" -f 2)
@@ -252,7 +252,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: [nkg, nginx]
+        container: [ngf, nginx]
     permissions:
       contents: read # for docker/build-push-action to read repo content
       security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
@@ -265,7 +265,7 @@ jobs:
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         with:
           path: ${{ github.workspace }}/dist
-          key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }}
+          key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
 
       - name: Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
@@ -288,7 +288,7 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '/nginx' || '' }}
+            name=ghcr.io/nginxinc/nginx-gateway-fabric${{ matrix.container == 'nginx' && '/nginx' || '' }}
           tags: |
             type=semver,pattern={{version}}
             type=edge
@@ -300,7 +300,7 @@ jobs:
         with:
           file: ${{ matrix.container == 'nginx' && 'build/Dockerfile.nginx' || 'build/Dockerfile' }}
           context: "."
-          target: ${{ matrix.container == 'nkg' && 'goreleaser' || '' }}
+          target: ${{ matrix.container == 'ngf' && 'goreleaser' || '' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           load: ${{ github.event_name == 'pull_request' }}
@@ -320,23 +320,23 @@ jobs:
         uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f # 0.12.0
         continue-on-error: true
         with:
-          image-ref: ghcr.io/nginxinc/nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '/nginx' || '' }}:${{ steps.meta.outputs.version }}
+          image-ref: ghcr.io/nginxinc/nginx-gateway-fabric${{ matrix.container == 'nginx' && '/nginx' || '' }}:${{ steps.meta.outputs.version }}
           format: "sarif"
-          output: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
+          output: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
           ignore-unfixed: "true"
 
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
         continue-on-error: true
         with:
-          sarif_file: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
+          sarif_file: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
 
       - name: Upload Scan Results
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         continue-on-error: true
         with:
-          name: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
-          path: trivy-results-nginx-kubernetes-gateway${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
+          name: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
+          path: trivy-results-nginx-gateway-fabric${{ matrix.container == 'nginx' && '-nginx' || '' }}.sarif
         if: always()
 
   publish-helm:

@@ -45,12 +45,12 @@ jobs:
       - name: Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
-      - name: NKG Docker meta
-        id: nkg-meta
+      - name: NGF Docker meta
+        id: ngf-meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway
+            name=ghcr.io/nginxinc/nginx-gateway-fabric
           tags: |
             type=semver,pattern={{version}}
             type=edge
@@ -62,18 +62,18 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
+            name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
           tags: |
             type=semver,pattern={{version}}
             type=edge
             type=ref,event=pr
             type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
 
-      - name: Prepare NKG files
+      - name: Prepare NGF files
         run: |
-          nkg_prefix=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
-          nkg_tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
-          make update-nkg-manifest NKG_PREFIX=${nkg_prefix} NKG_TAG=${nkg_tag}
+          ngf_prefix=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
+          ngf_tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
+          make update-ngf-manifest NGF_PREFIX=${ngf_prefix} NGF_TAG=${ngf_tag}
         working-directory: ./conformance
 
       - name: Build binary
@@ -82,16 +82,16 @@ jobs:
           version: latest
           args: build --snapshot --clean
 
-      - name: Build NKG Docker Image
+      - name: Build NGF Docker Image
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           file: build/Dockerfile
-          tags: ${{ steps.nkg-meta.outputs.tags }}
+          tags: ${{ steps.ngf-meta.outputs.tags }}
           context: "."
           target: goreleaser
           load: true
-          cache-from: type=gha,scope=nkg
-          cache-to: type=gha,scope=nkg,mode=max
+          cache-from: type=gha,scope=ngf
+          cache-to: type=gha,scope=ngf,mode=max
           pull: true
 
       - name: Build NGINX Docker Image
@@ -142,12 +142,12 @@ jobs:
 
       - name: Setup conformance tests
         run: |
-          nkg_prefix=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 1)
-          nkg_tag=$(echo ${{ steps.nkg-meta.outputs.tags }} | cut -d ":" -f 2)
+          ngf_prefix=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 1)
+          ngf_tag=$(echo ${{ steps.ngf-meta.outputs.tags }} | cut -d ":" -f 2)
           if [ ${{ github.event_name }} == "schedule" ]; then
           export GW_API_VERSION=main
           fi
-          make install-nkg-local-no-build NKG_PREFIX=${nkg_prefix} NKG_TAG=${nkg_tag}
+          make install-ngf-local-no-build NGF_PREFIX=${ngf_prefix} NGF_TAG=${ngf_tag}
         working-directory: ./conformance
 
       - name: Run conformance tests

@@ -31,6 +31,6 @@ jobs:
         run: jarsigner -verify wss-unified-agent.jar
       - name: Scan and upload
         env:
-          PRODUCT_NAME: nginx-kubernetes-gateway_${{ github.ref_name }}
-          PROJECT_NAME: nginx-kubernetes-gateway
+          PRODUCT_NAME: nginx-gateway-fabric_${{ github.ref_name }}
+          PROJECT_NAME: nginx-gateway-fabric
         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 .
@@ -23,24 +23,24 @@ jobs:
     name: Get versions of base images
     runs-on: ubuntu-22.04
     outputs:
-      nkg_tag: ${{ steps.nkg.outputs.tag }}
+      ngf_tag: ${{ steps.ngf.outputs.tag }}
       nginx_version: ${{ steps.nginx.outputs.nginx_version }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
         with:
           fetch-depth: 0
 
-      - name: Set NKG version
-        id: nkg
+      - name: Set NGF version
+        id: ngf
         run: |
           tag="$(git tag --sort=-version:refname | head -n1)"
           echo "tag=${tag//v}" >> $GITHUB_OUTPUT
 
-      - name: Checkout Repository at ${{ steps.nkg.outputs.tag }}
+      - name: Checkout Repository at ${{ steps.ngf.outputs.tag }}
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
         with:
-          ref: refs/tags/v${{ steps.nkg.outputs.tag }}
+          ref: refs/tags/v${{ steps.ngf.outputs.tag }}
 
       - name: Set NGINX version
         id: nginx
@@ -60,7 +60,7 @@ jobs:
         uses: lucacome/docker-image-update-checker@f50d56412b948cfdbb842c5419372681e0db3df1 # v1.2.1
         with:
           base-image: ${{ needs.variables.outputs.nginx_version }}
-          image: ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx:${{ needs.variables.outputs.nkg_tag }}
+          image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
           platforms: ${{ env.platforms }}
 
       - id: needs
@@ -101,9 +101,9 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: |
-            name=ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx
+            name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx
           tags: |
-            ${{ needs.variables.outputs.nkg_tag }}
+            ${{ needs.variables.outputs.ngf_tag }}
 
       - name: Build Docker Image
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
@@ -126,21 +126,21 @@ jobs:
         uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f # 0.12.0
         continue-on-error: true
         with:
-          image-ref: ghcr.io/nginxinc/nginx-kubernetes-gateway/nginx:${{ needs.variables.outputs.nkg_tag }}
+          image-ref: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
           format: "sarif"
-          output: trivy-results-nginx-kubernetes-gateway-nginx
+          output: trivy-results-nginx-gateway-fabric-nginx
           ignore-unfixed: "true"
 
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
         continue-on-error: true
         with:
-          sarif_file: trivy-results-nginx-kubernetes-gateway-nginx
+          sarif_file: trivy-results-nginx-gateway-fabric-nginx
 
       - name: Upload Scan Results
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         continue-on-error: true
         with:
-          name: trivy-results-nginx-kubernetes-gateway-nginx
-          path: trivy-results-nginx-kubernetes-gateway-nginx
+          name: trivy-results-nginx-gateway-fabric-nginx
+          path: trivy-results-nginx-gateway-fabric-nginx
         if: always()
@@ -1,6 +1,6 @@
 linters-settings:
   goimports:
-    local-prefixes: github.com/nginxinc/nginx-kubernetes-gateway
+    local-prefixes: github.com/nginxinc/nginx-gateway-fabric
   misspell:
     locale: US
   revive:

@@ -48,7 +48,7 @@ announce:
   slack:
     enabled: true
     channel: '#announcements'
-    message_template: 'NGINX Kubernetes Gateway {{ .Tag }} is out! Check it out: {{ .ReleaseURL }}'
+    message_template: 'NGINX Gateway Fabric {{ .Tag }} is out! Check it out: {{ .ReleaseURL }}'
 
 milestones:
   - close: true