From 49773193790d46cb0430e7cabfc9358bf251e83b Mon Sep 17 00:00:00 2001 From: 9bany Date: Mon, 15 May 2023 14:09:24 +0700 Subject: [PATCH 1/5] fix: unable to use CRDs imported as modules --- 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 | 4 +-- 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, 282 insertions(+), 282 deletions(-) diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go index dc4db316c5..86b44a3216 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/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/healthcheck" - "github.com/nginxinc/kubernetes-ingress/internal/k8s" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/metrics" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - cr_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - conf_scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/healthcheck" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics" + "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" + cr_validation "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + conf_scheme "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/scheme" "github.com/nginxinc/nginx-plus-go-client/client" nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" diff --git a/go.mod b/go.mod index 53bd893acb..0a234ccecc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/kubernetes-ingress +module github.com/nginxinc/kubernetes-ingress/v3 go 1.20 diff --git a/internal/certmanager/cm_controller.go b/internal/certmanager/cm_controller.go index 59a75ef904..b63773db35 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/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" - listers_v1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions" + listers_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1" ) const ( diff --git a/internal/certmanager/cm_controller_test.go b/internal/certmanager/cm_controller_test.go index 92c9dcaaaf..1cf1f7091a 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/internal/certmanager/test_files" + testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/util/workqueue" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" ) func Test_controller_Register(t *testing.T) { diff --git a/internal/certmanager/helper.go b/internal/certmanager/helper.go index 03c60d05b1..beadbdb277 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/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" ) var ( diff --git a/internal/certmanager/helper_test.go b/internal/certmanager/helper_test.go index da384a2f0b..651fc6ae22 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/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" ) func Test_translateVsSpec(t *testing.T) { diff --git a/internal/certmanager/sync.go b/internal/certmanager/sync.go index e4c7cd8e34..b2f5bcb0ac 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/pkg/apis/configuration/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" ) const ( diff --git a/internal/certmanager/sync_test.go b/internal/certmanager/sync_test.go index b3b662fd14..9a7e0f9a0c 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/internal/certmanager/test_files" - vsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + testpkg "github.com/nginxinc/kubernetes-ingress/v3/internal/certmanager/test_files" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" ) func TestSync(t *testing.T) { diff --git a/internal/certmanager/test_files/context_builder.go b/internal/certmanager/test_files/context_builder.go index 3caa3c70a7..d0810003e9 100644 --- a/internal/certmanager/test_files/context_builder.go +++ b/internal/certmanager/test_files/context_builder.go @@ -44,9 +44,9 @@ import ( "github.com/cert-manager/cert-manager/pkg/metrics" "github.com/cert-manager/cert-manager/pkg/util" discoveryfake "github.com/cert-manager/cert-manager/test/unit/discovery" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - vsfake "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/fake" - vsinformers "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + vsfake "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned/fake" + vsinformers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions" ) // Builder is a structure used to construct new Contexts for use during tests. diff --git a/internal/configs/config_params.go b/internal/configs/config_params.go index c2dfa6a2bb..875a574aa0 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/pkg/apis/configuration/v1alpha1" +import conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" // ConfigParams holds NGINX configuration parameters that affect the main NGINX config // as well as configs for Ingress resources. diff --git a/internal/configs/configmaps.go b/internal/configs/configmaps.go index 8e7c893b2f..5406712e22 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/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" ) // ParseConfigMap parses ConfigMap into ConfigParams. diff --git a/internal/configs/configurator.go b/internal/configs/configurator.go index e0e7ab37e5..cf7028461b 100644 --- a/internal/configs/configurator.go +++ b/internal/configs/configurator.go @@ -7,27 +7,27 @@ import ( "os" "strings" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/spiffe/go-spiffe/v2/workloadapi" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" "github.com/golang/glog" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - latCollector "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + latCollector "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" ) const ( diff --git a/internal/configs/configurator_test.go b/internal/configs/configurator_test.go index b6ad8ec1bc..b901cd2bc3 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/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" ) func createTestStaticConfigParams() *StaticConfigParams { diff --git a/internal/configs/dos_test.go b/internal/configs/dos_test.go index 7abef5cdb5..9424f29cee 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/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/configs/ingress.go b/internal/configs/ingress.go index f92700ed88..ee766c4a6c 100644 --- a/internal/configs/ingress.go +++ b/internal/configs/ingress.go @@ -6,17 +6,17 @@ import ( "strconv" "strings" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" api_v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/nginxinc/kubernetes-ingress/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" ) const emptyHost = "" diff --git a/internal/configs/ingress_test.go b/internal/configs/ingress_test.go index 0da7f9ac25..2eca0fb88d 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/internal/configs/version1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" v1 "k8s.io/api/core/v1" networking "k8s.io/api/networking/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/configs/transportserver.go b/internal/configs/transportserver.go index 36a848f1c0..4d71691bc1 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/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" ) const nginxNonExistingUnixSocket = "unix:/var/lib/nginx/non-existing-unix-socket.sock" diff --git a/internal/configs/transportserver_test.go b/internal/configs/transportserver_test.go index 7c5c92ee52..59ce27d966 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/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/configs/virtualserver.go b/internal/configs/virtualserver.go index c399b910d1..38795cd356 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/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" diff --git a/internal/configs/virtualserver_test.go b/internal/configs/virtualserver_test.go index 2e40ed2385..ca7dba44b7 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/internal/configs/version2" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" - conf_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs/version2" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" api_v1 "k8s.io/api/core/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/externaldns/controller.go b/internal/externaldns/controller.go index 57d258bf96..7362542585 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/pkg/apis/configuration/v1" - extdns_v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - k8s_nginx "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - listersV1 "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/configuration/v1" - extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + conf_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + extdns_v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + k8s_nginx "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + listersV1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/configuration/v1" + extdnslisters "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/runtime" @@ -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/pkg/client/informers/externalversions" + k8s_nginx_informers "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/informers/externalversions" ) const ( diff --git a/internal/externaldns/sync.go b/internal/externaldns/sync.go index 96d2273c24..b5e18097e9 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/pkg/apis/configuration/v1" - extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - clientset "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned" - extdnslisters "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + extdnsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + clientset "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/clientset/versioned" + extdnslisters "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" validators "k8s.io/apimachinery/pkg/util/validation" diff --git a/internal/externaldns/sync_test.go b/internal/externaldns/sync_test.go index 812e4a2e66..09266fc097 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/pkg/apis/configuration/v1" - extdnsapi "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/v1" - extdnsclient "github.com/nginxinc/kubernetes-ingress/pkg/client/listers/externaldns/v1" + vsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + extdnsapi "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + extdnsclient "github.com/nginxinc/kubernetes-ingress/v3/pkg/client/listers/externaldns/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/healthcheck/healthcheck.go b/internal/healthcheck/healthcheck.go index 5c74d8d7a5..6751f1a7ab 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/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/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 2090f35f59..5ee604f261 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/internal/healthcheck" + "github.com/nginxinc/kubernetes-ingress/v3/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 9a1f4e611b..51dacc0416 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/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration.go b/internal/k8s/appprotectdos/app_protect_dos_configuration.go index f01a671a97..f323133d98 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/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/validation" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotectcommon" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/validation" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go b/internal/k8s/appprotectdos/app_protect_dos_configuration_test.go index 8b66934763..1aa405c44b 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/internal/configs" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/configuration.go b/internal/k8s/configuration.go index c98b0a0c31..2806199ed9 100644 --- a/internal/k8s/configuration.go +++ b/internal/k8s/configuration.go @@ -7,10 +7,10 @@ import ( "strings" "sync" - "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" + "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" 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 770203fdbf..870566e685 100644 --- a/internal/k8s/configuration_test.go +++ b/internal/k8s/configuration_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/google/go-cmp/cmp" - 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" + 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" 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 04fbd20cc9..563b6e7253 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -25,16 +25,16 @@ import ( "sync" "time" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotect" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectcommon" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/appprotectdos" + "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" "k8s.io/client-go/informers" "k8s.io/client-go/rest" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" "github.com/nginxinc/nginx-service-mesh/pkg/spiffe" "github.com/spiffe/go-spiffe/v2/workloadapi" @@ -48,21 +48,21 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/record" - 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" + 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" 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/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" + 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" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" @@ -932,7 +932,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/issues/1448 ) +// it will report warnings. (See https://github.com/nginxinc/kubernetes-ingress/v3/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 b1b352edf8..1f97491753 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/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" + "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" 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 7b07b7f69b..5059c735e3 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/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets" + "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/secrets" 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/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + 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.io/apimachinery/pkg/apis/meta/v1/unstructured" ) diff --git a/internal/k8s/reference_checkers.go b/internal/k8s/reference_checkers.go index f8fe80467a..d1ef6ed3c5 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/internal/configs" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" - conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + conf_v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 4548a54dc1..97e7275135 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/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/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" 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 bec7dcf5a7..8d7eee5716 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/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" + 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" 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 9dd1c10cf2..974d25edf7 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/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" + 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" 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 502ef53576..685bfc1f60 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/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" "github.com/golang/glog" - "github.com/nginxinc/kubernetes-ingress/internal/k8s/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" + "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" 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 3d1cac11fe..49a99e6f50 100644 --- a/internal/k8s/validation.go +++ b/internal/k8s/validation.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/nginxinc/kubernetes-ingress/internal/configs" - ap_validation "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + ap_validation "github.com/nginxinc/kubernetes-ingress/v3/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 cbc2ecd583..17f8caa80f 100644 --- a/internal/metrics/listener.go +++ b/internal/metrics/listener.go @@ -7,8 +7,8 @@ import ( "strconv" "github.com/golang/glog" - config "github.com/nginxinc/kubernetes-ingress/internal/configs" - "github.com/nginxinc/kubernetes-ingress/internal/nginx" + config "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" 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 d15dc22c0f..1638d9d248 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/internal/metrics/collectors" + "github.com/nginxinc/kubernetes-ingress/v3/internal/metrics/collectors" ) // SyslogListener is an interface for syslog metrics listener diff --git a/internal/nginx/manager.go b/internal/nginx/manager.go index 7f3348b1ca..cca7ddd8c3 100644 --- a/internal/nginx/manager.go +++ b/internal/nginx/manager.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/nginxinc/kubernetes-ingress/internal/metrics/collectors" + "github.com/nginxinc/kubernetes-ingress/v3/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 73924e09d8..c2f4d9bb76 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/pkg/apis/configuration" + "github.com/nginxinc/kubernetes-ingress/v3/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 22c1aa7327..825c12b588 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/pkg/apis/configuration" + "github.com/nginxinc/kubernetes-ingress/v3/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 b66fcdaaa4..b7853c1eac 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/internal/configs" + "github.com/nginxinc/kubernetes-ingress/v3/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 ccee08d1f8..18b8302c70 100644 --- a/pkg/apis/configuration/validation/globalconfiguration.go +++ b/pkg/apis/configuration/validation/globalconfiguration.go @@ -3,7 +3,7 @@ package validation import ( "fmt" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/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 6d9309c79d..7528241cad 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/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/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 c855c6ce41..4ea19061de 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 4d715faec3..b88442d991 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 a0d76d4d84..5a1c37614a 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/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/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 616dc8f1a7..03ea41f1ba 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/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/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 434c49223c..521dee4bfd 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/internal/configs" - v1 "github.com/nginxinc/kubernetes-ingress/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 a694fa76d2..70e8951d93 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 d527b6a37f..edd869ad54 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/pkg/apis/dos" + "github.com/nginxinc/kubernetes-ingress/v3/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 2c4efc268b..01e4ba91c4 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/pkg/apis/configuration/validation" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/dos/v1beta1" + validation2 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/validation" + "github.com/nginxinc/kubernetes-ingress/v3/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 e1bfc5494a..449f8a8fcc 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/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/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 ed304ca203..fd500359b8 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/pkg/apis/externaldns" + "github.com/nginxinc/kubernetes-ingress/v3/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 9350f3b921..9cf962a26c 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/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 5f85d792f8..c2a4258bd1 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/pkg/apis/externaldns/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/apis/externaldns/validation" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + "github.com/nginxinc/kubernetes-ingress/v3/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 254b60c025..2b8168fb6e 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/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" + 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" 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 6f23a69f15..5b2602e96a 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/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" + 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" "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 387f77a14a..391576ca9a 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/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" + 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" 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 c69fe24de5..bf58d0c01f 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/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" + 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" 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 c59b6a1b1f..30fe3da58a 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/pkg/apis/configuration/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + "github.com/nginxinc/kubernetes-ingress/v3/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 3281d34a8a..479ecb60da 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/pkg/client/clientset/versioned/typed/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 9d2b079243..f7195c683d 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 9d3eade2b7..5c9d42a078 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 b4c644c5f6..a965f727cf 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 63fd8d564a..a2bc0c4f43 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/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 4d9b39944a..02678c394e 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/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 76290fd5eb..6714a1d550 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/pkg/apis/configuration/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 349d660772..e1e9071112 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/pkg/apis/configuration/v1alpha1" - "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + "github.com/nginxinc/kubernetes-ingress/v3/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 9ad22127bd..3364b9ae7b 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/pkg/client/clientset/versioned/typed/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 e2aba966d1..82c28b4547 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 9f9d0356a5..83f71ac860 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 982dbe531f..04a49ac00c 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 80e0eb8da6..586bd84d94 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/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 f90324d076..2ad82aeade 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/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 c402b9776d..f8a26165ac 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/pkg/apis/configuration/v1alpha1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/configuration/v1alpha1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 186caac0ee..d7d9f4b56e 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/pkg/apis/dos/v1beta1" - "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + "github.com/nginxinc/kubernetes-ingress/v3/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 15fdb8c655..a7cc819974 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/pkg/apis/dos/v1beta1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 2a59aff231..d1f10eb82c 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/pkg/client/clientset/versioned/typed/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/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 6c76137c15..85f35ec883 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/pkg/apis/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/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 a90773de76..8b561f22a1 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/pkg/apis/externaldns/v1" - scheme "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + scheme "github.com/nginxinc/kubernetes-ingress/v3/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 2e9b1232e9..0e66f73aa0 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/pkg/apis/externaldns/v1" - "github.com/nginxinc/kubernetes-ingress/pkg/client/clientset/versioned/scheme" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" + "github.com/nginxinc/kubernetes-ingress/v3/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 702442c079..a958f6876e 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/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 ccc09f3e04..11a9ce0830 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/pkg/client/clientset/versioned/typed/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 56ce00e07e..96a2156e48 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/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" + 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" ) // 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 85ebcfab80..ab84c4bc5f 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/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/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 4f9a412588..e451f93901 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/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" + 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" 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 8fe544dd6a..60e4c16aab 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/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" + 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" 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 b681a1acb8..56ec64b82d 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/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" + 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" 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 7c2da1c427..866d86445e 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/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" + 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" 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 b65ce74c68..2713524f32 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/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/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 8cb91c2189..a96aa3a5ff 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/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" + 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" 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 a6dbdcd29e..a55b835029 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/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" + 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" 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 ac812cda74..335f8b4931 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/pkg/client/informers/externalversions/dos/v1beta1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + 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" ) // 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 e6a03fb143..258109ab7d 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/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" + 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" 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 774aefee0d..20997c46c0 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/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/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 947e6b788a..fc753d6b61 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/pkg/client/informers/externalversions/externaldns/v1" - internalinterfaces "github.com/nginxinc/kubernetes-ingress/pkg/client/informers/externalversions/internalinterfaces" + 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" ) // 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 331f9057df..0a998ac034 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/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" + 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" 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 747d4431af..da778e8eb9 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/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/nginxinc/kubernetes-ingress/v3/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 f3a1605aeb..8c64c823ab 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/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" + 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" 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 6780037382..fbdbc823c0 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/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" + 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" 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 4bb7c08ee3..d3d5dfbcb1 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/pkg/client/clientset/versioned" + versioned "github.com/nginxinc/kubernetes-ingress/v3/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 9d58b364e4..2d73097f5b 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 024193000f..3041782121 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 5060282cdf..0313c401c0 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/pkg/apis/configuration/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/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 5401f6a3b8..236fff1727 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 8034a5d068..b2e9dd6f0d 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 1e207cd1cd..0598d6a15c 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/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/nginxinc/kubernetes-ingress/v3/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 f587f5ba26..f3d3c7c084 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/pkg/apis/dos/v1beta1" + v1beta1 "github.com/nginxinc/kubernetes-ingress/v3/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 2709268b42..ed325782e1 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/pkg/apis/externaldns/v1" + v1 "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/externaldns/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" From e5e8c53c238b993f8902b265c1aec7639218057c Mon Sep 17 00:00:00 2001 From: 9bany Date: Mon, 15 May 2023 14:28:45 +0700 Subject: [PATCH 2/5] update change log --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20d14a8a48..798eb756a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### Changed + +Unable to use CRDs imported as modules [#3770](https://github.com/nginxinc/kubernetes-ingress/issues/3770) + ### 3.1.1 An automatically generated list of changes can be found on GitHub at: [3.1.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.1) From acdb2991a57e46c13566bd4b8af943d0c9864b89 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:24:18 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- internal/metrics/listener.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go index 91d9c5c01b..398777e56d 100644 --- a/internal/metrics/listener.go +++ b/internal/metrics/listener.go @@ -11,7 +11,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang/glog" - + config "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" From 002d18d36b7c50e8b8f55fc767f6f35626bc234a Mon Sep 17 00:00:00 2001 From: 9bany Date: Wed, 28 Jun 2023 17:28:08 +0700 Subject: [PATCH 4/5] fix: lint code smell --- internal/metrics/listener.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/internal/metrics/listener.go b/internal/metrics/listener.go index 398777e56d..0f938d7722 100644 --- a/internal/metrics/listener.go +++ b/internal/metrics/listener.go @@ -12,9 +12,6 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang/glog" - config "github.com/nginxinc/kubernetes-ingress/v3/internal/configs" - "github.com/nginxinc/kubernetes-ingress/v3/internal/nginx" - prometheusClient "github.com/nginxinc/nginx-prometheus-exporter/client" nginxCollector "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/prometheus/client_golang/prometheus" From 3a68ddb32975c5a9565d5ae808f2c25f55e00abf Mon Sep 17 00:00:00 2001 From: 9bany Date: Tue, 4 Jul 2023 16:39:57 +0700 Subject: [PATCH 5/5] fix: lint code --- internal/k8s/controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/k8s/controller.go b/internal/k8s/controller.go index 0953524ba2..f4521233d1 100644 --- a/internal/k8s/controller.go +++ b/internal/k8s/controller.go @@ -24,7 +24,8 @@ import ( "strings" "sync" "time" - "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" + + "github.com/nginxinc/kubernetes-ingress/v3/pkg/apis/dos/v1beta1" "golang.org/x/exp/maps" "github.com/nginxinc/kubernetes-ingress/v3/internal/k8s/appprotect"