diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eaba4825d5..4821110ff5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,7 +4,7 @@ Describe the use case and detail of the change. If this PR addresses an issue on ### Checklist Before creating a PR, run through this checklist and mark each as complete. -- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-gateway-kubernetes/blob/main/CONTRIBUTING.md) doc +- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-kubernetes-gateway/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/ci.yml b/.github/workflows/ci.yml index a5152269fc..df795b491b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ github.workspace }}/build/.out/gateway - key: nginx-gateway-kubernetes-${{ github.run_id }}-${{ github.run_number }} + key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }} build: name: Build Image @@ -114,7 +114,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ github.workspace }}/build/.out/gateway - key: nginx-gateway-kubernetes-${{ github.run_id }}-${{ github.run_number }} + key: nginx-kubernetes-gateway-${{ github.run_id }}-${{ github.run_number }} - name: Docker Buildx uses: docker/setup-buildx-action@v1 - name: Build Image Debian @@ -126,7 +126,7 @@ jobs: load: true cache-from: type=gha cache-to: type=gha,mode=max - tags: nginx/nginx-gateway-kubernetes:${{ needs.vars.outputs.sha }} + tags: nginx/nginx-kubernetes-gateway:${{ needs.vars.outputs.sha }} build-args: | VERSION=${{ needs.vars.outputs.version }} GIT_COMMIT=${{ needs.vars.outputs.sha }} @@ -135,20 +135,20 @@ jobs: uses: aquasecurity/trivy-action@0.2.2 continue-on-error: true with: - image-ref: nginx/nginx-gateway-kubernetes:${{ needs.vars.outputs.sha }} + image-ref: nginx/nginx-kubernetes-gateway:${{ needs.vars.outputs.sha }} format: 'template' template: '@/contrib/sarif.tpl' - output: 'trivy-results-nginx-gateway-kubernetes.sarif' + output: 'trivy-results-nginx-kubernetes-gateway.sarif' ignore-unfixed: 'true' - name: Upload Trivy scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v1 continue-on-error: true with: - sarif_file: 'trivy-results-nginx-gateway-kubernetes.sarif' + sarif_file: 'trivy-results-nginx-kubernetes-gateway.sarif' - name: Upload Scan Results uses: actions/upload-artifact@v2 continue-on-error: true with: - name: 'trivy-results-nginx-gateway-kubernetes.sarif' - path: 'trivy-results-nginx-gateway-kubernetes.sarif' + name: 'trivy-results-nginx-kubernetes-gateway.sarif' + path: 'trivy-results-nginx-kubernetes-gateway.sarif' if: always() diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f2c5719d9..dc3dc5b1ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ The following is a set of guidelines for contributing to NGINX Kubernetes Gatewa * [Git Style Guide](#git-style-guide) * [Go Style Guide](#go-style-guide) -[Code of Conduct](https://github.com/nginxinc/nginx-gateway-kubernetes/blob/master/CODE_OF_CONDUCT.md) +[Code of Conduct](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/master/CODE_OF_CONDUCT.md) [Contributor License Agreement](#contributor-license-agreement) @@ -50,7 +50,7 @@ To suggest an enhancement, please create an issue on GitHub with the label `enha ### Open a Pull Request * Fork the repo, create a branch, submit a PR when your changes are tested and ready for review -* Fill in [our pull request template](https://github.com/nginxinc/nginx-gateway-kubernetes/blob/main/.github/PULL_REQUEST_TEMPLATE.md) +* Fill in [our pull request template](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/.github/PULL_REQUEST_TEMPLATE.md) Note: if you’d like to implement a new feature, please consider creating a feature request issue first to start a discussion about the feature. diff --git a/Makefile b/Makefile index 3ec39d3821..cfe81e00d7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = 0.0.1 TAG = $(VERSION) -PREFIX ?= nginx-gateway +PREFIX ?= nginx-kubernetes-gateway GIT_COMMIT = $(shell git rev-parse HEAD) DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") @@ -19,7 +19,7 @@ container: build .PHONY: build build: ifeq (${TARGET},local) - CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o $(OUT_DIR)/gateway github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway + CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o $(OUT_DIR)/gateway github.com/nginxinc/nginx-kubernetes-gateway/cmd/gateway endif .PHONY: generate @@ -71,7 +71,7 @@ vet: ## Run go vet against code. .PHONY: lint lint: ## Run golangci-lint against code. - docker run --pull always --rm -v $(shell pwd):/nginx-gateway-kubernetes -w /nginx-gateway-kubernetes -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run + docker run --pull always --rm -v $(shell pwd):/nginx-kubernetes-gateway -w /nginx-kubernetes-gateway -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run .PHONY: unit-test unit-test: diff --git a/README.md b/README.md index 1326ba3f26..0145f694d5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-kubernetes.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-kubernetes?ref=badge_shield) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-kubernetes-gateway.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-kubernetes-gateway?ref=badge_shield) # NGINX Kubernetes Gateway @@ -21,29 +21,29 @@ Before you can build and run the NGINX Kubernetes Gateway, make sure you have th ## Build the image -1. Clone the repo and change into the `nginx-gateway-kubernetes` directory: +1. Clone the repo and change into the `nginx-kubernetes-gateway` directory: ``` - git clone https://github.com/nginxinc/nginx-gateway-kubernetes.git - cd nginx-gateway-kubernetes + git clone https://github.com/nginxinc/nginx-kubernetes-gateway.git + cd nginx-kubernetes-gateway ``` 1. Build the image: ``` - make PREFIX=myregistry.example.com/nginx-gateway container + make PREFIX=myregistry.example.com/nginx-kubernetes-gateway container ``` - Set the `PREFIX` variable to the name of the registry you'd like to push the image to. By default, the image will be named `nginx-gateway:0.0.1`. + Set the `PREFIX` variable to the name of the registry you'd like to push the image to. By default, the image will be named `nginx-kubernetes-gateway:0.0.1`. 1. Push the image to your container registry: ``` - docker push myregistry.example.com/nginx-gateway:0.0.1 + docker push myregistry.example.com/nginx-kubernetes-gateway:0.0.1 ``` - Make sure to substitute `myregistry.example.com/nginx-gateway` with your private registry. + Make sure to substitute `myregistry.example.com/nginx-kubernetes-gateway` with your private registry. ## Deploy NGINX Kubernetes Gateway @@ -52,7 +52,7 @@ You can deploy NGINX Kubernetes Gateway on an existing Kubernetes 1.16+ cluster. 1. Load the NGINX Kubernetes Gateway image onto your kind cluster: ``` - kind load docker-image nginx-gateway:0.0.1 + kind load docker-image nginx-kubernetes-gateway:0.0.1 ``` Make sure to substitute the image name with the name of the image you built. diff --git a/build/Dockerfile b/build/Dockerfile index 7b7e52170f..30ea400de9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,14 +3,14 @@ ARG VERSION ARG GIT_COMMIT ARG DATE -WORKDIR /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway +WORKDIR /go/src/github.com/nginxinc/nginx-kubernetes-gateway/cmd/gateway -COPY go.mod go.sum /go/src/github.com/nginxinc/nginx-gateway-kubernetes +COPY go.mod go.sum /go/src/github.com/nginxinc/nginx-kubernetes-gateway RUN go mod download -COPY cmd /go/src/github.com/nginxinc/nginx-gateway-kubernetes/cmd -COPY internal /go/src/github.com/nginxinc/nginx-gateway-kubernetes/internal -COPY pkg /go/src/github.com/nginxinc/nginx-gateway-kubernetes/pkg +COPY cmd /go/src/github.com/nginxinc/nginx-kubernetes-gateway/cmd +COPY internal /go/src/github.com/nginxinc/nginx-kubernetes-gateway/internal +COPY pkg /go/src/github.com/nginxinc/nginx-kubernetes-gateway/pkg RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o gateway . FROM alpine:3.15 as capabilizer @@ -21,7 +21,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-kubernetes/cmd/gateway/gateway /usr/bin/ +COPY --from=builder /go/src/github.com/nginxinc/nginx-kubernetes-gateway/cmd/gateway/gateway /usr/bin/ RUN setcap 'cap_kill=+ep' /usr/bin/gateway FROM scratch as common @@ -32,4 +32,4 @@ FROM common as container COPY --from=container-capabilizer /usr/bin/gateway /usr/bin/ FROM common as local -COPY --from=local-capabilizer /usr/bin/gateway /usr/bin/ \ No newline at end of file +COPY --from=local-capabilizer /usr/bin/gateway /usr/bin/ diff --git a/cmd/gateway/main.go b/cmd/gateway/main.go index 0e03dabf72..42386fe6fb 100644 --- a/cmd/gateway/main.go +++ b/cmd/gateway/main.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/manager" - flag "github.com/spf13/pflag" "sigs.k8s.io/controller-runtime/pkg/log/zap" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/manager" ) const ( @@ -43,7 +43,7 @@ func main() { GatewayControllerParam(domain, "nginx-gateway" /* TODO dynamically set */), ) - logger.Info("Starting NGINX Gateway", + logger.Info("Starting NGINX Kubernetes Gateway", "version", version, "commit", commit, "date", date) diff --git a/cmd/gateway/setup_test.go b/cmd/gateway/setup_test.go index 558075edb9..a2cc67de90 100644 --- a/cmd/gateway/setup_test.go +++ b/cmd/gateway/setup_test.go @@ -3,7 +3,7 @@ package main_test import ( "errors" - . "github.com/nginxinc/nginx-gateway-kubernetes/cmd/gateway" + . "github.com/nginxinc/nginx-kubernetes-gateway/cmd/gateway" flag "github.com/spf13/pflag" . "github.com/onsi/ginkgo" diff --git a/design/gateway-evaluation.md b/design/archive/gateway-evaluation.md similarity index 99% rename from design/gateway-evaluation.md rename to design/archive/gateway-evaluation.md index 84dc3aac9a..40561eac5a 100644 --- a/design/gateway-evaluation.md +++ b/design/archive/gateway-evaluation.md @@ -1,4 +1,5 @@ # Gateway Evaluation +STATUS: Archived This document captures the design of the initial experimental work to implement the [Gateway API](https://gateway-api.sigs.k8s.io/) using the NGINX data plane. Throughout this document we will refer to this work as "Gateway evaluation". diff --git a/examples/cafe-example/README.md b/examples/cafe-example/README.md index a65268641c..66dd360cb5 100644 --- a/examples/cafe-example/README.md +++ b/examples/cafe-example/README.md @@ -1,20 +1,20 @@ # Example -In this example we deploy NGINX Gateway, a simple web application, and then configure NGINX Gateway to route traffic to that application using `HTTPRoute` resources. +In this example we deploy NGINX Kubernetes Gateway, a simple web application, and then configure NGINX Gateway to route traffic to that application using `HTTPRoute` resources. ## Running the Example -## 1. Deploy NGINX Gateway +## 1. Deploy NGINX Kubernetes Gateway -1. Follow the [installation instructions](https://github.com/nginxinc/nginx-gateway-kubernetes/blob/main/README.md#run-nginx-gateway) to deploy NGINX Gateway. +1. Follow the [installation instructions](https://github.com/nginxinc/nginx-kubernetes-gateway/blob/main/README.md#run-nginx-gateway) to deploy NGINX Gateway. -1. Save the public IP address of NGINX Gateway into a shell variable: +1. Save the public IP address of NGINX Kubernetes Gateway into a shell variable: ``` GW_IP=XXX.YYY.ZZZ.III ``` -1. Save the port of NGINX Gateway: +1. Save the port of NGINX Kubernetes Gateway: ``` GW_PORT= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 741a9a10a4..265a0d4b7f 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -32,8 +32,8 @@ fi # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # instead of the $GOPATH directly. For normal projects this can be dropped. bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/nginxinc/nginx-gateway-kubernetes/pkg/client \ - github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis \ + github.com/nginxinc/nginx-kubernetes-gateway/pkg/client \ + github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis \ gateway:v1alpha1 \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt diff --git a/internal/events/loop.go b/internal/events/loop.go index 0ef6c7de63..146fdbee08 100644 --- a/internal/events/loop.go +++ b/internal/events/loop.go @@ -5,13 +5,14 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/file" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/runtime" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/status" apiv1 "k8s.io/api/core/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/file" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/runtime" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/status" ) // EventLoop is the main event loop of the Gateway. diff --git a/internal/events/loop_test.go b/internal/events/loop_test.go index f272c406f1..f2f7545960 100644 --- a/internal/events/loop_test.go +++ b/internal/events/loop_test.go @@ -3,14 +3,6 @@ package events_test import ( "context" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/events" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/config/configfakes" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/file/filefakes" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/runtime/runtimefakes" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state/statefakes" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/status/statusfakes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" apiv1 "k8s.io/api/core/v1" @@ -20,6 +12,15 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/events" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/config/configfakes" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/file/filefakes" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/runtime/runtimefakes" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state/statefakes" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/status/statusfakes" ) type unsupportedResource struct { diff --git a/internal/implementations/gateway/gateway.go b/internal/implementations/gateway/gateway.go index 0840fe11ae..9946e5e070 100644 --- a/internal/implementations/gateway/gateway.go +++ b/internal/implementations/gateway/gateway.go @@ -2,10 +2,10 @@ package implementation import ( "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" - "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) type gatewayImplementation struct { diff --git a/internal/implementations/gatewayclass/gatewayclass.go b/internal/implementations/gatewayclass/gatewayclass.go index ac5e010c5d..e8ec954ef4 100644 --- a/internal/implementations/gatewayclass/gatewayclass.go +++ b/internal/implementations/gatewayclass/gatewayclass.go @@ -1,11 +1,11 @@ package implementation import ( - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" - "github.com/go-logr/logr" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) type gatewayClassImplementation struct { diff --git a/internal/implementations/gatewayconfig/gatewayconfig.go b/internal/implementations/gatewayconfig/gatewayconfig.go index 3f614033af..f5d746a6e8 100644 --- a/internal/implementations/gatewayconfig/gatewayconfig.go +++ b/internal/implementations/gatewayconfig/gatewayconfig.go @@ -2,10 +2,10 @@ package gatewayconfig import ( "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + nginxgwv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) type gatewayConfigImplementation struct { diff --git a/internal/implementations/httproute/httproute.go b/internal/implementations/httproute/httproute.go index df6a02d2ab..27d10a7699 100644 --- a/internal/implementations/httproute/httproute.go +++ b/internal/implementations/httproute/httproute.go @@ -2,12 +2,12 @@ package implementation import ( "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/events" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/events" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) type httpRouteImplementation struct { diff --git a/internal/implementations/service/service.go b/internal/implementations/service/service.go index 0bac6140c5..d5b746a2bd 100644 --- a/internal/implementations/service/service.go +++ b/internal/implementations/service/service.go @@ -2,11 +2,12 @@ package service import ( "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/events" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" apiv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/events" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) type serviceImplementation struct { diff --git a/internal/manager/manager.go b/internal/manager/manager.go index 70c67ce30b..6b07501d79 100644 --- a/internal/manager/manager.go +++ b/internal/manager/manager.go @@ -4,26 +4,26 @@ import ( "fmt" "time" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/events" - gw "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gateway" - gc "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayclass" - gcfg "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/gatewayconfig" - hr "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/httproute" - svc "github.com/nginxinc/nginx-gateway-kubernetes/internal/implementations/service" - ngxcfg "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/file" - ngxruntime "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/runtime" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/status" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/sdk" apiv1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" ctlr "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/events" + gw "github.com/nginxinc/nginx-kubernetes-gateway/internal/implementations/gateway" + gc "github.com/nginxinc/nginx-kubernetes-gateway/internal/implementations/gatewayclass" + gcfg "github.com/nginxinc/nginx-kubernetes-gateway/internal/implementations/gatewayconfig" + hr "github.com/nginxinc/nginx-kubernetes-gateway/internal/implementations/httproute" + svc "github.com/nginxinc/nginx-kubernetes-gateway/internal/implementations/service" + ngxcfg "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/file" + ngxruntime "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/runtime" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/status" + nginxgwv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/sdk" ) // clusterTimeout is a timeout for connections to the Kubernetes API diff --git a/internal/nginx/config/configfakes/fake_generator.go b/internal/nginx/config/configfakes/fake_generator.go index ff7a05b688..c02af23d70 100644 --- a/internal/nginx/config/configfakes/fake_generator.go +++ b/internal/nginx/config/configfakes/fake_generator.go @@ -4,8 +4,8 @@ package configfakes import ( "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/config" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/config" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" ) type FakeGenerator struct { diff --git a/internal/nginx/config/generator.go b/internal/nginx/config/generator.go index c103a2ea34..4e3aab099d 100644 --- a/internal/nginx/config/generator.go +++ b/internal/nginx/config/generator.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" ) // nginx502Server is used as a backend for services that cannot be resolved (have no IP address). diff --git a/internal/nginx/config/generator_test.go b/internal/nginx/config/generator_test.go index ca959660fc..3ac2c89d7a 100644 --- a/internal/nginx/config/generator_test.go +++ b/internal/nginx/config/generator_test.go @@ -5,12 +5,13 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/helpers" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state/statefakes" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/helpers" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state/statefakes" ) func TestGenerateForHost(t *testing.T) { diff --git a/internal/nginx/file/filefakes/fake_manager.go b/internal/nginx/file/filefakes/fake_manager.go index d33e31188f..c65078d846 100644 --- a/internal/nginx/file/filefakes/fake_manager.go +++ b/internal/nginx/file/filefakes/fake_manager.go @@ -4,7 +4,7 @@ package filefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/file" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/file" ) type FakeManager struct { diff --git a/internal/nginx/runtime/runtimefakes/fake_manager.go b/internal/nginx/runtime/runtimefakes/fake_manager.go index 8afa4f2517..73593d09aa 100644 --- a/internal/nginx/runtime/runtimefakes/fake_manager.go +++ b/internal/nginx/runtime/runtimefakes/fake_manager.go @@ -5,7 +5,7 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/nginx/runtime" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/nginx/runtime" ) type FakeManager struct { diff --git a/internal/state/configuration_test.go b/internal/state/configuration_test.go index 0c58240cdc..7c43e2a70e 100644 --- a/internal/state/configuration_test.go +++ b/internal/state/configuration_test.go @@ -3,14 +3,14 @@ package state_test import ( "time" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/helpers" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1alpha2" - . "github.com/onsi/gomega" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/helpers" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" ) const gatewayCtlrName = v1alpha2.GatewayController("test-name") diff --git a/internal/state/statefakes/fake_configuration.go b/internal/state/statefakes/fake_configuration.go index 98930bf053..0019e0f0d0 100644 --- a/internal/state/statefakes/fake_configuration.go +++ b/internal/state/statefakes/fake_configuration.go @@ -4,7 +4,7 @@ package statefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1alpha2" ) diff --git a/internal/state/statefakes/fake_service_store.go b/internal/state/statefakes/fake_service_store.go index 9042fbfcd6..2194f8a47b 100644 --- a/internal/state/statefakes/fake_service_store.go +++ b/internal/state/statefakes/fake_service_store.go @@ -4,7 +4,7 @@ package statefakes import ( "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/internal/status/statusfakes/fake_updater.go b/internal/status/statusfakes/fake_updater.go index 71781c7f27..f9d916ee43 100644 --- a/internal/status/statusfakes/fake_updater.go +++ b/internal/status/statusfakes/fake_updater.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/status" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/status" ) type FakeUpdater struct { diff --git a/internal/status/updater.go b/internal/status/updater.go index cd9c39de35..8ae7a9f17b 100644 --- a/internal/status/updater.go +++ b/internal/status/updater.go @@ -5,11 +5,12 @@ import ( "fmt" "github.com/go-logr/logr" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" ) //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . Updater diff --git a/internal/status/updater_test.go b/internal/status/updater_test.go index 71d8aa4ea8..c8db418320 100644 --- a/internal/status/updater_test.go +++ b/internal/status/updater_test.go @@ -3,9 +3,6 @@ package status_test import ( "context" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/helpers" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/state" - "github.com/nginxinc/nginx-gateway-kubernetes/internal/status" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -16,6 +13,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" + + "github.com/nginxinc/nginx-kubernetes-gateway/internal/helpers" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/state" + "github.com/nginxinc/nginx-kubernetes-gateway/internal/status" ) var _ = Describe("Updater", func() { diff --git a/pkg/apis/gateway/register.go b/pkg/apis/gateway/register.go index a2648116ba..6ee9a3a450 100644 --- a/pkg/apis/gateway/register.go +++ b/pkg/apis/gateway/register.go @@ -1,5 +1,5 @@ -// Package gateway defines the API group for NGINX Gateway configuration resources. +// Package gateway defines the API group for NGINX Kubernetes Gateway configuration resources. package gateway -// GroupName identifies the API Group Name for NGINX Gateway configuration resources. +// GroupName identifies the API Group Name for NGINX Kubernetes Gateway configuration resources. const GroupName = "gateway.nginx.org" diff --git a/pkg/apis/gateway/v1alpha1/register.go b/pkg/apis/gateway/v1alpha1/register.go index c898201ed4..60591917d5 100644 --- a/pkg/apis/gateway/v1alpha1/register.go +++ b/pkg/apis/gateway/v1alpha1/register.go @@ -1,11 +1,11 @@ package v1alpha1 import ( - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway" ) // SchemeGroupVersion is group version used to register these object. diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index d57c203ef4..6df64ba895 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -5,7 +5,7 @@ package versioned import ( "fmt" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/typed/gateway/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 0fd6efc6e7..e908c7560f 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" - fakegatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake" + clientset "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/typed/gateway/v1alpha1" + fakegatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 1983d8ca42..02ba8dedf8 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 1301842a72..711b1efcd6 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go index 8b1a5f1cf5..21e0ea3218 100644 --- a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/typed/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/typed/gateway/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go index 71efbd3b9b..db66a149f2 100644 --- a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go index f129c9dbb5..664f650d57 100644 --- a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go index 9d68df358e..2159354cb8 100644 --- a/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go +++ b/pkg/client/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - scheme "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + scheme "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/gateway/clientset/versioned/clientset.go b/pkg/client/gateway/clientset/versioned/clientset.go index c71d3d484e..7974a6b497 100644 --- a/pkg/client/gateway/clientset/versioned/clientset.go +++ b/pkg/client/gateway/clientset/versioned/clientset.go @@ -5,7 +5,7 @@ package versioned import ( "fmt" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go b/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go index 235bcbe12b..bb3f79ac68 100644 --- a/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/gateway/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" - fakegatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake" + clientset "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + fakegatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/gateway/clientset/versioned/fake/register.go b/pkg/client/gateway/clientset/versioned/fake/register.go index 1983d8ca42..02ba8dedf8 100644 --- a/pkg/client/gateway/clientset/versioned/fake/register.go +++ b/pkg/client/gateway/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/gateway/clientset/versioned/scheme/register.go b/pkg/client/gateway/clientset/versioned/scheme/register.go index 1301842a72..711b1efcd6 100644 --- a/pkg/client/gateway/clientset/versioned/scheme/register.go +++ b/pkg/client/gateway/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go index 6d1e054ad7..6863179c60 100644 --- a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gateway_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go index 71efbd3b9b..db66a149f2 100644 --- a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/fake/fake_gatewayconfig.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go index cac126b1c2..55920b91d4 100644 --- a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gateway_client.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go index 0a0c76faee..2c34f6c76c 100644 --- a/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go +++ b/pkg/client/gateway/clientset/versioned/typed/gateway/v1alpha1/gatewayconfig.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - scheme "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + scheme "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/gateway/informers/externalversions/factory.go b/pkg/client/gateway/informers/externalversions/factory.go index d090412b1e..99e755ee4c 100644 --- a/pkg/client/gateway/informers/externalversions/factory.go +++ b/pkg/client/gateway/informers/externalversions/factory.go @@ -7,9 +7,9 @@ import ( sync "sync" time "time" - versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" - gateway "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/gateway" - internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" + versioned "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned" + gateway "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/gateway" + internalinterfaces "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/gateway/informers/externalversions/gateway/interface.go b/pkg/client/gateway/informers/externalversions/gateway/interface.go index fa262e61d1..08c297d30e 100644 --- a/pkg/client/gateway/informers/externalversions/gateway/interface.go +++ b/pkg/client/gateway/informers/externalversions/gateway/interface.go @@ -3,8 +3,8 @@ package gateway import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/gateway/v1alpha1" - internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/gateway/v1alpha1" + internalinterfaces "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go index 4f7fe98459..7c98fcaeac 100644 --- a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go +++ b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/gatewayconfig.go @@ -6,10 +6,10 @@ import ( "context" time "time" - gatewayv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" - versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" - internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/listers/gateway/v1alpha1" + gatewayv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" + versioned "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned" + internalinterfaces "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/listers/gateway/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go index 6ef36d213b..ff3f26b706 100644 --- a/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go +++ b/pkg/client/gateway/informers/externalversions/gateway/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/gateway/informers/externalversions/generic.go b/pkg/client/gateway/informers/externalversions/generic.go index 17e3fd8620..fc0ee14644 100644 --- a/pkg/client/gateway/informers/externalversions/generic.go +++ b/pkg/client/gateway/informers/externalversions/generic.go @@ -5,7 +5,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go index 70fd222817..4c9e4adca5 100644 --- a/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/gateway/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/nginxinc/nginx-gateway-kubernetes/pkg/client/gateway/clientset/versioned" + versioned "github.com/nginxinc/nginx-kubernetes-gateway/pkg/client/gateway/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go b/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go index 1df00310de..77ac32f2d6 100644 --- a/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go +++ b/pkg/client/gateway/listers/gateway/v1alpha1/gatewayconfig.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" + v1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/sdk/gatewayconfig_controller.go b/pkg/sdk/gatewayconfig_controller.go index f5e9a52cb4..8631252d32 100644 --- a/pkg/sdk/gatewayconfig_controller.go +++ b/pkg/sdk/gatewayconfig_controller.go @@ -3,7 +3,6 @@ package sdk import ( "context" - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctlr "sigs.k8s.io/controller-runtime" @@ -11,6 +10,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + nginxgwv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" ) type gatewayConfigReconciler struct { diff --git a/pkg/sdk/interfaces.go b/pkg/sdk/interfaces.go index b588778555..fed115620f 100644 --- a/pkg/sdk/interfaces.go +++ b/pkg/sdk/interfaces.go @@ -1,10 +1,11 @@ package sdk import ( - nginxgwv1alpha1 "github.com/nginxinc/nginx-gateway-kubernetes/pkg/apis/gateway/v1alpha1" apiv1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/gateway-api/apis/v1alpha2" + + nginxgwv1alpha1 "github.com/nginxinc/nginx-kubernetes-gateway/pkg/apis/gateway/v1alpha1" ) type GatewayClassImpl interface {