Skip to content

Update go module to v2 #3660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjberman merged 2 commits into from
Jul 28, 2025
Merged

Update go module to v2 #3660

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e580cff
Update go module to v2
sjberman Jul 25, 2025
93ffe72
Merge branch 'main' into chore/update-module
sjberman Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/apis"
go run github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REFERENCE_DOCS_VERSION) -config docs/api/config.json -template-dir docs/api -out-file docs/api/content.md -api-dir "github.com/nginx/nginx-gateway-fabric/v2/apis"

.PHONY: generate-helm-docs
generate-helm-docs: ## Generate the Helm chart documentation
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha2/nginxproxy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
)

// +genclient
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha2/observabilitypolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
)

// +genclient
Expand Down
2 changes: 1 addition & 1 deletion apis/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions cmd/gateway/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
ctlrZap "sigs.k8s.io/controller-runtime/pkg/log/zap"

"github.com/nginx/nginx-gateway-fabric/internal/controller"
"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/internal/framework/file"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing"
ngxConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file"
)

// These flags are shared by multiple commands.
Expand Down
2 changes: 1 addition & 1 deletion cmd/gateway/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
)

type flagTestCase struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/gateway/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/go-logr/logr"

"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/internal/framework/file"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions cmd/gateway/initialize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"github.com/go-logr/logr"
. "github.com/onsi/gomega"

"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing/licensingfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/configfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/framework/file"
"github.com/nginx/nginx-gateway-fabric/internal/framework/file/filefakes"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing/licensingfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/configfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/file/filefakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

func TestInitialize_OSS(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nginx/nginx-gateway-fabric
module github.com/nginx/nginx-gateway-fabric/v2

go 1.24.2

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/config_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/client-go/tools/record"

ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

// updateControlPlane updates the control plane configuration with the given user spec.
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/config_updater_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"

ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/internal/controller/controllerfakes"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/controllerfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

func TestUpdateControlPlane(t *testing.T) {
Expand Down
28 changes: 14 additions & 14 deletions internal/controller/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
ngfConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent"
ngxConfig "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
"github.com/nginx/nginx-gateway-fabric/internal/framework/events"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
ngfConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent"
ngxConfig "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

type handlerMetricsCollector interface {
Expand Down
34 changes: 17 additions & 17 deletions internal/controller/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"

ngfAPI "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing/licensingfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/metrics/collectors"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/agentfakes"
agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc/grpcfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/configfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner/provisionerfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/statefakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status/statusfakes"
"github.com/nginx/nginx-gateway-fabric/internal/framework/controller"
"github.com/nginx/nginx-gateway-fabric/internal/framework/events"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
ngfAPI "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing/licensingfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics/collectors"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/agentfakes"
agentgrpcfakes "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc/grpcfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/configfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner/provisionerfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/statefakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status/statusfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

var _ = Describe("eventHandler", func() {
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/licensing/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/go-logr/logr"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry"
)

//go:generate go tool counterfeiter -generate
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/licensing/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/framework/helpers"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
)

var _ = Describe("DeploymentContextCollector", func() {
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/licensing/licensingfakes/fake_collector.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/controller/log_level_setters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/onsi/gomega"
"go.uber.org/zap"

"github.com/nginx/nginx-gateway-fabric/internal/controller/controllerfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/controllerfakes"
)

func TestMultiLogLevelSetter_SetLevel(t *testing.T) {
Expand Down
58 changes: 29 additions & 29 deletions internal/controller/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,35 @@ import (
gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3"
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2"
"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/internal/controller/metrics/collectors"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent"
agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc"
ngxcfg "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/clientsettings"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/observability"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/policies/upstreamsettings"
ngxvalidation "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/config/validation"
"github.com/nginx/nginx-gateway-fabric/internal/controller/provisioner"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/validation"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/internal/controller/telemetry"
"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/helpers"
"github.com/nginx/nginx-gateway-fabric/internal/framework/kinds"
"github.com/nginx/nginx-gateway-fabric/internal/framework/runnables"
ngftypes "github.com/nginx/nginx-gateway-fabric/internal/framework/types"
ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/licensing"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics/collectors"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent"
agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc"
ngxcfg "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/clientsettings"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/observability"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies/upstreamsettings"
ngxvalidation "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/validation"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/provisioner"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/telemetry"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/filter"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/index"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/controller/predicate"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/events"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/runnables"
ngftypes "github.com/nginx/nginx-gateway-fabric/v2/internal/framework/types"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
gatewayv1alpha3 "sigs.k8s.io/gateway-api/apis/v1alpha3"
gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha1"
ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/apis/v1alpha2"
"github.com/nginx/nginx-gateway-fabric/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/graph"
ngfAPIv1alpha1 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha1"
ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/config"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/graph"
)

func TestPrepareFirstEventBatchPreparerArgs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/metrics/collectors/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/prometheus/client_golang/prometheus"

"github.com/nginx/nginx-gateway-fabric/internal/controller/metrics"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/metrics"
)

// ControllerCollector collects metrics for the NGF controller.
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/nginx/agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast"
agentgrpc "github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/grpc"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast"
agentgrpc "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/grpc"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status"
)

const retryUpstreamTimeout = 5 * time.Second
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/nginx/agent/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"google.golang.org/protobuf/types/known/structpb"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/agent/broadcast/broadcastfakes"
"github.com/nginx/nginx-gateway-fabric/internal/controller/nginx/types"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/internal/controller/status"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/agent/broadcast/broadcastfakes"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/types"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/dataplane"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/resolver"
"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/status"
)

func TestUpdateConfig(t *testing.T) {
Expand Down
Loading
Loading