Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/DavidAnson/markdow…
Browse files Browse the repository at this point in the history 
…nlint-cli2-action-12.0.0
  • Loading branch information
@vepatel
vepatel committed Sep 5, 2023
2 parents 20923ef + f14e910 commit ea71323
Show file tree
Hide file tree
Showing 114 changed files with 282 additions and 281 deletions.
24 changes: 12 additions & 12 deletions cmd/nginx-ingress/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ import (
"time"

"github.com/golang/glog"
"github.com/nginxinc/kubernetes-ingress/internal/configs"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/healthcheck"
"github.com/nginxinc/kubernetes-ingress/internal/k8s"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/internal/metrics"
"github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors"
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
cr_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
conf_scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/healthcheck"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/metrics"
"github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors"
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
cr_validation "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
conf_scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme"
"github.com/nginxinc/nginx-plus-go-client/client"
nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector"
"github.com/prometheus/client_golang/prometheus"
Expand Down
2 changes: 1 addition & 1 deletion docs/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github.com/nginxinc/nginx-hugo-theme v0.37.0 h1:bRxwtzpgud0Th4+wvx5To+B3f1j8WKP4HcV6leoCNSQ=
github.com/nginxinc/nginx-hugo-theme v0.37.0 h1:kiWaP2RvbxFLUnPnS5/vOi4XB4zc2YCYlbHlnr0K2xA=
github.com/nginxinc/nginx-hugo-theme v0.37.0/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/nginxinc/kubernetes-ingress
module github.com/nginxinc/kubernetes-ingress/v3

go 1.21

Expand Down
8 changes: 4 additions & 4 deletions internal/certmanager/cm_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"

conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions"
listers_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions"
listers_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/certmanager/cm_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import (
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
controllerpkg "github.com/cert-manager/cert-manager/pkg/controller"
testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files"
testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/util/workqueue"

vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
)

func Test_controller_Register(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/certmanager/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/certmanager/helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
)

func Test_translateVsSpec(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/certmanager/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/record"

vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/certmanager/sync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/apimachinery/pkg/types"
coretesting "k8s.io/client-go/testing"

testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files"
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
)

func TestSync(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions internal/certmanager/test_files/context_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
cmfake "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
informers "github.com/cert-manager/cert-manager/pkg/client/informers/externalversions"
"github.com/cert-manager/cert-manager/pkg/util"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
vsfake "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake"
vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
vsfake "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/fake"
vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions"
)

// Builder is a structure used to construct new Contexts for use during tests.
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/config_params.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package configs

import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"

// ConfigParams holds NGINX configuration parameters that affect the main NGINX config
// as well as configs for Ingress resources.
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/configmaps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/golang/glog"
v1 "k8s.io/api/core/v1"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
)

// ParseConfigMap parses ConfigMap into ConfigParams.
Expand Down
16 changes: 8 additions & 8 deletions internal/configs/configurator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ import (
"os"
"strings"

"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1"

"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
"github.com/nginxinc/nginx-prometheus-exporter/collector"
"github.com/spiffe/go-spiffe/v2/workloadapi"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"

"github.com/golang/glog"
api_v1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

latCollector "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors"
latCollector "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions internal/configs/configurator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"
)

func createTestStaticConfigParams() *StaticConfigParams {
Expand Down
2 changes: 1 addition & 1 deletion internal/configs/dos_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/configs/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import (
"strconv"
"strings"

"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1"

"github.com/golang/glog"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
api_v1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/runtime"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
)

const emptyHost = ""
Expand Down
4 changes: 2 additions & 2 deletions internal/configs/ingress_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
v1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
6 changes: 3 additions & 3 deletions internal/configs/transportserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

api_v1 "k8s.io/api/core/v1"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"
)

const nginxNonExistingUnixSocket = "unix:/var/lib/nginx/non-existing-unix-socket.sock"
Expand Down
6 changes: 3 additions & 3 deletions internal/configs/transportserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1"
api_v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/configs/virtualserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strings"

"github.com/golang/glog"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
api_v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
Expand Down
8 changes: 4 additions & 4 deletions internal/configs/virtualserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets"
"github.com/nginxinc/kubernetes-ingress/v3/internal/nginx"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
api_v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
12 changes: 6 additions & 6 deletions internal/externaldns/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ import (
"time"

"github.com/golang/glog"
conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
extdns_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
listersV1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1"
extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1"
conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
extdns_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1"
k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
listersV1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1"
extdnslisters "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"

k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions"
k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions internal/externaldns/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (

"github.com/golang/glog"
"github.com/google/go-cmp/cmp"
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1"
clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned"
extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
extdnsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1"
clientset "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned"
extdnslisters "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
validators "k8s.io/apimachinery/pkg/util/validation"
Expand Down
6 changes: 3 additions & 3 deletions internal/externaldns/sync_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1"
extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1"
extdnsclient "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1"
vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1"
extdnsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1"
extdnsclient "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/healthcheck/healthcheck.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/go-chi/chi/v5"
"github.com/golang/glog"
"github.com/nginxinc/kubernetes-ingress/internal/configs"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs"
"github.com/nginxinc/nginx-plus-go-client/client"
"k8s.io/utils/strings/slices"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/healthcheck/healthcheck_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/nginxinc/kubernetes-ingress/internal/healthcheck"
"github.com/nginxinc/kubernetes-ingress/v3/internal/healthcheck"
"github.com/nginxinc/nginx-plus-go-client/client"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/k8s/appprotect/app_protect_configuration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"sort"
"time"

"github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation"

"github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
8 changes: 4 additions & 4 deletions internal/k8s/appprotectdos/app_protect_dos_configuration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"fmt"
"strings"

"github.com/nginxinc/kubernetes-ingress/internal/configs"
"github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon"
"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1"
"github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/validation"
"github.com/nginxinc/kubernetes-ingress/v3/internal/configs"
"github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1"
"github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/validation"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down

0 comments on commit ea71323

Please sign in to comment.