From b44efbb6107bc238e6c23511cbe1e4a1de44829f Mon Sep 17 00:00:00 2001 From: Venktesh Shivam Patel Date: Wed, 6 Sep 2023 20:23:25 +0100 Subject: [PATCH] Revert "enable use of CRDs imported as modules (#4152)" (#4327) --- cmd/nginx-ingress/main.go | 24 +++++++-------- go.mod | 2 +- internal/certmanager/cm_controller.go | 8 ++--- internal/certmanager/cm_controller_test.go | 6 ++-- internal/certmanager/helper.go | 2 +- internal/certmanager/helper_test.go | 2 +- internal/certmanager/sync.go | 2 +- internal/certmanager/sync_test.go | 4 +-- .../certmanager/test_files/context_builder.go | 6 ++-- internal/configs/config_params.go | 2 +- internal/configs/configmaps.go | 2 +- internal/configs/configurator.go | 16 +++++----- internal/configs/configurator_test.go | 10 +++---- internal/configs/dos_test.go | 2 +- internal/configs/ingress.go | 6 ++-- internal/configs/ingress_test.go | 4 +-- internal/configs/transportserver.go | 6 ++-- internal/configs/transportserver_test.go | 6 ++-- internal/configs/virtualserver.go | 8 ++--- internal/configs/virtualserver_test.go | 8 ++--- internal/externaldns/controller.go | 12 ++++---- internal/externaldns/sync.go | 8 ++--- internal/externaldns/sync_test.go | 6 ++-- internal/healthcheck/healthcheck.go | 2 +- internal/healthcheck/healthcheck_test.go | 2 +- .../appprotect/app_protect_configuration.go | 4 +-- .../app_protect_dos_configuration.go | 8 ++--- .../app_protect_dos_configuration_test.go | 4 +-- internal/k8s/configuration.go | 8 ++--- internal/k8s/configuration_test.go | 6 ++-- internal/k8s/controller.go | 30 +++++++++---------- internal/k8s/controller_test.go | 18 +++++------ internal/k8s/handlers.go | 8 ++--- internal/k8s/reference_checkers.go | 6 ++-- internal/k8s/reference_checkers_test.go | 6 ++-- internal/k8s/status.go | 6 ++-- internal/k8s/status_test.go | 6 ++-- internal/k8s/task_queue.go | 10 +++---- internal/k8s/validation.go | 4 +-- internal/metrics/listener.go | 1 - internal/metrics/syslog_listener.go | 2 +- internal/nginx/manager.go | 2 +- pkg/apis/configuration/v1/register.go | 2 +- pkg/apis/configuration/v1alpha1/register.go | 2 +- pkg/apis/configuration/validation/common.go | 2 +- .../validation/globalconfiguration.go | 2 +- .../validation/globalconfiguration_test.go | 2 +- pkg/apis/configuration/validation/policy.go | 2 +- .../configuration/validation/policy_test.go | 2 +- .../validation/transportserver.go | 2 +- .../validation/transportserver_test.go | 2 +- .../configuration/validation/virtualserver.go | 4 +-- .../validation/virtualserver_test.go | 2 +- pkg/apis/dos/v1beta1/register.go | 2 +- pkg/apis/dos/validation/dos.go | 4 +-- pkg/apis/dos/validation/dos_test.go | 2 +- pkg/apis/externaldns/v1/register.go | 2 +- .../externaldns/validation/externaldns.go | 2 +- .../validation/externaldns_test.go | 4 +-- pkg/client/clientset/versioned/clientset.go | 8 ++--- .../versioned/fake/clientset_generated.go | 18 +++++------ .../clientset/versioned/fake/register.go | 8 ++--- .../clientset/versioned/scheme/register.go | 8 ++--- .../configuration/v1/configuration_client.go | 4 +-- .../v1/fake/fake_configuration_client.go | 2 +- .../configuration/v1/fake/fake_policy.go | 2 +- .../v1/fake/fake_virtualserver.go | 2 +- .../v1/fake/fake_virtualserverroute.go | 2 +- .../typed/configuration/v1/policy.go | 4 +-- .../typed/configuration/v1/virtualserver.go | 4 +-- .../configuration/v1/virtualserverroute.go | 4 +-- .../v1alpha1/configuration_client.go | 4 +-- .../fake/fake_configuration_client.go | 2 +- .../v1alpha1/fake/fake_globalconfiguration.go | 2 +- .../v1alpha1/fake/fake_policy.go | 2 +- .../v1alpha1/fake/fake_transportserver.go | 2 +- .../v1alpha1/globalconfiguration.go | 4 +-- .../typed/configuration/v1alpha1/policy.go | 4 +-- .../configuration/v1alpha1/transportserver.go | 4 +-- .../versioned/typed/dos/v1beta1/dos_client.go | 4 +-- .../typed/dos/v1beta1/dosprotectedresource.go | 4 +-- .../typed/dos/v1beta1/fake/fake_dos_client.go | 2 +- .../v1beta1/fake/fake_dosprotectedresource.go | 2 +- .../typed/externaldns/v1/dnsendpoint.go | 4 +-- .../externaldns/v1/externaldns_client.go | 4 +-- .../externaldns/v1/fake/fake_dnsendpoint.go | 2 +- .../v1/fake/fake_externaldns_client.go | 2 +- .../configuration/interface.go | 6 ++-- .../configuration/v1/interface.go | 2 +- .../configuration/v1/policy.go | 8 ++--- .../configuration/v1/virtualserver.go | 8 ++--- .../configuration/v1/virtualserverroute.go | 8 ++--- .../v1alpha1/globalconfiguration.go | 8 ++--- .../configuration/v1alpha1/interface.go | 2 +- .../configuration/v1alpha1/policy.go | 8 ++--- .../configuration/v1alpha1/transportserver.go | 8 ++--- .../externalversions/dos/interface.go | 4 +-- .../dos/v1beta1/dosprotectedresource.go | 8 ++--- .../externalversions/dos/v1beta1/interface.go | 2 +- .../externalversions/externaldns/interface.go | 4 +-- .../externaldns/v1/dnsendpoint.go | 8 ++--- .../externaldns/v1/interface.go | 2 +- .../informers/externalversions/factory.go | 10 +++---- .../informers/externalversions/generic.go | 8 ++--- .../internalinterfaces/factory_interfaces.go | 2 +- pkg/client/listers/configuration/v1/policy.go | 2 +- .../listers/configuration/v1/virtualserver.go | 2 +- .../configuration/v1/virtualserverroute.go | 2 +- .../v1alpha1/globalconfiguration.go | 2 +- .../listers/configuration/v1alpha1/policy.go | 2 +- .../configuration/v1alpha1/transportserver.go | 2 +- .../dos/v1beta1/dosprotectedresource.go | 2 +- .../listers/externaldns/v1/dnsendpoint.go | 2 +- 113 files changed, 280 insertions(+), 281 deletions(-) diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go index 55c5bbc7af..8e86d5f942 100644 --- a/cmd/nginx-ingress/main.go +++ b/cmd/nginx-ingress/main.go @@ -13,18 +13,18 @@ import ( "time" "github.com/golang/glog" - "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/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/nginx-plus-go-client/client" nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" diff --git a/go.mod b/go.mod index 3f446e3311..5ec1e67e1c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/kubernetes-ingress/v3 +module github.com/nginxinc/kubernetes-ingress go 1.21 diff --git a/internal/certmanager/cm_controller.go b/internal/certmanager/cm_controller.go index b63773db35..59a75ef904 100644 --- a/internal/certmanager/cm_controller.go +++ b/internal/certmanager/cm_controller.go @@ -36,10 +36,10 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - 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" + 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" ) const ( diff --git a/internal/certmanager/cm_controller_test.go b/internal/certmanager/cm_controller_test.go index 1cf1f7091a..92c9dcaaaf 100644 --- a/internal/certmanager/cm_controller_test.go +++ b/internal/certmanager/cm_controller_test.go @@ -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/v3/internal/certmanager/test_files" + testpkg "github.com/nginxinc/kubernetes-ingress/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/v3/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" ) func Test_controller_Register(t *testing.T) { diff --git a/internal/certmanager/helper.go b/internal/certmanager/helper.go index beadbdb277..03c60d05b1 100644 --- a/internal/certmanager/helper.go +++ b/internal/certmanager/helper.go @@ -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/v3/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" ) var ( diff --git a/internal/certmanager/helper_test.go b/internal/certmanager/helper_test.go index 651fc6ae22..da384a2f0b 100644 --- a/internal/certmanager/helper_test.go +++ b/internal/certmanager/helper_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" ) func Test_translateVsSpec(t *testing.T) { diff --git a/internal/certmanager/sync.go b/internal/certmanager/sync.go index b2f5bcb0ac..e4c7cd8e34 100644 --- a/internal/certmanager/sync.go +++ b/internal/certmanager/sync.go @@ -37,7 +37,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/record" - vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" ) const ( diff --git a/internal/certmanager/sync_test.go b/internal/certmanager/sync_test.go index 9a7e0f9a0c..b3b662fd14 100644 --- a/internal/certmanager/sync_test.go +++ b/internal/certmanager/sync_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/types" coretesting "k8s.io/client-go/testing" - testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files" - vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + testpkg "github.com/nginxinc/kubernetes-ingress/internal/certmanager/test_files" + vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" ) func TestSync(t *testing.T) { diff --git a/internal/certmanager/test_files/context_builder.go b/internal/certmanager/test_files/context_builder.go index f5bcb20619..b055b288fd 100644 --- a/internal/certmanager/test_files/context_builder.go +++ b/internal/certmanager/test_files/context_builder.go @@ -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/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" + 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" ) // Builder is a structure used to construct new Contexts for use during tests. diff --git a/internal/configs/config_params.go b/internal/configs/config_params.go index 5ba3137c61..ba4be02d86 100644 --- a/internal/configs/config_params.go +++ b/internal/configs/config_params.go @@ -1,6 +1,6 @@ package configs -import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" +import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" // ConfigParams holds NGINX configuration parameters that affect the main NGINX config // as well as configs for Ingress resources. diff --git a/internal/configs/configmaps.go b/internal/configs/configmaps.go index 4509e26a26..675fc7e443 100644 --- a/internal/configs/configmaps.go +++ b/internal/configs/configmaps.go @@ -6,7 +6,7 @@ import ( "github.com/golang/glog" v1 "k8s.io/api/core/v1" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" ) // ParseConfigMap parses ConfigMap into ConfigParams. diff --git a/internal/configs/configurator.go b/internal/configs/configurator.go index b2cb8a48ba..f902637e24 100644 --- a/internal/configs/configurator.go +++ b/internal/configs/configurator.go @@ -7,27 +7,27 @@ import ( "os" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/spiffe/go-spiffe/v2/workloadapi" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/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/v3/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/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" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - latCollector "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" + latCollector "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" ) const ( diff --git a/internal/configs/configurator_test.go b/internal/configs/configurator_test.go index b901cd2bc3..b6ad8ec1bc 100644 --- a/internal/configs/configurator_test.go +++ b/internal/configs/configurator_test.go @@ -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/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" + "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" ) func createTestStaticConfigParams() *StaticConfigParams { diff --git a/internal/configs/dos_test.go b/internal/configs/dos_test.go index 9424f29cee..7abef5cdb5 100644 --- a/internal/configs/dos_test.go +++ b/internal/configs/dos_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/configs/ingress.go b/internal/configs/ingress.go index ee766c4a6c..f92700ed88 100644 --- a/internal/configs/ingress.go +++ b/internal/configs/ingress.go @@ -6,17 +6,17 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/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/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" ) const emptyHost = "" diff --git a/internal/configs/ingress_test.go b/internal/configs/ingress_test.go index 2eca0fb88d..0da7f9ac25 100644 --- a/internal/configs/ingress_test.go +++ b/internal/configs/ingress_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/configs/transportserver.go b/internal/configs/transportserver.go index 4d71691bc1..36a848f1c0 100644 --- a/internal/configs/transportserver.go +++ b/internal/configs/transportserver.go @@ -6,9 +6,9 @@ import ( api_v1 "k8s.io/api/core/v1" - "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" + "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" ) const nginxNonExistingUnixSocket = "unix:/var/lib/nginx/non-existing-unix-socket.sock" diff --git a/internal/configs/transportserver_test.go b/internal/configs/transportserver_test.go index 59ce27d966..7c5c92ee52 100644 --- a/internal/configs/transportserver_test.go +++ b/internal/configs/transportserver_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "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" + "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" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go index c5bfd89d46..8d0dd95560 100644 --- a/internal/configs/virtualserver.go +++ b/internal/configs/virtualserver.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/golang/glog" - "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" + "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" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go index 436b470e3e..54832aa875 100644 --- a/internal/configs/virtualserver_test.go +++ b/internal/configs/virtualserver_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "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" + "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" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/externaldns/controller.go b/internal/externaldns/controller.go index 7362542585..57d258bf96 100644 --- a/internal/externaldns/controller.go +++ b/internal/externaldns/controller.go @@ -7,11 +7,11 @@ import ( "time" "github.com/golang/glog" - 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" + 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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/runtime" @@ -19,7 +19,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions" + k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" ) const ( diff --git a/internal/externaldns/sync.go b/internal/externaldns/sync.go index b5e18097e9..96d2273c24 100644 --- a/internal/externaldns/sync.go +++ b/internal/externaldns/sync.go @@ -7,10 +7,10 @@ import ( "github.com/golang/glog" "github.com/google/go-cmp/cmp" - 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" + 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" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" validators "k8s.io/apimachinery/pkg/util/validation" diff --git a/internal/externaldns/sync_test.go b/internal/externaldns/sync_test.go index 09266fc097..812e4a2e66 100644 --- a/internal/externaldns/sync_test.go +++ b/internal/externaldns/sync_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - 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" + 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" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/healthcheck/healthcheck.go b/internal/healthcheck/healthcheck.go index 6751f1a7ab..5c74d8d7a5 100644 --- a/internal/healthcheck/healthcheck.go +++ b/internal/healthcheck/healthcheck.go @@ -16,7 +16,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/internal/configs" "github.com/nginxinc/nginx-plus-go-client/client" "k8s.io/utils/strings/slices" ) diff --git a/internal/healthcheck/healthcheck_test.go b/internal/healthcheck/healthcheck_test.go index 5ee604f261..2090f35f59 100644 --- a/internal/healthcheck/healthcheck_test.go +++ b/internal/healthcheck/healthcheck_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/v3/internal/healthcheck" + "github.com/nginxinc/kubernetes-ingress/internal/healthcheck" "github.com/nginxinc/nginx-plus-go-client/client" ) diff --git a/internal/k8s/appprotect/app_protect_configuration.go b/internal/k8s/appprotect/app_protect_configuration.go index 51dacc0416..9a1f4e611b 100644 --- a/internal/k8s/appprotect/app_protect_configuration.go +++ b/internal/k8s/appprotect/app_protect_configuration.go @@ -5,9 +5,9 @@ import ( "sort" "time" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration.go b/internal/k8s/appprotectdos/app_protect_dos_configuration.go index f323133d98..f01a671a97 100644 --- a/internal/k8s/appprotectdos/app_protect_dos_configuration.go +++ b/internal/k8s/appprotectdos/app_protect_dos_configuration.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "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" + "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" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go b/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go index 1aa405c44b..8b66934763 100644 --- a/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go +++ b/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/configuration.go b/internal/k8s/configuration.go index 6a094d5733..e23eed1f06 100644 --- a/internal/k8s/configuration.go +++ b/internal/k8s/configuration.go @@ -7,10 +7,10 @@ import ( "strings" "sync" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + 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/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/k8s/configuration_test.go b/internal/k8s/configuration_test.go index 368ce98b68..e7b1b81398 100644 --- a/internal/k8s/configuration_test.go +++ b/internal/k8s/configuration_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + 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/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go index d429d72856..1aaa720ae1 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -25,17 +25,17 @@ import ( "sync" "time" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "golang.org/x/exp/maps" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectdos" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" "k8s.io/client-go/informers" "k8s.io/client-go/rest" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" "github.com/nginxinc/nginx-service-mesh/pkg/spiffe" "github.com/spiffe/go-spiffe/v2/workloadapi" @@ -49,21 +49,21 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/record" - cm_controller "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - ed_controller "github.com/nginxinc/kubernetes-ingress/v3/internal/externaldns" - "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" + cm_controller "github.com/nginxinc/kubernetes-ingress/internal/certmanager" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + ed_controller "github.com/nginxinc/kubernetes-ingress/internal/externaldns" + "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" api_v1 "k8s.io/api/core/v1" discovery_v1 "k8s.io/api/discovery/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions" + 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/pkg/apis/configuration/validation" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -934,7 +934,7 @@ func (lbc *LoadBalancerController) updateAllConfigs() { // If we don't add Secrets, there is a chance that during the IC start // syncing an Ingress or other resource that references a Secret will happen before that Secret was synced. // As a result, the IC will generate configuration for that resource assuming that the Secret is missing and -// it will report warnings. (See https://github.com/nginxinc/kubernetes-ingress/v3/issues/1448 ) +// it will report warnings. (See https://github.com/nginxinc/kubernetes-ingress/issues/1448 ) func (lbc *LoadBalancerController) preSyncSecrets() { for _, ni := range lbc.namespacedInformers { if !ni.isSecretsEnabledNamespace { diff --git a/internal/k8s/controller_test.go b/internal/k8s/controller_test.go index 0681123fe9..3d57c9d9bd 100644 --- a/internal/k8s/controller_test.go +++ b/internal/k8s/controller_test.go @@ -11,15 +11,15 @@ import ( discovery_v1 "k8s.io/api/discovery/v1" "github.com/google/go-cmp/cmp" - "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/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" - "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" + "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/k8s/appprotect" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + "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" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/handlers.go b/internal/k8s/handlers.go index 5059c735e3..7b07b7f69b 100644 --- a/internal/k8s/handlers.go +++ b/internal/k8s/handlers.go @@ -7,16 +7,16 @@ import ( discovery_v1 "k8s.io/api/discovery/v1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" "k8s.io/client-go/tools/cache" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/reference_checkers.go b/internal/k8s/reference_checkers.go index d1ef6ed3c5..f8fe80467a 100644 --- a/internal/k8s/reference_checkers.go +++ b/internal/k8s/reference_checkers.go @@ -3,9 +3,9 @@ package k8s import ( "strings" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" networking "k8s.io/api/networking/v1" ) diff --git a/internal/k8s/reference_checkers_test.go b/internal/k8s/reference_checkers_test.go index 247329a40a..2262c47a86 100644 --- a/internal/k8s/reference_checkers_test.go +++ b/internal/k8s/reference_checkers_test.go @@ -3,9 +3,9 @@ package k8s import ( "testing" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" networking "k8s.io/api/networking/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8s/status.go b/internal/k8s/status.go index 8d7eee5716..bec7dcf5a7 100644 --- a/internal/k8s/status.go +++ b/internal/k8s/status.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/golang/glog" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/status_test.go b/internal/k8s/status_test.go index 980ee00a01..39dbe906b0 100644 --- a/internal/k8s/status_test.go +++ b/internal/k8s/status_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - fake_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/fake" + conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + fake_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8s/task_queue.go b/internal/k8s/task_queue.go index 685bfc1f60..502ef53576 100644 --- a/internal/k8s/task_queue.go +++ b/internal/k8s/task_queue.go @@ -4,13 +4,13 @@ import ( "fmt" "time" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectdos" - conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" + "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" + conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" v1 "k8s.io/api/core/v1" discovery_v1 "k8s.io/api/discovery/v1" networking "k8s.io/api/networking/v1" diff --git a/internal/k8s/validation.go b/internal/k8s/validation.go index 675e670319..2690a5c6d0 100644 --- a/internal/k8s/validation.go +++ b/internal/k8s/validation.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - ap_validation "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + ap_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go index 0f938d7722..4d56b50a70 100644 --- a/internal/metrics/listener.go +++ b/internal/metrics/listener.go @@ -11,7 +11,6 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang/glog" - prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client" nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/metrics/syslog_listener.go b/internal/metrics/syslog_listener.go index 1638d9d248..d15dc22c0f 100644 --- a/internal/metrics/syslog_listener.go +++ b/internal/metrics/syslog_listener.go @@ -6,7 +6,7 @@ import ( "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" + "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" ) // SyslogListener is an interface for syslog metrics listener diff --git a/internal/nginx/manager.go b/internal/nginx/manager.go index cca7ddd8c3..7f3348b1ca 100644 --- a/internal/nginx/manager.go +++ b/internal/nginx/manager.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" + "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" "github.com/golang/glog" "github.com/nginxinc/nginx-plus-go-client/client" diff --git a/pkg/apis/configuration/v1/register.go b/pkg/apis/configuration/v1/register.go index c2f4d9bb76..73924e09d8 100644 --- a/pkg/apis/configuration/v1/register.go +++ b/pkg/apis/configuration/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/configuration/v1alpha1/register.go b/pkg/apis/configuration/v1alpha1/register.go index 825c12b588..22c1aa7327 100644 --- a/pkg/apis/configuration/v1alpha1/register.go +++ b/pkg/apis/configuration/v1alpha1/register.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/configuration/validation/common.go b/pkg/apis/configuration/validation/common.go index b7853c1eac..b66fcdaaa4 100644 --- a/pkg/apis/configuration/validation/common.go +++ b/pkg/apis/configuration/validation/common.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/internal/configs" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/globalconfiguration.go b/pkg/apis/configuration/validation/globalconfiguration.go index 4093d7863a..b6333f671f 100644 --- a/pkg/apis/configuration/validation/globalconfiguration.go +++ b/pkg/apis/configuration/validation/globalconfiguration.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/globalconfiguration_test.go b/pkg/apis/configuration/validation/globalconfiguration_test.go index 26c3c8314a..3a3283eefd 100644 --- a/pkg/apis/configuration/validation/globalconfiguration_test.go +++ b/pkg/apis/configuration/validation/globalconfiguration_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/policy.go b/pkg/apis/configuration/validation/policy.go index 97a540a094..228300d24c 100644 --- a/pkg/apis/configuration/validation/policy.go +++ b/pkg/apis/configuration/validation/policy.go @@ -9,7 +9,7 @@ import ( "strings" "unicode" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/policy_test.go b/pkg/apis/configuration/validation/policy_test.go index 1149542857..dcfe61d578 100644 --- a/pkg/apis/configuration/validation/policy_test.go +++ b/pkg/apis/configuration/validation/policy_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/transportserver.go b/pkg/apis/configuration/validation/transportserver.go index c1e8f987c1..7b975a6934 100644 --- a/pkg/apis/configuration/validation/transportserver.go +++ b/pkg/apis/configuration/validation/transportserver.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/transportserver_test.go b/pkg/apis/configuration/validation/transportserver_test.go index c3afb799da..7e27022b4d 100644 --- a/pkg/apis/configuration/validation/transportserver_test.go +++ b/pkg/apis/configuration/validation/transportserver_test.go @@ -3,7 +3,7 @@ package validation import ( "testing" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" ) diff --git a/pkg/apis/configuration/validation/virtualserver.go b/pkg/apis/configuration/validation/virtualserver.go index 532efcf967..a5f6bb5291 100644 --- a/pkg/apis/configuration/validation/virtualserver.go +++ b/pkg/apis/configuration/validation/virtualserver.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/internal/configs" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/configuration/validation/virtualserver_test.go b/pkg/apis/configuration/validation/virtualserver_test.go index d7ba7d8aae..60e7470706 100644 --- a/pkg/apis/configuration/validation/virtualserver_test.go +++ b/pkg/apis/configuration/validation/virtualserver_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/dos/v1beta1/register.go b/pkg/apis/dos/v1beta1/register.go index edd869ad54..d527b6a37f 100644 --- a/pkg/apis/dos/v1beta1/register.go +++ b/pkg/apis/dos/v1beta1/register.go @@ -1,7 +1,7 @@ package v1beta1 import ( - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/dos/validation/dos.go b/pkg/apis/dos/validation/dos.go index a5e0b5f970..a87d33bb8e 100644 --- a/pkg/apis/dos/validation/dos.go +++ b/pkg/apis/dos/validation/dos.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - validation2 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + validation2 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" diff --git a/pkg/apis/dos/validation/dos_test.go b/pkg/apis/dos/validation/dos_test.go index c27d919192..1ad881ee80 100644 --- a/pkg/apis/dos/validation/dos_test.go +++ b/pkg/apis/dos/validation/dos_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/pkg/apis/externaldns/v1/register.go b/pkg/apis/externaldns/v1/register.go index fd500359b8..ed304ca203 100644 --- a/pkg/apis/externaldns/v1/register.go +++ b/pkg/apis/externaldns/v1/register.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/externaldns/validation/externaldns.go b/pkg/apis/externaldns/validation/externaldns.go index 9cf962a26c..9350f3b921 100644 --- a/pkg/apis/externaldns/validation/externaldns.go +++ b/pkg/apis/externaldns/validation/externaldns.go @@ -7,7 +7,7 @@ import ( "golang.org/x/exp/slices" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" "k8s.io/apimachinery/pkg/util/validation" ) diff --git a/pkg/apis/externaldns/validation/externaldns_test.go b/pkg/apis/externaldns/validation/externaldns_test.go index c2a4258bd1..5f85d792f8 100644 --- a/pkg/apis/externaldns/validation/externaldns_test.go +++ b/pkg/apis/externaldns/validation/externaldns_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/validation" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/validation" ) func TestValidateDNSEndpoint(t *testing.T) { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 2b8168fb6e..254b60c025 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -6,10 +6,10 @@ import ( "fmt" "net/http" - k8sv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1alpha1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/externaldns/v1" + k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" + appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" 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 5b2602e96a..6f23a69f15 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,15 +3,15 @@ package fake import ( - clientset "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - k8sv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1" - fakek8sv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1/fake" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1alpha1" - fakek8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/dos/v1beta1" - fakeappprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/dos/v1beta1/fake" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/externaldns/v1" - fakeexternaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/externaldns/v1/fake" + clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" + fakek8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1/fake" + k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" + fakek8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake" + appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" + fakeappprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1/fake" + externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" + fakeexternaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1/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 391576ca9a..387f77a14a 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -3,10 +3,10 @@ package fake import ( - k8sv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" 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 bf58d0c01f..c69fe24de5 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -3,10 +3,10 @@ package scheme import ( - k8sv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + k8sv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + k8sv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + appprotectdosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" 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/configuration/v1/configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go index 30fe3da58a..c59b6a1b1f 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/configuration_client.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go index 479ecb60da..3281d34a8a 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_configuration_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go index f7195c683d..9d2b079243 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_policy.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go index 5c9d42a078..9d3eade2b7 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserver.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go index a965f727cf..b4c644c5f6 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/fake/fake_virtualserverroute.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/policy.go b/pkg/client/clientset/versioned/typed/configuration/v1/policy.go index a2bc0c4f43..63fd8d564a 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/policy.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go index 02678c394e..4d9b39944a 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserver.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go index 6714a1d550..76290fd5eb 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1/virtualserverroute.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go index e1e9071112..349d660772 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/configuration_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go index 3364b9ae7b..9ad22127bd 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_configuration_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/configuration/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go index 82c28b4547..e2aba966d1 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_globalconfiguration.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go index 83f71ac860..9f9d0356a5 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_policy.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go index 04a49ac00c..982dbe531f 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/fake/fake_transportserver.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go index 586bd84d94..80e0eb8da6 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/globalconfiguration.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/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/clientset/versioned/typed/configuration/v1alpha1/policy.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go index 2ad82aeade..f90324d076 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/policy.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/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/clientset/versioned/typed/configuration/v1alpha1/transportserver.go b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go index f8a26165ac..c402b9776d 100644 --- a/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go +++ b/pkg/client/clientset/versioned/typed/configuration/v1alpha1/transportserver.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/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/clientset/versioned/typed/dos/v1beta1/dos_client.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go index d7d9f4b56e..186caac0ee 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/dos_client.go @@ -5,8 +5,8 @@ package v1beta1 import ( "net/http" - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go index a7cc819974..15fdb8c655 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/dosprotectedresource.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + scheme "github.com/nginxinc/kubernetes-ingress/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/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go index d1f10eb82c..2a59aff231 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dos_client.go @@ -3,7 +3,7 @@ package fake import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/dos/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go index 85f35ec883..6c76137c15 100644 --- a/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go +++ b/pkg/client/clientset/versioned/typed/dos/v1beta1/fake/fake_dosprotectedresource.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go b/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go index 8b561f22a1..a90773de76 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/dnsendpoint.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" - scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go b/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go index 0e66f73aa0..2e9b1232e9 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/externaldns_client.go @@ -5,8 +5,8 @@ package v1 import ( "net/http" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go index a958f6876e..702442c079 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_dnsendpoint.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go index 11a9ce0830..ccc09f3e04 100644 --- a/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go +++ b/pkg/client/clientset/versioned/typed/externaldns/v1/fake/fake_externaldns_client.go @@ -3,7 +3,7 @@ package fake import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/typed/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/typed/externaldns/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/informers/externalversions/configuration/interface.go b/pkg/client/informers/externalversions/configuration/interface.go index 96a2156e48..56ce00e07e 100644 --- a/pkg/client/informers/externalversions/configuration/interface.go +++ b/pkg/client/informers/externalversions/configuration/interface.go @@ -3,9 +3,9 @@ package configuration import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/configuration/v1" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/configuration/v1alpha1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration/v1alpha1" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/configuration/v1/interface.go b/pkg/client/informers/externalversions/configuration/v1/interface.go index ab84c4bc5f..85ebcfab80 100644 --- a/pkg/client/informers/externalversions/configuration/v1/interface.go +++ b/pkg/client/informers/externalversions/configuration/v1/interface.go @@ -3,7 +3,7 @@ package v1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/configuration/v1/policy.go b/pkg/client/informers/externalversions/configuration/v1/policy.go index e451f93901..4f9a412588 100644 --- a/pkg/client/informers/externalversions/configuration/v1/policy.go +++ b/pkg/client/informers/externalversions/configuration/v1/policy.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1" + configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/virtualserver.go b/pkg/client/informers/externalversions/configuration/v1/virtualserver.go index 60e4c16aab..8fe544dd6a 100644 --- a/pkg/client/informers/externalversions/configuration/v1/virtualserver.go +++ b/pkg/client/informers/externalversions/configuration/v1/virtualserver.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1" + configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go b/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go index 56ec64b82d..b681a1acb8 100644 --- a/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go +++ b/pkg/client/informers/externalversions/configuration/v1/virtualserverroute.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1" + configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go b/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go index 866d86445e..7c2da1c427 100644 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go +++ b/pkg/client/informers/externalversions/configuration/v1alpha1/globalconfiguration.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1alpha1" + configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/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/informers/externalversions/configuration/v1alpha1/interface.go b/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go index 2713524f32..b65ce74c68 100644 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/configuration/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go b/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go index a96aa3a5ff..8cb91c2189 100644 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go +++ b/pkg/client/informers/externalversions/configuration/v1alpha1/policy.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1alpha1" + configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/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/informers/externalversions/configuration/v1alpha1/transportserver.go b/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go index a55b835029..a6dbdcd29e 100644 --- a/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go +++ b/pkg/client/informers/externalversions/configuration/v1alpha1/transportserver.go @@ -6,10 +6,10 @@ import ( "context" time "time" - configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1alpha1" + configurationv1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/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/informers/externalversions/dos/interface.go b/pkg/client/informers/externalversions/dos/interface.go index 335f8b4931..ac812cda74 100644 --- a/pkg/client/informers/externalversions/dos/interface.go +++ b/pkg/client/informers/externalversions/dos/interface.go @@ -3,8 +3,8 @@ package dos import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/dos/v1beta1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/dos/v1beta1" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go b/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go index 258109ab7d..e6a03fb143 100644 --- a/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/informers/externalversions/dos/v1beta1/dosprotectedresource.go @@ -6,10 +6,10 @@ import ( "context" time "time" - dosv1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/dos/v1beta1" + dosv1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/dos/v1beta1" 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/informers/externalversions/dos/v1beta1/interface.go b/pkg/client/informers/externalversions/dos/v1beta1/interface.go index 20997c46c0..774aefee0d 100644 --- a/pkg/client/informers/externalversions/dos/v1beta1/interface.go +++ b/pkg/client/informers/externalversions/dos/v1beta1/interface.go @@ -3,7 +3,7 @@ package v1beta1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/externaldns/interface.go b/pkg/client/informers/externalversions/externaldns/interface.go index fc753d6b61..947e6b788a 100644 --- a/pkg/client/informers/externalversions/externaldns/interface.go +++ b/pkg/client/informers/externalversions/externaldns/interface.go @@ -3,8 +3,8 @@ package externaldns import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/externaldns/v1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/externaldns/v1" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go b/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go index 0a998ac034..331f9057df 100644 --- a/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go +++ b/pkg/client/informers/externalversions/externaldns/v1/dnsendpoint.go @@ -6,10 +6,10 @@ import ( "context" time "time" - externaldnsv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1" + externaldnsv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/externaldns/v1/interface.go b/pkg/client/informers/externalversions/externaldns/v1/interface.go index da778e8eb9..747d4431af 100644 --- a/pkg/client/informers/externalversions/externaldns/v1/interface.go +++ b/pkg/client/informers/externalversions/externaldns/v1/interface.go @@ -3,7 +3,7 @@ package v1 import ( - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 8c64c823ab..f3a1605aeb 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -7,11 +7,11 @@ import ( sync "sync" time "time" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" - configuration "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/configuration" - dos "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/dos" - externaldns "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/externaldns" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + configuration "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/configuration" + dos "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/dos" + externaldns "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/externaldns" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/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/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index fbdbc823c0..6780037382 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -5,10 +5,10 @@ package externalversions import ( "fmt" - configurationv1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + configurationv1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index d3d5dfbcb1..4bb7c08ee3 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + versioned "github.com/nginxinc/kubernetes-ingress/pkg/client/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/listers/configuration/v1/policy.go b/pkg/client/listers/configuration/v1/policy.go index 2d73097f5b..9d58b364e4 100644 --- a/pkg/client/listers/configuration/v1/policy.go +++ b/pkg/client/listers/configuration/v1/policy.go @@ -3,7 +3,7 @@ package v1 import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/virtualserver.go b/pkg/client/listers/configuration/v1/virtualserver.go index 3041782121..024193000f 100644 --- a/pkg/client/listers/configuration/v1/virtualserver.go +++ b/pkg/client/listers/configuration/v1/virtualserver.go @@ -3,7 +3,7 @@ package v1 import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1/virtualserverroute.go b/pkg/client/listers/configuration/v1/virtualserverroute.go index 0313c401c0..5060282cdf 100644 --- a/pkg/client/listers/configuration/v1/virtualserverroute.go +++ b/pkg/client/listers/configuration/v1/virtualserverroute.go @@ -3,7 +3,7 @@ package v1 import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go b/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go index 236fff1727..5401f6a3b8 100644 --- a/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go +++ b/pkg/client/listers/configuration/v1alpha1/globalconfiguration.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1alpha1/policy.go b/pkg/client/listers/configuration/v1alpha1/policy.go index b2e9dd6f0d..8034a5d068 100644 --- a/pkg/client/listers/configuration/v1alpha1/policy.go +++ b/pkg/client/listers/configuration/v1alpha1/policy.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/configuration/v1alpha1/transportserver.go b/pkg/client/listers/configuration/v1alpha1/transportserver.go index 0598d6a15c..1e207cd1cd 100644 --- a/pkg/client/listers/configuration/v1alpha1/transportserver.go +++ b/pkg/client/listers/configuration/v1alpha1/transportserver.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/dos/v1beta1/dosprotectedresource.go b/pkg/client/listers/dos/v1beta1/dosprotectedresource.go index f3d3c7c084..f587f5ba26 100644 --- a/pkg/client/listers/dos/v1beta1/dosprotectedresource.go +++ b/pkg/client/listers/dos/v1beta1/dosprotectedresource.go @@ -3,7 +3,7 @@ package v1beta1 import ( - v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/externaldns/v1/dnsendpoint.go b/pkg/client/listers/externaldns/v1/dnsendpoint.go index ed325782e1..2709268b42 100644 --- a/pkg/client/listers/externaldns/v1/dnsendpoint.go +++ b/pkg/client/listers/externaldns/v1/dnsendpoint.go @@ -3,7 +3,7 @@ package v1 import ( - v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache"