diff --git a/.github/CHANGELOG_TEMPLATE.md b/.github/CHANGELOG_TEMPLATE.md index 607d88b26..8aaff5fff 100644 --- a/.github/CHANGELOG_TEMPLATE.md +++ b/.github/CHANGELOG_TEMPLATE.md @@ -36,6 +36,6 @@ COMPATIBILITY: CONTAINER IMAGES: -- Control plane: `ghcr.io/nginxinc/nginx-gateway-fabric:%%VERSION%%` -- Data plane: `ghcr.io/nginxinc/nginx-gateway-fabric/nginx:%%VERSION%%` +- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:%%VERSION%%` +- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:%%VERSION%%` - Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:%%VERSION%%` diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6531a9c5e..13e42fc94 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ -* @nginxinc/nginx-gateway-fabric -/site/ @nginxinc/nginx-gateway-fabric @nginxinc/nginx-docs -/docs/ @nginxinc/nginx-gateway-fabric @nginxinc/nginx-docs +* @nginx/nginx-gateway-fabric +/site/ @nginx/nginx-gateway-fabric @nginx/nginx-docs +/docs/ @nginx/nginx-gateway-fabric @nginx/nginx-docs diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md index 7139ce53b..067a162f3 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.md +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -6,7 +6,7 @@ labels: 'enhancement' **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. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 21287370d..29da682b5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.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-gateway-fabric/blob/main/CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b56401816..afb6778b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,8 +103,8 @@ jobs: with: context: ${{ inputs.tag != '' && 'git' || 'workflow' }} images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }} - name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }} + name=ghcr.io/nginx/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }} + name=ghcr.io/nginx/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }} name=docker-mgmt.nginx.com/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }} name=us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }} name=localhost:5000/nginx-gateway-fabric/${{ inputs.image }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c972fc881..b9a3e952e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,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-gateway-fabric/blob/{{version}}/CHANGELOG.md).* + For a shorter version that highlights only important changes, see [CHANGELOG.md](https://github.com/nginx/nginx-gateway-fabric/blob/{{version}}/CHANGELOG.md).* if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }} - name: Download Syft diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index c89301da5..16f46f658 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -55,7 +55,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric + name=ghcr.io/nginx/nginx-gateway-fabric tags: | type=semver,pattern={{version}} type=edge @@ -68,7 +68,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} + name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} tags: | type=semver,pattern={{version}} type=edge @@ -78,7 +78,7 @@ jobs: - name: Generate static deployment run: | - ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric + ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric ngf_tag=${{ steps.ngf-meta.outputs.version }} make generate-static-deployment PLUS_ENABLED=${{ inputs.image == 'plus' && 'true' || 'false' }} PREFIX=${ngf_prefix} TAG=${ngf_tag} working-directory: ./tests @@ -147,7 +147,7 @@ jobs: - name: Setup conformance tests run: | - ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric + ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric ngf_tag=${{ steps.ngf-meta.outputs.version }} if [ ${{ github.event_name }} == "schedule" ]; then export GW_API_VERSION=main; fi make helm-install-local${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index fd9cfd992..719685e6f 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -49,7 +49,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric + name=ghcr.io/nginx/nginx-gateway-fabric tags: | type=semver,pattern={{version}} type=schedule @@ -62,7 +62,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} + name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} tags: | type=semver,pattern={{version}} type=edge @@ -126,21 +126,21 @@ jobs: - name: Run functional telemetry tests run: | - ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric + ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric ngf_tag=${{ steps.ngf-meta.outputs.version }} make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true working-directory: ./tests - name: Run functional graceful-recovery tests run: | - ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric + ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric ngf_tag=${{ steps.ngf-meta.outputs.version }} make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=graceful-recovery GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true working-directory: ./tests - name: Run functional tests run: | - ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric + ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric ngf_tag=${{ steps.ngf-meta.outputs.version }} make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true working-directory: ./tests diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 4d34b22d6..156ead43e 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -38,7 +38,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric + name=ghcr.io/nginx/nginx-gateway-fabric tags: | type=semver,pattern={{version}} type=edge @@ -51,7 +51,7 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 with: images: | - name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} + name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }} tags: | type=semver,pattern={{version}} type=edge @@ -120,7 +120,7 @@ jobs: - name: Install Chart run: | ct install --config .ct.yaml --namespace nginx-gateway --helm-extra-set-args="--set=nginxGateway.image.tag=${{ steps.ngf-meta.outputs.version }} \ - --set=nginx.image.repository=ghcr.io/nginxinc/nginx-gateway-fabric/nginx${{ inputs.image == 'plus' && '-plus' || ''}} \ + --set=nginx.image.repository=ghcr.io/nginx/nginx-gateway-fabric/nginx${{ inputs.image == 'plus' && '-plus' || ''}} \ --set=nginx.plus=${{ inputs.image == 'plus' }} \ --set=nginx.image.tag=${{ steps.nginx-meta.outputs.version }} \ --set=nginxGateway.image.pullPolicy=Never \ diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml index c61d4dbff..1e474df59 100644 --- a/.github/workflows/nfr.yml +++ b/.github/workflows/nfr.yml @@ -103,8 +103,8 @@ jobs: run: | echo "RESOURCE_NAME=nfr-tests-${{ github.run_id }}-${{ matrix.type }}" >> vars.env echo "TAG=${{ needs.vars.outputs.image_tag }}" >> vars.env - echo "PREFIX=ghcr.io/nginxinc/nginx-gateway-fabric" >> vars.env - echo "NGINX_PREFIX=ghcr.io/nginxinc/nginx-gateway-fabric/nginx" >> vars.env + echo "PREFIX=ghcr.io/nginx/nginx-gateway-fabric" >> vars.env + echo "NGINX_PREFIX=ghcr.io/nginx/nginx-gateway-fabric/nginx" >> vars.env echo "NGINX_PLUS_PREFIX=us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/nginx-gateway-fabric/nginx-plus" >> vars.env echo "GKE_CLUSTER_NAME=nfr-tests-${{ github.run_id }}-${{ matrix.type }}" >> vars.env echo "GKE_CLUSTER_ZONE=us-west1-b" >> vars.env diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 7d6ab1fff..e5b5bbb0b 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -70,7 +70,7 @@ jobs: uses: lucacome/docker-image-update-checker@a233de0585661c019fb71f9601328db37051cc66 # v2.0.0 with: base-image: ${{ needs.variables.outputs.nginx_version }} - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }} + image: ghcr.io/nginx/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }} build: name: Build Image diff --git a/.golangci.yml b/.golangci.yml index 1b496f032..a79fdb22c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,7 +2,7 @@ linters-settings: ginkgolinter: forbid-focus-container: true goimports: - local-prefixes: github.com/nginxinc/nginx-gateway-fabric + local-prefixes: github.com/nginx/nginx-gateway-fabric misspell: locale: US revive: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 808f72650..141929153 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ considering contributing! ## Ask a Question -To ask a question, use [Github Discussions](https://github.com/nginxinc/nginx-gateway-fabric/discussions). +To ask a question, use [Github Discussions](https://github.com/nginx/nginx-gateway-fabric/discussions). [NGINX Community Slack](https://community.nginx.org/joinslack) has a dedicated channel for this project -- `#nginx-gateway-fabric`. @@ -55,7 +55,7 @@ Follow our [Installation Instructions](https://docs.nginx.com/nginx-gateway-fabr #### Open a Discussion If you have any questions, ideas, or simply want to engage in a conversation with the community and maintainers, we -encourage you to open a [discussion](https://github.com/nginxinc/nginx-gateway-fabric/discussions) on GitHub. +encourage you to open a [discussion](https://github.com/nginx/nginx-gateway-fabric/discussions) on GitHub. #### Report a Bug @@ -71,7 +71,7 @@ regarding the idea and its use cases, while also giving the community an opportu In some cases, the maintainers may ask you to write an Enhancement Proposal. For details on this process, see the [Enhancement Proposal](/docs/proposals/README.md) README. -[idea]: https://github.com/nginxinc/nginx-gateway-fabric/discussions/new?category=ideas +[idea]: https://github.com/nginx/nginx-gateway-fabric/discussions/new?category=ideas #### Issue lifecycle diff --git a/Makefile b/Makefile index 90baf6de1..833247162 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ check-for-docker: ## Check if Docker is installed build: ## Build the binary ifeq (${TARGET},local) @go version || (code=$$?; printf "\033[0;31mError\033[0m: unable to build locally\n"; exit $$code) - CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C $(SELF_DIR) -trimpath -a -ldflags "$(GO_LINKER_FLAGS)" $(ADDITIONAL_GO_BUILD_FLAGS) -o $(OUT_DIR)/gateway github.com/nginxinc/nginx-gateway-fabric/cmd/gateway + CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -C $(SELF_DIR) -trimpath -a -ldflags "$(GO_LINKER_FLAGS)" $(ADDITIONAL_GO_BUILD_FLAGS) -o $(OUT_DIR)/gateway github.com/nginx/nginx-gateway-fabric/cmd/gateway endif .PHONY: build-goreleaser @@ -141,7 +141,7 @@ generate-manifests: ## Generate manifests using Helm. ./scripts/generate-manifests.sh generate-api-docs: ## Generate API docs - go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config site/config/api/config.json -template-dir site/config/api -out-file site/content/reference/api.md -api-dir "github.com/nginxinc/nginx-gateway-fabric/apis" + go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config site/config/api/config.json -template-dir site/config/api -out-file site/content/reference/api.md -api-dir "github.com/nginx/nginx-gateway-fabric/apis" .PHONY: generate-helm-docs generate-helm-docs: ## Generate the Helm chart documentation diff --git a/README.md b/README.md index 6543dde51..053711944 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-gateway-fabric/badge)](https://scorecard.dev/viewer/?uri=github.com/nginxinc/nginx-gateway-fabric) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginx/nginx-gateway-fabric/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/nginx-gateway-fabric) [![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric?ref=badge_shield) -[![Continuous Integration](https://github.com/nginxinc/nginx-gateway-fabric/actions/workflows/ci.yml/badge.svg)](https://github.com/nginxinc/nginx-gateway-fabric/actions/workflows/ci.yml) -[![Go Report Card](https://goreportcard.com/badge/github.com/nginxinc/nginx-gateway-fabric)](https://goreportcard.com/report/github.com/nginxinc/nginx-gateway-fabric) +[![Continuous Integration](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml) +[![Go Report Card](https://goreportcard.com/badge/github.com/nginx/nginx-gateway-fabric)](https://goreportcard.com/report/github.com/nginx/nginx-gateway-fabric) [![codecov](https://codecov.io/gh/nginxinc/nginx-gateway-fabric/graph/badge.svg?token=32ULC8F13Z)](https://codecov.io/gh/nginxinc/nginx-gateway-fabric) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginxinc/nginx-gateway-fabric?logo=github&sort=semver)](https://github.com/nginxinc/nginx-gateway-fabric/releases/latest) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginxinc/nginx-gateway-fabric?logo=github&sort=semver)](https://github.com/nginx/nginx-gateway-fabric/releases/latest) [![Slack](https://img.shields.io/badge/slack-%23nginx--gateway--fabric-green?logo=slack)](https://nginxcommunity.slack.com/channels/nginx-gateway-fabric) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) @@ -32,12 +32,12 @@ You can find the comprehensive NGINX Gateway Fabric user documentation on the [N ## NGINX Gateway Fabric Releases We publish NGINX Gateway Fabric releases on GitHub. See -our [releases page](https://github.com/nginxinc/nginx-gateway-fabric/releases). +our [releases page](https://github.com/nginx/nginx-gateway-fabric/releases). -The latest release is [1.5.1](https://github.com/nginxinc/nginx-gateway-fabric/releases/tag/v1.5.1). +The latest release is [1.5.1](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v1.5.1). The edge version is useful for experimenting with new features that are not yet published in a release. To use, choose -the _edge_ version built from the [latest commit](https://github.com/nginxinc/nginx-gateway-fabric/commits/main) +the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-gateway-fabric/commits/main) from the main branch. The table below summarizes the options regarding the images, manifests, documentation and examples and gives your links @@ -45,8 +45,8 @@ to the correct versions: | Version | Description | Installation Manifests | Documentation and Examples | |----------------|------------------------------------------|-----------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Latest release | For production use | [Manifests](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/examples). | -| Edge | For experimental use and latest features | [Manifests](https://github.com/nginxinc/nginx-gateway-fabric/tree/main/deploy). | [Documentation](https://github.com/nginxinc/nginx-gateway-fabric/tree/main/site/content). [Examples](https://github.com/nginxinc/nginx-gateway-fabric/tree/main/examples). | +| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples). | +| Edge | For experimental use and latest features | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/main/deploy). | [Documentation](https://github.com/nginx/nginx-gateway-fabric/tree/main/site/content). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples). | ### Versioning @@ -57,7 +57,7 @@ NGF uses semantic versioning for its releases. For more information, see https:/ ### Release Planning and Development The features that will go into the next release are reflected in the -corresponding [milestone](https://github.com/nginxinc/nginx-gateway-fabric/milestones). Refer to +corresponding [milestone](https://github.com/nginx/nginx-gateway-fabric/milestones). Refer to the [Issue Lifecycle](ISSUE_LIFECYCLE.md) document for information on issue creation and assignment to releases. ## Technical Specifications @@ -87,7 +87,7 @@ using [syft](https://github.com/anchore/syft) and are available in SPDX format. ### Docker Images The SBOM for the Docker image is available in -the [GitHub Container](https://github.com/nginxinc/nginx-gateway-fabric/pkgs/container/nginx-gateway-fabric) +the [GitHub Container](https://github.com/nginx/nginx-gateway-fabric/pkgs/container/nginx-gateway-fabric) repository. The SBOM is generated using [syft](https://github.com/anchore/syft) and stored as an attestation in the image manifest. @@ -95,7 +95,7 @@ For example to retrieve the SBOM for `linux/amd64` and analyze it using [grype]( can run the following command: ```shell -docker buildx imagetools inspect ghcr.io/nginxinc/nginx-gateway-fabric:edge --format '{{ json (index .SBOM "linux/amd64").SPDX }}' | grype +docker buildx imagetools inspect ghcr.io/nginx/nginx-gateway-fabric:edge --format '{{ json (index .SBOM "linux/amd64").SPDX }}' | grype ``` ## Troubleshooting @@ -110,8 +110,8 @@ contact us directly on the [NGINX Community Slack][slack] in the `#nginx-gateway-fabric` channel. -[bug]: https://github.com/nginxinc/nginx-gateway-fabric/issues/new?assignees=&labels=&projects=&template=bug_report.md&title= -[idea]: https://github.com/nginxinc/nginx-gateway-fabric/discussions/categories/ideas +[bug]: https://github.com/nginx/nginx-gateway-fabric/issues/new?assignees=&labels=&projects=&template=bug_report.md&title= +[idea]: https://github.com/nginx/nginx-gateway-fabric/discussions/categories/ideas [slack]: https://nginxcommunity.slack.com/channels/nginx-gateway-fabric ## Community Meetings diff --git a/apis/v1alpha1/policy_methods.go b/apis/v1alpha1/policy_methods.go index ad399c089..71cc93ede 100644 --- a/apis/v1alpha1/policy_methods.go +++ b/apis/v1alpha1/policy_methods.go @@ -4,7 +4,7 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" ) -// FIXME(kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1939. +// FIXME(kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1939. // Figure out a way to generate these methods for all our policies. // These methods implement the policies.Policy interface which extends client.Object to add the following methods. diff --git a/build/Dockerfile b/build/Dockerfile index f546c15de..8371c87ec 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1.12 FROM golang:1.23 AS builder -WORKDIR /go/src/github.com/nginxinc/nginx-gateway-fabric +WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric -COPY go.mod go.sum /go/src/github.com/nginxinc/nginx-gateway-fabric/ +COPY go.mod go.sum /go/src/github.com/nginx/nginx-gateway-fabric/ RUN go mod download -COPY . /go/src/github.com/nginxinc/nginx-gateway-fabric +COPY . /go/src/github.com/nginx/nginx-gateway-fabric RUN make build FROM golang:1.23 AS ca-certs-provider @@ -19,7 +19,7 @@ COPY ./build/out/gateway /usr/bin/ RUN setcap 'cap_kill=+ep' /usr/bin/gateway FROM capabilizer AS container-capabilizer -COPY --from=builder /go/src/github.com/nginxinc/nginx-gateway-fabric/build/out/gateway /usr/bin/ +COPY --from=builder /go/src/github.com/nginx/nginx-gateway-fabric/build/out/gateway /usr/bin/ RUN setcap 'cap_kill=+ep' /usr/bin/gateway FROM capabilizer AS goreleaser-capabilizer diff --git a/charts/nginx-gateway-fabric/Chart.yaml b/charts/nginx-gateway-fabric/Chart.yaml index 91c03d51d..0cbae3faf 100644 --- a/charts/nginx-gateway-fabric/Chart.yaml +++ b/charts/nginx-gateway-fabric/Chart.yaml @@ -5,10 +5,10 @@ type: application version: 1.5.1 appVersion: "edge" kubeVersion: ">= 1.25.0-0" -home: https://github.com/nginxinc/nginx-gateway-fabric +home: https://github.com/nginx/nginx-gateway-fabric icon: https://raw.githubusercontent.com/nginxinc/nginx-gateway-fabric/main/charts/nginx-gateway-fabric/chart-icon.png sources: - - https://github.com/nginxinc/nginx-gateway-fabric/tree/main/charts/nginx-gateway-fabric + - https://github.com/nginx/nginx-gateway-fabric/tree/main/charts/nginx-gateway-fabric keywords: - kubernetes - gateway diff --git a/charts/nginx-gateway-fabric/README.md b/charts/nginx-gateway-fabric/README.md index a2136f24a..d6ea57f11 100644 --- a/charts/nginx-gateway-fabric/README.md +++ b/charts/nginx-gateway-fabric/README.md @@ -41,10 +41,10 @@ This chart deploys the NGINX Gateway Fabric in your Kubernetes cluster. > The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be > installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure > they are the correct version as supported by the NGINX Gateway Fabric - -> [see the Technical Specifications](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/README.md#technical-specifications). +> [see the Technical Specifications](https://github.com/nginx/nginx-gateway-fabric/blob/main/README.md#technical-specifications). ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - ``` ## Requirements @@ -136,7 +136,7 @@ Gateway Fabric - [see the Technical Specifications](../../README.md#technical-sp To upgrade the Gateway CRDs from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run: ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - ``` ### Upgrading the CRDs @@ -246,7 +246,7 @@ These commands remove all the Kubernetes components associated with the release To delete the Gateway API CRDs from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run: ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl delete -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl delete -f - ``` ## Configuration @@ -264,7 +264,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | `nginx.debug` | Enable debugging for NGINX. Uses the nginx-debug binary. The NGINX error log level should be set to debug in the NginxProxy resource. | bool | `false` | | `nginx.extraVolumeMounts` | extraVolumeMounts are the additional volume mounts for the nginx container. | list | `[]` | | `nginx.image.pullPolicy` | | string | `"Always"` | -| `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginxinc/nginx-gateway-fabric/nginx"` | +| `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginx/nginx-gateway-fabric/nginx"` | | `nginx.image.tag` | | string | `"edge"` | | `nginx.lifecycle` | The lifecycle of the nginx container. | object | `{}` | | `nginx.plus` | Is NGINX Plus image being used | bool | `false` | @@ -282,7 +282,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | `nginxGateway.gatewayControllerName` | The name of the Gateway controller. The controller name must be of the form: DOMAIN/PATH. The controller's domain is gateway.nginx.org. | string | `"gateway.nginx.org/nginx-gateway-controller"` | | `nginxGateway.gwAPIExperimentalFeatures.enable` | Enable the experimental features of Gateway API which are supported by NGINX Gateway Fabric. Requires the Gateway APIs installed from the experimental channel. | bool | `false` | | `nginxGateway.image.pullPolicy` | | string | `"Always"` | -| `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginxinc/nginx-gateway-fabric"` | +| `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginx/nginx-gateway-fabric"` | | `nginxGateway.image.tag` | | string | `"edge"` | | `nginxGateway.kind` | The kind of the NGINX Gateway Fabric installation - currently, only deployment is supported. | string | `"deployment"` | | `nginxGateway.leaderElection.enable` | Enable leader election. Leader election is used to avoid multiple replicas of the NGINX Gateway Fabric reporting the status of the Gateway API resources. If not enabled, all replicas of NGINX Gateway Fabric will update the statuses of the Gateway API resources. | bool | `true` | diff --git a/charts/nginx-gateway-fabric/README.md.gotmpl b/charts/nginx-gateway-fabric/README.md.gotmpl index 04aac3eaf..aed72f15c 100644 --- a/charts/nginx-gateway-fabric/README.md.gotmpl +++ b/charts/nginx-gateway-fabric/README.md.gotmpl @@ -41,10 +41,10 @@ This chart deploys the NGINX Gateway Fabric in your Kubernetes cluster. > The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be > installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure > they are the correct version as supported by the NGINX Gateway Fabric - -> [see the Technical Specifications](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/README.md#technical-specifications). +> [see the Technical Specifications](https://github.com/nginx/nginx-gateway-fabric/blob/main/README.md#technical-specifications). ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - ``` {{ template "chart.requirementsSection" . }} @@ -134,7 +134,7 @@ Gateway Fabric - [see the Technical Specifications](../../README.md#technical-sp To upgrade the Gateway CRDs from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run: ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl apply -f - ``` ### Upgrading the CRDs @@ -244,7 +244,7 @@ These commands remove all the Kubernetes components associated with the release To delete the Gateway API CRDs from [the Gateway API repo](https://github.com/kubernetes-sigs/gateway-api), run: ```shell -kubectl kustomize https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl delete -f - +kubectl kustomize https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard | kubectl delete -f - ``` ## Configuration diff --git a/charts/nginx-gateway-fabric/templates/deployment.yaml b/charts/nginx-gateway-fabric/templates/deployment.yaml index 4149bdf58..ce727ac02 100644 --- a/charts/nginx-gateway-fabric/templates/deployment.yaml +++ b/charts/nginx-gateway-fabric/templates/deployment.yaml @@ -50,10 +50,10 @@ spec: - --destination - /etc/nginx/main-includes env: - - name: POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid + - name: POD_UID + valueFrom: + fieldRef: + fieldPath: metadata.uid securityContext: seccompProfile: type: RuntimeDefault diff --git a/charts/nginx-gateway-fabric/values.schema.json b/charts/nginx-gateway-fabric/values.schema.json index 801f372c1..048e4163c 100644 --- a/charts/nginx-gateway-fabric/values.schema.json +++ b/charts/nginx-gateway-fabric/values.schema.json @@ -229,7 +229,7 @@ "title": "pullPolicy" }, "repository": { - "default": "ghcr.io/nginxinc/nginx-gateway-fabric/nginx", + "default": "ghcr.io/nginx/nginx-gateway-fabric/nginx", "description": "The NGINX image to use.", "required": [], "title": "repository", @@ -404,7 +404,7 @@ "title": "pullPolicy" }, "repository": { - "default": "ghcr.io/nginxinc/nginx-gateway-fabric", + "default": "ghcr.io/nginx/nginx-gateway-fabric", "description": "The NGINX Gateway Fabric image to use", "required": [], "title": "repository", diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml index c2b5d2bba..947212da9 100644 --- a/charts/nginx-gateway-fabric/values.yaml +++ b/charts/nginx-gateway-fabric/values.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=values.schema.json nginxGateway: - # FIXME(lucacome): https://github.com/nginxinc/nginx-gateway-fabric/issues/2490 + # FIXME(lucacome): https://github.com/nginx/nginx-gateway-fabric/issues/2490 # @schema # const: deployment @@ -81,7 +81,7 @@ nginxGateway: image: # -- The NGINX Gateway Fabric image to use - repository: ghcr.io/nginxinc/nginx-gateway-fabric + repository: ghcr.io/nginx/nginx-gateway-fabric tag: edge # @schema # enum: @@ -121,7 +121,7 @@ nginxGateway: nginx: image: # -- The NGINX image to use. - repository: ghcr.io/nginxinc/nginx-gateway-fabric/nginx + repository: ghcr.io/nginx/nginx-gateway-fabric/nginx tag: edge # @schema # enum: diff --git a/cmd/gateway/commands.go b/cmd/gateway/commands.go index 34c595f45..ed2b473de 100644 --- a/cmd/gateway/commands.go +++ b/cmd/gateway/commands.go @@ -19,12 +19,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/provisioner" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - ngxConfig "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/provisioner" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" ) // These flags are shared by multiple commands. diff --git a/cmd/gateway/commands_test.go b/cmd/gateway/commands_test.go index a714004bf..2c1ac5d26 100644 --- a/cmd/gateway/commands_test.go +++ b/cmd/gateway/commands_test.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" ) type flagTestCase struct { diff --git a/cmd/gateway/initialize.go b/cmd/gateway/initialize.go index 1aa01f923..59af1e4f0 100644 --- a/cmd/gateway/initialize.go +++ b/cmd/gateway/initialize.go @@ -8,9 +8,9 @@ import ( "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" ) const ( diff --git a/cmd/gateway/initialize_test.go b/cmd/gateway/initialize_test.go index 507acc6fa..fcdc84990 100644 --- a/cmd/gateway/initialize_test.go +++ b/cmd/gateway/initialize_test.go @@ -11,12 +11,12 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing/licensingfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/configfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing/licensingfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/configfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestInitialize_OSS(t *testing.T) { diff --git a/config/tests/static-deployment.yaml b/config/tests/static-deployment.yaml index e84e3cbfd..698f9b82c 100644 --- a/config/tests/static-deployment.yaml +++ b/config/tests/static-deployment.yaml @@ -23,7 +23,7 @@ spec: spec: initContainers: - name: init - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always command: - /usr/bin/gateway @@ -33,10 +33,10 @@ spec: - --destination - /etc/nginx/main-includes env: - - name: POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid + - name: POD_UID + valueFrom: + fieldRef: + fieldPath: metadata.uid securityContext: seccompProfile: type: RuntimeDefault @@ -81,7 +81,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -118,7 +118,7 @@ spec: mountPath: /var/run/nginx - name: nginx-includes mountPath: /etc/nginx/includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: diff --git a/deploy/aws-nlb/deploy.yaml b/deploy/aws-nlb/deploy.yaml index 018cf3610..bd222a1ec 100644 --- a/deploy/aws-nlb/deploy.yaml +++ b/deploy/aws-nlb/deploy.yaml @@ -236,7 +236,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -275,7 +275,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -322,7 +322,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/azure/deploy.yaml b/deploy/azure/deploy.yaml index a8dc451b7..990adedf3 100644 --- a/deploy/azure/deploy.yaml +++ b/deploy/azure/deploy.yaml @@ -233,7 +233,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -272,7 +272,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -319,7 +319,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/default/deploy.yaml b/deploy/default/deploy.yaml index 69853e77d..9a0746a1d 100644 --- a/deploy/default/deploy.yaml +++ b/deploy/default/deploy.yaml @@ -233,7 +233,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -272,7 +272,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -319,7 +319,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/experimental-nginx-plus/deploy.yaml b/deploy/experimental-nginx-plus/deploy.yaml index 9f3030743..69f8a68c5 100644 --- a/deploy/experimental-nginx-plus/deploy.yaml +++ b/deploy/experimental-nginx-plus/deploy.yaml @@ -254,7 +254,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -348,7 +348,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/experimental/deploy.yaml b/deploy/experimental/deploy.yaml index f3114d3b5..0248ce832 100644 --- a/deploy/experimental/deploy.yaml +++ b/deploy/experimental/deploy.yaml @@ -239,7 +239,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -278,7 +278,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -325,7 +325,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml index 26df3ab55..eab2eac54 100644 --- a/deploy/kustomization.yaml +++ b/deploy/kustomization.yaml @@ -35,10 +35,10 @@ resources: images: # NGF image -- name: ghcr.io/nginxinc/nginx-gateway-fabric +- name: ghcr.io/nginx/nginx-gateway-fabric newName: my-registry/nginx-gateway-fabric newTag: new-tag # NGINX image -- name: ghcr.io/nginxinc/nginx-gateway-fabric/nginx +- name: ghcr.io/nginx/nginx-gateway-fabric/nginx newName: my-registry/nginx-gateway-fabric/nginx newTag: new-tag diff --git a/deploy/nginx-plus/deploy.yaml b/deploy/nginx-plus/deploy.yaml index 4561a6edb..4d7180632 100644 --- a/deploy/nginx-plus/deploy.yaml +++ b/deploy/nginx-plus/deploy.yaml @@ -248,7 +248,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -342,7 +342,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/nodeport/deploy.yaml b/deploy/nodeport/deploy.yaml index 19bae5805..414317999 100644 --- a/deploy/nodeport/deploy.yaml +++ b/deploy/nodeport/deploy.yaml @@ -233,7 +233,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -272,7 +272,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -319,7 +319,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/openshift/deploy.yaml b/deploy/openshift/deploy.yaml index 8dd460e35..61a8f8258 100644 --- a/deploy/openshift/deploy.yaml +++ b/deploy/openshift/deploy.yaml @@ -241,7 +241,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -280,7 +280,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -327,7 +327,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/snippets-filters-nginx-plus/deploy.yaml b/deploy/snippets-filters-nginx-plus/deploy.yaml index 176cf08c0..4e896d2f2 100644 --- a/deploy/snippets-filters-nginx-plus/deploy.yaml +++ b/deploy/snippets-filters-nginx-plus/deploy.yaml @@ -251,7 +251,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -345,7 +345,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/deploy/snippets-filters/deploy.yaml b/deploy/snippets-filters/deploy.yaml index 6c177233b..8f220c8fe 100644 --- a/deploy/snippets-filters/deploy.yaml +++ b/deploy/snippets-filters/deploy.yaml @@ -236,7 +236,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway ports: @@ -275,7 +275,7 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:edge + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge imagePullPolicy: Always name: nginx ports: @@ -322,7 +322,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: init securityContext: diff --git a/design/control-data-plane-separation/design.md b/design/control-data-plane-separation/design.md index 7d5959a34..905bc5c83 100644 --- a/design/control-data-plane-separation/design.md +++ b/design/control-data-plane-separation/design.md @@ -1,10 +1,10 @@ # Separation of control and data plane -**Archived; Superseded by [Proposal 1508](https://github.com/nginxinc/nginx-gateway-fabric/tree/main/docs/proposals/control-data-plane-split/README.md)** +**Archived; Superseded by [Proposal 1508](https://github.com/nginx/nginx-gateway-fabric/tree/main/docs/proposals/control-data-plane-split/README.md)** This document proposes a design for separating the control and data planes. -Issue #292: https://github.com/nginxinc/nginx-gateway-fabric/issues/292 +Issue #292: https://github.com/nginx/nginx-gateway-fabric/issues/292 > Note: I use data plane and agent interchangeably in this document. @@ -666,7 +666,7 @@ command and then download the config chunks over the `DownloadChannel .`It will configuration and attempt to apply it. It will send the status of the configuration application over the `CommandChannel` in a `NginxConfigResponse` message. -[internal-config]: https://github.com/nginxinc/nginx-gateway-fabric/blob/main/internal/nginx/config/http/config.go +[internal-config]: https://github.com/nginx/nginx-gateway-fabric/blob/main/internal/nginx/config/http/config.go [zip-file]: https://github.com/nginx/agent/blob/ea3a1b4df5d7ecf95bd3d9297d26e420f5e1dd57/sdk/proto/common.pb.go#L668 diff --git a/docs/developer/branching-and-workflow.md b/docs/developer/branching-and-workflow.md index ce0c0cc49..bc1e6f6f3 100644 --- a/docs/developer/branching-and-workflow.md +++ b/docs/developer/branching-and-workflow.md @@ -9,7 +9,7 @@ branch. This way ephemeral developer branches will remain outside the main repos Below is an example of following the merge and fork process. Developer Alice: -- Forks `github.com/nginxinc/nginx-gateway-fabric` → `github.com//nginx-gateway-fabric` +- Forks `github.com/nginx/nginx-gateway-fabric` → `github.com//nginx-gateway-fabric` - Adds upstream: ```shell @@ -33,7 +33,7 @@ Below is an example of following the merge and fork process. Developer Alice: - Alice develops a feature or bugfix - using as many ephemeral branches as she needs. - Alice creates a - PR `github.com//nginx-gateway-fabric:feature/some-feature` → `github.com/nginxinc/nginx-gateway-fabric:main` + PR `github.com//nginx-gateway-fabric:feature/some-feature` → `github.com/nginx/nginx-gateway-fabric:main` - Alice keeps her fork up to date by running: ```shell diff --git a/docs/developer/implementing-a-feature.md b/docs/developer/implementing-a-feature.md index 917d79756..b98248dea 100644 --- a/docs/developer/implementing-a-feature.md +++ b/docs/developer/implementing-a-feature.md @@ -32,7 +32,7 @@ practices to ensure a successful feature development process. the [testing](/docs/developer/testing.md#unit-test-guidelines) documentation. 9. **Manually verify your changes**: Refer to the [manual testing](/docs/developer/testing.md#manual-testing) section of the testing documentation for instructions on how to manually test your changes. -10. **Update any relevant documentation**: See the [documentation](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/site/README.md) guide for in-depth information about the workflow to update the docs and how we publish them. +10. **Update any relevant documentation**: See the [documentation](https://github.com/nginx/nginx-gateway-fabric/blob/main/site/README.md) guide for in-depth information about the workflow to update the docs and how we publish them. Here are some basic guidelines for updating documentation: - **Gateway API Feature**: If you are implementing a Gateway API feature, make sure to update the [Gateway API Compatibility](/site/content/concepts/gateway-api-compatibility.md) documentation. @@ -54,7 +54,7 @@ practices to ensure a successful feature development process. [Update Generated Manifests](/docs/developer/quickstart.md#update-generated-manifests) sections of the quickstart guide for instructions. 13. **Open pull request**: Open a pull request targeting the `main` branch of - the [nginx-gateway-fabric](https://github.com/nginxinc/nginx-gateway-fabric/tree/main) repository. The + the [nginx-gateway-fabric](https://github.com/nginx/nginx-gateway-fabric/tree/main) repository. The entire `nginx-gateway-fabric` group will be automatically requested for review. If you have a specific or different reviewer in mind, you can request them as well. Refer to the [pull request](/docs/developer/pull-request.md) documentation for expectations and guidelines. diff --git a/docs/developer/logging-guidelines.md b/docs/developer/logging-guidelines.md index f8e630de4..a71fe1c9c 100644 --- a/docs/developer/logging-guidelines.md +++ b/docs/developer/logging-guidelines.md @@ -363,7 +363,7 @@ because the runtime adds context to that logger with the group, kind, namespace more key-value pairs. Note that the runtime creates that logger from the one we inject into it during the runtime initialization (see [External Libraries](#external-libraries)). Also note that logger is compatible with our logging guidelines. -[reconciler-logger]:https://github.com/nginxinc/nginx-gateway-fabric/blob/5547fe5472d1742a937c8adbbd399893ee30f9e1/internal/framework/controller/reconciler.go#L63 +[reconciler-logger]:https://github.com/nginx/nginx-gateway-fabric/blob/5547fe5472d1742a937c8adbbd399893ee30f9e1/internal/framework/controller/reconciler.go#L63 #### Unit Tests @@ -388,7 +388,7 @@ There are two critical libraries for NGF that log: verbosity. However, errors are logged at the default verbosity like in [this line](https://github.com/kubernetes/client-go/blob/c5b1c13ccbedeb03c00ba162ef27566b0dfb512d/tools/record/event.go#L240). -[inject]:https://github.com/nginxinc/nginx-gateway-fabric/blob/9b3ae2c7c59f28213a7690e049d9996443dbd3fc/internal/mode/static/manager.go#L54 +[inject]:https://github.com/nginx/nginx-gateway-fabric/blob/9b3ae2c7c59f28213a7690e049d9996443dbd3fc/internal/mode/static/manager.go#L54 [cr-logging-guidelines]:https://github.com/kubernetes-sigs/controller-runtime/blob/b1d6919d3e12fa85a119dd9792bdfdc17bdf8c3b/TMP-LOGGING.md diff --git a/docs/developer/quickstart.md b/docs/developer/quickstart.md index 38bad3fbb..7fdfa05cb 100644 --- a/docs/developer/quickstart.md +++ b/docs/developer/quickstart.md @@ -50,7 +50,7 @@ Follow these steps to set up your development environment. brew install pre-commit ``` -2. [Fork the project repository](https://github.com/nginxinc/nginx-gateway-fabric/fork) +2. [Fork the project repository](https://github.com/nginx/nginx-gateway-fabric/fork) 3. Clone your repository with ssh, and install the project dependencies: ```shell diff --git a/docs/developer/release-process.md b/docs/developer/release-process.md index 970770d49..048109286 100644 --- a/docs/developer/release-process.md +++ b/docs/developer/release-process.md @@ -23,7 +23,7 @@ NGF uses semantic versioning for its releases. For more information, see https:/ ## Release Planning and Development The features that will go into the next release are reflected in the -corresponding [milestone](https://github.com/nginxinc/nginx-gateway-fabric/milestones). Refer to +corresponding [milestone](https://github.com/nginx/nginx-gateway-fabric/milestones). Refer to the [Issue Lifecycle](/ISSUE_LIFECYCLE.md) document for information on issue creation and assignment to releases. ## Releasing @@ -41,9 +41,9 @@ To create a new release, follow these steps: 2. Stop merging any new work into the main branch. 3. Create a release branch following the `release-X.Y` naming convention. 4. Once the release branch pipeline completes, run tests using the `release-X.X-rc` images that are pushed to Github (for example, `release-1.3-rc`). - 1. Kick off the [longevity tests](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/tests/README.md#longevity-testing) for both OSS and Plus. You'll need to create two clusters and VMs for this. Before running, update your `vars.env` file with the proper image tag and prefixes. NGF and nginx images will be available from `ghcr.io`, and nginx plus will be available in GCP (`us-docker.pkg.dev//nginx-gateway-fabric/nginx-plus`). These tests need to run for 4 days before releasing. The results should be committed to the main branch and then cherry-picked to the release branch. - 2. Kick off the [NFR workflow](https://github.com/nginxinc/nginx-gateway-fabric/actions/workflows/nfr.yml) in the browser. For `image_tag`, use `release-X.X-rc`, and for `version`, use the upcoming `X.Y.Z` NGF version. This will run all of the NFR tests which are automated and open a PR with the results files when it is complete. Review this PR and make any necessary changes before merging. Once merged, be sure to cherry-pick the commit to the main branch as well (the original PR targets the release branch). -5. Run the [Release PR](https://github.com/nginxinc/nginx-gateway-fabric/actions/workflows/release-pr.yml) workflow to update the repo files for the release. Then there are a few manual steps to complete: + 1. Kick off the [longevity tests](https://github.com/nginx/nginx-gateway-fabric/blob/main/tests/README.md#longevity-testing) for both OSS and Plus. You'll need to create two clusters and VMs for this. Before running, update your `vars.env` file with the proper image tag and prefixes. NGF and nginx images will be available from `ghcr.io`, and nginx plus will be available in GCP (`us-docker.pkg.dev//nginx-gateway-fabric/nginx-plus`). These tests need to run for 4 days before releasing. The results should be committed to the main branch and then cherry-picked to the release branch. + 2. Kick off the [NFR workflow](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/nfr.yml) in the browser. For `image_tag`, use `release-X.X-rc`, and for `version`, use the upcoming `X.Y.Z` NGF version. This will run all of the NFR tests which are automated and open a PR with the results files when it is complete. Review this PR and make any necessary changes before merging. Once merged, be sure to cherry-pick the commit to the main branch as well (the original PR targets the release branch). +5. Run the [Release PR](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/release-pr.yml) workflow to update the repo files for the release. Then there are a few manual steps to complete: 1. Update the version tag used in the [provisioner manifest](/tests/conformance/provisioner/provisioner.yaml) and [getting started guide](/site/content/get-started). 2. Update the [README](/README.md) to include information about the release. 3. Update the [changelog](/CHANGELOG.md). There is going to be a new blank section generated by the automation that needs to be adjusted accordingly. @@ -52,7 +52,7 @@ To create a new release, follow these steps: changes to NGF. This is in contrast with the autogenerated full changelog, which is created in the next step. As a starting point, copy the important features, bug fixes, and dependencies from the autogenerated draft of the full changelog. This draft can be found under - the [GitHub releases](https://github.com/nginxinc/nginx-gateway-fabric/releases) after the release branch is + the [GitHub releases](https://github.com/nginx/nginx-gateway-fabric/releases) after the release branch is created. - If the supported Gateway API minor version has changed since the last release, add a note to the release notes explaining if the previous version is no longer supported. 6. Create and push the release tag in the format `vX.Y.Z`. As a result, the CI/CD pipeline will: @@ -66,9 +66,9 @@ To create a new release, follow these steps: 4. `GW_API_PREV_VERSION` in tests Makefile, if necessary. 5. Any references in the docs to the previous release. 6. Any installation instructions to ensure that the supported Gateway API and NGF versions are correct. Specifically, helm README. -8. Run the [docs workflow](https://github.com/nginxinc/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. +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. 9. Close the issue created in Step 1. -10. Ensure that the [associated milestone](https://github.com/nginxinc/nginx-gateway-fabric/milestones) is closed. +10. Ensure that the [associated milestone](https://github.com/nginx/nginx-gateway-fabric/milestones) is closed. 11. Verify that published artifacts in the release can be installed properly. 12. Submit the `conformance-profile.yaml` artifact from the release to the [Gateway API repo](https://github.com/kubernetes-sigs/gateway-api/tree/main/conformance/reports). - Create a fork of the repository diff --git a/docs/proposals/README.md b/docs/proposals/README.md index 81bfa9338..2f5d05a08 100644 --- a/docs/proposals/README.md +++ b/docs/proposals/README.md @@ -21,7 +21,7 @@ Enhancement Proposal. For example, here are some examples of requests that may n - Small changes (validation, documentation, fixups). It is always possible that the maintainers will determine a "small" change ends up requiring a Enhancement Proposal. -[discussion]: https://github.com/nginxinc/nginx-gateway-fabric/discussions +[discussion]: https://github.com/nginx/nginx-gateway-fabric/discussions ## Process @@ -41,7 +41,7 @@ Before creating an issue or Enhancement Proposal, [open an idea][idea] on GitHub you would like, any use cases you have, and other relevant details. Beginning with a discussion allows you to get feedback from the maintainers and the community before you invest time in writing an Enhancement Proposal. -[idea]: https://github.com/nginxinc/nginx-gateway-fabric/discussions/new?category=ideas +[idea]: https://github.com/nginx/nginx-gateway-fabric/discussions/new?category=ideas ### 2. Create an Issue @@ -51,7 +51,7 @@ maintainer will ask you to [open an issue][issue] on GitHub. Not every enhancement warrants an Enhancement Proposal. _If_ the enhancement issue requires an Enhancement Proposals, the maintainers will add the label `enhancement-proposal` to the issue. -[issue]: https://github.com/nginxinc/nginx-gateway-fabric/issues/new?assignees=&labels=proposal&projects=&template=enhancement.md&title= +[issue]: https://github.com/nginx/nginx-gateway-fabric/issues/new?assignees=&labels=proposal&projects=&template=enhancement.md&title= ### 3. Agree on the Goals (Provisional) @@ -80,7 +80,7 @@ with the changes and update the status field of the corresponding Enhancement Pr > Note: > -> Make sure to read the [Development Guide](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/CONTRIBUTING.md#development-guide) +> Make sure to read the [Development Guide](https://github.com/nginx/nginx-gateway-fabric/blob/main/CONTRIBUTING.md#development-guide) > before making any code changes. ## Status diff --git a/docs/proposals/advanced-nginx-extensions.md b/docs/proposals/advanced-nginx-extensions.md index ecced57bd..5bebea168 100644 --- a/docs/proposals/advanced-nginx-extensions.md +++ b/docs/proposals/advanced-nginx-extensions.md @@ -1,6 +1,6 @@ # Enhancement Proposal-2035: Advanced NGINX Extensions -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/2035 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/2035 - Status: Implementable ## Summary @@ -195,8 +195,8 @@ SnippetsPolicy supports the following NGINX configuration contexts: - http module - there are not enough features in https://nginx.org/en/docs/http/ngx_http_upstream_module.html - There are a few `keepalive`-related directives. But they also require `proxy_set_header Connection "";`, which is possible to configure with location snippets, but it will conflict with the generated Connection header (see - https://github.com/nginxinc/nginx-gateway-fabric/blob/5968bc348213a8470f6aaaa1a9bd51f2e90523ac/internal/mode/static/nginx/config/servers.go#L39-L40 - and https://github.com/nginxinc/nginx-gateway-fabric/blob/5968bc348213a8470f6aaaa1a9bd51f2e90523ac/internal/mode/static/nginx/config/maps_template.go#L21-L26) + https://github.com/nginx/nginx-gateway-fabric/blob/5968bc348213a8470f6aaaa1a9bd51f2e90523ac/internal/mode/static/nginx/config/servers.go#L39-L40 + and https://github.com/nginx/nginx-gateway-fabric/blob/5968bc348213a8470f6aaaa1a9bd51f2e90523ac/internal/mode/static/nginx/config/maps_template.go#L21-L26) so those keepalive directives won't work. - Session persistence ([`sticky`](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#sticky)). Those are valid use cases. But at the same time, they only apply to NGINX Plus. Additionally, Gateway API started introducing session persistence. @@ -218,9 +218,9 @@ SnippetsFilter supports `http`, `server`, and `location` contexts of the http mo > TLSRoute, TCPRoute, and UPDRoute don't support filters. As a result, SnippetsFilter doesn't support stream-related > contexts. > -> Snippets for location might share the same problem as mentioned in the issue https://github.com/nginxinc/nginx-gateway-fabric/issues/207, +> Snippets for location might share the same problem as mentioned in the issue https://github.com/nginx/nginx-gateway-fabric/issues/207, > depending on the NGINX directives being used in the snippets. This proposal doesn't address the problem but -> anticipates the solution to https://github.com/nginxinc/nginx-gateway-fabric/issues/2079 will also solve the problem +> anticipates the solution to https://github.com/nginx/nginx-gateway-fabric/issues/2079 will also solve the problem > for Snippets. #### Examples @@ -756,7 +756,7 @@ type TemplateMetadata struct { If requested by users, NGF can provide additional context. For example, for a template for the `location` context, it can pass the data from -the [`Location`](https://github.com/nginxinc/nginx-gateway-fabric/blob/7bc0b6e6c5131920ac18f41359dd1eba7f53a8ba/internal/mode/static/nginx/config/http/config.go#L16) +the [`Location`](https://github.com/nginx/nginx-gateway-fabric/blob/7bc0b6e6c5131920ac18f41359dd1eba7f53a8ba/internal/mode/static/nginx/config/http/config.go#L16) struct, which NGF uses to generate location config. NGF will unmarshal the values CRD spec into the `Spec` field of `TemplateData`. This way the template can access diff --git a/docs/proposals/client-settings.md b/docs/proposals/client-settings.md index 5437c88f5..2e84af71b 100644 --- a/docs/proposals/client-settings.md +++ b/docs/proposals/client-settings.md @@ -1,6 +1,6 @@ # Enhancement Proposal-1632: Client Settings Policy -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/1632 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/1632 - Status: Completed ## Summary @@ -350,7 +350,7 @@ B. Same Hostname: C. Internal Redirect: ![example-c1](/docs/images/client-settings/example-c1.png) -For this attachment scenario, specifying the directives in every server context creates the effective policies for the attached HTTPRoutes. Specifying the directives in the http context would have the same effect, but this would not work once we add support for [multiple Gateway resources](https://github.com/nginxinc/nginx-gateway-fabric/issues/1443). +For this attachment scenario, specifying the directives in every server context creates the effective policies for the attached HTTPRoutes. Specifying the directives in the http context would have the same effect, but this would not work once we add support for [multiple Gateway resources](https://github.com/nginx/nginx-gateway-fabric/issues/1443). **2. HTTPRoute Attachment** @@ -404,7 +404,7 @@ All fields in the `ClientSettingsPolicy` will be validated with Open API Schema. - Add support for more client-related directives, such as `client_body_buffer_size`, `client_header_buffer_size`, or `keepalive_disable`. - Extend implementation to support multiple Gateways. -- Allow attaching to GRPCRoutes. [GRPCRoute implementation](https://github.com/nginxinc/nginx-gateway-fabric/issues/1139) is scheduled for the 1.3 release. All the directives included in this policy are applicable to gRPC servers (HTTP/2 server). For streams, the `client_max_body_size` directive applies to the entire stream, not individual messages. Therefore, for streaming methods it is recommended that this be set to a large value or 0 to disable checking. +- Allow attaching to GRPCRoutes. [GRPCRoute implementation](https://github.com/nginx/nginx-gateway-fabric/issues/1139) is scheduled for the 1.3 release. All the directives included in this policy are applicable to gRPC servers (HTTP/2 server). For streams, the `client_max_body_size` directive applies to the entire stream, not individual messages. Therefore, for streaming methods it is recommended that this be set to a large value or 0 to disable checking. - Extend with HTTP/2 and HTTP/3 directives. For example, `http2_preread_size`, `http2_chunk_size`, `http2_max_concurrent_streams`, etc. See the [HTTP/2](https://nginx.org/en/docs/http/ngx_http_v2_module.html) and [HTTP/3](https://nginx.org/en/docs/http/ngx_http_v3_module.html) modules for more directives. - Add more attachment points. For example, allowing attachment to GatewayClasses or Gateway Listeners. - Improve on status and discoverability. diff --git a/docs/proposals/control-data-plane-split/README.md b/docs/proposals/control-data-plane-split/README.md index ce50f4383..328a262ec 100644 --- a/docs/proposals/control-data-plane-split/README.md +++ b/docs/proposals/control-data-plane-split/README.md @@ -2,7 +2,7 @@ This document proposes a design for separating the control and data planes. -- Issue https://github.com/nginxinc/nginx-gateway-fabric/issues/1508 +- Issue https://github.com/nginx/nginx-gateway-fabric/issues/1508 - Status: Implementable ## Background diff --git a/docs/proposals/control-plane-config.md b/docs/proposals/control-plane-config.md index 8ae2bc07b..01a73f5ad 100644 --- a/docs/proposals/control-plane-config.md +++ b/docs/proposals/control-plane-config.md @@ -1,6 +1,6 @@ # Enhancement Proposal-928: Control Plane Dynamic Configuration -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/928 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/928 - Status: Completed ## Summary diff --git a/docs/proposals/gateway-settings.md b/docs/proposals/gateway-settings.md index cd0b0e810..ab7721ec4 100644 --- a/docs/proposals/gateway-settings.md +++ b/docs/proposals/gateway-settings.md @@ -1,6 +1,6 @@ # Enhancement Proposal-1775: Gateway Settings -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/1775 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/1775 - Status: Completed ## Summary diff --git a/docs/proposals/nginx-extensions.md b/docs/proposals/nginx-extensions.md index e5faec592..497de1355 100644 --- a/docs/proposals/nginx-extensions.md +++ b/docs/proposals/nginx-extensions.md @@ -1,7 +1,7 @@ # Extensions for NGINX Features -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/1566 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/1566 - Status: Implementable ## Summary @@ -121,7 +121,7 @@ spec: [GEP-1867](https://gateway-api.sigs.k8s.io/geps/gep-1867/) raises the following operational challenges with `parameterRefs`: 1. _Permissions_: To make declarative changes to a Gateway, the Gateway owner (who has RBAC permissions to a specific Gateway) must have access to GatewayClass, a cluster-scoped resource. -2. _Scope_: If a change is made on a GatewayClass, _all_ Gateways are affected by that change. This will become an issue once we [support multiple Gateways](https://github.com/nginxinc/nginx-gateway-fabric/issues/1443). +2. _Scope_: If a change is made on a GatewayClass, _all_ Gateways are affected by that change. This will become an issue once we [support multiple Gateways](https://github.com/nginx/nginx-gateway-fabric/issues/1443). 3. _Dynamic Changes_: GatewayClasses are meant to be templates, so changes made to the GatewayClass are not expected to change deployed Gateways. This means the configuration is not dynamic. However, this is just a recommendation by the spec and is not required. If we propagate the changes from a GatewayClass to existing Gateways, we must clearly document this behavior. ### Infrastructure API @@ -615,7 +615,7 @@ NGINX Plus directives: These features are grouped because they are all the responsibility of the Cluster Operator and should not be set or changed by Application Developers. -All the Gateways attached to the GatewayClass will inherit these settings. This is acceptable since NGINX Gateway Fabric supports a single Gateway per GatewayClass. However, once we [support multiple Gateways](https://github.com/nginxinc/nginx-gateway-fabric/issues/1443), this could become an issue. It may force users to create multiple GatewayClasses in order to create Gateways with different settings. +All the Gateways attached to the GatewayClass will inherit these settings. This is acceptable since NGINX Gateway Fabric supports a single Gateway per GatewayClass. However, once we [support multiple Gateways](https://github.com/nginx/nginx-gateway-fabric/issues/1443), this could become an issue. It may force users to create multiple GatewayClasses in order to create Gateways with different settings. #### Future Work diff --git a/docs/proposals/observability.md b/docs/proposals/observability.md index 67cee1b93..71ed333cd 100644 --- a/docs/proposals/observability.md +++ b/docs/proposals/observability.md @@ -1,6 +1,6 @@ # Enhancement Proposal-1778: Observability Policy -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/1778 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/1778 - Status: Completed ## Summary diff --git a/docs/proposals/rewrite-client-ip.md b/docs/proposals/rewrite-client-ip.md index 3e9e55fd0..030eddda8 100644 --- a/docs/proposals/rewrite-client-ip.md +++ b/docs/proposals/rewrite-client-ip.md @@ -1,6 +1,6 @@ # Enhancement Proposal-2335: Rewrite Client IP -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/2325 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/2325 - Status: Completed ## Summary diff --git a/docs/proposals/upstream-settings.md b/docs/proposals/upstream-settings.md index 7928220c5..ebc9584a4 100644 --- a/docs/proposals/upstream-settings.md +++ b/docs/proposals/upstream-settings.md @@ -1,6 +1,6 @@ # Enhancement Proposal-2467: Upstream Settings Policy -- Issue: https://github.com/nginxinc/nginx-gateway-fabric/issues/2467 +- Issue: https://github.com/nginx/nginx-gateway-fabric/issues/2467 - Status: Implementable ## Summary diff --git a/go.mod b/go.mod index 565524093..dc622a593 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/nginx-gateway-fabric +module github.com/nginx/nginx-gateway-fabric go 1.23.0 diff --git a/internal/framework/controller/controllerfakes/fake_getter.go b/internal/framework/controller/controllerfakes/fake_getter.go index a343bfe26..54027354f 100644 --- a/internal/framework/controller/controllerfakes/fake_getter.go +++ b/internal/framework/controller/controllerfakes/fake_getter.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/framework/controller/filter/filter.go b/internal/framework/controller/filter/filter.go index 7a9a1c234..36cd51836 100644 --- a/internal/framework/controller/filter/filter.go +++ b/internal/framework/controller/filter/filter.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" ) // CreateSingleResourceFilter creates a filter function that filters out all resources except the one diff --git a/internal/framework/controller/reconciler.go b/internal/framework/controller/reconciler.go index 4b37baeef..54fdec7e0 100644 --- a/internal/framework/controller/reconciler.go +++ b/internal/framework/controller/reconciler.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) // NamespacedNameFilterFunc is a function that returns true if the resource should be processed by the reconciler. diff --git a/internal/framework/controller/reconciler_test.go b/internal/framework/controller/reconciler_test.go index d9b2f77d9..10038b5e8 100644 --- a/internal/framework/controller/reconciler_test.go +++ b/internal/framework/controller/reconciler_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/controllerfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" ) type getFunc func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error diff --git a/internal/framework/controller/register.go b/internal/framework/controller/register.go index 09bd69577..c76db1f57 100644 --- a/internal/framework/controller/register.go +++ b/internal/framework/controller/register.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) const ( diff --git a/internal/framework/controller/register_test.go b/internal/framework/controller/register_test.go index 1854fb243..e4a2fbc40 100644 --- a/internal/framework/controller/register_test.go +++ b/internal/framework/controller/register_test.go @@ -18,12 +18,12 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/controllerfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) func TestRegister(t *testing.T) { diff --git a/internal/framework/events/event.go b/internal/framework/events/event.go index 13bc1cad2..2200c8023 100644 --- a/internal/framework/events/event.go +++ b/internal/framework/events/event.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) // EventBatch is a batch of events to be handled at once. diff --git a/internal/framework/events/eventsfakes/fake_event_handler.go b/internal/framework/events/eventsfakes/fake_event_handler.go index 0f17b6a39..bf2db98f2 100644 --- a/internal/framework/events/eventsfakes/fake_event_handler.go +++ b/internal/framework/events/eventsfakes/fake_event_handler.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" ) type FakeEventHandler struct { diff --git a/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go b/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go index 66f02b645..a4e19a72f 100644 --- a/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go +++ b/internal/framework/events/eventsfakes/fake_first_event_batch_preparer.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" ) type FakeFirstEventBatchPreparer struct { diff --git a/internal/framework/events/eventsfakes/fake_reader.go b/internal/framework/events/eventsfakes/fake_reader.go index 0a66fee47..48f1bec2e 100644 --- a/internal/framework/events/eventsfakes/fake_reader.go +++ b/internal/framework/events/eventsfakes/fake_reader.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/framework/events/first_eventbatch_preparer_test.go b/internal/framework/events/first_eventbatch_preparer_test.go index eaf6afa60..175818f62 100644 --- a/internal/framework/events/first_eventbatch_preparer_test.go +++ b/internal/framework/events/first_eventbatch_preparer_test.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events/eventsfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events/eventsfakes" ) var _ = Describe("FirstEventBatchPreparer", func() { diff --git a/internal/framework/events/loop.go b/internal/framework/events/loop.go index 25272a427..700210ef0 100644 --- a/internal/framework/events/loop.go +++ b/internal/framework/events/loop.go @@ -21,7 +21,7 @@ import ( // (2) A reload can have side-effects for data plane traffic. // FIXME(pleshakov): better document the side effects and how to prevent and mitigate them. // So when the EventLoop have 100 saved events, it is better to process them at once rather than one by one. -// https://github.com/nginxinc/nginx-gateway-fabric/issues/551 +// https://github.com/nginx/nginx-gateway-fabric/issues/551 type EventLoop struct { handler EventHandler preparer FirstEventBatchPreparer diff --git a/internal/framework/events/loop_test.go b/internal/framework/events/loop_test.go index 09e5c3060..45560c4ce 100644 --- a/internal/framework/events/loop_test.go +++ b/internal/framework/events/loop_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events/eventsfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events/eventsfakes" ) var _ = Describe("EventLoop", func() { diff --git a/internal/framework/gatewayclass/validate.go b/internal/framework/gatewayclass/validate.go index 19f0b9f44..c9b217e28 100644 --- a/internal/framework/gatewayclass/validate.go +++ b/internal/framework/gatewayclass/validate.go @@ -6,7 +6,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" ) const ( diff --git a/internal/framework/gatewayclass/validate_test.go b/internal/framework/gatewayclass/validate_test.go index 96825d09c..c76f6a883 100644 --- a/internal/framework/gatewayclass/validate_test.go +++ b/internal/framework/gatewayclass/validate_test.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" ) func TestValidateCRDVersions(t *testing.T) { diff --git a/internal/framework/helpers/helpers_test.go b/internal/framework/helpers/helpers_test.go index 107408623..bb7574b29 100644 --- a/internal/framework/helpers/helpers_test.go +++ b/internal/framework/helpers/helpers_test.go @@ -9,7 +9,7 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) func TestMustCastObject(t *testing.T) { diff --git a/internal/framework/status/statusfakes/fake_group_updater.go b/internal/framework/status/statusfakes/fake_group_updater.go index 4b33a10a7..2b643ff21 100644 --- a/internal/framework/status/statusfakes/fake_group_updater.go +++ b/internal/framework/status/statusfakes/fake_group_updater.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" ) type FakeGroupUpdater struct { diff --git a/internal/framework/status/statusfakes/fake_k8s_updater.go b/internal/framework/status/statusfakes/fake_k8s_updater.go index 8208947af..ee5fdd713 100644 --- a/internal/framework/status/statusfakes/fake_k8s_updater.go +++ b/internal/framework/status/statusfakes/fake_k8s_updater.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/framework/status/updater.go b/internal/framework/status/updater.go index ccfd0fb12..cf4fc6b08 100644 --- a/internal/framework/status/updater.go +++ b/internal/framework/status/updater.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) // UpdateRequest is a request to update the status of a resource. @@ -38,17 +38,17 @@ type Setter func(client.Object) (wasSet bool) // status API calls sequentially will take time. // (b) k8s API can become slow or even timeout. This will increase every update status API call. // Making Updater asynchronous will prevent it from adding variable delays to the event loop. -// FIXME(pleshakov): https://github.com/nginxinc/nginx-gateway-fabric/issues/1014 +// FIXME(pleshakov): https://github.com/nginx/nginx-gateway-fabric/issues/1014 // // (2) It doesn't clear the statuses of a resources that are no longer handled by the Gateway. For example, if // an HTTPRoute resource no longer has the parentRef to the Gateway resources, the Gateway must update the status // of the resource to remove the status about the removed parentRef. -// FIXME(pleshakov): https://github.com/nginxinc/nginx-gateway-fabric/issues/1015 +// FIXME(pleshakov): https://github.com/nginx/nginx-gateway-fabric/issues/1015 // // (3) If another controllers changes the status of the Gateway/HTTPRoute resource so that the information set by our // Gateway is removed, our Gateway will not restore the status until the EventLoop invokes the StatusUpdater as a // result of processing some other new change to a resource(s). -// FIXME(pleshakov): https://github.com/nginxinc/nginx-gateway-fabric/issues/1813 +// FIXME(pleshakov): https://github.com/nginx/nginx-gateway-fabric/issues/1813 type Updater struct { client client.Client logger logr.Logger diff --git a/internal/framework/status/updater_retry_test.go b/internal/framework/status/updater_retry_test.go index b498123e9..80466e659 100644 --- a/internal/framework/status/updater_retry_test.go +++ b/internal/framework/status/updater_retry_test.go @@ -13,9 +13,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/controllerfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status/statusfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/controllerfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status/statusfakes" ) func TestNewRetryUpdateFunc(t *testing.T) { diff --git a/internal/framework/status/updater_test.go b/internal/framework/status/updater_test.go index a29d3a249..e053517da 100644 --- a/internal/framework/status/updater_test.go +++ b/internal/framework/status/updater_test.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) func createGC(name string) *v1.GatewayClass { diff --git a/internal/mode/provisioner/handler.go b/internal/mode/provisioner/handler.go index 5b8c80fb1..b31145bd3 100644 --- a/internal/mode/provisioner/handler.go +++ b/internal/mode/provisioner/handler.go @@ -11,11 +11,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" ) type timeNowFunc func() metav1.Time diff --git a/internal/mode/provisioner/handler_test.go b/internal/mode/provisioner/handler_test.go index 636753980..ee24ada68 100644 --- a/internal/mode/provisioner/handler_test.go +++ b/internal/mode/provisioner/handler_test.go @@ -17,12 +17,12 @@ import ( . "github.com/onsi/gomega" - embeddedfiles "github.com/nginxinc/nginx-gateway-fabric" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" + embeddedfiles "github.com/nginx/nginx-gateway-fabric" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" ) var _ = Describe("handler", func() { diff --git a/internal/mode/provisioner/manager.go b/internal/mode/provisioner/manager.go index 7651b05a2..bb2b93b6e 100644 --- a/internal/mode/provisioner/manager.go +++ b/internal/mode/provisioner/manager.go @@ -15,13 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - embeddedfiles "github.com/nginxinc/nginx-gateway-fabric" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + embeddedfiles "github.com/nginx/nginx-gateway-fabric" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) // Config is configuration for the provisioner mode. @@ -38,7 +38,7 @@ type Config struct { // an independent data plane instance being provisioned for each Gateway. // // The provisioner mode is not intended to be used in production (in the short term), as it lacks support for -// many important features. See https://github.com/nginxinc/nginx-gateway-fabric/issues/634 for more details. +// many important features. See https://github.com/nginx/nginx-gateway-fabric/issues/634 for more details. func StartManager(cfg Config) error { scheme := runtime.NewScheme() utilruntime.Must(gatewayv1.Install(scheme)) diff --git a/internal/mode/provisioner/store.go b/internal/mode/provisioner/store.go index 6585f2101..ebc6afcc1 100644 --- a/internal/mode/provisioner/store.go +++ b/internal/mode/provisioner/store.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" ) // store stores the cluster state needed by the provisioner and allows to update it from the events. diff --git a/internal/mode/static/config_updater.go b/internal/mode/static/config_updater.go index 884a918b2..368f55c81 100644 --- a/internal/mode/static/config_updater.go +++ b/internal/mode/static/config_updater.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/tools/record" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) // updateControlPlane updates the control plane configuration with the given user spec. diff --git a/internal/mode/static/config_updater_test.go b/internal/mode/static/config_updater_test.go index 94807253b..7b5f77029 100644 --- a/internal/mode/static/config_updater_test.go +++ b/internal/mode/static/config_updater_test.go @@ -10,9 +10,9 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/log/zap" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/staticfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/staticfakes" ) func TestUpdateControlPlane(t *testing.T) { diff --git a/internal/mode/static/handler.go b/internal/mode/static/handler.go index 2a835b858..e7be8e5d1 100644 --- a/internal/mode/static/handler.go +++ b/internal/mode/static/handler.go @@ -16,20 +16,20 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - frameworkStatus "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - ngfConfig "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - ngxConfig "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/status" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + frameworkStatus "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/status" ) type handlerMetricsCollector interface { diff --git a/internal/mode/static/handler_test.go b/internal/mode/static/handler_test.go index 8d8ef9a8d..7a315b5c2 100644 --- a/internal/mode/static/handler_test.go +++ b/internal/mode/static/handler_test.go @@ -18,21 +18,21 @@ import ( ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status/statusfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing/licensingfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics/collectors" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/configfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime/runtimefakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/statefakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status/statusfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing/licensingfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/metrics/collectors" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/configfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime/runtimefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/statefakes" ) var _ = Describe("eventHandler", func() { diff --git a/internal/mode/static/licensing/collector.go b/internal/mode/static/licensing/collector.go index 4d4d1a945..0e28a4763 100644 --- a/internal/mode/static/licensing/collector.go +++ b/internal/mode/static/licensing/collector.go @@ -7,8 +7,8 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/internal/mode/static/licensing/collector_test.go b/internal/mode/static/licensing/collector_test.go index c01b16961..21753a5cf 100644 --- a/internal/mode/static/licensing/collector_test.go +++ b/internal/mode/static/licensing/collector_test.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var _ = Describe("DeploymentContextCollector", func() { diff --git a/internal/mode/static/licensing/licensingfakes/fake_collector.go b/internal/mode/static/licensing/licensingfakes/fake_collector.go index d801c5a44..8491b5b5a 100644 --- a/internal/mode/static/licensing/licensingfakes/fake_collector.go +++ b/internal/mode/static/licensing/licensingfakes/fake_collector.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) type FakeCollector struct { diff --git a/internal/mode/static/log_level_setters_test.go b/internal/mode/static/log_level_setters_test.go index df2d51f44..b9dce5ae7 100644 --- a/internal/mode/static/log_level_setters_test.go +++ b/internal/mode/static/log_level_setters_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" "go.uber.org/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/staticfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/staticfakes" ) func TestMultiLogLevelSetter_SetLevel(t *testing.T) { diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go index afb056017..e5351f6a6 100644 --- a/internal/mode/static/manager.go +++ b/internal/mode/static/manager.go @@ -34,34 +34,34 @@ import ( gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/filter" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/predicate" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/runnables" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/licensing" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics/collectors" - ngxcfg "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" - ngxvalidation "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - ngxruntime "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/filter" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/predicate" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/runnables" + "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/licensing" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/metrics/collectors" + ngxcfg "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" + ngxvalidation "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + ngxruntime "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) const ( @@ -524,7 +524,7 @@ func registerControllers( }, { // FIXME(ciarams87): If possible, use only metadata predicate - // https://github.com/nginxinc/nginx-gateway-fabric/issues/1545 + // https://github.com/nginx/nginx-gateway-fabric/issues/1545 objectType: &apiv1.ConfigMap{}, }, { diff --git a/internal/mode/static/manager_test.go b/internal/mode/static/manager_test.go index 0f2d802d3..7c995f90b 100644 --- a/internal/mode/static/manager_test.go +++ b/internal/mode/static/manager_test.go @@ -19,9 +19,9 @@ import ( gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) { diff --git a/internal/mode/static/metrics/collectors/controller.go b/internal/mode/static/metrics/collectors/controller.go index fa1f9757e..3a5db0cb1 100644 --- a/internal/mode/static/metrics/collectors/controller.go +++ b/internal/mode/static/metrics/collectors/controller.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/metrics" ) // ControllerCollector collects metrics for the NGF controller. diff --git a/internal/mode/static/metrics/collectors/nginx.go b/internal/mode/static/metrics/collectors/nginx.go index f8ce60b26..838dcf642 100644 --- a/internal/mode/static/metrics/collectors/nginx.go +++ b/internal/mode/static/metrics/collectors/nginx.go @@ -9,8 +9,8 @@ import ( nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/metrics" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" ) const ( diff --git a/internal/mode/static/metrics/collectors/nginx_runtime.go b/internal/mode/static/metrics/collectors/nginx_runtime.go index 5195e603d..c84e696a2 100644 --- a/internal/mode/static/metrics/collectors/nginx_runtime.go +++ b/internal/mode/static/metrics/collectors/nginx_runtime.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/metrics" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/metrics" ) // NginxRuntimeCollector implements runtime.Collector interface and prometheus.Collector interface. diff --git a/internal/mode/static/nginx/config/base_http_config.go b/internal/mode/static/nginx/config/base_http_config.go index 4db43b78b..65552b319 100644 --- a/internal/mode/static/nginx/config/base_http_config.go +++ b/internal/mode/static/nginx/config/base_http_config.go @@ -3,9 +3,9 @@ package config import ( gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var baseHTTPTemplate = gotemplate.Must(gotemplate.New("baseHttp").Parse(baseHTTPTemplateText)) diff --git a/internal/mode/static/nginx/config/base_http_config_test.go b/internal/mode/static/nginx/config/base_http_config_test.go index ef5a2f4ad..040802af9 100644 --- a/internal/mode/static/nginx/config/base_http_config_test.go +++ b/internal/mode/static/nginx/config/base_http_config_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestExecuteBaseHttp_HTTP2(t *testing.T) { diff --git a/internal/mode/static/nginx/config/configfakes/fake_generator.go b/internal/mode/static/nginx/config/configfakes/fake_generator.go index d2b3a6e7b..d92b09e7e 100644 --- a/internal/mode/static/nginx/config/configfakes/fake_generator.go +++ b/internal/mode/static/nginx/config/configfakes/fake_generator.go @@ -4,9 +4,9 @@ package configfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) type FakeGenerator struct { diff --git a/internal/mode/static/nginx/config/convert.go b/internal/mode/static/nginx/config/convert.go index 3038149a0..ece4e1b5c 100644 --- a/internal/mode/static/nginx/config/convert.go +++ b/internal/mode/static/nginx/config/convert.go @@ -5,7 +5,7 @@ import ( ngxclient "github.com/nginxinc/nginx-plus-go-client/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) // ConvertEndpoints converts a list of Endpoints into a list of NGINX Plus SDK UpstreamServers. diff --git a/internal/mode/static/nginx/config/convert_test.go b/internal/mode/static/nginx/config/convert_test.go index 68520dfd7..312b3d41c 100644 --- a/internal/mode/static/nginx/config/convert_test.go +++ b/internal/mode/static/nginx/config/convert_test.go @@ -6,7 +6,7 @@ import ( ngxclient "github.com/nginxinc/nginx-plus-go-client/client" . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func TestConvertEndpoints(t *testing.T) { diff --git a/internal/mode/static/nginx/config/generator.go b/internal/mode/static/nginx/config/generator.go index a408cffd6..13d664c28 100644 --- a/internal/mode/static/nginx/config/generator.go +++ b/internal/mode/static/nginx/config/generator.go @@ -7,14 +7,14 @@ import ( "github.com/go-logr/logr" - ngfConfig "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/internal/mode/static/nginx/config/generator_test.go b/internal/mode/static/nginx/config/generator_test.go index a0a5670c2..435314e88 100644 --- a/internal/mode/static/nginx/config/generator_test.go +++ b/internal/mode/static/nginx/config/generator_test.go @@ -9,13 +9,13 @@ import ( "k8s.io/apimachinery/pkg/types" ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - ngfConfig "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func TestGenerate(t *testing.T) { diff --git a/internal/mode/static/nginx/config/http/config.go b/internal/mode/static/nginx/config/http/config.go index 6a8e77ff4..b81a6771b 100644 --- a/internal/mode/static/nginx/config/http/config.go +++ b/internal/mode/static/nginx/config/http/config.go @@ -1,7 +1,7 @@ package http import ( - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" ) const ( diff --git a/internal/mode/static/nginx/config/includes.go b/internal/mode/static/nginx/config/includes.go index 81b7ff8b9..729c100d9 100644 --- a/internal/mode/static/nginx/config/includes.go +++ b/internal/mode/static/nginx/config/includes.go @@ -1,10 +1,10 @@ package config import ( - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) // createIncludeExecuteResultsFromServers creates a list of executeResults -- or NGINX config files -- from all diff --git a/internal/mode/static/nginx/config/includes_test.go b/internal/mode/static/nginx/config/includes_test.go index b4b413323..40e6f292b 100644 --- a/internal/mode/static/nginx/config/includes_test.go +++ b/internal/mode/static/nginx/config/includes_test.go @@ -5,10 +5,10 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestCreateIncludeExecuteResultsFromServers(t *testing.T) { diff --git a/internal/mode/static/nginx/config/main_config.go b/internal/mode/static/nginx/config/main_config.go index 58cdef68c..8355c5d0d 100644 --- a/internal/mode/static/nginx/config/main_config.go +++ b/internal/mode/static/nginx/config/main_config.go @@ -3,11 +3,11 @@ package config import ( gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) var ( diff --git a/internal/mode/static/nginx/config/main_config_test.go b/internal/mode/static/nginx/config/main_config_test.go index 6a5773542..476614c01 100644 --- a/internal/mode/static/nginx/config/main_config_test.go +++ b/internal/mode/static/nginx/config/main_config_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestExecuteMainConfig_Telemetry(t *testing.T) { diff --git a/internal/mode/static/nginx/config/maps.go b/internal/mode/static/nginx/config/maps.go index f34539726..78f81c9e3 100644 --- a/internal/mode/static/nginx/config/maps.go +++ b/internal/mode/static/nginx/config/maps.go @@ -4,9 +4,9 @@ import ( "strings" gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var mapsTemplate = gotemplate.Must(gotemplate.New("maps").Parse(mapsTemplateText)) diff --git a/internal/mode/static/nginx/config/maps_test.go b/internal/mode/static/nginx/config/maps_test.go index af94f77d0..f1207715f 100644 --- a/internal/mode/static/nginx/config/maps_test.go +++ b/internal/mode/static/nginx/config/maps_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func TestExecuteMaps(t *testing.T) { diff --git a/internal/mode/static/nginx/config/policies/clientsettings/generator.go b/internal/mode/static/nginx/config/policies/clientsettings/generator.go index 753d87628..8ab6ea10d 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/generator.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/generator.go @@ -4,10 +4,10 @@ import ( "fmt" "text/template" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) var tmpl = template.Must(template.New("client settings policy").Parse(clientSettingsTemplate)) diff --git a/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go index 395f0dd90..ffc00bd29 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/generator_test.go @@ -5,11 +5,11 @@ import ( . "github.com/onsi/gomega" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" ) func TestGenerate(t *testing.T) { diff --git a/internal/mode/static/nginx/config/policies/clientsettings/validator.go b/internal/mode/static/nginx/config/policies/clientsettings/validator.go index 79a390ce9..98198eb26 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/validator.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/validator.go @@ -4,13 +4,13 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // Validator validates a ClientSettingsPolicy. diff --git a/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go b/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go index 2d1f95686..bce96d81c 100644 --- a/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go +++ b/internal/mode/static/nginx/config/policies/clientsettings/validator_test.go @@ -8,14 +8,14 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/clientsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) type policyModFunc func(policy *ngfAPI.ClientSettingsPolicy) *ngfAPI.ClientSettingsPolicy diff --git a/internal/mode/static/nginx/config/policies/generator.go b/internal/mode/static/nginx/config/policies/generator.go index 24ed738a6..642aaf181 100644 --- a/internal/mode/static/nginx/config/policies/generator.go +++ b/internal/mode/static/nginx/config/policies/generator.go @@ -1,7 +1,7 @@ package policies import ( - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" ) // Generator defines an interface for a policy to implement its appropriate generator functions. diff --git a/internal/mode/static/nginx/config/policies/generator_test.go b/internal/mode/static/nginx/config/policies/generator_test.go index 83a746d99..62dcf4d3b 100644 --- a/internal/mode/static/nginx/config/policies/generator_test.go +++ b/internal/mode/static/nginx/config/policies/generator_test.go @@ -4,9 +4,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" ) var _ = Describe("Policy Generator", func() { diff --git a/internal/mode/static/nginx/config/policies/observability/generator.go b/internal/mode/static/nginx/config/policies/observability/generator.go index 3e86827fe..261defeef 100644 --- a/internal/mode/static/nginx/config/policies/observability/generator.go +++ b/internal/mode/static/nginx/config/policies/observability/generator.go @@ -4,11 +4,11 @@ import ( "fmt" "text/template" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var ( diff --git a/internal/mode/static/nginx/config/policies/observability/generator_test.go b/internal/mode/static/nginx/config/policies/observability/generator_test.go index bee1df4e8..03ad174cb 100644 --- a/internal/mode/static/nginx/config/policies/observability/generator_test.go +++ b/internal/mode/static/nginx/config/policies/observability/generator_test.go @@ -6,12 +6,12 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestGenerate(t *testing.T) { diff --git a/internal/mode/static/nginx/config/policies/observability/validator.go b/internal/mode/static/nginx/config/policies/observability/validator.go index b93902d95..8cf43c478 100644 --- a/internal/mode/static/nginx/config/policies/observability/validator.go +++ b/internal/mode/static/nginx/config/policies/observability/validator.go @@ -4,13 +4,13 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // Validator validates an ObservabilityPolicy. diff --git a/internal/mode/static/nginx/config/policies/observability/validator_test.go b/internal/mode/static/nginx/config/policies/observability/validator_test.go index 53aa9c19e..679906a39 100644 --- a/internal/mode/static/nginx/config/policies/observability/validator_test.go +++ b/internal/mode/static/nginx/config/policies/observability/validator_test.go @@ -8,15 +8,15 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/observability" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) type policyModFunc func(policy *ngfAPI.ObservabilityPolicy) *ngfAPI.ObservabilityPolicy diff --git a/internal/mode/static/nginx/config/policies/policiesfakes/fake_generator.go b/internal/mode/static/nginx/config/policies/policiesfakes/fake_generator.go index f7cdb6537..c826eceee 100644 --- a/internal/mode/static/nginx/config/policies/policiesfakes/fake_generator.go +++ b/internal/mode/static/nginx/config/policies/policiesfakes/fake_generator.go @@ -4,8 +4,8 @@ package policiesfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) type FakeGenerator struct { diff --git a/internal/mode/static/nginx/config/policies/policiesfakes/fake_policy.go b/internal/mode/static/nginx/config/policies/policiesfakes/fake_policy.go index 3370e931a..e47ee41dd 100644 --- a/internal/mode/static/nginx/config/policies/policiesfakes/fake_policy.go +++ b/internal/mode/static/nginx/config/policies/policiesfakes/fake_policy.go @@ -4,7 +4,7 @@ package policiesfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/mode/static/nginx/config/policies/policiesfakes/fake_validator.go b/internal/mode/static/nginx/config/policies/policiesfakes/fake_validator.go index 05125b0d2..43cfb7e87 100644 --- a/internal/mode/static/nginx/config/policies/policiesfakes/fake_validator.go +++ b/internal/mode/static/nginx/config/policies/policiesfakes/fake_validator.go @@ -4,8 +4,8 @@ package policiesfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) type FakeValidator struct { diff --git a/internal/mode/static/nginx/config/policies/upstreamsettings/processor.go b/internal/mode/static/nginx/config/policies/upstreamsettings/processor.go index 5df29eed6..6072820ac 100644 --- a/internal/mode/static/nginx/config/policies/upstreamsettings/processor.go +++ b/internal/mode/static/nginx/config/policies/upstreamsettings/processor.go @@ -1,9 +1,9 @@ package upstreamsettings import ( - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) // Processor processes UpstreamSettingsPolicies. diff --git a/internal/mode/static/nginx/config/policies/upstreamsettings/processor_test.go b/internal/mode/static/nginx/config/policies/upstreamsettings/processor_test.go index b7c785376..835dfe8ee 100644 --- a/internal/mode/static/nginx/config/policies/upstreamsettings/processor_test.go +++ b/internal/mode/static/nginx/config/policies/upstreamsettings/processor_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) func TestProcess(t *testing.T) { diff --git a/internal/mode/static/nginx/config/policies/upstreamsettings/validator.go b/internal/mode/static/nginx/config/policies/upstreamsettings/validator.go index 9fccebd16..c3c0a1af5 100644 --- a/internal/mode/static/nginx/config/policies/upstreamsettings/validator.go +++ b/internal/mode/static/nginx/config/policies/upstreamsettings/validator.go @@ -4,13 +4,13 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // Validator validates an UpstreamSettingsPolicy. diff --git a/internal/mode/static/nginx/config/policies/upstreamsettings/validator_test.go b/internal/mode/static/nginx/config/policies/upstreamsettings/validator_test.go index 3e303a822..e34f4738e 100644 --- a/internal/mode/static/nginx/config/policies/upstreamsettings/validator_test.go +++ b/internal/mode/static/nginx/config/policies/upstreamsettings/validator_test.go @@ -7,14 +7,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/validation" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) type policyModFunc func(policy *ngfAPI.UpstreamSettingsPolicy) *ngfAPI.UpstreamSettingsPolicy diff --git a/internal/mode/static/nginx/config/policies/validator.go b/internal/mode/static/nginx/config/policies/validator.go index 80ffe1198..7ab88667e 100644 --- a/internal/mode/static/nginx/config/policies/validator.go +++ b/internal/mode/static/nginx/config/policies/validator.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) // Validator validates an NGF Policy. diff --git a/internal/mode/static/nginx/config/policies/validator_test.go b/internal/mode/static/nginx/config/policies/validator_test.go index 0ea940ce0..81b1ee87c 100644 --- a/internal/mode/static/nginx/config/policies/validator_test.go +++ b/internal/mode/static/nginx/config/policies/validator_test.go @@ -6,10 +6,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - policies "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - policiesfakes "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + policies "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + policiesfakes "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) var _ = Describe("Policy CompositeValidator", func() { diff --git a/internal/mode/static/nginx/config/servers.go b/internal/mode/static/nginx/config/servers.go index d387404f5..5f236817c 100644 --- a/internal/mode/static/nginx/config/servers.go +++ b/internal/mode/static/nginx/config/servers.go @@ -8,11 +8,11 @@ import ( "strings" gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var serversTemplate = gotemplate.Must(gotemplate.New("servers").Parse(serversTemplateText)) @@ -299,7 +299,7 @@ func createLocations( for i := range extLocations { // FIXME(sberman): De-dupe matches and associated locations // so we don't need nginx/njs to perform unnecessary matching. - // https://github.com/nginxinc/nginx-gateway-fabric/issues/662 + // https://github.com/nginx/nginx-gateway-fabric/issues/662 extLocations[i].HTTPMatchKey = httpMatchKey matchPairs[extLocations[i].HTTPMatchKey] = matches } diff --git a/internal/mode/static/nginx/config/servers_test.go b/internal/mode/static/nginx/config/servers_test.go index 1a92090a2..3fd5266f4 100644 --- a/internal/mode/static/nginx/config/servers_test.go +++ b/internal/mode/static/nginx/config/servers_test.go @@ -9,12 +9,12 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var ( diff --git a/internal/mode/static/nginx/config/split_clients.go b/internal/mode/static/nginx/config/split_clients.go index 0e196a206..0e8250e80 100644 --- a/internal/mode/static/nginx/config/split_clients.go +++ b/internal/mode/static/nginx/config/split_clients.go @@ -5,9 +5,9 @@ import ( "math" gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var splitClientsTemplate = gotemplate.Must(gotemplate.New("split_clients").Parse(splitClientsTemplateText)) diff --git a/internal/mode/static/nginx/config/split_clients_test.go b/internal/mode/static/nginx/config/split_clients_test.go index 4e70c44d1..edc44e7b7 100644 --- a/internal/mode/static/nginx/config/split_clients_test.go +++ b/internal/mode/static/nginx/config/split_clients_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestExecuteSplitClients(t *testing.T) { diff --git a/internal/mode/static/nginx/config/stream/config.go b/internal/mode/static/nginx/config/stream/config.go index 1202c1ec8..00b93d1ec 100644 --- a/internal/mode/static/nginx/config/stream/config.go +++ b/internal/mode/static/nginx/config/stream/config.go @@ -1,6 +1,6 @@ package stream -import "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" +import "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" // Server holds all configuration for a stream server. type Server struct { diff --git a/internal/mode/static/nginx/config/stream_servers.go b/internal/mode/static/nginx/config/stream_servers.go index b6cb763cb..fa84ab4e4 100644 --- a/internal/mode/static/nginx/config/stream_servers.go +++ b/internal/mode/static/nginx/config/stream_servers.go @@ -4,10 +4,10 @@ import ( "fmt" gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/shared" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var streamServersTemplate = gotemplate.Must(gotemplate.New("streamServers").Parse(streamServersTemplateText)) diff --git a/internal/mode/static/nginx/config/stream_servers_test.go b/internal/mode/static/nginx/config/stream_servers_test.go index 1e5c8b660..93b85b364 100644 --- a/internal/mode/static/nginx/config/stream_servers_test.go +++ b/internal/mode/static/nginx/config/stream_servers_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func TestExecuteStreamServers(t *testing.T) { diff --git a/internal/mode/static/nginx/config/telemetry.go b/internal/mode/static/nginx/config/telemetry.go index 719fad9fc..9fcfd7c2b 100644 --- a/internal/mode/static/nginx/config/telemetry.go +++ b/internal/mode/static/nginx/config/telemetry.go @@ -3,8 +3,8 @@ package config import ( gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var otelTemplate = gotemplate.Must(gotemplate.New("otel").Parse(otelTemplateText)) diff --git a/internal/mode/static/nginx/config/telemetry_test.go b/internal/mode/static/nginx/config/telemetry_test.go index 583815298..456adc8a9 100644 --- a/internal/mode/static/nginx/config/telemetry_test.go +++ b/internal/mode/static/nginx/config/telemetry_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestExecuteTelemetry(t *testing.T) { diff --git a/internal/mode/static/nginx/config/upstreams.go b/internal/mode/static/nginx/config/upstreams.go index bcee82c68..a5ee3286d 100644 --- a/internal/mode/static/nginx/config/upstreams.go +++ b/internal/mode/static/nginx/config/upstreams.go @@ -4,11 +4,11 @@ import ( "fmt" gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var ( diff --git a/internal/mode/static/nginx/config/upstreams_template.go b/internal/mode/static/nginx/config/upstreams_template.go index e4bcaa69a..ad60ce7d4 100644 --- a/internal/mode/static/nginx/config/upstreams_template.go +++ b/internal/mode/static/nginx/config/upstreams_template.go @@ -4,7 +4,7 @@ package config // 512k will support up to 648 http upstream servers for OSS. // NGINX Plus needs 1m to support roughly the same amount of http servers (556 upstream servers). // For stream upstream servers, 512k will support 576 in OSS and 1m will support 991 in NGINX Plus -// https://github.com/nginxinc/nginx-gateway-fabric/issues/483 +// https://github.com/nginx/nginx-gateway-fabric/issues/483 // // if the keepalive directive is present, it is necessary to activate the load balancing method before the directive. const upstreamsTemplateText = ` diff --git a/internal/mode/static/nginx/config/upstreams_test.go b/internal/mode/static/nginx/config/upstreams_test.go index 9d6cfdf20..2bec7c13e 100644 --- a/internal/mode/static/nginx/config/upstreams_test.go +++ b/internal/mode/static/nginx/config/upstreams_test.go @@ -6,14 +6,14 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/upstreamsettings" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/stream" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func TestExecuteUpstreams(t *testing.T) { diff --git a/internal/mode/static/nginx/config/validation/http_njs_match.go b/internal/mode/static/nginx/config/validation/http_njs_match.go index bad9c548f..b492d7c79 100644 --- a/internal/mode/static/nginx/config/validation/http_njs_match.go +++ b/internal/mode/static/nginx/config/validation/http_njs_match.go @@ -7,7 +7,7 @@ import ( k8svalidation "k8s.io/apimachinery/pkg/util/validation" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config" ) // HTTPNJSMatchValidator validates values used for matching a request. diff --git a/internal/mode/static/nginx/config/validation/http_validator.go b/internal/mode/static/nginx/config/validation/http_validator.go index 9d0ef9ca8..82a6d5542 100644 --- a/internal/mode/static/nginx/config/validation/http_validator.go +++ b/internal/mode/static/nginx/config/validation/http_validator.go @@ -1,7 +1,7 @@ package validation import ( - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // HTTPValidator validates values that will propagate into the NGINX configuration http context. diff --git a/internal/mode/static/nginx/config/variable_names.go b/internal/mode/static/nginx/config/variable_names.go index 0b8cd6430..8f557dae5 100644 --- a/internal/mode/static/nginx/config/variable_names.go +++ b/internal/mode/static/nginx/config/variable_names.go @@ -15,7 +15,7 @@ func convertStringToSafeVariableName(s string) string { // proxy_headers_hash_max_size and variables_hash_max_size to 1024 to support the longest header name as allowed // by the schema (256 characters). This ensures NGINX will not fail to reload. // FIXME(ciarams87): Investigate if any there are any performance related concerns with changing these directives. -// https://github.com/nginxinc/nginx-gateway-fabric/issues/772 +// https://github.com/nginx/nginx-gateway-fabric/issues/772 func generateAddHeaderMapVariableName(name string) string { return strings.ToLower(convertStringToSafeVariableName(name)) + "_header_var" } diff --git a/internal/mode/static/nginx/config/version.go b/internal/mode/static/nginx/config/version.go index 6e29f3605..20e677e27 100644 --- a/internal/mode/static/nginx/config/version.go +++ b/internal/mode/static/nginx/config/version.go @@ -3,8 +3,8 @@ package config import ( gotemplate "text/template" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) var versionTemplate = gotemplate.Must(gotemplate.New("version").Parse(versionTemplateText)) diff --git a/internal/mode/static/nginx/config/version_test.go b/internal/mode/static/nginx/config/version_test.go index 3d30c6c3b..ce5913ec9 100644 --- a/internal/mode/static/nginx/config/version_test.go +++ b/internal/mode/static/nginx/config/version_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" ) func TestExecuteVersion(t *testing.T) { diff --git a/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go b/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go index 15f57b79e..90e3fe03d 100644 --- a/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go +++ b/internal/mode/static/nginx/file/filefakes/fake_clear_folders_osfile_manager.go @@ -5,7 +5,7 @@ import ( "os" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" ) type FakeClearFoldersOSFileManager struct { diff --git a/internal/mode/static/nginx/file/filefakes/fake_manager.go b/internal/mode/static/nginx/file/filefakes/fake_manager.go index 557202ae1..52b34e8e7 100644 --- a/internal/mode/static/nginx/file/filefakes/fake_manager.go +++ b/internal/mode/static/nginx/file/filefakes/fake_manager.go @@ -4,7 +4,7 @@ package filefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" ) type FakeManager struct { diff --git a/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go b/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go index 733da9a1c..9f63e0a02 100644 --- a/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go +++ b/internal/mode/static/nginx/file/filefakes/fake_osfile_manager.go @@ -7,7 +7,7 @@ import ( "os" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" ) type FakeOSFileManager struct { diff --git a/internal/mode/static/nginx/file/folders_test.go b/internal/mode/static/nginx/file/folders_test.go index beefd76dd..8ae8fe180 100644 --- a/internal/mode/static/nginx/file/folders_test.go +++ b/internal/mode/static/nginx/file/folders_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" ) func writeFile(t *testing.T, name string, data []byte) { diff --git a/internal/mode/static/nginx/file/manager_test.go b/internal/mode/static/nginx/file/manager_test.go index 5a2d5d57b..1f0d5fa8a 100644 --- a/internal/mode/static/nginx/file/manager_test.go +++ b/internal/mode/static/nginx/file/manager_test.go @@ -9,8 +9,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/file/filefakes" ) var _ = Describe("EventHandler", func() { diff --git a/internal/mode/static/nginx/runtime/manager_test.go b/internal/mode/static/nginx/runtime/manager_test.go index 036731e1e..e029a255c 100644 --- a/internal/mode/static/nginx/runtime/manager_test.go +++ b/internal/mode/static/nginx/runtime/manager_test.go @@ -13,8 +13,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime/runtimefakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime/runtimefakes" ) var _ = Describe("NGINX Runtime Manager", func() { diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go index ea7504a76..ef8bd1668 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_manager.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" "github.com/nginxinc/nginx-plus-go-client/client" ) diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_metrics_collector.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_metrics_collector.go index 4562c2c5c..10215a675 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_metrics_collector.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_metrics_collector.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" ) type FakeMetricsCollector struct { diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_config_verifier.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_config_verifier.go index 23c5c6734..3b1e522c7 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_config_verifier.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_config_verifier.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" ) type FakeNginxConfigVerifier struct { diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go index 8001f7f8a..0a5065e74 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_nginx_plus_client.go @@ -4,7 +4,7 @@ package runtimefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" "github.com/nginxinc/nginx-plus-go-client/client" ) diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_process_handler.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_process_handler.go index bae52e2fa..481a354f2 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_process_handler.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_process_handler.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" ) type FakeProcessHandler struct { diff --git a/internal/mode/static/nginx/runtime/runtimefakes/fake_verify_client.go b/internal/mode/static/nginx/runtime/runtimefakes/fake_verify_client.go index 13c5f7822..8c6aa7c42 100644 --- a/internal/mode/static/nginx/runtime/runtimefakes/fake_verify_client.go +++ b/internal/mode/static/nginx/runtime/runtimefakes/fake_verify_client.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/runtime" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/runtime" ) type FakeVerifyClient struct { diff --git a/internal/mode/static/state/change_processor.go b/internal/mode/static/state/change_processor.go index 82edbcc7b..9992c7291 100644 --- a/internal/mode/static/state/change_processor.go +++ b/internal/mode/static/state/change_processor.go @@ -16,13 +16,13 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate @@ -245,9 +245,9 @@ func NewChangeProcessorImpl(cfg ChangeProcessorConfig) *ChangeProcessorImpl { // belong to the NGINX Gateway Fabric or an HTTPRoute that doesn't belong to any of the Gateways of the // NGINX Gateway Fabric. Find a way to ignore changes that don't affect the configuration and/or statuses of // the resources. -// Tracking issues: https://github.com/nginxinc/nginx-gateway-fabric/issues/1123, -// https://github.com/nginxinc/nginx-gateway-fabric/issues/1124, -// https://github.com/nginxinc/nginx-gateway-fabric/issues/1577 +// Tracking issues: https://github.com/nginx/nginx-gateway-fabric/issues/1123, +// https://github.com/nginx/nginx-gateway-fabric/issues/1124, +// https://github.com/nginx/nginx-gateway-fabric/issues/1577 // FIXME(pleshakov) // Remove CaptureUpsertChange() and CaptureDeleteChange() from ChangeProcessor and pass all changes directly to diff --git a/internal/mode/static/state/change_processor_test.go b/internal/mode/static/state/change_processor_test.go index 03d86a377..b61de8672 100644 --- a/internal/mode/static/state/change_processor_test.go +++ b/internal/mode/static/state/change_processor_test.go @@ -19,18 +19,18 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) const ( diff --git a/internal/mode/static/state/changed_predicate.go b/internal/mode/static/state/changed_predicate.go index e8df5581e..461cc6ff8 100644 --- a/internal/mode/static/state/changed_predicate.go +++ b/internal/mode/static/state/changed_predicate.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) // stateChangedPredicate determines whether upsert and delete events constitute a change in state. diff --git a/internal/mode/static/state/changed_predicate_test.go b/internal/mode/static/state/changed_predicate_test.go index c5a199a85..27aae1bfa 100644 --- a/internal/mode/static/state/changed_predicate_test.go +++ b/internal/mode/static/state/changed_predicate_test.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" ) func TestFuncPredicate(t *testing.T) { diff --git a/internal/mode/static/state/conditions/conditions.go b/internal/mode/static/state/conditions/conditions.go index c97f9efa2..84ba2d971 100644 --- a/internal/mode/static/state/conditions/conditions.go +++ b/internal/mode/static/state/conditions/conditions.go @@ -7,8 +7,8 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" ) const ( diff --git a/internal/mode/static/state/dataplane/configuration.go b/internal/mode/static/state/dataplane/configuration.go index cafcbc0db..68a46387f 100644 --- a/internal/mode/static/state/dataplane/configuration.go +++ b/internal/mode/static/state/dataplane/configuration.go @@ -13,11 +13,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) const ( @@ -804,7 +804,7 @@ func buildTelemetry(g *graph.Graph) Telemetry { tel.SpanAttributes = setSpanAttributes(telemetry.SpanAttributes) - // FIXME(sberman): https://github.com/nginxinc/nginx-gateway-fabric/issues/2038 + // FIXME(sberman): https://github.com/nginx/nginx-gateway-fabric/issues/2038 // Find a generic way to include relevant policy info at the http context so we don't need policy-specific // logic in this function ratioMap := make(map[string]int32) diff --git a/internal/mode/static/state/dataplane/configuration_test.go b/internal/mode/static/state/dataplane/configuration_test.go index 037bcd7d9..45da72bf9 100644 --- a/internal/mode/static/state/dataplane/configuration_test.go +++ b/internal/mode/static/state/dataplane/configuration_test.go @@ -19,14 +19,14 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver/resolverfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver/resolverfakes" ) func getNormalBackendRef() graph.BackendRef { diff --git a/internal/mode/static/state/dataplane/convert.go b/internal/mode/static/state/dataplane/convert.go index 626e5c903..61e5761b7 100644 --- a/internal/mode/static/state/dataplane/convert.go +++ b/internal/mode/static/state/dataplane/convert.go @@ -6,8 +6,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) func convertMatch(m v1.HTTPRouteMatch) Match { diff --git a/internal/mode/static/state/dataplane/convert_test.go b/internal/mode/static/state/dataplane/convert_test.go index 3ab1e083f..5ffa90007 100644 --- a/internal/mode/static/state/dataplane/convert_test.go +++ b/internal/mode/static/state/dataplane/convert_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) func TestConvertMatch(t *testing.T) { diff --git a/internal/mode/static/state/dataplane/sort.go b/internal/mode/static/state/dataplane/sort.go index 13dcc3149..b663c6144 100644 --- a/internal/mode/static/state/dataplane/sort.go +++ b/internal/mode/static/state/dataplane/sort.go @@ -3,7 +3,7 @@ package dataplane import ( "sort" - ngfsort "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/sort" + ngfsort "github.com/nginx/nginx-gateway-fabric/internal/mode/static/sort" ) func sortMatchRules(matchRules []MatchRule) { diff --git a/internal/mode/static/state/dataplane/sort_test.go b/internal/mode/static/state/dataplane/sort_test.go index e500d05af..dd578df70 100644 --- a/internal/mode/static/state/dataplane/sort_test.go +++ b/internal/mode/static/state/dataplane/sort_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) func TestSort(t *testing.T) { diff --git a/internal/mode/static/state/dataplane/types.go b/internal/mode/static/state/dataplane/types.go index 128990617..6cbc6192f 100644 --- a/internal/mode/static/state/dataplane/types.go +++ b/internal/mode/static/state/dataplane/types.go @@ -6,9 +6,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) // PathType is the type of the path in a PathRule. diff --git a/internal/mode/static/state/graph/backend_refs.go b/internal/mode/static/state/graph/backend_refs.go index e8c5120b4..3852e900e 100644 --- a/internal/mode/static/state/graph/backend_refs.go +++ b/internal/mode/static/state/graph/backend_refs.go @@ -11,12 +11,12 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/sort" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/sort" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) // BackendRef is an internal representation of a backendRef in an HTTP/GRPC/TLSRoute. @@ -214,7 +214,7 @@ func createBackendRef( // The backend TLS policy configuration is considered matching if: 1. CACertRefs reference the same ConfigMap, or // 2. WellKnownCACerts are the same, and 3. Hostname is the same. // FIXME (ciarams87): This is a temporary solution until we can support multiple backend TLS policies per group. -// https://github.com/nginxinc/nginx-gateway-fabric/issues/1546 +// https://github.com/nginx/nginx-gateway-fabric/issues/1546 func validateBackendTLSPolicyMatchingAllBackends(backendRefs []BackendRef) *conditions.Condition { var mismatch bool var referencePolicy *BackendTLSPolicy diff --git a/internal/mode/static/state/graph/backend_refs_test.go b/internal/mode/static/state/graph/backend_refs_test.go index b7c49648d..6b4e27f04 100644 --- a/internal/mode/static/state/graph/backend_refs_test.go +++ b/internal/mode/static/state/graph/backend_refs_test.go @@ -14,10 +14,10 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func getNormalRef() gatewayv1.BackendRef { diff --git a/internal/mode/static/state/graph/backend_tls_policy.go b/internal/mode/static/state/graph/backend_tls_policy.go index 7ef857033..eb385fa79 100644 --- a/internal/mode/static/state/graph/backend_tls_policy.go +++ b/internal/mode/static/state/graph/backend_tls_policy.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) type BackendTLSPolicy struct { @@ -73,7 +73,7 @@ func validateBackendTLSPolicy( valid = true ignored = false - // FIXME (kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1987 + // FIXME (kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1987 if backendTLSPolicyAncestorsFull(backendTLSPolicy.Status.Ancestors, ctlrName) { valid = false ignored = true diff --git a/internal/mode/static/state/graph/backend_tls_policy_test.go b/internal/mode/static/state/graph/backend_tls_policy_test.go index 791b8f8ff..7b4e794a2 100644 --- a/internal/mode/static/state/graph/backend_tls_policy_test.go +++ b/internal/mode/static/state/graph/backend_tls_policy_test.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) func TestProcessBackendTLSPoliciesEmpty(t *testing.T) { diff --git a/internal/mode/static/state/graph/common_filter.go b/internal/mode/static/state/graph/common_filter.go index 5eba3964c..6bd71cf8e 100644 --- a/internal/mode/static/state/graph/common_filter.go +++ b/internal/mode/static/state/graph/common_filter.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // RouteRuleFilters holds the Filters for a RouteRule. diff --git a/internal/mode/static/state/graph/common_filter_test.go b/internal/mode/static/state/graph/common_filter_test.go index 1d9a2d1fa..680938ea2 100644 --- a/internal/mode/static/state/graph/common_filter_test.go +++ b/internal/mode/static/state/graph/common_filter_test.go @@ -8,9 +8,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) func TestValidateFilter(t *testing.T) { diff --git a/internal/mode/static/state/graph/extension_ref_filter.go b/internal/mode/static/state/graph/extension_ref_filter.go index 0444e08f9..7587a69c0 100644 --- a/internal/mode/static/state/graph/extension_ref_filter.go +++ b/internal/mode/static/state/graph/extension_ref_filter.go @@ -4,8 +4,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) // ExtensionRefFilter are NGF-specific extensions to the "filter" behavior. diff --git a/internal/mode/static/state/graph/extension_ref_filter_test.go b/internal/mode/static/state/graph/extension_ref_filter_test.go index 780188be3..bcc5539b7 100644 --- a/internal/mode/static/state/graph/extension_ref_filter_test.go +++ b/internal/mode/static/state/graph/extension_ref_filter_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) func TestValidateExtensionRefFilter(t *testing.T) { diff --git a/internal/mode/static/state/graph/gateway.go b/internal/mode/static/state/graph/gateway.go index 2b73b46be..2ee69b554 100644 --- a/internal/mode/static/state/graph/gateway.go +++ b/internal/mode/static/state/graph/gateway.go @@ -8,9 +8,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - ngfsort "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/sort" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + ngfsort "github.com/nginx/nginx-gateway-fabric/internal/mode/static/sort" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) // Gateway represents the winning Gateway resource. diff --git a/internal/mode/static/state/graph/gateway_listener.go b/internal/mode/static/state/graph/gateway_listener.go index 0b98c2364..aa5b7062e 100644 --- a/internal/mode/static/state/graph/gateway_listener.go +++ b/internal/mode/static/state/graph/gateway_listener.go @@ -11,10 +11,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) // Listener represents a Listener of the Gateway resource. diff --git a/internal/mode/static/state/graph/gateway_listener_test.go b/internal/mode/static/state/graph/gateway_listener_test.go index e0dbe645e..cdcb8b22d 100644 --- a/internal/mode/static/state/graph/gateway_listener_test.go +++ b/internal/mode/static/state/graph/gateway_listener_test.go @@ -8,10 +8,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func TestValidateHTTPListener(t *testing.T) { diff --git a/internal/mode/static/state/graph/gateway_test.go b/internal/mode/static/state/graph/gateway_test.go index 36021e6dc..cdf7879a7 100644 --- a/internal/mode/static/state/graph/gateway_test.go +++ b/internal/mode/static/state/graph/gateway_test.go @@ -12,9 +12,9 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func TestProcessedGatewaysGetAllNsNames(t *testing.T) { diff --git a/internal/mode/static/state/graph/gatewayclass.go b/internal/mode/static/state/graph/gatewayclass.go index 9fc1f6725..510fd63f3 100644 --- a/internal/mode/static/state/graph/gatewayclass.go +++ b/internal/mode/static/state/graph/gatewayclass.go @@ -9,10 +9,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) // GatewayClass represents the GatewayClass resource. diff --git a/internal/mode/static/state/graph/gatewayclass_test.go b/internal/mode/static/state/graph/gatewayclass_test.go index 35e7f0476..1f1454e83 100644 --- a/internal/mode/static/state/graph/gatewayclass_test.go +++ b/internal/mode/static/state/graph/gatewayclass_test.go @@ -10,12 +10,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/gatewayclass" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/gatewayclass" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func TestProcessGatewayClasses(t *testing.T) { diff --git a/internal/mode/static/state/graph/graph.go b/internal/mode/static/state/graph/graph.go index 0b56ec101..82dc2712d 100644 --- a/internal/mode/static/state/graph/graph.go +++ b/internal/mode/static/state/graph/graph.go @@ -14,12 +14,12 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // ClusterState includes cluster resources necessary to build the Graph. diff --git a/internal/mode/static/state/graph/graph_test.go b/internal/mode/static/state/graph/graph_test.go index f2b71d05f..a9e327662 100644 --- a/internal/mode/static/state/graph/graph_test.go +++ b/internal/mode/static/state/graph/graph_test.go @@ -17,16 +17,16 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha3" "sigs.k8s.io/gateway-api/apis/v1beta1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) func TestBuildGraph(t *testing.T) { diff --git a/internal/mode/static/state/graph/grpcroute.go b/internal/mode/static/state/graph/grpcroute.go index 14ba253e4..713a0eb9e 100644 --- a/internal/mode/static/state/graph/grpcroute.go +++ b/internal/mode/static/state/graph/grpcroute.go @@ -5,10 +5,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) func buildGRPCRoute( diff --git a/internal/mode/static/state/graph/grpcroute_test.go b/internal/mode/static/state/graph/grpcroute_test.go index 793458f83..0e3edde7b 100644 --- a/internal/mode/static/state/graph/grpcroute_test.go +++ b/internal/mode/static/state/graph/grpcroute_test.go @@ -10,12 +10,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) func createGRPCMethodMatch(serviceName, methodName, methodType string) v1.GRPCRouteRule { diff --git a/internal/mode/static/state/graph/httproute.go b/internal/mode/static/state/graph/httproute.go index 8cc3b66ea..090039ebf 100644 --- a/internal/mode/static/state/graph/httproute.go +++ b/internal/mode/static/state/graph/httproute.go @@ -8,11 +8,11 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/http" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/http" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) var ( diff --git a/internal/mode/static/state/graph/httproute_test.go b/internal/mode/static/state/graph/httproute_test.go index a655364e6..825007d1a 100644 --- a/internal/mode/static/state/graph/httproute_test.go +++ b/internal/mode/static/state/graph/httproute_test.go @@ -11,12 +11,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) const ( diff --git a/internal/mode/static/state/graph/nginxproxy.go b/internal/mode/static/state/graph/nginxproxy.go index fa55f209c..01e6e6de5 100644 --- a/internal/mode/static/state/graph/nginxproxy.go +++ b/internal/mode/static/state/graph/nginxproxy.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // NginxProxy represents the NginxProxy resource. diff --git a/internal/mode/static/state/graph/nginxproxy_test.go b/internal/mode/static/state/graph/nginxproxy_test.go index 54447f3b3..8c688d981 100644 --- a/internal/mode/static/state/graph/nginxproxy_test.go +++ b/internal/mode/static/state/graph/nginxproxy_test.go @@ -9,10 +9,10 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation/validationfakes" ) func TestGetNginxProxy(t *testing.T) { diff --git a/internal/mode/static/state/graph/policies.go b/internal/mode/static/state/graph/policies.go index 7634c2d09..38e9aec84 100644 --- a/internal/mode/static/state/graph/policies.go +++ b/internal/mode/static/state/graph/policies.go @@ -9,12 +9,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - ngfsort "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/sort" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + ngfsort "github.com/nginx/nginx-gateway-fabric/internal/mode/static/sort" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) // Policy represents an NGF Policy. @@ -140,7 +140,7 @@ func attachPolicyToRoute(policy *Policy, route *L7Route, ctlrName string) { } if ngfPolicyAncestorsFull(policy, ctlrName) { - // FIXME (kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1987 + // FIXME (kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1987 return } @@ -172,7 +172,7 @@ func attachPolicyToGateway( } if ngfPolicyAncestorsFull(policy, ctlrName) { - // FIXME (kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1987 + // FIXME (kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1987 return } diff --git a/internal/mode/static/state/graph/policies_test.go b/internal/mode/static/state/graph/policies_test.go index 439667449..a7a8b71dc 100644 --- a/internal/mode/static/state/graph/policies_test.go +++ b/internal/mode/static/state/graph/policies_test.go @@ -11,13 +11,13 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) var testNs = "test" diff --git a/internal/mode/static/state/graph/policy_ancestor.go b/internal/mode/static/state/graph/policy_ancestor.go index b55990d6d..0e0b1f49b 100644 --- a/internal/mode/static/state/graph/policy_ancestor.go +++ b/internal/mode/static/state/graph/policy_ancestor.go @@ -5,7 +5,7 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) const maxAncestors = 16 diff --git a/internal/mode/static/state/graph/policy_ancestor_test.go b/internal/mode/static/state/graph/policy_ancestor_test.go index 0b34f8e1e..75391bc09 100644 --- a/internal/mode/static/state/graph/policy_ancestor_test.go +++ b/internal/mode/static/state/graph/policy_ancestor_test.go @@ -8,8 +8,8 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) func TestBackendTLSPolicyAncestorsFull(t *testing.T) { diff --git a/internal/mode/static/state/graph/reference_grant.go b/internal/mode/static/state/graph/reference_grant.go index 96999b209..084e06fa2 100644 --- a/internal/mode/static/state/graph/reference_grant.go +++ b/internal/mode/static/state/graph/reference_grant.go @@ -5,7 +5,7 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) // referenceGrantResolver resolves references from one resource to another. diff --git a/internal/mode/static/state/graph/reference_grant_test.go b/internal/mode/static/state/graph/reference_grant_test.go index cb9f780a1..b3f5b7ec8 100644 --- a/internal/mode/static/state/graph/reference_grant_test.go +++ b/internal/mode/static/state/graph/reference_grant_test.go @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" ) func TestReferenceGrantResolver(t *testing.T) { diff --git a/internal/mode/static/state/graph/route_common.go b/internal/mode/static/state/graph/route_common.go index 4b2e767c6..2db3e9e0b 100644 --- a/internal/mode/static/state/graph/route_common.go +++ b/internal/mode/static/state/graph/route_common.go @@ -13,11 +13,11 @@ import ( v1 "sigs.k8s.io/gateway-api/apis/v1" v1alpha "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngfSort "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/sort" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngfSort "github.com/nginx/nginx-gateway-fabric/internal/mode/static/sort" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) const wildcardHostname = "~^" @@ -93,7 +93,7 @@ type L4RouteSpec struct { // Hostnames defines a set of hostnames used to select a Route used to process the request. Hostnames []v1.Hostname // FIXME (sarthyparty): change to slice of BackendRef, as for now we are only supporting one BackendRef. - // We will eventually support multiple BackendRef https://github.com/nginxinc/nginx-gateway-fabric/issues/2184 + // We will eventually support multiple BackendRef https://github.com/nginx/nginx-gateway-fabric/issues/2184 BackendRef BackendRef } diff --git a/internal/mode/static/state/graph/route_common_test.go b/internal/mode/static/state/graph/route_common_test.go index e0d3db46d..42f601e5d 100644 --- a/internal/mode/static/state/graph/route_common_test.go +++ b/internal/mode/static/state/graph/route_common_test.go @@ -14,10 +14,10 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func TestBuildSectionNameRefs(t *testing.T) { diff --git a/internal/mode/static/state/graph/snippets_filter.go b/internal/mode/static/state/graph/snippets_filter.go index 58020345e..3904d3477 100644 --- a/internal/mode/static/state/graph/snippets_filter.go +++ b/internal/mode/static/state/graph/snippets_filter.go @@ -5,10 +5,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) // SnippetsFilter represents a ngfAPI.SnippetsFilter. diff --git a/internal/mode/static/state/graph/snippets_filter_test.go b/internal/mode/static/state/graph/snippets_filter_test.go index c5c854555..dd617c409 100644 --- a/internal/mode/static/state/graph/snippets_filter_test.go +++ b/internal/mode/static/state/graph/snippets_filter_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/types" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func TestProcessSnippetsFilters(t *testing.T) { diff --git a/internal/mode/static/state/graph/tlsroute.go b/internal/mode/static/state/graph/tlsroute.go index 03a8ca8a3..0acf1cadd 100644 --- a/internal/mode/static/state/graph/tlsroute.go +++ b/internal/mode/static/state/graph/tlsroute.go @@ -6,9 +6,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func buildTLSRoute( diff --git a/internal/mode/static/state/graph/tlsroute_test.go b/internal/mode/static/state/graph/tlsroute_test.go index edd6536ac..12d9beb87 100644 --- a/internal/mode/static/state/graph/tlsroute_test.go +++ b/internal/mode/static/state/graph/tlsroute_test.go @@ -10,10 +10,10 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" ) func createTLSRoute( diff --git a/internal/mode/static/state/resolver/resolver.go b/internal/mode/static/state/resolver/resolver.go index 0c7656297..151c59173 100644 --- a/internal/mode/static/state/resolver/resolver.go +++ b/internal/mode/static/state/resolver/resolver.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate diff --git a/internal/mode/static/state/resolver/resolver_test.go b/internal/mode/static/state/resolver/resolver_test.go index e94b810b7..694935881 100644 --- a/internal/mode/static/state/resolver/resolver_test.go +++ b/internal/mode/static/state/resolver/resolver_test.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" ) var ( diff --git a/internal/mode/static/state/resolver/resolverfakes/fake_service_resolver.go b/internal/mode/static/state/resolver/resolverfakes/fake_service_resolver.go index 09e624cfe..a1eadd5d1 100644 --- a/internal/mode/static/state/resolver/resolverfakes/fake_service_resolver.go +++ b/internal/mode/static/state/resolver/resolverfakes/fake_service_resolver.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" v1 "k8s.io/api/core/v1" v1a "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" diff --git a/internal/mode/static/state/resolver/service_resolver_test.go b/internal/mode/static/state/resolver/service_resolver_test.go index 51cdd2948..7c4f1ec09 100644 --- a/internal/mode/static/state/resolver/service_resolver_test.go +++ b/internal/mode/static/state/resolver/service_resolver_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/controller/index" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/framework/controller/index" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" ) func createSlice( diff --git a/internal/mode/static/state/statefakes/fake_change_processor.go b/internal/mode/static/state/statefakes/fake_change_processor.go index 7e512a451..b3de756b6 100644 --- a/internal/mode/static/state/statefakes/fake_change_processor.go +++ b/internal/mode/static/state/statefakes/fake_change_processor.go @@ -4,9 +4,9 @@ package statefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" typesa "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/mode/static/state/store.go b/internal/mode/static/state/store.go index 692866f79..58bf28216 100644 --- a/internal/mode/static/state/store.go +++ b/internal/mode/static/state/store.go @@ -8,10 +8,10 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) // Updater updates the cluster state. diff --git a/internal/mode/static/state/validation/validationfakes/fake_generic_validator.go b/internal/mode/static/state/validation/validationfakes/fake_generic_validator.go index faa9ed1bc..44e0da38b 100644 --- a/internal/mode/static/state/validation/validationfakes/fake_generic_validator.go +++ b/internal/mode/static/state/validation/validationfakes/fake_generic_validator.go @@ -4,7 +4,7 @@ package validationfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) type FakeGenericValidator struct { diff --git a/internal/mode/static/state/validation/validationfakes/fake_httpfields_validator.go b/internal/mode/static/state/validation/validationfakes/fake_httpfields_validator.go index 64d9b0934..ffdd4df89 100644 --- a/internal/mode/static/state/validation/validationfakes/fake_httpfields_validator.go +++ b/internal/mode/static/state/validation/validationfakes/fake_httpfields_validator.go @@ -4,7 +4,7 @@ package validationfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) type FakeHTTPFieldsValidator struct { diff --git a/internal/mode/static/state/validation/validationfakes/fake_policy_validator.go b/internal/mode/static/state/validation/validationfakes/fake_policy_validator.go index 9f72257ec..4460ec36e 100644 --- a/internal/mode/static/state/validation/validationfakes/fake_policy_validator.go +++ b/internal/mode/static/state/validation/validationfakes/fake_policy_validator.go @@ -4,9 +4,9 @@ package validationfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/validation" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/validation" ) type FakePolicyValidator struct { diff --git a/internal/mode/static/state/validation/validator.go b/internal/mode/static/state/validation/validator.go index c941ed170..4006fbf4a 100644 --- a/internal/mode/static/state/validation/validator.go +++ b/internal/mode/static/state/validation/validator.go @@ -3,8 +3,8 @@ package validation //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -generate import ( - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) // Validators include validators for API resources from the perspective of a data-plane. diff --git a/internal/mode/static/status/prepare_requests.go b/internal/mode/static/status/prepare_requests.go index e0add956a..818445d8d 100644 --- a/internal/mode/static/status/prepare_requests.go +++ b/internal/mode/static/status/prepare_requests.go @@ -10,13 +10,13 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - frameworkStatus "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + frameworkStatus "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) // NginxReloadResult describes the result of an NGINX reload. diff --git a/internal/mode/static/status/prepare_requests_test.go b/internal/mode/static/status/prepare_requests_test.go index d52b43e7a..702cbe982 100644 --- a/internal/mode/static/status/prepare_requests_test.go +++ b/internal/mode/static/status/prepare_requests_test.go @@ -18,14 +18,14 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - statusFramework "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - ngftypes "github.com/nginxinc/nginx-gateway-fabric/internal/framework/types" - staticConds "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + statusFramework "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types" + staticConds "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) func createK8sClientFor(resourceType ngftypes.ObjectType) client.Client { diff --git a/internal/mode/static/status/status_setters.go b/internal/mode/static/status/status_setters.go index 84f6b6529..afd3923ee 100644 --- a/internal/mode/static/status/status_setters.go +++ b/internal/mode/static/status/status_setters.go @@ -8,10 +8,10 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - frameworkStatus "github.com/nginxinc/nginx-gateway-fabric/internal/framework/status" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + frameworkStatus "github.com/nginx/nginx-gateway-fabric/internal/framework/status" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies" ) func newNginxGatewayStatusSetter(status ngfAPI.NginxGatewayStatus) frameworkStatus.Setter { diff --git a/internal/mode/static/status/status_setters_test.go b/internal/mode/static/status/status_setters_test.go index 836087983..d9eb31632 100644 --- a/internal/mode/static/status/status_setters_test.go +++ b/internal/mode/static/status/status_setters_test.go @@ -9,10 +9,10 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1alpha3" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/helpers" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/helpers" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/nginx/config/policies/policiesfakes" ) func TestNewNginxGatewayStatusSetter(t *testing.T) { diff --git a/internal/mode/static/telemetry/collector.go b/internal/mode/static/telemetry/collector.go index d809ab342..f78185211 100644 --- a/internal/mode/static/telemetry/collector.go +++ b/internal/mode/static/telemetry/collector.go @@ -16,11 +16,11 @@ import ( k8sversion "k8s.io/apimachinery/pkg/util/version" "sigs.k8s.io/controller-runtime/pkg/client" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" ) //counterfeiter:generate . GraphGetter diff --git a/internal/mode/static/telemetry/collector_test.go b/internal/mode/static/telemetry/collector_test.go index 5a7b11b58..7a69dbeb3 100644 --- a/internal/mode/static/telemetry/collector_test.go +++ b/internal/mode/static/telemetry/collector_test.go @@ -17,15 +17,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/events/eventsfakes" - "github.com/nginxinc/nginx-gateway-fabric/internal/framework/kinds" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/config" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/resolver" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry/telemetryfakes" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/framework/events/eventsfakes" + "github.com/nginx/nginx-gateway-fabric/internal/framework/kinds" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/config" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/resolver" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry/telemetryfakes" ) type listCallsFunc = func( diff --git a/internal/mode/static/telemetry/job_worker.go b/internal/mode/static/telemetry/job_worker.go index 76594f742..dedc640bb 100644 --- a/internal/mode/static/telemetry/job_worker.go +++ b/internal/mode/static/telemetry/job_worker.go @@ -23,7 +23,7 @@ func CreateTelemetryJobWorker( // Gather telemetry logger.V(1).Info("Gathering telemetry data") - // We will need to gather data as defined in https://github.com/nginxinc/nginx-gateway-fabric/issues/793 + // We will need to gather data as defined in https://github.com/nginx/nginx-gateway-fabric/issues/793 data, err := dataCollector.Collect(ctx) if err != nil { logger.Error(err, "Failed to collect telemetry data") diff --git a/internal/mode/static/telemetry/job_worker_test.go b/internal/mode/static/telemetry/job_worker_test.go index 1425fc397..c331473cf 100644 --- a/internal/mode/static/telemetry/job_worker_test.go +++ b/internal/mode/static/telemetry/job_worker_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry/telemetryfakes" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry/telemetryfakes" ) func TestCreateTelemetryJobWorker_Succeeds(t *testing.T) { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_configuration_getter.go b/internal/mode/static/telemetry/telemetryfakes/fake_configuration_getter.go index 841fff767..a56fce8f7 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_configuration_getter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_configuration_getter.go @@ -4,8 +4,8 @@ package telemetryfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/dataplane" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/dataplane" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) type FakeConfigurationGetter struct { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_data_collector.go b/internal/mode/static/telemetry/telemetryfakes/fake_data_collector.go index 0bce02c41..6c820a3a6 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_data_collector.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_data_collector.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) type FakeDataCollector struct { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go index 15c100fc6..74207bd30 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" telemetrya "github.com/nginxinc/telemetry-exporter/pkg/telemetry" ) diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_graph_getter.go b/internal/mode/static/telemetry/telemetryfakes/fake_graph_getter.go index 2b7c5b2e1..60b9d6baa 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_graph_getter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_graph_getter.go @@ -4,8 +4,8 @@ package telemetryfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/graph" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/telemetry" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/graph" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" ) type FakeGraphGetter struct { diff --git a/scripts/generate-manifests.sh b/scripts/generate-manifests.sh index d387bf71f..731b35927 100755 --- a/scripts/generate-manifests.sh +++ b/scripts/generate-manifests.sh @@ -32,7 +32,7 @@ done generate_manifests openshift # FIXME(lucacome): Implement a better way to generate the static deployment file -# https://github.com/nginxinc/nginx-gateway-fabric/issues/2326 +# https://github.com/nginx/nginx-gateway-fabric/issues/2326 helm template nginx-gateway charts/nginx-gateway-fabric --set nameOverride=nginx-gateway --set metrics.enable=false --set nginxGateway.productTelemetry.enable=false -n nginx-gateway -s templates/deployment.yaml >config/tests/static-deployment.yaml sed -i.bak '/app.kubernetes.io\/managed-by: Helm/d' config/tests/static-deployment.yaml sed -i.bak '/helm.sh/d' config/tests/static-deployment.yaml diff --git a/site/content/get-started.md b/site/content/get-started.md index c68e4a1ed..07069eb69 100644 --- a/site/content/get-started.md +++ b/site/content/get-started.md @@ -8,7 +8,7 @@ docs: DOCS-000 This is a guide for getting started with NGINX Gateway Fabric. It explains how to: - Set up a [kind (Kubernetes in Docker)](https://kind.sigs.k8s.io/) cluster -- Install [NGINX Gateway Fabric](https://github.com/nginxinc/nginx-gateway-fabric) with [NGINX](https://nginx.org/) +- Install [NGINX Gateway Fabric](https://github.com/nginx/nginx-gateway-fabric) with [NGINX](https://nginx.org/) - Test NGINX Gateway Fabric with an example application By following the steps in order, you will finish with a functional NGINX Gateway Fabric cluster. @@ -71,7 +71,7 @@ Thanks for using kind! 😊 ``` {{< note >}} -If you have cloned [the NGINX Gateway Fabric repository](https://github.com/nginxinc/nginx-gateway-fabric/tree/main), you can also create a kind cluster from the root folder with the following *make* command: +If you have cloned [the NGINX Gateway Fabric repository](https://github.com/nginx/nginx-gateway-fabric/tree/main), you can also create a kind cluster from the root folder with the following *make* command: ```shell make create-kind-cluster @@ -88,7 +88,7 @@ make create-kind-cluster Use `kubectl` to add the API resources for NGINX Gateway Fabric with the following command: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - ``` ```text @@ -103,7 +103,7 @@ customresourcedefinition.apiextensions.k8s.io/referencegrants.gateway.networking To use experimental features, you'll need to install the API resources from the experimental channel instead. ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - ``` {{< /note >}} @@ -199,7 +199,7 @@ If you are making customizations, ensure your `labels:` and `selectors:` also ma In the previous section, you deployed NGINX Gateway Fabric to a local cluster. This section shows you how to deploy a simple web application to test that NGINX Gateway Fabric works. {{< note >}} -The YAML code in the following sections can be found in the [cafe-example folder](https://github.com/nginxinc/nginx-gateway-fabric/tree/main/examples/cafe-example) of the GitHub repository. +The YAML code in the following sections can be found in the [cafe-example folder](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples/cafe-example) of the GitHub repository. {{< /note >}} --- diff --git a/site/content/how-to/monitoring/prometheus.md b/site/content/how-to/monitoring/prometheus.md index aca4c3789..f430db8a7 100644 --- a/site/content/how-to/monitoring/prometheus.md +++ b/site/content/how-to/monitoring/prometheus.md @@ -102,11 +102,11 @@ You can configure monitoring metrics for NGINX Gateway Fabric using Helm or Mani ### Using Helm -If you're setting up NGINX Gateway Fabric with Helm, you can adjust the `metrics.*` parameters to fit your needs. For detailed options and instructions, see the [Helm README](https://github.com/nginxinc/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md). +If you're setting up NGINX Gateway Fabric with Helm, you can adjust the `metrics.*` parameters to fit your needs. For detailed options and instructions, see the [Helm README](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md). ### Using Kubernetes manifests -For setups using Kubernetes manifests, change the metrics configuration by editing the NGINX Gateway Fabric manifest that you want to deploy. You can find some examples in the [deploy](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/deploy) directory. +For setups using Kubernetes manifests, change the metrics configuration by editing the NGINX Gateway Fabric manifest that you want to deploy. You can find some examples in the [deploy](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/deploy) directory. #### Disabling metrics diff --git a/site/content/how-to/traffic-management/routing-traffic-to-your-app.md b/site/content/how-to/traffic-management/routing-traffic-to-your-app.md index 784c8b936..4d285c647 100644 --- a/site/content/how-to/traffic-management/routing-traffic-to-your-app.md +++ b/site/content/how-to/traffic-management/routing-traffic-to-your-app.md @@ -359,7 +359,7 @@ If you have any issues while testing the configuration, try the following to deb {{< note >}}The entire configuration is not shown because it is subject to change. Ellipses indicate that there's configuration not shown.{{< /note >}} -If your issue persists, [contact us](https://github.com/nginxinc/nginx-gateway-fabric#contacts). +If your issue persists, [contact us](https://github.com/nginx/nginx-gateway-fabric#contacts). ## Further reading diff --git a/site/content/how-to/traffic-management/snippets.md b/site/content/how-to/traffic-management/snippets.md index 469682401..fcc1676f3 100644 --- a/site/content/how-to/traffic-management/snippets.md +++ b/site/content/how-to/traffic-management/snippets.md @@ -417,7 +417,7 @@ with the last valid configuration and an event with the error will be outputted. An example of an error from the NGINX Gateway Fabric `nginx-gateway` container logs: ```text -{"level":"error","ts":"2024-10-29T22:19:41Z","logger":"eventLoop.eventHandler","msg":"Failed to update NGINX configuration","batchID":156,"error":"failed to reload NGINX: reload unsuccessful: no new NGINX worker processes started for config version 141. Please check the NGINX container logs for possible configuration issues: context deadline exceeded","stacktrace":"github.com/nginxinc/nginx-gateway-fabric/internal/mode/static.(*eventHandlerImpl).HandleEventBatch\n\tgithub.com/nginxinc/nginx-gateway-fabric/internal/mode/static/handler.go:219\ngithub.com/nginxinc/nginx-gateway-fabric/internal/framework/events.(*EventLoop).Start.func1.1\n\tgithub.com/nginxinc/nginx-gateway-fabric/internal/framework/events/loop.go:74"} +{"level":"error","ts":"2024-10-29T22:19:41Z","logger":"eventLoop.eventHandler","msg":"Failed to update NGINX configuration","batchID":156,"error":"failed to reload NGINX: reload unsuccessful: no new NGINX worker processes started for config version 141. Please check the NGINX container logs for possible configuration issues: context deadline exceeded","stacktrace":"github.com/nginx/nginx-gateway-fabric/internal/mode/static.(*eventHandlerImpl).HandleEventBatch\n\tgithub.com/nginxinc/nginx-gateway-fabric/internal/mode/static/handler.go:219\ngithub.com/nginxinc/nginx-gateway-fabric/internal/framework/events.(*EventLoop).Start.func1.1\n\tgithub.com/nginxinc/nginx-gateway-fabric/internal/framework/events/loop.go:74"} ``` An example of an error from the NGINX Gateway Fabric `nginx` container logs: @@ -464,7 +464,7 @@ Conditions: ``` {{< note >}} If you run into situations where an NGINX directive fails to be applied and the troubleshooting information here isn't sufficient, please create an issue in the -[NGINX Gateway Fabric Github repository](https://github.com/nginxinc/nginx-gateway-fabric). {{< /note >}} +[NGINX Gateway Fabric Github repository](https://github.com/nginx/nginx-gateway-fabric). {{< /note >}} --- diff --git a/site/content/how-to/upgrade-apps-without-downtime.md b/site/content/how-to/upgrade-apps-without-downtime.md index 0feaf8cf5..6c0e9492a 100644 --- a/site/content/how-to/upgrade-apps-without-downtime.md +++ b/site/content/how-to/upgrade-apps-without-downtime.md @@ -56,7 +56,7 @@ For example, an application can be exposed using a routing rule like below: port: 80 ``` -{{< note >}}See the [Cafe example](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/examples/cafe-example) for a basic example.{{< /note >}} +{{< note >}}See the [Cafe example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/cafe-example) for a basic example.{{< /note >}} The upgrade methods in the next sections cover: @@ -121,4 +121,4 @@ By updating the rule you can further increase the share of traffic the new versi weight: 1 ``` -See the [Traffic splitting example](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/examples/traffic-splitting) from our repository. +See the [Traffic splitting example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/traffic-splitting) from our repository. diff --git a/site/content/includes/installation/install-gateway-api-experimental-features.md b/site/content/includes/installation/install-gateway-api-experimental-features.md index 1881e314c..4341e080d 100644 --- a/site/content/includes/installation/install-gateway-api-experimental-features.md +++ b/site/content/includes/installation/install-gateway-api-experimental-features.md @@ -10,7 +10,7 @@ To use Gateway API experimental resources, the Gateway API resources from the ex To install the Gateway API resources from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - ``` {{< note >}}If you plan to use the `edge` version of NGINX Gateway Fabric, you can replace the version in `ref` with `main`, for example `ref=main`. {{}} diff --git a/site/content/includes/installation/install-gateway-api-resources.md b/site/content/includes/installation/install-gateway-api-resources.md index 8b0f85340..cfaaf35ca 100644 --- a/site/content/includes/installation/install-gateway-api-resources.md +++ b/site/content/includes/installation/install-gateway-api-resources.md @@ -2,12 +2,12 @@ docs: "DOCS-1438" --- -{{< note >}} The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure they are the correct version as supported by the NGINX Gateway Fabric - [see the Technical Specifications](https://github.com/nginxinc/nginx-gateway-fabric/blob/v1.5.1/README.md#technical-specifications). {{}} +{{< note >}} The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure they are the correct version as supported by the NGINX Gateway Fabric - [see the Technical Specifications](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/README.md#technical-specifications). {{}} To install the Gateway API resources, run the following: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - ``` {{< note >}}If you plan to use the `edge` version of NGINX Gateway Fabric, you can replace the version in `ref` with `main`, for example `ref=main`.{{}} @@ -18,7 +18,7 @@ NGINX Gateway Fabric currently supports a subset of the additional features prov To install from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - ``` {{< note >}} To learn more about what Gateway API resources NGINX Gateway Fabric currently supports, visit our [Gateway API Compatibility]({{< relref "overview/gateway-api-compatibility.md" >}}) document. {{}} diff --git a/site/content/includes/installation/uninstall-gateway-api-resources.md b/site/content/includes/installation/uninstall-gateway-api-resources.md index 16f91e986..b71549a61 100644 --- a/site/content/includes/installation/uninstall-gateway-api-resources.md +++ b/site/content/includes/installation/uninstall-gateway-api-resources.md @@ -7,11 +7,11 @@ docs: "DOCS-1436" To uninstall the Gateway API resources, run the following: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl delete -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl delete -f - ``` Alternatively, if you installed the Gateway APIs from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl delete -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl delete -f - ``` diff --git a/site/content/installation/building-the-images.md b/site/content/installation/building-the-images.md index 84d550c3a..5170ce773 100644 --- a/site/content/installation/building-the-images.md +++ b/site/content/installation/building-the-images.md @@ -26,7 +26,7 @@ If building the NGINX Plus image, you will also need a valid NGINX Plus license 1. Clone the repo and change into the `nginx-gateway-fabric` directory: ```shell - git clone https://github.com/nginxinc/nginx-gateway-fabric.git --branch v1.5.1 + git clone https://github.com/nginx/nginx-gateway-fabric.git --branch v1.5.1 cd nginx-gateway-fabric ``` diff --git a/site/content/installation/installing-ngf/helm.md b/site/content/installation/installing-ngf/helm.md index 57a7595ba..24abb2cfa 100644 --- a/site/content/installation/installing-ngf/helm.md +++ b/site/content/installation/installing-ngf/helm.md @@ -158,7 +158,7 @@ helm install ngf oci://ghcr.io/nginxinc/charts/nginx-gateway-fabric --create-nam #### Examples -You can find several examples of configuration options of the `values.yaml` file in the [helm examples](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/examples/helm) directory. +You can find several examples of configuration options of the `values.yaml` file in the [helm examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/helm) directory. ### Access NGINX Gateway Fabric @@ -179,13 +179,13 @@ To upgrade your Gateway API resources, take the following steps: - To upgrade the Gateway API resources, run: ```shell - kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - ``` or, if you installed the from the experimental channel: ```shell - kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - ``` ### Upgrade NGINX Gateway Fabric CRDs @@ -327,4 +327,4 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K ## Additional configuration -For a full list of the Helm Chart configuration parameters, read [the NGINX Gateway Fabric Helm Chart](https://github.com/nginxinc/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md#configuration). +For a full list of the Helm Chart configuration parameters, read [the NGINX Gateway Fabric Helm Chart](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md#configuration). diff --git a/site/content/installation/installing-ngf/manifests.md b/site/content/installation/installing-ngf/manifests.md index dad91d552..6b433a3f0 100644 --- a/site/content/installation/installing-ngf/manifests.md +++ b/site/content/installation/installing-ngf/manifests.md @@ -193,13 +193,13 @@ To upgrade NGINX Gateway Fabric and get the latest features and improvements, ta - To upgrade the Gateway API resources, run: ```shell - kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - ``` or, if you installed the from the experimental channel: ```shell - kubectl kustomize "https://github.com/nginxinc/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - ``` 1. **Upgrade NGINX Gateway Fabric CRDs:** diff --git a/site/content/overview/gateway-architecture.md b/site/content/overview/gateway-architecture.md index b31bcd3b7..12f68fb87 100644 --- a/site/content/overview/gateway-architecture.md +++ b/site/content/overview/gateway-architecture.md @@ -11,7 +11,7 @@ The intended audience for this information is primarily the two following groups - _Cluster Operators_ who would like to know how the software works and understand how it can fail. -- _Developers_ who would like to [contribute](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/CONTRIBUTING.md) to the project. +- _Developers_ who would like to [contribute](https://github.com/nginx/nginx-gateway-fabric/blob/main/CONTRIBUTING.md) to the project. The reader needs to be familiar with core Kubernetes concepts, such as pods, deployments, services, and endpoints. For an understanding of how NGINX itself works, you can read the ["Inside NGINX: How We Designed for Performance & Scale"](https://www.nginx.com/blog/inside-nginx-how-we-designed-for-performance-scale/) blog post. @@ -21,7 +21,7 @@ NGINX Gateway Fabric is an open source project that provides an implementation o For a list of supported Gateway API resources and features, see the [Gateway API Compatibility]({{< relref "/overview/gateway-api-compatibility.md" >}}) documentation. -We have more information regarding our [design principles](https://github.com/nginxinc/nginx-gateway-fabric/blob/v1.5.1/docs/developer/design-principles.md) in the project's GitHub repository. +We have more information regarding our [design principles](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/docs/developer/design-principles.md) in the project's GitHub repository. ## NGINX Gateway Fabric at a high level @@ -72,7 +72,7 @@ The following list describes the connections, preceeded by their types in parent 1. (HTTPS) - Read: _NGF_ reads the _Kubernetes API_ to get the latest versions of the resources in the cluster. - - Write: _NGF_ writes to the _Kubernetes API_ to update the handled resources' statuses and emit events. If there's more than one replica of _NGF_ and [leader election](https://github.com/nginxinc/nginx-gateway-fabric/tree/v1.5.1/charts/nginx-gateway-fabric#configuration) is enabled, only the _NGF_ pod that is leading will write statuses to the _Kubernetes API_. + - Write: _NGF_ writes to the _Kubernetes API_ to update the handled resources' statuses and emit events. If there's more than one replica of _NGF_ and [leader election](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/charts/nginx-gateway-fabric#configuration) is enabled, only the _NGF_ pod that is leading will write statuses to the _Kubernetes API_. 1. (HTTP, HTTPS) _Prometheus_ fetches the `controller-runtime` and NGINX metrics via an HTTP endpoint that _NGF_ exposes (`:9113/metrics` by default). Prometheus is **not** required by NGINX Gateway Fabric, and its endpoint can be turned off. 1. (File I/O) - Write: _NGF_ generates NGINX _configuration_ based on the cluster resources and writes them as `.conf` files to the mounted `nginx-conf` volume, located at `/etc/nginx/conf.d`. It also writes _TLS certificates_ and _keys_ from [TLS secrets](https://kubernetes.io/docs/concepts/configuration/secret/#tls-secrets) referenced in the accepted Gateway resource to the `nginx-secrets` volume at the path `/etc/nginx/secrets`. @@ -86,7 +86,7 @@ The following list describes the connections, preceeded by their types in parent 1. (File I/O) - Write: The _NGINX master_ writes to the auxiliary Unix sockets folder, which is located in the `/var/run/nginx` directory. - - Read: The _NGINX master_ reads the `nginx.conf` file from the `/etc/nginx` directory. This [file](https://github.com/nginxinc/nginx-gateway-fabric/blob/v1.5.1/internal/mode/static/nginx/conf/nginx.conf) contains the global and http configuration settings for NGINX. In addition, _NGINX master_ reads the NJS modules referenced in the configuration when it starts or during a reload. NJS modules are stored in the `/usr/lib/nginx/modules` directory. + - Read: The _NGINX master_ reads the `nginx.conf` file from the `/etc/nginx` directory. This [file](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/internal/mode/static/nginx/conf/nginx.conf) contains the global and http configuration settings for NGINX. In addition, _NGINX master_ reads the NJS modules referenced in the configuration when it starts or during a reload. NJS modules are stored in the `/usr/lib/nginx/modules` directory. 1. (File I/O) The _NGINX master_ sends logs to its _stdout_ and _stderr_, which are collected by the container runtime. 1. (File I/O) An _NGINX worker_ writes logs to its _stdout_ and _stderr_, which are collected by the container runtime. 1. (Signal) The _NGINX master_ controls the [lifecycle of _NGINX workers_](https://nginx.org/en/docs/control.html#reconfiguration) it creates workers with the new configuration and shutdowns workers with the old configuration. diff --git a/site/content/overview/product-telemetry.md b/site/content/overview/product-telemetry.md index 701774547..eb69961c9 100644 --- a/site/content/overview/product-telemetry.md +++ b/site/content/overview/product-telemetry.md @@ -37,7 +37,7 @@ This data is used to identify the following information: - The scale of Gateway API resources. - The used features of NGINX Gateway Fabric. -Our goal is to publicly discuss data trends to drive roadmap discussions in our [Community Meeting](https://github.com/nginxinc/nginx-gateway-fabric/discussions/1472). +Our goal is to publicly discuss data trends to drive roadmap discussions in our [Community Meeting](https://github.com/nginx/nginx-gateway-fabric/discussions/1472). ## Opt out diff --git a/site/content/reference/technical-specifications.md b/site/content/reference/technical-specifications.md index bb403c028..97bb523ba 100644 --- a/site/content/reference/technical-specifications.md +++ b/site/content/reference/technical-specifications.md @@ -10,4 +10,4 @@ docs: "DOCS-1434" See the NGINX Gateway Fabric technical specifications page: - + diff --git a/site/content/releases.md b/site/content/releases.md index ebf167418..fb2991857 100644 --- a/site/content/releases.md +++ b/site/content/releases.md @@ -8,4 +8,4 @@ docs: "DOCS-1359" See the NGINX Gateway Fabric changelog page: - + diff --git a/site/content/support.md b/site/content/support.md index 061929b2c..c62d4f723 100644 --- a/site/content/support.md +++ b/site/content/support.md @@ -29,9 +29,9 @@ Visit the [project’s GitHub repository](https://github.com/nginxinc/nginx-supp **Support Channels:** -- If you experience issues with NGINX Gateway Fabric, please [open an issue](https://github.com/nginxinc/nginx-gateway-fabric/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=) in GitHub. +- If you experience issues with NGINX Gateway Fabric, please [open an issue](https://github.com/nginx/nginx-gateway-fabric/issues/new?assignees=&labels=&projects=&template=bug_report.md&title=) in GitHub. -- If you have any suggestions or enhancement requests, please [open an idea](https://github.com/nginxinc/nginx-gateway-fabric/discussions/categories/ideas) on GitHub discussions. +- If you have any suggestions or enhancement requests, please [open an idea](https://github.com/nginx/nginx-gateway-fabric/discussions/categories/ideas) on GitHub discussions. - You can contact us directly, by sending an email to [kubernetes@nginx.com](mailto:kubernetes@nginx.com) or on the [NGINX Community Slack](https://nginxcommunity.slack.com/channels/nginx-gateway-fabric), in the #nginx-gateway-fabric channel. diff --git a/site/go.mod b/site/go.mod index da518ca16..942de55c3 100644 --- a/site/go.mod +++ b/site/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/nginx-gateway-fabric/site +module github.com/nginx/nginx-gateway-fabric/site go 1.21.0 diff --git a/tests/conformance/Dockerfile b/tests/conformance/Dockerfile index 311644805..caeb2f7f5 100644 --- a/tests/conformance/Dockerfile +++ b/tests/conformance/Dockerfile @@ -1,11 +1,11 @@ # syntax=docker/dockerfile:1.12 FROM golang:1.23 -WORKDIR /go/src/github.com/nginxinc/nginx-gateway-fabric/tests/conformance +WORKDIR /go/src/github.com/nginx/nginx-gateway-fabric/tests/conformance -COPY ../. /go/src/github.com/nginxinc/nginx-gateway-fabric/ -COPY --link go.mod /go/src/github.com/nginxinc/nginx-gateway-fabric/tests/ -COPY --link go.sum /go/src/github.com/nginxinc/nginx-gateway-fabric/tests/ +COPY ../. /go/src/github.com/nginx/nginx-gateway-fabric/ +COPY --link go.mod /go/src/github.com/nginx/nginx-gateway-fabric/tests/ +COPY --link go.sum /go/src/github.com/nginx/nginx-gateway-fabric/tests/ RUN go mod download -COPY --link conformance /go/src/github.com/nginxinc/nginx-gateway-fabric/tests/conformance +COPY --link conformance /go/src/github.com/nginx/nginx-gateway-fabric/tests/conformance diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go index bb4cd72a4..b06a5ca31 100644 --- a/tests/conformance/conformance_test.go +++ b/tests/conformance/conformance_test.go @@ -45,10 +45,10 @@ func TestConformance(t *testing.T) { opts.Implementation = conf_v1.Implementation{ Organization: "nginxinc", Project: "nginx-gateway-fabric", - URL: "https://github.com/nginxinc/nginx-gateway-fabric", + URL: "https://github.com/nginx/nginx-gateway-fabric", Version: *flags.ImplementationVersion, Contact: []string{ - "https://github.com/nginxinc/nginx-gateway-fabric/discussions/new/choose", + "https://github.com/nginx/nginx-gateway-fabric/discussions/new/choose", }, } diff --git a/tests/conformance/provisioner/README.md b/tests/conformance/provisioner/README.md index 44f73b526..c9f5bc36a 100644 --- a/tests/conformance/provisioner/README.md +++ b/tests/conformance/provisioner/README.md @@ -16,10 +16,10 @@ Global Flags: ``` > Note: Provisioner is not ready for production yet (see this issue for more details -https://github.com/nginxinc/nginx-gateway-fabric/issues/634). However, it can be used in the Gateway API conformance +https://github.com/nginx/nginx-gateway-fabric/issues/634). However, it can be used in the Gateway API conformance tests, which expect a Gateway API implementation to provision an independent data plane per Gateway. > -> Note: Provisioner uses [this manifest](https://github.com/nginxinc/nginx-gateway-fabric/blob/main/config/tests/static-deployment.yaml) +> Note: Provisioner uses [this manifest](https://github.com/nginx/nginx-gateway-fabric/blob/main/config/tests/static-deployment.yaml) to create an NGF static mode Deployment. > This manifest gets included into the NGF binary during the NGF build. To customize the Deployment, modify the manifest and **re-build** NGF. diff --git a/tests/conformance/provisioner/provisioner.yaml b/tests/conformance/provisioner/provisioner.yaml index 5862ee37e..07ebae4a4 100644 --- a/tests/conformance/provisioner/provisioner.yaml +++ b/tests/conformance/provisioner/provisioner.yaml @@ -68,7 +68,7 @@ spec: spec: serviceAccountName: nginx-gateway-provisioner containers: - - image: ghcr.io/nginxinc/nginx-gateway-fabric:edge + - image: ghcr.io/nginx/nginx-gateway-fabric:edge imagePullPolicy: Always name: nginx-gateway-provisioner securityContext: diff --git a/tests/framework/crossplane/go.mod b/tests/framework/crossplane/go.mod index 20e65f1eb..781f0db44 100644 --- a/tests/framework/crossplane/go.mod +++ b/tests/framework/crossplane/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/nginx-gateway-fabric/tests/framework/crossplane +module github.com/nginx/nginx-gateway-fabric/tests/framework/crossplane go 1.23.1 diff --git a/tests/go.mod b/tests/go.mod index 720f91c87..7dbd16005 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,11 +1,11 @@ -module github.com/nginxinc/nginx-gateway-fabric/tests +module github.com/nginx/nginx-gateway-fabric/tests go 1.23.0 -replace github.com/nginxinc/nginx-gateway-fabric => ../ +replace github.com/nginx/nginx-gateway-fabric => ../ require ( - github.com/nginxinc/nginx-gateway-fabric v0.0.0 + github.com/nginx/nginx-gateway-fabric v0.0.0 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.20.5 diff --git a/tests/suite/client_settings_test.go b/tests/suite/client_settings_test.go index f7ab05c88..e7fd5ee1d 100644 --- a/tests/suite/client_settings_test.go +++ b/tests/suite/client_settings_test.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("ClientSettingsPolicy", Ordered, Label("functional", "cspolicy"), func() { diff --git a/tests/suite/dataplane_perf_test.go b/tests/suite/dataplane_perf_test.go index 703dbc3a2..5604b0188 100644 --- a/tests/suite/dataplane_perf_test.go +++ b/tests/suite/dataplane_perf_test.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"), func() { diff --git a/tests/suite/graceful_recovery_test.go b/tests/suite/graceful_recovery_test.go index c952ad4cc..07184fc3c 100644 --- a/tests/suite/graceful_recovery_test.go +++ b/tests/suite/graceful_recovery_test.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) const ( @@ -397,7 +397,7 @@ func getUnexpectedNginxErrorLogs(ngfPodName string) string { "could not be resolved (host not found) during usage report", "server returned 429", // FIXME(salonichf5) remove this error message check - // when https://github.com/nginxinc/nginx-gateway-fabric/issues/2090 is completed. + // when https://github.com/nginx/nginx-gateway-fabric/issues/2090 is completed. "no live upstreams while connecting to upstream", } diff --git a/tests/suite/longevity_test.go b/tests/suite/longevity_test.go index 4054ddb99..c768c71cb 100644 --- a/tests/suite/longevity_test.go +++ b/tests/suite/longevity_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) // Longevity test is an NFR test, but does not include the "nfr" label. It needs to run on its own, diff --git a/tests/suite/nginxgateway_test.go b/tests/suite/nginxgateway_test.go index 5e99b3774..1129310fa 100644 --- a/tests/suite/nginxgateway_test.go +++ b/tests/suite/nginxgateway_test.go @@ -12,8 +12,8 @@ import ( core "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("NginxGateway", Ordered, Label("functional", "nginxGateway"), func() { diff --git a/tests/suite/reconfig_test.go b/tests/suite/reconfig_test.go index 3f1d67785..7503aef76 100644 --- a/tests/suite/reconfig_test.go +++ b/tests/suite/reconfig_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) // Cluster node size must be greater than or equal to 4 for test to perform correctly. @@ -208,7 +208,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r cleanupResources := func() error { var err error - // FIXME (bjee19): https://github.com/nginxinc/nginx-gateway-fabric/issues/2376 + // FIXME (bjee19): https://github.com/nginx/nginx-gateway-fabric/issues/2376 // Find a way to bulk delete these namespaces. for i := 1; i <= maxResourceCount; i++ { nsName := "namespace" + strconv.Itoa(i) @@ -431,7 +431,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r }) Expect(err).ToNot(HaveOccurred()) - // FIXME (bjee19): https://github.com/nginxinc/nginx-gateway-fabric/issues/2374 + // FIXME (bjee19): https://github.com/nginx/nginx-gateway-fabric/issues/2374 // Find a way to calculate time to ready metrics without having to rely on specific log lines. timeToReadyTotal, err := calculateTimeToReadyTotal(logs, timeToReadyStartingLogSubstring) Expect(err).ToNot(HaveOccurred()) diff --git a/tests/suite/sample_test.go b/tests/suite/sample_test.go index 62d482edb..03299d109 100644 --- a/tests/suite/sample_test.go +++ b/tests/suite/sample_test.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("Basic test example", Label("functional"), func() { diff --git a/tests/suite/scale_test.go b/tests/suite/scale_test.go index 27919a7e4..4dadb97d6 100644 --- a/tests/suite/scale_test.go +++ b/tests/suite/scale_test.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() { diff --git a/tests/suite/snippets_filter_test.go b/tests/suite/snippets_filter_test.go index e92e44d0a..1edf2b2fe 100644 --- a/tests/suite/snippets_filter_test.go +++ b/tests/suite/snippets_filter_test.go @@ -14,9 +14,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter"), func() { diff --git a/tests/suite/system_suite_test.go b/tests/suite/system_suite_test.go index cb8640abf..1f759d0db 100644 --- a/tests/suite/system_suite_test.go +++ b/tests/suite/system_suite_test.go @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" v1 "sigs.k8s.io/gateway-api/apis/v1" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) func TestNGF(t *testing.T) { diff --git a/tests/suite/telemetry_test.go b/tests/suite/telemetry_test.go index 011b3d312..ba15f130f 100644 --- a/tests/suite/telemetry_test.go +++ b/tests/suite/telemetry_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" core "k8s.io/api/core/v1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("Telemetry test with OTel collector", Label("telemetry"), func() { diff --git a/tests/suite/tracing_test.go b/tests/suite/tracing_test.go index 354c1137d..46ec5bfc1 100644 --- a/tests/suite/tracing_test.go +++ b/tests/suite/tracing_test.go @@ -17,9 +17,9 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/internal/mode/static/state/conditions" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/internal/mode/static/state/conditions" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) // This test can be flaky when waiting to see traces show up in the collector logs. diff --git a/tests/suite/upgrade_test.go b/tests/suite/upgrade_test.go index 07ba45671..d6f773d45 100644 --- a/tests/suite/upgrade_test.go +++ b/tests/suite/upgrade_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) // This test installs the latest released version of NGF, then upgrades to the edge version (or dev version). diff --git a/tests/suite/upstream_settings_test.go b/tests/suite/upstream_settings_test.go index fcc4e6ef4..23fceb768 100644 --- a/tests/suite/upstream_settings_test.go +++ b/tests/suite/upstream_settings_test.go @@ -16,8 +16,8 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" - ngfAPI "github.com/nginxinc/nginx-gateway-fabric/apis/v1alpha1" - "github.com/nginxinc/nginx-gateway-fabric/tests/framework" + ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1" + "github.com/nginx/nginx-gateway-fabric/tests/framework" ) var _ = Describe("UpstreamSettingsPolicy", Ordered, Label("functional", "uspolicy"), func() {