From 513db87cbf94ce66207f74365b502e8cde841357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Mon, 30 Oct 2023 13:53:32 +0100 Subject: [PATCH] chore(go): bump KIC's Go module from v2 to v3 (#5014) --- .golangci.yaml | 5 ++- Makefile | 25 ++++++------ PROJECT | 2 +- README.md | 2 +- go.mod | 4 +- hack/cleanup/gke_clusters.go | 2 +- hack/cleanup/konnect_runtime_groups.go | 4 +- .../generators/controllers/networking/main.go | 24 +++++------ internal/adminapi/backoff_strategy_konnect.go | 2 +- .../adminapi/backoff_strategy_konnect_test.go | 2 +- internal/adminapi/client.go | 4 +- internal/adminapi/client_test.go | 4 +- internal/adminapi/endpoints.go | 2 +- internal/adminapi/endpoints_test.go | 4 +- internal/adminapi/kong.go | 4 +- internal/adminapi/kong_test.go | 8 ++-- internal/adminapi/konnect.go | 2 +- internal/adminapi/konnect_test.go | 2 +- internal/admission/adminapi_provider.go | 2 +- internal/admission/adminapi_provider_test.go | 4 +- internal/admission/handler.go | 8 ++-- internal/admission/response_builder_test.go | 2 +- internal/admission/server_test.go | 6 +-- internal/admission/utils.go | 4 +- .../consumers/credentials/validation.go | 4 +- .../consumers/credentials/validation_test.go | 2 +- .../admission/validation/gateway/httproute.go | 6 +-- .../validation/gateway/httproute_test.go | 4 +- .../admission/validation/ingress/ingress.go | 4 +- internal/admission/validator.go | 22 +++++----- internal/admission/validator_test.go | 8 ++-- internal/clients/config_status_test.go | 2 +- internal/clients/manager.go | 6 +-- internal/clients/manager_test.go | 6 +-- internal/clients/readiness.go | 4 +- internal/clients/readiness_test.go | 4 +- internal/cmd/fips/main.go | 4 +- internal/cmd/main.go | 4 +- internal/cmd/rootcmd/rootcmd.go | 4 +- internal/cmd/rootcmd/rootcmd_test.go | 2 +- internal/cmd/rootcmd/run.go | 2 +- internal/cmd/rootcmd/servers.go | 6 +-- internal/cmd/rootcmd/signal.go | 2 +- .../configuration/kongadminapi_controller.go | 6 +-- .../configuration/object_references.go | 10 ++--- .../configuration/object_references_test.go | 4 +- .../configuration/secret_controller.go | 6 +-- .../configuration/zz_generated_controllers.go | 18 ++++----- .../controllers/crds/dynamic_controller.go | 4 +- internal/controllers/dataplane.go | 2 +- .../controllers/gateway/gateway_controller.go | 12 +++--- .../gateway/gateway_controller_test.go | 6 +-- internal/controllers/gateway/gateway_utils.go | 8 ++-- .../controllers/gateway/gateway_utils_test.go | 4 +- .../gateway/gatewayclass_controller.go | 4 +- .../gateway/gatewayclass_controller_test.go | 2 +- .../gateway/grpcroute_controller.go | 10 ++--- .../gateway/httproute_controller.go | 12 +++--- .../gateway/referencegrant_controller.go | 4 +- .../gateway/route_parent_status.go | 2 +- .../gateway/route_parent_status_test.go | 2 +- internal/controllers/gateway/route_utils.go | 4 +- .../controllers/gateway/route_utils_test.go | 8 ++-- .../gateway/tcproute_controller.go | 10 ++--- .../gateway/tlsroute_controller.go | 10 ++--- .../gateway/udproute_controller.go | 10 ++--- internal/controllers/gateway/utils.go | 2 +- internal/controllers/reference/indexer.go | 6 +-- internal/controllers/reference/reference.go | 2 +- internal/controllers/utils/conditions.go | 6 +-- internal/controllers/utils/conditions_test.go | 6 +-- internal/controllers/utils/conversion.go | 2 +- internal/controllers/utils/conversion_test.go | 2 +- internal/controllers/utils/utils.go | 2 +- internal/controllers/utils/utils_test.go | 2 +- .../dataplane/configfetcher/config_fetcher.go | 8 ++-- .../configfetcher/config_fetcher_test.go | 4 +- .../dataplane/configfetcher/kongrawstate.go | 2 +- .../configfetcher/kongrawstate_test.go | 4 +- internal/dataplane/deckerrors/api_test.go | 2 +- internal/dataplane/deckgen/deckgen_test.go | 4 +- internal/dataplane/deckgen/generate.go | 4 +- internal/dataplane/deckgen/generate_test.go | 6 +-- internal/dataplane/failures/failures_test.go | 2 +- internal/dataplane/kong_client.go | 28 ++++++------- internal/dataplane/kong_client_test.go | 26 ++++++------ internal/dataplane/kongstate/consumer.go | 2 +- internal/dataplane/kongstate/consumer_test.go | 2 +- internal/dataplane/kongstate/consumergroup.go | 2 +- internal/dataplane/kongstate/kongstate.go | 10 ++--- .../dataplane/kongstate/kongstate_test.go | 14 +++---- internal/dataplane/kongstate/route.go | 4 +- internal/dataplane/kongstate/route_test.go | 4 +- internal/dataplane/kongstate/service.go | 4 +- internal/dataplane/kongstate/service_test.go | 2 +- internal/dataplane/kongstate/upstream.go | 4 +- internal/dataplane/kongstate/upstream_test.go | 2 +- internal/dataplane/kongstate/util.go | 8 ++-- internal/dataplane/kongstate/util_test.go | 10 ++--- internal/dataplane/parser/backendref.go | 6 +-- internal/dataplane/parser/golden_test.go | 8 ++-- .../parser/ingressclassparemeters_test.go | 4 +- internal/dataplane/parser/ingressrules.go | 10 ++--- .../dataplane/parser/ingressrules_test.go | 6 +-- internal/dataplane/parser/objects_test.go | 2 +- internal/dataplane/parser/parser.go | 18 ++++----- internal/dataplane/parser/parser_test.go | 16 ++++---- .../parser/translate_failures_test.go | 2 +- .../dataplane/parser/translate_grpcroute.go | 6 +-- .../parser/translate_grpcroute_test.go | 12 +++--- .../dataplane/parser/translate_httproute.go | 8 ++-- .../parser/translate_httproute_test.go | 14 +++---- .../dataplane/parser/translate_ingress.go | 12 +++--- .../parser/translate_ingress_test.go | 8 ++-- .../dataplane/parser/translate_kong_l4.go | 4 +- .../parser/translate_kong_l4_test.go | 8 ++-- .../parser/translate_routes_helpers.go | 6 +-- .../parser/translate_routes_helpers_test.go | 6 +-- .../dataplane/parser/translate_secrets.go | 4 +- .../parser/translate_secrets_test.go | 6 +-- .../dataplane/parser/translate_tcproute.go | 4 +- .../parser/translate_tcproute_test.go | 10 ++--- .../dataplane/parser/translate_tlsroute.go | 6 +-- .../parser/translate_tlsroute_test.go | 10 ++--- .../dataplane/parser/translate_udproute.go | 4 +- .../parser/translate_udproute_test.go | 12 +++--- internal/dataplane/parser/translate_utils.go | 8 ++-- .../dataplane/parser/translate_utils_test.go | 6 +-- .../dataplane/parser/translators/atc_utils.go | 2 +- .../dataplane/parser/translators/grpcroute.go | 6 +-- .../parser/translators/grpcroute_atc.go | 10 ++--- .../parser/translators/grpcroute_atc_test.go | 6 +-- .../parser/translators/grpcroute_test.go | 6 +-- .../dataplane/parser/translators/httproute.go | 6 +-- .../parser/translators/httproute_atc.go | 10 ++--- .../parser/translators/httproute_atc_test.go | 8 ++-- .../parser/translators/httproute_test.go | 2 +- .../dataplane/parser/translators/ingress.go | 8 ++-- .../parser/translators/ingress_atc.go | 8 ++-- .../parser/translators/ingress_atc_test.go | 6 +-- .../parser/translators/ingress_test.go | 8 ++-- .../parser/translators/kongupstreampolicy.go | 2 +- .../translators/kongupstreampolicy_test.go | 4 +- .../parser/translators/l4route_atc.go | 4 +- .../parser/translators/l4route_atc_test.go | 2 +- .../dataplane/parser/translators/portdef.go | 2 +- .../dataplane/parser/wrappers_refchecker.go | 2 +- .../dataplane/sendconfig/backoff_strategy.go | 6 +-- .../sendconfig/backoff_strategy_test.go | 6 +-- .../sendconfig/config_change_detector.go | 2 +- .../sendconfig/config_change_detector_test.go | 2 +- internal/dataplane/sendconfig/dbmode.go | 4 +- internal/dataplane/sendconfig/inmemory.go | 2 +- .../sendconfig/inmemory_error_handling.go | 2 +- .../sendconfig/inmemory_schema_test.go | 2 +- internal/dataplane/sendconfig/kong.go | 2 +- internal/dataplane/sendconfig/sendconfig.go | 8 ++-- internal/dataplane/sendconfig/strategy.go | 4 +- .../dataplane/sendconfig/strategy_test.go | 4 +- internal/dataplane/synchronizer.go | 2 +- internal/diagnostics/server.go | 2 +- internal/konnect/license/client.go | 6 +-- internal/konnect/license/client_test.go | 4 +- internal/konnect/mock_node_api_test.go | 2 +- internal/konnect/node_agent.go | 8 ++-- internal/konnect/node_agent_test.go | 10 ++--- internal/konnect/nodes/client.go | 4 +- internal/konnect/roles/client_test.go | 2 +- internal/labels/labels.go | 2 +- internal/license/agent.go | 4 +- internal/license/agent_test.go | 6 +-- internal/manager/config.go | 22 +++++----- internal/manager/config_test.go | 2 +- internal/manager/config_validation.go | 6 +-- internal/manager/config_validation_test.go | 6 +-- internal/manager/controllerdef.go | 16 ++++---- internal/manager/flags/validated_test.go | 2 +- internal/manager/health_check_test.go | 2 +- internal/manager/run.go | 40 +++++++++---------- internal/manager/scheme/scheme.go | 6 +-- internal/manager/setup.go | 16 ++++---- internal/manager/setup_test.go | 6 +-- internal/manager/telemetry/manager.go | 4 +- internal/manager/telemetry/reports.go | 6 +-- internal/manager/type_meta_setting_client.go | 2 +- internal/manager/utils/kongconfig/root.go | 2 +- .../manager/utils/kongconfig/root_test.go | 2 +- internal/metrics/prometheus.go | 2 +- internal/metrics/prometheus_test.go | 2 +- internal/store/cache_stores.go | 8 ++-- internal/store/cache_stores_test.go | 4 +- internal/store/fake_store.go | 10 ++--- internal/store/fake_store_test.go | 8 ++-- internal/store/store.go | 14 +++---- internal/store/store_test.go | 4 +- internal/util/builder/allowedroutes.go | 2 +- internal/util/builder/backendref.go | 4 +- internal/util/builder/httpbackendref.go | 4 +- internal/util/builder/httproutefilter.go | 2 +- internal/util/builder/httproutematch.go | 2 +- internal/util/builder/ingress.go | 2 +- .../util/builder/kongstateservicebackend.go | 2 +- internal/util/builder/listener.go | 2 +- internal/util/builder/routegroupkind.go | 2 +- internal/util/builder/routenamespaces.go | 2 +- internal/util/conditions_test.go | 4 +- internal/util/conversions.go | 2 +- internal/util/credential.go | 2 +- internal/util/credential_test.go | 2 +- internal/util/hostname.go | 2 +- internal/util/hostname_test.go | 2 +- internal/util/k8s.go | 4 +- internal/util/k8s_test.go | 4 +- internal/util/kubernetes/object/set_test.go | 2 +- .../kubernetes/object/status/queue_test.go | 2 +- internal/util/test/controller_manager.go | 6 +-- internal/util/test/crds.go | 2 +- internal/util/test/rbacs.go | 2 +- internal/util/types_test.go | 2 +- pkg/clientset/clientset.go | 6 +-- pkg/clientset/fake/clientset_generated.go | 14 +++---- pkg/clientset/fake/register.go | 6 +-- pkg/clientset/scheme/register.go | 6 +-- .../configuration/v1/configuration_client.go | 4 +- .../v1/fake/fake_configuration_client.go | 2 +- .../v1/fake/fake_kongclusterplugin.go | 2 +- .../v1/fake/fake_kongconsumer.go | 2 +- .../configuration/v1/fake/fake_kongingress.go | 2 +- .../configuration/v1/fake/fake_kongplugin.go | 2 +- .../configuration/v1/kongclusterplugin.go | 4 +- .../typed/configuration/v1/kongconsumer.go | 4 +- .../typed/configuration/v1/kongingress.go | 4 +- .../typed/configuration/v1/kongplugin.go | 4 +- .../v1alpha1/configuration_client.go | 4 +- .../fake/fake_configuration_client.go | 2 +- .../fake/fake_ingressclassparameters.go | 2 +- .../v1alpha1/ingressclassparameters.go | 4 +- .../v1beta1/configuration_client.go | 4 +- .../v1beta1/fake/fake_configuration_client.go | 2 +- .../v1beta1/fake/fake_kongconsumergroup.go | 2 +- .../v1beta1/fake/fake_kongupstreampolicy.go | 2 +- .../v1beta1/fake/fake_tcpingress.go | 2 +- .../v1beta1/fake/fake_udpingress.go | 2 +- .../v1beta1/kongconsumergroup.go | 4 +- .../v1beta1/kongupstreampolicy.go | 4 +- .../typed/configuration/v1beta1/tcpingress.go | 4 +- .../typed/configuration/v1beta1/udpingress.go | 4 +- pkg/clientset_test/clientset_test.go | 4 +- scripts/cli-arguments-docs-gen/main.go | 2 +- test/conformance/gateway_conformance_test.go | 8 ++-- .../gateway_expermimental_conformance_test.go | 4 +- test/conformance/suite_test.go | 18 ++++----- test/e2e/all_in_one_test.go | 2 +- test/e2e/features_test.go | 20 +++++----- test/e2e/helpers_gateway_test.go | 12 +++--- test/e2e/helpers_test.go | 8 ++-- test/e2e/istio_test.go | 16 ++++---- test/e2e/konnect_test.go | 18 ++++----- test/e2e/upgrade_test.go | 2 +- test/e2e/utils_test.go | 4 +- .../adminapi_discoverer_envtest_test.go | 6 +-- test/envtest/adminapimock.go | 2 +- test/envtest/configerrorevent_envtest_test.go | 6 +-- test/envtest/controller.go | 2 +- test/envtest/crds_envtest_test.go | 12 +++--- test/envtest/gateway_envtest_test.go | 4 +- test/envtest/gatewayclass_envtest_test.go | 14 +++---- test/envtest/httproute_controller_test.go | 10 ++--- test/envtest/ingress_test.go | 6 +-- .../k8s_objects_status_envtest_test.go | 6 +-- .../kongadminapi_controller_envtest_test.go | 8 ++-- .../kongstate_consumer_failures_test.go | 4 +- test/envtest/manager_debugendpoints_test.go | 2 +- test/envtest/manager_envtest_test.go | 2 +- test/envtest/metrics_envtest_test.go | 2 +- .../programmed_condition_envtest_test.go | 10 ++--- test/envtest/run.go | 12 +++--- test/envtest/scheme.go | 6 +-- test/envtest/setup.go | 10 ++--- test/envtest/telemetry_test.go | 8 ++-- test/helpers/certificate/certificate.go | 2 +- test/helpers/conditions.go | 4 +- test/integration/consumer_group_test.go | 14 +++---- test/integration/consumer_test.go | 12 +++--- test/integration/examples_test.go | 8 ++-- test/integration/gateway_test.go | 16 ++++---- test/integration/gateway_webhook_test.go | 6 +-- test/integration/grpcroute_test.go | 10 ++--- test/integration/helpers_test.go | 8 ++-- test/integration/httproute_test.go | 16 ++++---- test/integration/httproute_webhook_test.go | 6 +-- test/integration/ingress_https_test.go | 8 ++-- test/integration/ingress_regex_match_test.go | 6 +-- test/integration/ingress_test.go | 14 +++---- test/integration/ingress_webhook_test.go | 6 +-- test/integration/kongingress_test.go | 8 ++-- test/integration/kongingress_webhook_test.go | 8 ++-- test/integration/plugin_test.go | 12 +++--- test/integration/suite_test.go | 14 +++---- test/integration/tcpingress_test.go | 14 +++---- test/integration/tcproute_test.go | 6 +-- test/integration/tlsroute_test.go | 12 +++--- test/integration/translation_failures_test.go | 20 +++++----- test/integration/udpingress_test.go | 10 ++--- test/integration/udproute_test.go | 4 +- test/integration/utils_test.go | 4 +- test/integration/version_test.go | 6 +-- test/integration/webhook_test.go | 18 ++++----- test/internal/helpers/kong.go | 6 +-- test/internal/helpers/ktf.go | 4 +- test/internal/helpers/tcp_test.go | 2 +- test/internal/helpers/teardown.go | 2 +- test/internal/testenv/feature_gates.go | 2 +- test/kongintegration/containers/httpbin.go | 2 +- test/kongintegration/containers/kong.go | 8 ++-- test/kongintegration/containers/ports.go | 2 +- .../kongintegration/expression_router_test.go | 8 ++-- .../inmemory_update_strategy_test.go | 4 +- .../kongupstreampolicy_test.go | 8 ++-- .../parser_golden_tests_outputs_test.go | 6 +-- test/mocks/admin_api_client_factory.go | 2 +- test/mocks/admin_api_discoverer.go | 2 +- test/mocks/admin_api_handler.go | 2 +- test/mocks/dataplane.go | 2 +- 324 files changed, 970 insertions(+), 966 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 43fc2711f6..4abeddcb76 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -53,7 +53,7 @@ linters-settings: sections: - standard - default - - prefix(github.com/kong/kubernetes-ingress-controller/v2) + - prefix(github.com/kong/kubernetes-ingress-controller/v3) importas: no-unaliased: true alias: @@ -119,6 +119,9 @@ linters-settings: recommendations: - github.com/go-logr/zapr - github.com/go-logr/logr + - github.com/kong/kubernetes-ingress-controller/v2: + recommendations: + - github.com/kong/kubernetes-ingress-controller/v3 tenv: all: true loggercheck: diff --git a/Makefile b/Makefile index 0f56561a83..aefb79cc58 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ SHELL := bash MAKEFLAGS += --no-print-directory REPO_URL ?= github.com/kong/kubernetes-ingress-controller REPO_INFO ?= $(shell git config --get remote.origin.url) +GO_MOD_MAJOR_VERSION ?= $(subst $(REPO_URL)/,,$(shell go list -m)) TAG ?= $(shell git describe --tags) ifndef COMMIT @@ -136,9 +137,9 @@ _build.fips: .PHONY: _build.template _build.template: go build -o bin/manager -ldflags "-s -w \ - -X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Commit=$(COMMIT) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN} + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Commit=$(COMMIT) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN} .PHONY: _build.debug _build.debug: @@ -147,9 +148,9 @@ _build.debug: .PHONY: _build.template.debug _build.template.debug: go build -o bin/manager-debug -trimpath -gcflags=all="-N -l" -ldflags " \ - -X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Commit=$(COMMIT) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN} + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Commit=$(COMMIT) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" ${MAIN} .PHONY: fmt fmt: @@ -244,12 +245,12 @@ generate.clientsets: client-gen --go-header-file ./hack/boilerplate.go.txt \ --logtostderr \ --clientset-name clientset \ - --input-base $(REPO_URL)/v2/pkg/apis/ \ + --input-base $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/pkg/apis/ \ --input configuration/v1,configuration/v1beta1,configuration/v1alpha1 \ --input-dirs $(REPO_URL)/pkg/apis/configuration/v1alpha1/,$(REPO_URL)/pkg/apis/configuration/v1beta1/,$(REPO_URL)/pkg/apis/configuration/v1/ \ --output-base pkg/ \ - --output-package $(REPO_URL)/v2/pkg/ \ - --trim-path-prefix pkg/$(REPO_URL)/v2/ + --output-package $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/pkg/ \ + --trim-path-prefix pkg/$(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/ .PHONY: generate.docs generate.docs: generate.apidocs generate.cli-arguments-docs @@ -331,9 +332,9 @@ test.conformance-experimental: _check.container.environment go-junit-report TEST_EXPERIMENTAL_CONFORMANCE="true" \ go test \ -ldflags " \ - -X $(REPO_URL)/v2/internal/manager/metadata.ProjectURL=$(REPO_URL) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Release=$(TAG) \ - -X $(REPO_URL)/v2/internal/manager/metadata.Repo=$(REPO_INFO)" \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.ProjectURL=$(REPO_URL) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Release=$(TAG) \ + -X $(REPO_URL)/$(GO_MOD_MAJOR_VERSION)/internal/manager/metadata.Repo=$(REPO_INFO)" \ -v \ -race $(GOTESTFLAGS) \ -timeout $(INTEGRATION_TEST_TIMEOUT) \ diff --git a/PROJECT b/PROJECT index 70426e2e3d..71f458d7d7 100644 --- a/PROJECT +++ b/PROJECT @@ -3,7 +3,7 @@ layout: - go.kubebuilder.io/v3 multigroup: true projectName: kubernetes-ingress-controller -repo: github.com/kong/kubernetes-ingress-controller/v2 +repo: github.com/kong/kubernetes-ingress-controller resources: - api: crdVersion: v1 diff --git a/README.md b/README.md index e6414d889b..9d89138504 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![kong-logo]][kong-url] [![Build Status](https://github.com/Kong/kubernetes-ingress-controller/actions/workflows/checks.yaml/badge.svg)](https://github.com/Kong/kubernetes-ingress-controller/actions/workflows/checks.yaml) -[![Go Reference](https://pkg.go.dev/badge/github.com/kong/kubernetes-ingress-controller/v2.svg)](https://pkg.go.dev/github.com/kong/kubernetes-ingress-controller/v2) +[![Go Reference](https://pkg.go.dev/badge/github.com/kong/kubernetes-ingress-controller/v3.svg)](https://pkg.go.dev/github.com/kong/kubernetes-ingress-controller/v3) [![Codecov](https://codecov.io/gh/Kong/kubernetes-ingress-controller/branch/main/graph/badge.svg?token=S1aqcXiGEo)](https://codecov.io/gh/Kong/kubernetes-ingress-controller) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/Kong/kong/blob/master/LICENSE) [![Twitter](https://img.shields.io/twitter/follow/thekonginc.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=thekonginc) diff --git a/go.mod b/go.mod index 3ca5e6ba23..daf8c8292a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kong/kubernetes-ingress-controller/v2 +module github.com/kong/kubernetes-ingress-controller/v3 go 1.21 @@ -74,6 +74,7 @@ require ( github.com/gammazero/workerpool v1.1.3 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/s2a-go v0.1.7 // indirect + github.com/hashicorp/go-hclog v1.2.0 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect @@ -138,7 +139,6 @@ require ( github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-hclog v1.2.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-memdb v1.3.4 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 diff --git a/hack/cleanup/gke_clusters.go b/hack/cleanup/gke_clusters.go index 2ce9724640..6d7158bf32 100644 --- a/hack/cleanup/gke_clusters.go +++ b/hack/cleanup/gke_clusters.go @@ -12,7 +12,7 @@ import ( "github.com/go-logr/logr" "google.golang.org/api/option" - "github.com/kong/kubernetes-ingress-controller/v2/test/e2e" + "github.com/kong/kubernetes-ingress-controller/v3/test/e2e" ) const timeUntilClusterOrphaned = time.Hour diff --git a/hack/cleanup/konnect_runtime_groups.go b/hack/cleanup/konnect_runtime_groups.go index f605db1046..0246d61bea 100644 --- a/hack/cleanup/konnect_runtime_groups.go +++ b/hack/cleanup/konnect_runtime_groups.go @@ -11,8 +11,8 @@ import ( "github.com/oapi-codegen/runtime/types" "github.com/samber/lo" - cp "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/controlplanes" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/roles" + cp "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/controlplanes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/roles" ) const ( diff --git a/hack/generators/controllers/networking/main.go b/hack/generators/controllers/networking/main.go index 49e41e6bcc..13df5ea01b 100644 --- a/hack/generators/controllers/networking/main.go +++ b/hack/generators/controllers/networking/main.go @@ -20,9 +20,9 @@ const ( discoveryv1 = "k8s.io/api/discovery/v1" netv1 = "k8s.io/api/networking/v1" - kongv1 = "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 = "github.com/kong/kubernetes-ingress-controller/v2/api/configuration/v1beta1" - kongv1alpha1 = "github.com/kong/kubernetes-ingress-controller/v2/api/configuration/v1alpha1" + kongv1 = "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 = "github.com/kong/kubernetes-ingress-controller/v3/api/configuration/v1beta1" + kongv1alpha1 = "github.com/kong/kubernetes-ingress-controller/v3/api/configuration/v1alpha1" ) // inputControllersNeeded is a list of the supported Types for the @@ -420,15 +420,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) ` diff --git a/internal/adminapi/backoff_strategy_konnect.go b/internal/adminapi/backoff_strategy_konnect.go index e9ce525d33..75b26f6355 100644 --- a/internal/adminapi/backoff_strategy_konnect.go +++ b/internal/adminapi/backoff_strategy_konnect.go @@ -13,7 +13,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" ) const ( diff --git a/internal/adminapi/backoff_strategy_konnect_test.go b/internal/adminapi/backoff_strategy_konnect_test.go index 36eb5ec57b..a26a72280e 100644 --- a/internal/adminapi/backoff_strategy_konnect_test.go +++ b/internal/adminapi/backoff_strategy_konnect_test.go @@ -10,7 +10,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) type mockClock struct { diff --git a/internal/adminapi/client.go b/internal/adminapi/client.go index 4dfe3c2884..74142c805d 100644 --- a/internal/adminapi/client.go +++ b/internal/adminapi/client.go @@ -10,8 +10,8 @@ import ( "github.com/samber/lo" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock" ) // Client is a wrapper around raw *kong.Client. It's advised to pass this wrapper across the codebase, and diff --git a/internal/adminapi/client_test.go b/internal/adminapi/client_test.go index aabb973c3a..2cc9dec217 100644 --- a/internal/adminapi/client_test.go +++ b/internal/adminapi/client_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestClientFactory_CreateAdminAPIClientAttachesPodReference(t *testing.T) { diff --git a/internal/adminapi/endpoints.go b/internal/adminapi/endpoints.go index bbeeec0bf0..7f7968dd65 100644 --- a/internal/adminapi/endpoints.go +++ b/internal/adminapi/endpoints.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" - cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" + cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" ) // DiscoveredAdminAPI represents an Admin API discovered from a Kubernetes Service. diff --git a/internal/adminapi/endpoints_test.go b/internal/adminapi/endpoints_test.go index d019892888..198c286a51 100644 --- a/internal/adminapi/endpoints_test.go +++ b/internal/adminapi/endpoints_test.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestDiscoverer_AddressesFromEndpointSlice(t *testing.T) { diff --git a/internal/adminapi/kong.go b/internal/adminapi/kong.go index ad4ccfd81c..5e6abeef65 100644 --- a/internal/adminapi/kong.go +++ b/internal/adminapi/kong.go @@ -14,8 +14,8 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) // KongClientNotReadyError is returned when the Kong client is not ready to be used yet. diff --git a/internal/adminapi/kong_test.go b/internal/adminapi/kong_test.go index 2f4f1c4a0f..06b28f58f1 100644 --- a/internal/adminapi/kong_test.go +++ b/internal/adminapi/kong_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestMakeHTTPClientWithTLSOpts(t *testing.T) { diff --git a/internal/adminapi/konnect.go b/internal/adminapi/konnect.go index a02dc6d9af..8cb4282c93 100644 --- a/internal/adminapi/konnect.go +++ b/internal/adminapi/konnect.go @@ -13,7 +13,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls" + tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls" ) type KonnectConfig struct { diff --git a/internal/adminapi/konnect_test.go b/internal/adminapi/konnect_test.go index a319feb666..bda3c36912 100644 --- a/internal/adminapi/konnect_test.go +++ b/internal/adminapi/konnect_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) func TestNewKongClientForKonnectControlPlane(t *testing.T) { diff --git a/internal/admission/adminapi_provider.go b/internal/admission/adminapi_provider.go index 1ca7322c45..051da681b8 100644 --- a/internal/admission/adminapi_provider.go +++ b/internal/admission/adminapi_provider.go @@ -3,7 +3,7 @@ package admission import ( "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) // GatewayClientsProvider returns the most recent set of Gateway Admin API clients. diff --git a/internal/admission/adminapi_provider_test.go b/internal/admission/adminapi_provider_test.go index aff5718d71..d08bcdddcb 100644 --- a/internal/admission/adminapi_provider_test.go +++ b/internal/admission/adminapi_provider_test.go @@ -6,8 +6,8 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/admission" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/admission" ) type fakeGatewayClientsProvider struct { diff --git a/internal/admission/handler.go b/internal/admission/handler.go index 4f0495e77c..79257cb0e1 100644 --- a/internal/admission/handler.go +++ b/internal/admission/handler.go @@ -12,10 +12,10 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // RequestHandler is an HTTP server that can validate Kong Ingress Controllers' diff --git a/internal/admission/response_builder_test.go b/internal/admission/response_builder_test.go index 9bdfbabab5..98c7973ee0 100644 --- a/internal/admission/response_builder_test.go +++ b/internal/admission/response_builder_test.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/admission" + "github.com/kong/kubernetes-ingress-controller/v3/internal/admission" ) func TestResponseBuilder(t *testing.T) { diff --git a/internal/admission/server_test.go b/internal/admission/server_test.go index c897c7bb7e..740f6f97ea 100644 --- a/internal/admission/server_test.go +++ b/internal/admission/server_test.go @@ -18,9 +18,9 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) var decoder = codecs.UniversalDeserializer() diff --git a/internal/admission/utils.go b/internal/admission/utils.go index ff786131a7..6d90eec747 100644 --- a/internal/admission/utils.go +++ b/internal/admission/utils.go @@ -7,8 +7,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - credsvalidation "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/consumers/credentials" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + credsvalidation "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/consumers/credentials" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) // ----------------------------------------------------------------------------- diff --git a/internal/admission/validation/consumers/credentials/validation.go b/internal/admission/validation/consumers/credentials/validation.go index 522662223f..7bea486875 100644 --- a/internal/admission/validation/consumers/credentials/validation.go +++ b/internal/admission/validation/consumers/credentials/validation.go @@ -7,8 +7,8 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/labels" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/labels" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/admission/validation/consumers/credentials/validation_test.go b/internal/admission/validation/consumers/credentials/validation_test.go index d3ce3304fd..e978a3da4f 100644 --- a/internal/admission/validation/consumers/credentials/validation_test.go +++ b/internal/admission/validation/consumers/credentials/validation_test.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/labels" + "github.com/kong/kubernetes-ingress-controller/v3/internal/labels" ) func TestUniqueConstraintsValidation(t *testing.T) { diff --git a/internal/admission/validation/gateway/httproute.go b/internal/admission/validation/gateway/httproute.go index 3fa4627a57..c5d231722a 100644 --- a/internal/admission/validation/gateway/httproute.go +++ b/internal/admission/validation/gateway/httproute.go @@ -7,9 +7,9 @@ import ( "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) type routeValidator interface { diff --git a/internal/admission/validation/gateway/httproute_test.go b/internal/admission/validation/gateway/httproute_test.go index b2c0d43a05..f2b7e44ceb 100644 --- a/internal/admission/validation/gateway/httproute_test.go +++ b/internal/admission/validation/gateway/httproute_test.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func TestValidateHTTPRoute(t *testing.T) { diff --git a/internal/admission/validation/ingress/ingress.go b/internal/admission/validation/ingress/ingress.go index 3a76c340e6..f7576d3d17 100644 --- a/internal/admission/validation/ingress/ingress.go +++ b/internal/admission/validation/ingress/ingress.go @@ -8,8 +8,8 @@ import ( "github.com/kong/go-kong/kong" netv1 "k8s.io/api/networking/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) type routeValidator interface { diff --git a/internal/admission/validator.go b/internal/admission/validator.go index 7d70aa7142..a46bd2860b 100644 --- a/internal/admission/validator.go +++ b/internal/admission/validator.go @@ -13,17 +13,17 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - credsvalidation "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/consumers/credentials" - gatewayvalidation "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/gateway" - ingressvalidation "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/ingress" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - gatewaycontroller "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + credsvalidation "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/consumers/credentials" + gatewayvalidation "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/gateway" + ingressvalidation "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/ingress" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + gatewaycontroller "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // KongValidator validates Kong entities. diff --git a/internal/admission/validator_test.go b/internal/admission/validator_test.go index cf9b6dfbe4..832a7c4de5 100644 --- a/internal/admission/validator_test.go +++ b/internal/admission/validator_test.go @@ -17,10 +17,10 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) type fakePluginSvc struct { diff --git a/internal/clients/config_status_test.go b/internal/clients/config_status_test.go index c07bfb56af..d1060a7322 100644 --- a/internal/clients/config_status_test.go +++ b/internal/clients/config_status_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" ) func TestChannelConfigNotifier(t *testing.T) { diff --git a/internal/clients/manager.go b/internal/clients/manager.go index 87a48246f5..cabcd6fe9f 100644 --- a/internal/clients/manager.go +++ b/internal/clients/manager.go @@ -10,9 +10,9 @@ import ( "github.com/samber/lo" "golang.org/x/exp/maps" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock" ) // DefaultReadinessReconciliationInterval is the interval at which the manager will run readiness reconciliation loop. diff --git a/internal/clients/manager_test.go b/internal/clients/manager_test.go index 7326c2f856..aa10363816 100644 --- a/internal/clients/manager_test.go +++ b/internal/clients/manager_test.go @@ -16,9 +16,9 @@ import ( "golang.org/x/exp/slices" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) type readinessCheckCall struct { diff --git a/internal/clients/readiness.go b/internal/clients/readiness.go index 0eb388101a..62c37eb17f 100644 --- a/internal/clients/readiness.go +++ b/internal/clients/readiness.go @@ -9,8 +9,8 @@ import ( "github.com/go-logr/logr" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) const ( diff --git a/internal/clients/readiness_test.go b/internal/clients/readiness_test.go index b0b6830aa3..07472c0b40 100644 --- a/internal/clients/readiness_test.go +++ b/internal/clients/readiness_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" ) const ( diff --git a/internal/cmd/fips/main.go b/internal/cmd/fips/main.go index ef3ae9e58a..f72613baf7 100644 --- a/internal/cmd/fips/main.go +++ b/internal/cmd/fips/main.go @@ -5,10 +5,10 @@ package main import ( _ "crypto/tls/fipsonly" - "github.com/kong/kubernetes-ingress-controller/v2/internal/cmd/rootcmd" + "github.com/kong/kubernetes-ingress-controller/v3/internal/cmd/rootcmd" ) -//go:generate go run github.com/kong/kubernetes-ingress-controller/v2/hack/generators/controllers/networking +//go:generate go run github.com/kong/kubernetes-ingress-controller/v3/hack/generators/controllers/networking func main() { rootcmd.Execute() diff --git a/internal/cmd/main.go b/internal/cmd/main.go index 56c3d100cf..dc2c4868fa 100644 --- a/internal/cmd/main.go +++ b/internal/cmd/main.go @@ -1,10 +1,10 @@ package main import ( - "github.com/kong/kubernetes-ingress-controller/v2/internal/cmd/rootcmd" + "github.com/kong/kubernetes-ingress-controller/v3/internal/cmd/rootcmd" ) -//go:generate go run github.com/kong/kubernetes-ingress-controller/v2/hack/generators/controllers/networking +//go:generate go run github.com/kong/kubernetes-ingress-controller/v3/hack/generators/controllers/networking func main() { rootcmd.Execute() diff --git a/internal/cmd/rootcmd/rootcmd.go b/internal/cmd/rootcmd/rootcmd.go index 9cd0dd8cfc..eef8f3da8c 100644 --- a/internal/cmd/rootcmd/rootcmd.go +++ b/internal/cmd/rootcmd/rootcmd.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/metadata" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/metadata" ) // Execute is the entry point to the controller manager. diff --git a/internal/cmd/rootcmd/rootcmd_test.go b/internal/cmd/rootcmd/rootcmd_test.go index 2dbb437c2b..07c446646e 100644 --- a/internal/cmd/rootcmd/rootcmd_test.go +++ b/internal/cmd/rootcmd/rootcmd_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" ) func TestRootCmd(t *testing.T) { diff --git a/internal/cmd/rootcmd/run.go b/internal/cmd/rootcmd/run.go index 5c288673ed..52c8826637 100644 --- a/internal/cmd/rootcmd/run.go +++ b/internal/cmd/rootcmd/run.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" ) // Run sets up a default stderr logger and starts the controller manager. diff --git a/internal/cmd/rootcmd/servers.go b/internal/cmd/rootcmd/servers.go index 888d6dfb39..cd3ec6f2d5 100644 --- a/internal/cmd/rootcmd/servers.go +++ b/internal/cmd/rootcmd/servers.go @@ -6,9 +6,9 @@ import ( "github.com/go-logr/logr" - "github.com/kong/kubernetes-ingress-controller/v2/internal/diagnostics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/diagnostics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) const ( diff --git a/internal/cmd/rootcmd/signal.go b/internal/cmd/rootcmd/signal.go index 7366526e92..b4b99a6f99 100644 --- a/internal/cmd/rootcmd/signal.go +++ b/internal/cmd/rootcmd/signal.go @@ -11,7 +11,7 @@ import ( "github.com/go-logr/logr" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" ) var ( diff --git a/internal/controllers/configuration/kongadminapi_controller.go b/internal/controllers/configuration/kongadminapi_controller.go index f0472511d4..f27c0284fc 100644 --- a/internal/controllers/configuration/kongadminapi_controller.go +++ b/internal/controllers/configuration/kongadminapi_controller.go @@ -20,9 +20,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // KongAdminAPIServiceReconciler reconciles Kong Admin API Service Endpointslices diff --git a/internal/controllers/configuration/object_references.go b/internal/controllers/configuration/object_references.go index bc0664093c..7565203d22 100644 --- a/internal/controllers/configuration/object_references.go +++ b/internal/controllers/configuration/object_references.go @@ -8,11 +8,11 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // updateReferredObjects updates reference records where the referrer is the object in parameter obj. diff --git a/internal/controllers/configuration/object_references_test.go b/internal/controllers/configuration/object_references_test.go index a53849eb9b..d1bc2d6379 100644 --- a/internal/controllers/configuration/object_references_test.go +++ b/internal/controllers/configuration/object_references_test.go @@ -9,8 +9,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestListCoreV1ServiceReferredSecrets(t *testing.T) { diff --git a/internal/controllers/configuration/secret_controller.go b/internal/controllers/configuration/secret_controller.go index 341e7de885..1b03384bd8 100644 --- a/internal/controllers/configuration/secret_controller.go +++ b/internal/controllers/configuration/secret_controller.go @@ -17,9 +17,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/configuration/zz_generated_controllers.go b/internal/controllers/configuration/zz_generated_controllers.go index 1c23eea862..dd9cab7983 100644 --- a/internal/controllers/configuration/zz_generated_controllers.go +++ b/internal/controllers/configuration/zz_generated_controllers.go @@ -39,15 +39,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/crds/dynamic_controller.go b/internal/controllers/crds/dynamic_controller.go index 3d3a9b82f0..6059c13e49 100644 --- a/internal/controllers/crds/dynamic_controller.go +++ b/internal/controllers/crds/dynamic_controller.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=list;watch diff --git a/internal/controllers/dataplane.go b/internal/controllers/dataplane.go index 4a884d0a3b..c484938775 100644 --- a/internal/controllers/dataplane.go +++ b/internal/controllers/dataplane.go @@ -6,7 +6,7 @@ import ( "github.com/kong/go-kong/kong" "sigs.k8s.io/controller-runtime/pkg/client" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" ) // DataPlane is a common interface that is used by reconcilers to interact diff --git a/internal/controllers/gateway/gateway_controller.go b/internal/controllers/gateway/gateway_controller.go index 2c26034b92..1a56e7ceed 100644 --- a/internal/controllers/gateway/gateway_controller.go +++ b/internal/controllers/gateway/gateway_controller.go @@ -25,12 +25,12 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/gateway_controller_test.go b/internal/controllers/gateway/gateway_controller_test.go index 6eef1940d9..008d2a0639 100644 --- a/internal/controllers/gateway/gateway_controller_test.go +++ b/internal/controllers/gateway/gateway_controller_test.go @@ -9,9 +9,9 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestReadyConditionExistsForObservedGeneration(t *testing.T) { diff --git a/internal/controllers/gateway/gateway_utils.go b/internal/controllers/gateway/gateway_utils.go index 60b2391f0c..92e2d968c4 100644 --- a/internal/controllers/gateway/gateway_utils.go +++ b/internal/controllers/gateway/gateway_utils.go @@ -18,10 +18,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/gateway_utils_test.go b/internal/controllers/gateway/gateway_utils_test.go index 37a85409ed..6a6dbd68fb 100644 --- a/internal/controllers/gateway/gateway_utils_test.go +++ b/internal/controllers/gateway/gateway_utils_test.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func init() { diff --git a/internal/controllers/gateway/gatewayclass_controller.go b/internal/controllers/gateway/gatewayclass_controller.go index 98170eb628..37dbd3f913 100644 --- a/internal/controllers/gateway/gatewayclass_controller.go +++ b/internal/controllers/gateway/gatewayclass_controller.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/gatewayclass_controller_test.go b/internal/controllers/gateway/gatewayclass_controller_test.go index f9501d3778..3a25c2f6d8 100644 --- a/internal/controllers/gateway/gatewayclass_controller_test.go +++ b/internal/controllers/gateway/gatewayclass_controller_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func TestSetGatewayClassCondtion(t *testing.T) { diff --git a/internal/controllers/gateway/grpcroute_controller.go b/internal/controllers/gateway/grpcroute_controller.go index 378266bd59..c297bd1a31 100644 --- a/internal/controllers/gateway/grpcroute_controller.go +++ b/internal/controllers/gateway/grpcroute_controller.go @@ -23,11 +23,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/httproute_controller.go b/internal/controllers/gateway/httproute_controller.go index af1d9074f6..af51ca2ece 100644 --- a/internal/controllers/gateway/httproute_controller.go +++ b/internal/controllers/gateway/httproute_controller.go @@ -25,12 +25,12 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/referencegrant_controller.go b/internal/controllers/gateway/referencegrant_controller.go index ba619c573f..aa91b6db0c 100644 --- a/internal/controllers/gateway/referencegrant_controller.go +++ b/internal/controllers/gateway/referencegrant_controller.go @@ -30,8 +30,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ReferenceGrantReconciler reconciles a ReferenceGrant object. diff --git a/internal/controllers/gateway/route_parent_status.go b/internal/controllers/gateway/route_parent_status.go index 49bd759e73..37b8065fe0 100644 --- a/internal/controllers/gateway/route_parent_status.go +++ b/internal/controllers/gateway/route_parent_status.go @@ -6,7 +6,7 @@ import ( "github.com/samber/lo" "github.com/samber/mo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // getParentStatuses creates a parent status map for the provided route given the diff --git a/internal/controllers/gateway/route_parent_status_test.go b/internal/controllers/gateway/route_parent_status_test.go index 417a1ad9fb..486110fb48 100644 --- a/internal/controllers/gateway/route_parent_status_test.go +++ b/internal/controllers/gateway/route_parent_status_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func TestGetParentStatuses(t *testing.T) { diff --git a/internal/controllers/gateway/route_utils.go b/internal/controllers/gateway/route_utils.go index 6806a54732..953eff023d 100644 --- a/internal/controllers/gateway/route_utils.go +++ b/internal/controllers/gateway/route_utils.go @@ -17,8 +17,8 @@ import ( gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/route_utils_test.go b/internal/controllers/gateway/route_utils_test.go index 9c046fb7db..f467b454e2 100644 --- a/internal/controllers/gateway/route_utils_test.go +++ b/internal/controllers/gateway/route_utils_test.go @@ -18,10 +18,10 @@ import ( fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/scheme" ) func init() { diff --git a/internal/controllers/gateway/tcproute_controller.go b/internal/controllers/gateway/tcproute_controller.go index 41a69079a4..2a4ba15eb5 100644 --- a/internal/controllers/gateway/tcproute_controller.go +++ b/internal/controllers/gateway/tcproute_controller.go @@ -24,11 +24,11 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/tlsroute_controller.go b/internal/controllers/gateway/tlsroute_controller.go index 2d7786bf8e..bad6ff352b 100644 --- a/internal/controllers/gateway/tlsroute_controller.go +++ b/internal/controllers/gateway/tlsroute_controller.go @@ -23,11 +23,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/udproute_controller.go b/internal/controllers/gateway/udproute_controller.go index b91bbcd7ce..0d45902bda 100644 --- a/internal/controllers/gateway/udproute_controller.go +++ b/internal/controllers/gateway/udproute_controller.go @@ -23,11 +23,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/gateway/utils.go b/internal/controllers/gateway/utils.go index c7d8da1fa5..032d1a847e 100644 --- a/internal/controllers/gateway/utils.go +++ b/internal/controllers/gateway/utils.go @@ -4,7 +4,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/controllers/reference/indexer.go b/internal/controllers/reference/indexer.go index b054ec994b..3245c94ae2 100644 --- a/internal/controllers/reference/indexer.go +++ b/internal/controllers/reference/indexer.go @@ -7,9 +7,9 @@ import ( "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/scheme" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/scheme" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) const ( diff --git a/internal/controllers/reference/reference.go b/internal/controllers/reference/reference.go index 1ea91461cc..6fe0997d7a 100644 --- a/internal/controllers/reference/reference.go +++ b/internal/controllers/reference/reference.go @@ -9,7 +9,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" ) const ( diff --git a/internal/controllers/utils/conditions.go b/internal/controllers/utils/conditions.go index bcd74212f7..547215287a 100644 --- a/internal/controllers/utils/conditions.go +++ b/internal/controllers/utils/conditions.go @@ -4,9 +4,9 @@ import ( "github.com/samber/lo" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) const ( diff --git a/internal/controllers/utils/conditions_test.go b/internal/controllers/utils/conditions_test.go index 810e1e4e49..f255eca9e2 100644 --- a/internal/controllers/utils/conditions_test.go +++ b/internal/controllers/utils/conditions_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func TestEnsureProgrammedCondition(t *testing.T) { diff --git a/internal/controllers/utils/conversion.go b/internal/controllers/utils/conversion.go index 1e74c29b72..3c71bfaea8 100644 --- a/internal/controllers/utils/conversion.go +++ b/internal/controllers/utils/conversion.go @@ -8,7 +8,7 @@ import ( netv1 "k8s.io/api/networking/v1" "sigs.k8s.io/controller-runtime/pkg/client" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // UpdateLoadBalancerIngress updates any supported Ingress object with new []netv1.IngressLoadBalancerIngress diff --git a/internal/controllers/utils/conversion_test.go b/internal/controllers/utils/conversion_test.go index 4f6d66c88b..bfe79cb9ac 100644 --- a/internal/controllers/utils/conversion_test.go +++ b/internal/controllers/utils/conversion_test.go @@ -10,7 +10,7 @@ import ( netv1 "k8s.io/api/networking/v1" "sigs.k8s.io/controller-runtime/pkg/client" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestUpdateLoadBalancerIngress(t *testing.T) { diff --git a/internal/controllers/utils/utils.go b/internal/controllers/utils/utils.go index bfc2a5828e..457afdc130 100644 --- a/internal/controllers/utils/utils.go +++ b/internal/controllers/utils/utils.go @@ -8,7 +8,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" ) const defaultIngressClassAnnotation = "ingressclass.kubernetes.io/is-default-class" diff --git a/internal/controllers/utils/utils_test.go b/internal/controllers/utils/utils_test.go index a762ef978d..77595f47ae 100644 --- a/internal/controllers/utils/utils_test.go +++ b/internal/controllers/utils/utils_test.go @@ -8,7 +8,7 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" ) func ingressWithClass(class string) *netv1.Ingress { diff --git a/internal/dataplane/configfetcher/config_fetcher.go b/internal/dataplane/configfetcher/config_fetcher.go index 58cb66c57a..f3555cb068 100644 --- a/internal/dataplane/configfetcher/config_fetcher.go +++ b/internal/dataplane/configfetcher/config_fetcher.go @@ -10,10 +10,10 @@ import ( "github.com/kong/deck/utils" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) type LastValidConfigFetcher interface { diff --git a/internal/dataplane/configfetcher/config_fetcher_test.go b/internal/dataplane/configfetcher/config_fetcher_test.go index 2213c18423..bc5616616b 100644 --- a/internal/dataplane/configfetcher/config_fetcher_test.go +++ b/internal/dataplane/configfetcher/config_fetcher_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestTryFetchingValidConfigFromGateways(t *testing.T) { diff --git a/internal/dataplane/configfetcher/kongrawstate.go b/internal/dataplane/configfetcher/kongrawstate.go index 8089ce7eb7..de4163b40c 100644 --- a/internal/dataplane/configfetcher/kongrawstate.go +++ b/internal/dataplane/configfetcher/kongrawstate.go @@ -4,7 +4,7 @@ import ( "github.com/kong/deck/utils" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/configfetcher/kongrawstate_test.go b/internal/dataplane/configfetcher/kongrawstate_test.go index 22b34f7bbe..2b537ab113 100644 --- a/internal/dataplane/configfetcher/kongrawstate_test.go +++ b/internal/dataplane/configfetcher/kongrawstate_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/configfetcher" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/configfetcher" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" ) func TestKongRawStateToKongState(t *testing.T) { diff --git a/internal/dataplane/deckerrors/api_test.go b/internal/dataplane/deckerrors/api_test.go index d4fe73bd9f..d653a4b1d4 100644 --- a/internal/dataplane/deckerrors/api_test.go +++ b/internal/dataplane/deckerrors/api_test.go @@ -9,7 +9,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" ) func TestExtractAPIErrors(t *testing.T) { diff --git a/internal/dataplane/deckgen/deckgen_test.go b/internal/dataplane/deckgen/deckgen_test.go index cce66dcef2..d0a3b6cc40 100644 --- a/internal/dataplane/deckgen/deckgen_test.go +++ b/internal/dataplane/deckgen/deckgen_test.go @@ -9,8 +9,8 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) func BenchmarkDeckgenGenerateSHA(b *testing.B) { diff --git a/internal/dataplane/deckgen/generate.go b/internal/dataplane/deckgen/generate.go index 9288a0afa1..c146338a4a 100644 --- a/internal/dataplane/deckgen/generate.go +++ b/internal/dataplane/deckgen/generate.go @@ -11,8 +11,8 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) // StubUpstreamName is a name of a stub upstream that is created when the configuration is empty. diff --git a/internal/dataplane/deckgen/generate_test.go b/internal/dataplane/deckgen/generate_test.go index 65230af172..ce72f199ee 100644 --- a/internal/dataplane/deckgen/generate_test.go +++ b/internal/dataplane/deckgen/generate_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) func TestToDeckContent(t *testing.T) { diff --git a/internal/dataplane/failures/failures_test.go b/internal/dataplane/failures/failures_test.go index 59eb5688d4..4dab7de901 100644 --- a/internal/dataplane/failures/failures_test.go +++ b/internal/dataplane/failures/failures_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) const someValidResourceFailureReason = "some valid message" diff --git a/internal/dataplane/kong_client.go b/internal/dataplane/kong_client.go index 2975560e02..c5a65977d5 100644 --- a/internal/dataplane/kong_client.go +++ b/internal/dataplane/kong_client.go @@ -23,20 +23,20 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/configfetcher" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - dataplaneutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/dataplane" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/configfetcher" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + dataplaneutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/dataplane" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) const ( diff --git a/internal/dataplane/kong_client_test.go b/internal/dataplane/kong_client_test.go index 8798a209a2..ee5330935f 100644 --- a/internal/dataplane/kong_client_test.go +++ b/internal/dataplane/kong_client_test.go @@ -27,19 +27,19 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/configfetcher" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/configfetcher" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) var defaultKongStatus = kong.Status{ diff --git a/internal/dataplane/kongstate/consumer.go b/internal/dataplane/kongstate/consumer.go index 6752b80e42..9c36945ae4 100644 --- a/internal/dataplane/kongstate/consumer.go +++ b/internal/dataplane/kongstate/consumer.go @@ -5,7 +5,7 @@ import ( "github.com/kong/go-kong/kong" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) // Consumer holds a Kong consumer and its plugins and credentials. diff --git a/internal/dataplane/kongstate/consumer_test.go b/internal/dataplane/kongstate/consumer_test.go index 21899e2d98..644e79bccc 100644 --- a/internal/dataplane/kongstate/consumer_test.go +++ b/internal/dataplane/kongstate/consumer_test.go @@ -6,7 +6,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/assert" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func int64Ptr(i int64) *int64 { diff --git a/internal/dataplane/kongstate/consumergroup.go b/internal/dataplane/kongstate/consumergroup.go index 1508d7bb04..21c676ac62 100644 --- a/internal/dataplane/kongstate/consumergroup.go +++ b/internal/dataplane/kongstate/consumergroup.go @@ -3,7 +3,7 @@ package kongstate import ( "github.com/kong/go-kong/kong" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // ConsumerGroup holds a Kong Consumer. diff --git a/internal/dataplane/kongstate/kongstate.go b/internal/dataplane/kongstate/kongstate.go index 80905ca48b..db1013ae93 100644 --- a/internal/dataplane/kongstate/kongstate.go +++ b/internal/dataplane/kongstate/kongstate.go @@ -10,11 +10,11 @@ import ( "github.com/kong/go-kong/kong" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kong/kubernetes-ingress-controller/v2/internal/admission/validation/consumers/credentials" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/admission/validation/consumers/credentials" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // KongState holds the configuration that should be applied to Kong. diff --git a/internal/dataplane/kongstate/kongstate_test.go b/internal/dataplane/kongstate/kongstate_test.go index 999cb84be9..e37c433103 100644 --- a/internal/dataplane/kongstate/kongstate_test.go +++ b/internal/dataplane/kongstate/kongstate_test.go @@ -18,13 +18,13 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/labels" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/labels" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) var kongConsumerTypeMeta = metav1.TypeMeta{ diff --git a/internal/dataplane/kongstate/route.go b/internal/dataplane/kongstate/route.go index d9a319f35b..9bb1589c57 100644 --- a/internal/dataplane/kongstate/route.go +++ b/internal/dataplane/kongstate/route.go @@ -8,8 +8,8 @@ import ( "github.com/go-logr/logr" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // Route represents a Kong Route and holds a reference to the Ingress diff --git a/internal/dataplane/kongstate/route_test.go b/internal/dataplane/kongstate/route_test.go index b1bb5d0989..d2dda56554 100644 --- a/internal/dataplane/kongstate/route_test.go +++ b/internal/dataplane/kongstate/route_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestOverrideRoute(t *testing.T) { diff --git a/internal/dataplane/kongstate/service.go b/internal/dataplane/kongstate/service.go index cc3f56c582..ae74b493c3 100644 --- a/internal/dataplane/kongstate/service.go +++ b/internal/dataplane/kongstate/service.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // Services is a list of kongstate.Service objects with sorting enabled based diff --git a/internal/dataplane/kongstate/service_test.go b/internal/dataplane/kongstate/service_test.go index 9b3a57fcae..dbe03dfdb4 100644 --- a/internal/dataplane/kongstate/service_test.go +++ b/internal/dataplane/kongstate/service_test.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" ) func TestOverrideService(t *testing.T) { diff --git a/internal/dataplane/kongstate/upstream.go b/internal/dataplane/kongstate/upstream.go index dfea342ff4..48a21c541c 100644 --- a/internal/dataplane/kongstate/upstream.go +++ b/internal/dataplane/kongstate/upstream.go @@ -5,8 +5,8 @@ import ( corev1 "k8s.io/api/core/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) // Upstream is a wrapper around Upstream object in Kong. diff --git a/internal/dataplane/kongstate/upstream_test.go b/internal/dataplane/kongstate/upstream_test.go index 803e0577b3..7b59083a95 100644 --- a/internal/dataplane/kongstate/upstream_test.go +++ b/internal/dataplane/kongstate/upstream_test.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func TestOverrideUpstream(t *testing.T) { diff --git a/internal/dataplane/kongstate/util.go b/internal/dataplane/kongstate/util.go index 1515de2ca5..24176767ac 100644 --- a/internal/dataplane/kongstate/util.go +++ b/internal/dataplane/kongstate/util.go @@ -10,10 +10,10 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func getKongIngressForServices( diff --git a/internal/dataplane/kongstate/util_test.go b/internal/dataplane/kongstate/util_test.go index 7562d45c88..d6bb642695 100644 --- a/internal/dataplane/kongstate/util_test.go +++ b/internal/dataplane/kongstate/util_test.go @@ -12,11 +12,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func TestKongPluginFromK8SClusterPlugin(t *testing.T) { diff --git a/internal/dataplane/parser/backendref.go b/internal/dataplane/parser/backendref.go index a1b3bbc4a0..0d921f665b 100644 --- a/internal/dataplane/parser/backendref.go +++ b/internal/dataplane/parser/backendref.go @@ -6,9 +6,9 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func backendRefsToKongStateBackends( diff --git a/internal/dataplane/parser/golden_test.go b/internal/dataplane/parser/golden_test.go index 4d23927814..c0386fa26e 100644 --- a/internal/dataplane/parser/golden_test.go +++ b/internal/dataplane/parser/golden_test.go @@ -18,10 +18,10 @@ import ( "k8s.io/kubectl/pkg/cmd/util" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) var ( diff --git a/internal/dataplane/parser/ingressclassparemeters_test.go b/internal/dataplane/parser/ingressclassparemeters_test.go index ccdcf783f6..5ef595b104 100644 --- a/internal/dataplane/parser/ingressclassparemeters_test.go +++ b/internal/dataplane/parser/ingressclassparemeters_test.go @@ -13,8 +13,8 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) func TestGetIngressClassParameters(t *testing.T) { diff --git a/internal/dataplane/parser/ingressrules.go b/internal/dataplane/parser/ingressrules.go index faada0ed78..95ab7e1d10 100644 --- a/internal/dataplane/parser/ingressrules.go +++ b/internal/dataplane/parser/ingressrules.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) type ingressRules struct { diff --git a/internal/dataplane/parser/ingressrules_test.go b/internal/dataplane/parser/ingressrules_test.go index 2d78521c99..3fc4430544 100644 --- a/internal/dataplane/parser/ingressrules_test.go +++ b/internal/dataplane/parser/ingressrules_test.go @@ -16,9 +16,9 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) type testSNIs struct { diff --git a/internal/dataplane/parser/objects_test.go b/internal/dataplane/parser/objects_test.go index 555d4ec9e5..de26ab9dba 100644 --- a/internal/dataplane/parser/objects_test.go +++ b/internal/dataplane/parser/objects_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" ) func TestObjectsCollector(t *testing.T) { diff --git a/internal/dataplane/parser/parser.go b/internal/dataplane/parser/parser.go index 81f85c39c3..c155d1aa19 100644 --- a/internal/dataplane/parser/parser.go +++ b/internal/dataplane/parser/parser.go @@ -19,15 +19,15 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/parser_test.go b/internal/dataplane/parser/parser_test.go index b007d92e71..798a2d8bb2 100644 --- a/internal/dataplane/parser/parser_test.go +++ b/internal/dataplane/parser/parser_test.go @@ -25,14 +25,14 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" ) func TestGlobalPlugin(t *testing.T) { diff --git a/internal/dataplane/parser/translate_failures_test.go b/internal/dataplane/parser/translate_failures_test.go index 4f82d59800..62049fbe3a 100644 --- a/internal/dataplane/parser/translate_failures_test.go +++ b/internal/dataplane/parser/translate_failures_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" ) // This file contains unit test functions to test translation failures generated by parser. diff --git a/internal/dataplane/parser/translate_grpcroute.go b/internal/dataplane/parser/translate_grpcroute.go index dbb00fc8bf..071441c4e0 100644 --- a/internal/dataplane/parser/translate_grpcroute.go +++ b/internal/dataplane/parser/translate_grpcroute.go @@ -3,9 +3,9 @@ package parser import ( "fmt" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_grpcroute_test.go b/internal/dataplane/parser/translate_grpcroute_test.go index 2ca5228715..2cd22d740a 100644 --- a/internal/dataplane/parser/translate_grpcroute_test.go +++ b/internal/dataplane/parser/translate_grpcroute_test.go @@ -13,12 +13,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestIngressRulesFromGRPCRoutesUsingExpressionRoutes(t *testing.T) { diff --git a/internal/dataplane/parser/translate_httproute.go b/internal/dataplane/parser/translate_httproute.go index 2b964beb80..e4eb097bf1 100644 --- a/internal/dataplane/parser/translate_httproute.go +++ b/internal/dataplane/parser/translate_httproute.go @@ -9,10 +9,10 @@ import ( "github.com/samber/lo" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_httproute_test.go b/internal/dataplane/parser/translate_httproute_test.go index ee5b6adc4d..183648a6c6 100644 --- a/internal/dataplane/parser/translate_httproute_test.go +++ b/internal/dataplane/parser/translate_httproute_test.go @@ -15,13 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) // httprouteGVK is the GVK for HTTPRoutes, needed in unit tests because diff --git a/internal/dataplane/parser/translate_ingress.go b/internal/dataplane/parser/translate_ingress.go index 3af6355c73..6434daf07c 100644 --- a/internal/dataplane/parser/translate_ingress.go +++ b/internal/dataplane/parser/translate_ingress.go @@ -8,12 +8,12 @@ import ( "github.com/kong/go-kong/kong" netv1 "k8s.io/api/networking/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) func (p *Parser) ingressRulesFromIngressV1() ingressRules { diff --git a/internal/dataplane/parser/translate_ingress_test.go b/internal/dataplane/parser/translate_ingress_test.go index e3ad297c12..ff80d8e4b7 100644 --- a/internal/dataplane/parser/translate_ingress_test.go +++ b/internal/dataplane/parser/translate_ingress_test.go @@ -12,10 +12,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) func TestFromIngressV1(t *testing.T) { diff --git a/internal/dataplane/parser/translate_kong_l4.go b/internal/dataplane/parser/translate_kong_l4.go index d33522e305..85934eb0dd 100644 --- a/internal/dataplane/parser/translate_kong_l4.go +++ b/internal/dataplane/parser/translate_kong_l4.go @@ -7,8 +7,8 @@ import ( "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func (p *Parser) ingressRulesFromTCPIngressV1beta1() ingressRules { diff --git a/internal/dataplane/parser/translate_kong_l4_test.go b/internal/dataplane/parser/translate_kong_l4_test.go index b7f65b4830..ba84a527c8 100644 --- a/internal/dataplane/parser/translate_kong_l4_test.go +++ b/internal/dataplane/parser/translate_kong_l4_test.go @@ -8,10 +8,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestFromTCPIngressV1beta1(t *testing.T) { diff --git a/internal/dataplane/parser/translate_routes_helpers.go b/internal/dataplane/parser/translate_routes_helpers.go index 409121b683..2bcc4b81b8 100644 --- a/internal/dataplane/parser/translate_routes_helpers.go +++ b/internal/dataplane/parser/translate_routes_helpers.go @@ -8,9 +8,9 @@ import ( "github.com/samber/lo" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_routes_helpers_test.go b/internal/dataplane/parser/translate_routes_helpers_test.go index 7c02a5aecb..36a64afb84 100644 --- a/internal/dataplane/parser/translate_routes_helpers_test.go +++ b/internal/dataplane/parser/translate_routes_helpers_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestGenerateKongRoutesFromRouteRule_TCP(t *testing.T) { diff --git a/internal/dataplane/parser/translate_secrets.go b/internal/dataplane/parser/translate_secrets.go index d26616f6f4..baaf45b827 100644 --- a/internal/dataplane/parser/translate_secrets.go +++ b/internal/dataplane/parser/translate_secrets.go @@ -13,8 +13,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // getCACerts translates CA certificates Secrets to kong.CACertificates. It ensures every certificate's structure and diff --git a/internal/dataplane/parser/translate_secrets_test.go b/internal/dataplane/parser/translate_secrets_test.go index 9b3fc8eef5..9b95dd2c2c 100644 --- a/internal/dataplane/parser/translate_secrets_test.go +++ b/internal/dataplane/parser/translate_secrets_test.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func TestGetPluginsAssociatedWithCACertSecret(t *testing.T) { diff --git a/internal/dataplane/parser/translate_tcproute.go b/internal/dataplane/parser/translate_tcproute.go index 6a632a8333..bac04a0e75 100644 --- a/internal/dataplane/parser/translate_tcproute.go +++ b/internal/dataplane/parser/translate_tcproute.go @@ -3,8 +3,8 @@ package parser import ( "fmt" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_tcproute_test.go b/internal/dataplane/parser/translate_tcproute_test.go index f3c3d43e4e..5ecbb5cca2 100644 --- a/internal/dataplane/parser/translate_tcproute_test.go +++ b/internal/dataplane/parser/translate_tcproute_test.go @@ -12,11 +12,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestIngressRulesFromTCPRoutesUsingExpressionRoutes(t *testing.T) { diff --git a/internal/dataplane/parser/translate_tlsroute.go b/internal/dataplane/parser/translate_tlsroute.go index f869bfad94..ba3aaaaa24 100644 --- a/internal/dataplane/parser/translate_tlsroute.go +++ b/internal/dataplane/parser/translate_tlsroute.go @@ -7,9 +7,9 @@ import ( "github.com/kong/go-kong/kong" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_tlsroute_test.go b/internal/dataplane/parser/translate_tlsroute_test.go index df55376fd6..4b129f66eb 100644 --- a/internal/dataplane/parser/translate_tlsroute_test.go +++ b/internal/dataplane/parser/translate_tlsroute_test.go @@ -12,11 +12,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestIngressRulesFromTLSRoutesUsingExpressionRoutes(t *testing.T) { diff --git a/internal/dataplane/parser/translate_udproute.go b/internal/dataplane/parser/translate_udproute.go index eefc4cfef9..1b5b5aa07c 100644 --- a/internal/dataplane/parser/translate_udproute.go +++ b/internal/dataplane/parser/translate_udproute.go @@ -3,8 +3,8 @@ package parser import ( "fmt" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_udproute_test.go b/internal/dataplane/parser/translate_udproute_test.go index fca8ce2767..512f33dc65 100644 --- a/internal/dataplane/parser/translate_udproute_test.go +++ b/internal/dataplane/parser/translate_udproute_test.go @@ -12,12 +12,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) var udpRouteTypeMeta = metav1.TypeMeta{Kind: "UDPRoute", APIVersion: gatewayv1alpha2.SchemeGroupVersion.String()} diff --git a/internal/dataplane/parser/translate_utils.go b/internal/dataplane/parser/translate_utils.go index 2f65186d3d..c5f0755b12 100644 --- a/internal/dataplane/parser/translate_utils.go +++ b/internal/dataplane/parser/translate_utils.go @@ -8,10 +8,10 @@ import ( "github.com/kong/go-kong/kong" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translate_utils_test.go b/internal/dataplane/parser/translate_utils_test.go index 870354474d..3dccfe0fd4 100644 --- a/internal/dataplane/parser/translate_utils_test.go +++ b/internal/dataplane/parser/translate_utils_test.go @@ -11,9 +11,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" ) func TestConvertGatewayMatchHeadersToKongRouteMatchHeaders(t *testing.T) { diff --git a/internal/dataplane/parser/translators/atc_utils.go b/internal/dataplane/parser/translators/atc_utils.go index 16608d0bc5..e2f53eaf4c 100644 --- a/internal/dataplane/parser/translators/atc_utils.go +++ b/internal/dataplane/parser/translators/atc_utils.go @@ -3,7 +3,7 @@ package translators import ( "strings" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" ) const ( diff --git a/internal/dataplane/parser/translators/grpcroute.go b/internal/dataplane/parser/translators/grpcroute.go index c3d2796d0e..8661958829 100644 --- a/internal/dataplane/parser/translators/grpcroute.go +++ b/internal/dataplane/parser/translators/grpcroute.go @@ -6,9 +6,9 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func getGRPCMatchDefaults() ( diff --git a/internal/dataplane/parser/translators/grpcroute_atc.go b/internal/dataplane/parser/translators/grpcroute_atc.go index 8a95177771..48545bb92a 100644 --- a/internal/dataplane/parser/translators/grpcroute_atc.go +++ b/internal/dataplane/parser/translators/grpcroute_atc.go @@ -9,11 +9,11 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // GenerateKongExpressionRoutesFromGRPCRouteRule generates expression based kong routes diff --git a/internal/dataplane/parser/translators/grpcroute_atc_test.go b/internal/dataplane/parser/translators/grpcroute_atc_test.go index bde07b44d5..51f0582eb5 100644 --- a/internal/dataplane/parser/translators/grpcroute_atc_test.go +++ b/internal/dataplane/parser/translators/grpcroute_atc_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestGenerateKongExpressionRoutesFromGRPCRouteRule(t *testing.T) { diff --git a/internal/dataplane/parser/translators/grpcroute_test.go b/internal/dataplane/parser/translators/grpcroute_test.go index 390f031497..0c143cdc52 100644 --- a/internal/dataplane/parser/translators/grpcroute_test.go +++ b/internal/dataplane/parser/translators/grpcroute_test.go @@ -9,9 +9,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) var grpcRouteGVK = schema.GroupVersionKind{ diff --git a/internal/dataplane/parser/translators/httproute.go b/internal/dataplane/parser/translators/httproute.go index 95b12e921b..2750c2faa2 100644 --- a/internal/dataplane/parser/translators/httproute.go +++ b/internal/dataplane/parser/translators/httproute.go @@ -9,9 +9,9 @@ import ( "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // KongServiceTranslation is a translation of a single HTTPRoute into metadata diff --git a/internal/dataplane/parser/translators/httproute_atc.go b/internal/dataplane/parser/translators/httproute_atc.go index ef1a109e24..5a3a5abc8c 100644 --- a/internal/dataplane/parser/translators/httproute_atc.go +++ b/internal/dataplane/parser/translators/httproute_atc.go @@ -9,11 +9,11 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // GenerateKongExpressionRoutesFromHTTPRouteMatches generates Kong routes from HTTPRouteRule diff --git a/internal/dataplane/parser/translators/httproute_atc_test.go b/internal/dataplane/parser/translators/httproute_atc_test.go index 14c927ca2d..3e5b1b35e9 100644 --- a/internal/dataplane/parser/translators/httproute_atc_test.go +++ b/internal/dataplane/parser/translators/httproute_atc_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestGenerateKongExpressionRoutesFromHTTPRouteMatches(t *testing.T) { diff --git a/internal/dataplane/parser/translators/httproute_test.go b/internal/dataplane/parser/translators/httproute_test.go index 6a6ad935b1..350ccbd65f 100644 --- a/internal/dataplane/parser/translators/httproute_test.go +++ b/internal/dataplane/parser/translators/httproute_test.go @@ -8,7 +8,7 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func TestGeneratePluginsFromHTTPRouteFilters(t *testing.T) { diff --git a/internal/dataplane/parser/translators/ingress.go b/internal/dataplane/parser/translators/ingress.go index 28954c63e9..d03de06ccf 100644 --- a/internal/dataplane/parser/translators/ingress.go +++ b/internal/dataplane/parser/translators/ingress.go @@ -12,10 +12,10 @@ import ( netv1 "k8s.io/api/networking/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/parser/translators/ingress_atc.go b/internal/dataplane/parser/translators/ingress_atc.go index c61f1a1f3c..09f01f370d 100644 --- a/internal/dataplane/parser/translators/ingress_atc.go +++ b/internal/dataplane/parser/translators/ingress_atc.go @@ -9,10 +9,10 @@ import ( "github.com/kong/go-kong/kong" netv1 "k8s.io/api/networking/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) var ( diff --git a/internal/dataplane/parser/translators/ingress_atc_test.go b/internal/dataplane/parser/translators/ingress_atc_test.go index 30310874e8..5c0885a192 100644 --- a/internal/dataplane/parser/translators/ingress_atc_test.go +++ b/internal/dataplane/parser/translators/ingress_atc_test.go @@ -11,9 +11,9 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) func TestTranslateIngressATC(t *testing.T) { diff --git a/internal/dataplane/parser/translators/ingress_test.go b/internal/dataplane/parser/translators/ingress_test.go index 28c5204a81..dbea8fcb8a 100644 --- a/internal/dataplane/parser/translators/ingress_test.go +++ b/internal/dataplane/parser/translators/ingress_test.go @@ -13,10 +13,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" ) var ( diff --git a/internal/dataplane/parser/translators/kongupstreampolicy.go b/internal/dataplane/parser/translators/kongupstreampolicy.go index 851e0dd68a..f833132600 100644 --- a/internal/dataplane/parser/translators/kongupstreampolicy.go +++ b/internal/dataplane/parser/translators/kongupstreampolicy.go @@ -4,7 +4,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) const ( diff --git a/internal/dataplane/parser/translators/kongupstreampolicy_test.go b/internal/dataplane/parser/translators/kongupstreampolicy_test.go index 4e19aaf68e..cecebd1716 100644 --- a/internal/dataplane/parser/translators/kongupstreampolicy_test.go +++ b/internal/dataplane/parser/translators/kongupstreampolicy_test.go @@ -7,8 +7,8 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestTranslateKongUpstreamPolicy(t *testing.T) { diff --git a/internal/dataplane/parser/translators/l4route_atc.go b/internal/dataplane/parser/translators/l4route_atc.go index fbbd7abb00..748d8e90f5 100644 --- a/internal/dataplane/parser/translators/l4route_atc.go +++ b/internal/dataplane/parser/translators/l4route_atc.go @@ -3,8 +3,8 @@ package translators import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" ) // ApplyExpressionToL4KongRoute convert route flavor from traditional to expressions diff --git a/internal/dataplane/parser/translators/l4route_atc_test.go b/internal/dataplane/parser/translators/l4route_atc_test.go index 109a84309b..d3856b01e0 100644 --- a/internal/dataplane/parser/translators/l4route_atc_test.go +++ b/internal/dataplane/parser/translators/l4route_atc_test.go @@ -7,7 +7,7 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" ) func TestApplyExpressionToL4KongRoute(t *testing.T) { diff --git a/internal/dataplane/parser/translators/portdef.go b/internal/dataplane/parser/translators/portdef.go index 01407e9476..0a9401635a 100644 --- a/internal/dataplane/parser/translators/portdef.go +++ b/internal/dataplane/parser/translators/portdef.go @@ -3,7 +3,7 @@ package translators import ( netv1 "k8s.io/api/networking/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" ) func PortDefFromServiceBackendPort(sbp *netv1.ServiceBackendPort) kongstate.PortDef { diff --git a/internal/dataplane/parser/wrappers_refchecker.go b/internal/dataplane/parser/wrappers_refchecker.go index db75ce2b0c..6e94411360 100644 --- a/internal/dataplane/parser/wrappers_refchecker.go +++ b/internal/dataplane/parser/wrappers_refchecker.go @@ -1,7 +1,7 @@ package parser import ( - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // refChecker is a wrapper type that facilitates checking whether a backenRef is allowed diff --git a/internal/dataplane/sendconfig/backoff_strategy.go b/internal/dataplane/sendconfig/backoff_strategy.go index 6d4f111c2f..cc1921b54e 100644 --- a/internal/dataplane/sendconfig/backoff_strategy.go +++ b/internal/dataplane/sendconfig/backoff_strategy.go @@ -6,9 +6,9 @@ import ( "github.com/go-logr/logr" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) type UpdateSkippedDueToBackoffStrategyError struct { diff --git a/internal/dataplane/sendconfig/backoff_strategy_test.go b/internal/dataplane/sendconfig/backoff_strategy_test.go index 9dbff8d5eb..fc5716842f 100644 --- a/internal/dataplane/sendconfig/backoff_strategy_test.go +++ b/internal/dataplane/sendconfig/backoff_strategy_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) type mockUpdateStrategy struct { diff --git a/internal/dataplane/sendconfig/config_change_detector.go b/internal/dataplane/sendconfig/config_change_detector.go index c9bc187030..246a5507ef 100644 --- a/internal/dataplane/sendconfig/config_change_detector.go +++ b/internal/dataplane/sendconfig/config_change_detector.go @@ -9,7 +9,7 @@ import ( "github.com/kong/deck/file" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" ) const ( diff --git a/internal/dataplane/sendconfig/config_change_detector_test.go b/internal/dataplane/sendconfig/config_change_detector_test.go index 990084831e..d360a5b72c 100644 --- a/internal/dataplane/sendconfig/config_change_detector_test.go +++ b/internal/dataplane/sendconfig/config_change_detector_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" ) type konnectAwareClientMock struct { diff --git a/internal/dataplane/sendconfig/dbmode.go b/internal/dataplane/sendconfig/dbmode.go index 89acfcae82..694f3a14d2 100644 --- a/internal/dataplane/sendconfig/dbmode.go +++ b/internal/dataplane/sendconfig/dbmode.go @@ -12,8 +12,8 @@ import ( deckutils "github.com/kong/deck/utils" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) // UpdateStrategyDBMode implements the UpdateStrategy interface. It updates Kong's data-plane diff --git a/internal/dataplane/sendconfig/inmemory.go b/internal/dataplane/sendconfig/inmemory.go index b77409f92d..fea1cdf832 100644 --- a/internal/dataplane/sendconfig/inmemory.go +++ b/internal/dataplane/sendconfig/inmemory.go @@ -10,7 +10,7 @@ import ( "github.com/go-logr/logr" "github.com/kong/deck/file" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) type ConfigService interface { diff --git a/internal/dataplane/sendconfig/inmemory_error_handling.go b/internal/dataplane/sendconfig/inmemory_error_handling.go index a89c6e0b92..5f285c133d 100644 --- a/internal/dataplane/sendconfig/inmemory_error_handling.go +++ b/internal/dataplane/sendconfig/inmemory_error_handling.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // rawResourceError is a Kong configuration error associated with a Kubernetes resource with Kubernetes metadata stored diff --git a/internal/dataplane/sendconfig/inmemory_schema_test.go b/internal/dataplane/sendconfig/inmemory_schema_test.go index a5aabb9d4a..d41897871f 100644 --- a/internal/dataplane/sendconfig/inmemory_schema_test.go +++ b/internal/dataplane/sendconfig/inmemory_schema_test.go @@ -8,7 +8,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" ) func TestDBLessConfigMarshalToJSON(t *testing.T) { diff --git a/internal/dataplane/sendconfig/kong.go b/internal/dataplane/sendconfig/kong.go index d5055ecc57..97b76738b5 100644 --- a/internal/dataplane/sendconfig/kong.go +++ b/internal/dataplane/sendconfig/kong.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" "golang.org/x/sync/errgroup" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) // Config gathers parameters that are needed for sending configuration to Kong Admin APIs. diff --git a/internal/dataplane/sendconfig/sendconfig.go b/internal/dataplane/sendconfig/sendconfig.go index e62ad714e3..01a5fcd793 100644 --- a/internal/dataplane/sendconfig/sendconfig.go +++ b/internal/dataplane/sendconfig/sendconfig.go @@ -12,10 +12,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckgen" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/failures" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckgen" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/failures" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // ----------------------------------------------------------------------------- diff --git a/internal/dataplane/sendconfig/strategy.go b/internal/dataplane/sendconfig/strategy.go index e9a37113f5..52cde81848 100644 --- a/internal/dataplane/sendconfig/strategy.go +++ b/internal/dataplane/sendconfig/strategy.go @@ -8,8 +8,8 @@ import ( "github.com/kong/deck/file" "github.com/kong/go-kong/kong" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) // ContentWithHash encapsulates file.Content along with its precalculated hash. diff --git a/internal/dataplane/sendconfig/strategy_test.go b/internal/dataplane/sendconfig/strategy_test.go index 64e486defe..666accd27c 100644 --- a/internal/dataplane/sendconfig/strategy_test.go +++ b/internal/dataplane/sendconfig/strategy_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" ) type clientMock struct { diff --git a/internal/dataplane/synchronizer.go b/internal/dataplane/synchronizer.go index 1c3bc0e647..ab01eec545 100644 --- a/internal/dataplane/synchronizer.go +++ b/internal/dataplane/synchronizer.go @@ -9,7 +9,7 @@ import ( "github.com/go-logr/logr" - dataplaneutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/dataplane" + dataplaneutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/dataplane" ) // ----------------------------------------------------------------------------- diff --git a/internal/diagnostics/server.go b/internal/diagnostics/server.go index 941b567027..6815adcb93 100644 --- a/internal/diagnostics/server.go +++ b/internal/diagnostics/server.go @@ -13,7 +13,7 @@ import ( "github.com/go-logr/logr" "github.com/kong/deck/file" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // Server is an HTTP server running exposing the pprof profiling tool, and processing diagnostic dumps of Kong configurations. diff --git a/internal/konnect/license/client.go b/internal/konnect/license/client.go index 6875ef17b6..5c876e1851 100644 --- a/internal/konnect/license/client.go +++ b/internal/konnect/license/client.go @@ -13,9 +13,9 @@ import ( "github.com/samber/mo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/license" - tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/license" + tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls" ) // Client interacts with the Konnect license API. diff --git a/internal/konnect/license/client_test.go b/internal/konnect/license/client_test.go index 23babde7d4..540747405a 100644 --- a/internal/konnect/license/client_test.go +++ b/internal/konnect/license/client_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/license" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/license" ) type mockKonnectLicenseServer struct { diff --git a/internal/konnect/mock_node_api_test.go b/internal/konnect/mock_node_api_test.go index c0c3f5dee2..d0df7bc764 100644 --- a/internal/konnect/mock_node_api_test.go +++ b/internal/konnect/mock_node_api_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/nodes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/nodes" ) // mockNodeClient is a mock implementation of the NodeClient interface. diff --git a/internal/konnect/node_agent.go b/internal/konnect/node_agent.go index 9cd03fd623..f357c559c5 100644 --- a/internal/konnect/node_agent.go +++ b/internal/konnect/node_agent.go @@ -11,10 +11,10 @@ import ( "github.com/go-logr/logr" "github.com/google/uuid" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/nodes" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/nodes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock" ) const ( diff --git a/internal/konnect/node_agent_test.go b/internal/konnect/node_agent_test.go index b17b7f75bf..a329721ede 100644 --- a/internal/konnect/node_agent_test.go +++ b/internal/konnect/node_agent_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/nodes" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/nodes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) const ( diff --git a/internal/konnect/nodes/client.go b/internal/konnect/nodes/client.go index f4662b3eb5..6bc0358d7b 100644 --- a/internal/konnect/nodes/client.go +++ b/internal/konnect/nodes/client.go @@ -12,8 +12,8 @@ import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - tlsutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/tls" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + tlsutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/tls" ) // Client is used for sending requests to Konnect Node API. diff --git a/internal/konnect/roles/client_test.go b/internal/konnect/roles/client_test.go index 8cffca5209..3e94efb26d 100644 --- a/internal/konnect/roles/client_test.go +++ b/internal/konnect/roles/client_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/roles" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/roles" ) const ( diff --git a/internal/labels/labels.go b/internal/labels/labels.go index 13b0b32d47..ed0100ff51 100644 --- a/internal/labels/labels.go +++ b/internal/labels/labels.go @@ -1,6 +1,6 @@ package labels -import "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" +import "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" const ( // LabelPrefix is the string used at the beginning of KIC-specific labels. diff --git a/internal/license/agent.go b/internal/license/agent.go index dcfbf0eb29..280bda9f14 100644 --- a/internal/license/agent.go +++ b/internal/license/agent.go @@ -10,8 +10,8 @@ import ( "github.com/samber/lo" "github.com/samber/mo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock" ) const ( diff --git a/internal/license/agent_test.go b/internal/license/agent_test.go index 494f731994..3ee0600483 100644 --- a/internal/license/agent_test.go +++ b/internal/license/agent_test.go @@ -11,9 +11,9 @@ import ( "github.com/samber/mo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/license" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/clock" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/license" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/clock" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) type mockKonnectClientClient struct { diff --git a/internal/manager/config.go b/internal/manager/config.go index 374dcb7104..de57440da0 100644 --- a/internal/manager/config.go +++ b/internal/manager/config.go @@ -13,17 +13,17 @@ import ( cliflag "k8s.io/component-base/cli/flag" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/admission" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect" - "github.com/kong/kubernetes-ingress-controller/v2/internal/license" - cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/flags" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/admission" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect" + "github.com/kong/kubernetes-ingress-controller/v3/internal/license" + cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/flags" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) type OptionalNamespacedName = mo.Option[k8stypes.NamespacedName] diff --git a/internal/manager/config_test.go b/internal/manager/config_test.go index 8b742f3240..bfd27755c1 100644 --- a/internal/manager/config_test.go +++ b/internal/manager/config_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" ) func TestConfigResolve(t *testing.T) { diff --git a/internal/manager/config_validation.go b/internal/manager/config_validation.go index 10190a841a..abfcc500d8 100644 --- a/internal/manager/config_validation.go +++ b/internal/manager/config_validation.go @@ -9,9 +9,9 @@ import ( "github.com/samber/mo" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" - dataplaneutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" + dataplaneutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/dataplane" ) // https://github.com/kubernetes-sigs/gateway-api/blob/547122f7f55ac0464685552898c560658fb40073/apis/v1beta1/shared_types.go#L448-L463 diff --git a/internal/manager/config_validation_test.go b/internal/manager/config_validation_test.go index 22e713b6d1..0cec19138a 100644 --- a/internal/manager/config_validation_test.go +++ b/internal/manager/config_validation_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" ) func TestConfigValidatedVars(t *testing.T) { diff --git a/internal/manager/controllerdef.go b/internal/manager/controllerdef.go index 0ab96c4494..016a2dbd1b 100644 --- a/internal/manager/controllerdef.go +++ b/internal/manager/controllerdef.go @@ -11,14 +11,14 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/configuration" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/crds" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/configuration" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/crds" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/manager/flags/validated_test.go b/internal/manager/flags/validated_test.go index 9637c732fb..43110d2091 100644 --- a/internal/manager/flags/validated_test.go +++ b/internal/manager/flags/validated_test.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/pflag" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/flags" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/flags" ) func TestValidatedValue(t *testing.T) { diff --git a/internal/manager/health_check_test.go b/internal/manager/health_check_test.go index c194aba8d0..5cffbdd0e4 100644 --- a/internal/manager/health_check_test.go +++ b/internal/manager/health_check_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/healthz" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" ) func TestHealthCheckServer(t *testing.T) { diff --git a/internal/manager/run.go b/internal/manager/run.go index 55e28a4e3e..9277e8b164 100644 --- a/internal/manager/run.go +++ b/internal/manager/run.go @@ -18,26 +18,26 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/configfetcher" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect" - konnectLicense "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/license" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/nodes" - "github.com/kong/kubernetes-ingress-controller/v2/internal/license" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/metadata" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/telemetry" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/utils/kongconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - dataplaneutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object/status" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/configfetcher" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect" + konnectLicense "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/license" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/nodes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/license" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/metadata" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/telemetry" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/utils/kongconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + dataplaneutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object/status" ) // ----------------------------------------------------------------------------- diff --git a/internal/manager/scheme/scheme.go b/internal/manager/scheme/scheme.go index 2be20de987..8230343ed4 100644 --- a/internal/manager/scheme/scheme.go +++ b/internal/manager/scheme/scheme.go @@ -8,9 +8,9 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // Get returns a scheme aware of all types the manager can interact with. diff --git a/internal/manager/setup.go b/internal/manager/setup.go index 5b0cf4bf73..e26cda36b8 100644 --- a/internal/manager/setup.go +++ b/internal/manager/setup.go @@ -22,14 +22,14 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/admission" - "github.com/kong/kubernetes-ingress-controller/v2/internal/clients" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/scheme" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - dataplaneutil "github.com/kong/kubernetes-ingress-controller/v2/internal/util/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/admission" + "github.com/kong/kubernetes-ingress-controller/v3/internal/clients" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/scheme" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + dataplaneutil "github.com/kong/kubernetes-ingress-controller/v3/internal/util/dataplane" ) // ----------------------------------------------------------------------------- diff --git a/internal/manager/setup_test.go b/internal/manager/setup_test.go index 61002a4b6e..93a42c9732 100644 --- a/internal/manager/setup_test.go +++ b/internal/manager/setup_test.go @@ -14,9 +14,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestAdminAPIClientFromServiceDiscovery(t *testing.T) { diff --git a/internal/manager/telemetry/manager.go b/internal/manager/telemetry/manager.go index ff4cea0b7a..b9ade95fc0 100644 --- a/internal/manager/telemetry/manager.go +++ b/internal/manager/telemetry/manager.go @@ -17,8 +17,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/telemetry/workflows" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/telemetry/workflows" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) const ( diff --git a/internal/manager/telemetry/reports.go b/internal/manager/telemetry/reports.go index b1f1e1364a..3ff839ffd9 100644 --- a/internal/manager/telemetry/reports.go +++ b/internal/manager/telemetry/reports.go @@ -10,9 +10,9 @@ import ( "github.com/kong/go-kong/kong" "k8s.io/client-go/rest" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/metadata" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/utils/kongconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/metadata" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/utils/kongconfig" ) // GatewayClientsProvider is an interface that provides clients for the currently discovered Gateway instances. diff --git a/internal/manager/type_meta_setting_client.go b/internal/manager/type_meta_setting_client.go index c005b98df3..8b9d91cfd2 100644 --- a/internal/manager/type_meta_setting_client.go +++ b/internal/manager/type_meta_setting_client.go @@ -7,7 +7,7 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // TypeMetaSettingClient decorates client.Client so that it populates the TypeMeta field of the diff --git a/internal/manager/utils/kongconfig/root.go b/internal/manager/utils/kongconfig/root.go index 610dd9424b..208143052a 100644 --- a/internal/manager/utils/kongconfig/root.go +++ b/internal/manager/utils/kongconfig/root.go @@ -13,7 +13,7 @@ import ( "github.com/samber/lo" "golang.org/x/sync/errgroup" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) // KongStartUpOptions includes start up configurations of Kong that could change behavior of Kong Ingress Controller. diff --git a/internal/manager/utils/kongconfig/root_test.go b/internal/manager/utils/kongconfig/root_test.go index 8df13a0c2a..1c8bd02383 100644 --- a/internal/manager/utils/kongconfig/root_test.go +++ b/internal/manager/utils/kongconfig/root_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) func TestRoot(t *testing.T) { diff --git a/internal/metrics/prometheus.go b/internal/metrics/prometheus.go index 2c21102d49..11194bd93b 100644 --- a/internal/metrics/prometheus.go +++ b/internal/metrics/prometheus.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "sigs.k8s.io/controller-runtime/pkg/metrics" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" ) // descriptions of these metrics are found below, where their help text is set in NewCtrlFuncMetrics() diff --git a/internal/metrics/prometheus_test.go b/internal/metrics/prometheus_test.go index 41987613c9..60e4e31875 100644 --- a/internal/metrics/prometheus_test.go +++ b/internal/metrics/prometheus_test.go @@ -12,7 +12,7 @@ import ( "github.com/kong/go-kong/kong" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/deckerrors" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/deckerrors" ) func TestNewCtrlFuncMetricsDoesNotPanicWhenCalledTwice(t *testing.T) { diff --git a/internal/store/cache_stores.go b/internal/store/cache_stores.go index 877d8414d5..26017afc1e 100644 --- a/internal/store/cache_stores.go +++ b/internal/store/cache_stores.go @@ -13,10 +13,10 @@ import ( yamlserializer "k8s.io/apimachinery/pkg/runtime/serializer/yaml" "k8s.io/client-go/tools/cache" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) // CacheStores stores cache.Store for all Kinds of k8s objects that diff --git a/internal/store/cache_stores_test.go b/internal/store/cache_stores_test.go index 8413760fd3..96550350fa 100644 --- a/internal/store/cache_stores_test.go +++ b/internal/store/cache_stores_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestCacheStores(t *testing.T) { diff --git a/internal/store/fake_store.go b/internal/store/fake_store.go index abbab4e312..8de49642b4 100644 --- a/internal/store/fake_store.go +++ b/internal/store/fake_store.go @@ -20,11 +20,11 @@ import ( gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func keyFunc(obj interface{}) (string, error) { diff --git a/internal/store/fake_store_test.go b/internal/store/fake_store_test.go index 456c8ebf2b..7fbeddb532 100644 --- a/internal/store/fake_store_test.go +++ b/internal/store/fake_store_test.go @@ -12,10 +12,10 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestKeyFunc(t *testing.T) { diff --git a/internal/store/store.go b/internal/store/store.go index 598314317c..90f9a21263 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -36,13 +36,13 @@ import ( gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - ctrlutils "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/utils" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + ctrlutils "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/utils" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) const ( diff --git a/internal/store/store_test.go b/internal/store/store_test.go index a3b7c53253..1a03be82c4 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -13,8 +13,8 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestCacheStoresGet(t *testing.T) { diff --git a/internal/util/builder/allowedroutes.go b/internal/util/builder/allowedroutes.go index 836a3acbec..635ef9384d 100644 --- a/internal/util/builder/allowedroutes.go +++ b/internal/util/builder/allowedroutes.go @@ -3,7 +3,7 @@ package builder import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func NewAllowedRoutesFromSameNamespaces() *gatewayapi.AllowedRoutes { diff --git a/internal/util/builder/backendref.go b/internal/util/builder/backendref.go index fdd9f4e1ce..d53e6bd0cc 100644 --- a/internal/util/builder/backendref.go +++ b/internal/util/builder/backendref.go @@ -3,8 +3,8 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // BackendRefBuilder is a builder for gateway api BackendRef. diff --git a/internal/util/builder/httpbackendref.go b/internal/util/builder/httpbackendref.go index c4f6c34913..8f283cc03a 100644 --- a/internal/util/builder/httpbackendref.go +++ b/internal/util/builder/httpbackendref.go @@ -3,8 +3,8 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // HTTPBackendRefBuilder is a builder for gateway api HTTPBackendRef. diff --git a/internal/util/builder/httproutefilter.go b/internal/util/builder/httproutefilter.go index 891968fa66..29ade9444b 100644 --- a/internal/util/builder/httproutefilter.go +++ b/internal/util/builder/httproutefilter.go @@ -3,7 +3,7 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // HTTPRouteFilterBuilder is a builder for gateway api HTTPRouteMatch. diff --git a/internal/util/builder/httproutematch.go b/internal/util/builder/httproutematch.go index 52b8f348cb..febc8ae265 100644 --- a/internal/util/builder/httproutematch.go +++ b/internal/util/builder/httproutematch.go @@ -3,7 +3,7 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // HTTPRouteMatchBuilder is a builder for gateway api HTTPRouteMatch. diff --git a/internal/util/builder/ingress.go b/internal/util/builder/ingress.go index 2b113b0cfa..a29120b582 100644 --- a/internal/util/builder/ingress.go +++ b/internal/util/builder/ingress.go @@ -4,7 +4,7 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" ) type IngressBuilder struct { diff --git a/internal/util/builder/kongstateservicebackend.go b/internal/util/builder/kongstateservicebackend.go index 8a1e1c8927..8313654db4 100644 --- a/internal/util/builder/kongstateservicebackend.go +++ b/internal/util/builder/kongstateservicebackend.go @@ -3,7 +3,7 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/kongstate" ) // KongstateServiceBackendBuilder is a builder for KongstateServiceBackend. diff --git a/internal/util/builder/listener.go b/internal/util/builder/listener.go index 89e4a67f14..f52dec508c 100644 --- a/internal/util/builder/listener.go +++ b/internal/util/builder/listener.go @@ -3,7 +3,7 @@ package builder import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ListenerBuilder is a builder for gateway api Listener. diff --git a/internal/util/builder/routegroupkind.go b/internal/util/builder/routegroupkind.go index 99571b8a0a..b5f25bc667 100644 --- a/internal/util/builder/routegroupkind.go +++ b/internal/util/builder/routegroupkind.go @@ -4,7 +4,7 @@ import ( "github.com/samber/lo" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // RouteGroupKindBuilder is a builder for gateway api RouteGroupKind. diff --git a/internal/util/builder/routenamespaces.go b/internal/util/builder/routenamespaces.go index 01749a9c45..bdd4c03a85 100644 --- a/internal/util/builder/routenamespaces.go +++ b/internal/util/builder/routenamespaces.go @@ -4,7 +4,7 @@ import ( "github.com/samber/lo" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // RouteNamespacesBuilder is a builder for gateway api RouteNamespaces. diff --git a/internal/util/conditions_test.go b/internal/util/conditions_test.go index 39e14ae5b9..0618d32022 100644 --- a/internal/util/conditions_test.go +++ b/internal/util/conditions_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestCheckCondition(t *testing.T) { diff --git a/internal/util/conversions.go b/internal/util/conversions.go index aa5ca26be2..5fa1db99d8 100644 --- a/internal/util/conversions.go +++ b/internal/util/conversions.go @@ -3,7 +3,7 @@ package util import ( "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ----------------------------------------------------------------------------- diff --git a/internal/util/credential.go b/internal/util/credential.go index f82a998eee..b0ab4eedff 100644 --- a/internal/util/credential.go +++ b/internal/util/credential.go @@ -3,7 +3,7 @@ package util import ( corev1 "k8s.io/api/core/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/labels" + "github.com/kong/kubernetes-ingress-controller/v3/internal/labels" ) // TODO https://github.com/Kong/kubernetes-ingress-controller/issues/4853 remove field handling when no longer supported. diff --git a/internal/util/credential_test.go b/internal/util/credential_test.go index c50c21cc2f..fbd7379d32 100644 --- a/internal/util/credential_test.go +++ b/internal/util/credential_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/labels" + "github.com/kong/kubernetes-ingress-controller/v3/internal/labels" ) func TestExtractKongCredentialType(t *testing.T) { diff --git a/internal/util/hostname.go b/internal/util/hostname.go index e9b69c06eb..a7b868eb9c 100644 --- a/internal/util/hostname.go +++ b/internal/util/hostname.go @@ -3,7 +3,7 @@ package util import ( "strings" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // HostnamesIntersect checks if the hostnameA and hostnameB have an intersection. diff --git a/internal/util/hostname_test.go b/internal/util/hostname_test.go index 7a21d57348..edf86b63f3 100644 --- a/internal/util/hostname_test.go +++ b/internal/util/hostname_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) func TestIntersection(t *testing.T) { diff --git a/internal/util/k8s.go b/internal/util/k8s.go index 837b9fd953..6458770072 100644 --- a/internal/util/k8s.go +++ b/internal/util/k8s.go @@ -30,8 +30,8 @@ import ( clientset "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // ParseNameNS parses a string searching a namespace and name. diff --git a/internal/util/k8s_test.go b/internal/util/k8s_test.go index 9a4393192b..a5058975ee 100644 --- a/internal/util/k8s_test.go +++ b/internal/util/k8s_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" testclient "k8s.io/client-go/kubernetes/fake" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) func TestParseNameNS(t *testing.T) { diff --git a/internal/util/kubernetes/object/set_test.go b/internal/util/kubernetes/object/set_test.go index 5f6d4d6bf8..677f4adb35 100644 --- a/internal/util/kubernetes/object/set_test.go +++ b/internal/util/kubernetes/object/set_test.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestObjectConfigurationStatusSet(t *testing.T) { diff --git a/internal/util/kubernetes/object/status/queue_test.go b/internal/util/kubernetes/object/status/queue_test.go index 87f26e018d..b9e2f0b36d 100644 --- a/internal/util/kubernetes/object/status/queue_test.go +++ b/internal/util/kubernetes/object/status/queue_test.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/event" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) func TestQueue(t *testing.T) { diff --git a/internal/util/test/controller_manager.go b/internal/util/test/controller_manager.go index c707650df1..7c93e6f680 100644 --- a/internal/util/test/controller_manager.go +++ b/internal/util/test/controller_manager.go @@ -10,9 +10,9 @@ import ( ktfkong "github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/kong" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/kong/kubernetes-ingress-controller/v2/internal/cmd/rootcmd" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/internal/cmd/rootcmd" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) // logOutput is a file to use for manager log output other than stderr. diff --git a/internal/util/test/crds.go b/internal/util/test/crds.go index 87520cca74..ed78a0de6e 100644 --- a/internal/util/test/crds.go +++ b/internal/util/test/crds.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) // ----------------------------------------------------------------------------- diff --git a/internal/util/test/rbacs.go b/internal/util/test/rbacs.go index caddf9dce1..518c7affc4 100644 --- a/internal/util/test/rbacs.go +++ b/internal/util/test/rbacs.go @@ -6,7 +6,7 @@ import ( "github.com/kong/kubernetes-testing-framework/pkg/clusters" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) const ( diff --git a/internal/util/types_test.go b/internal/util/types_test.go index fd07fdaa2b..ea38283a16 100644 --- a/internal/util/types_test.go +++ b/internal/util/types_test.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/scheme" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/scheme" ) func TestPopulateTypeMeta(t *testing.T) { diff --git a/pkg/clientset/clientset.go b/pkg/clientset/clientset.go index 280a8e8eb7..7c6a0dcfc2 100644 --- a/pkg/clientset/clientset.go +++ b/pkg/clientset/clientset.go @@ -22,9 +22,9 @@ import ( "fmt" "net/http" - configurationv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1" - configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1alpha1" - configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1beta1" + configurationv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1" + configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1alpha1" + configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1beta1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/clientset/fake/clientset_generated.go b/pkg/clientset/fake/clientset_generated.go index 52d9100316..e37f45e404 100644 --- a/pkg/clientset/fake/clientset_generated.go +++ b/pkg/clientset/fake/clientset_generated.go @@ -19,13 +19,13 @@ limitations under the License. package fake import ( - clientset "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - configurationv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1" - fakeconfigurationv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1/fake" - configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1alpha1" - fakeconfigurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1alpha1/fake" - configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1beta1" - fakeconfigurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1beta1/fake" + clientset "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + configurationv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1" + fakeconfigurationv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1/fake" + configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1alpha1" + fakeconfigurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1alpha1/fake" + configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1beta1" + fakeconfigurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1beta1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/clientset/fake/register.go b/pkg/clientset/fake/register.go index 2e62c413f0..092a21e759 100644 --- a/pkg/clientset/fake/register.go +++ b/pkg/clientset/fake/register.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - configurationv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + configurationv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" 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/clientset/scheme/register.go b/pkg/clientset/scheme/register.go index f15a09946b..f134a271f4 100644 --- a/pkg/clientset/scheme/register.go +++ b/pkg/clientset/scheme/register.go @@ -19,9 +19,9 @@ limitations under the License. package scheme import ( - configurationv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + configurationv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + configurationv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + configurationv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" 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/clientset/typed/configuration/v1/configuration_client.go b/pkg/clientset/typed/configuration/v1/configuration_client.go index 6042dae8f7..633fafc409 100644 --- a/pkg/clientset/typed/configuration/v1/configuration_client.go +++ b/pkg/clientset/typed/configuration/v1/configuration_client.go @@ -21,8 +21,8 @@ package v1 import ( "net/http" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/clientset/typed/configuration/v1/fake/fake_configuration_client.go b/pkg/clientset/typed/configuration/v1/fake/fake_configuration_client.go index 15772c7e83..10e60ea49a 100644 --- a/pkg/clientset/typed/configuration/v1/fake/fake_configuration_client.go +++ b/pkg/clientset/typed/configuration/v1/fake/fake_configuration_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/clientset/typed/configuration/v1/fake/fake_kongclusterplugin.go b/pkg/clientset/typed/configuration/v1/fake/fake_kongclusterplugin.go index f8ca668870..58c56ab795 100644 --- a/pkg/clientset/typed/configuration/v1/fake/fake_kongclusterplugin.go +++ b/pkg/clientset/typed/configuration/v1/fake/fake_kongclusterplugin.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + v1 "github.com/kong/kubernetes-ingress-controller/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/clientset/typed/configuration/v1/fake/fake_kongconsumer.go b/pkg/clientset/typed/configuration/v1/fake/fake_kongconsumer.go index 1b4c8dc301..762bfe0ebd 100644 --- a/pkg/clientset/typed/configuration/v1/fake/fake_kongconsumer.go +++ b/pkg/clientset/typed/configuration/v1/fake/fake_kongconsumer.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + v1 "github.com/kong/kubernetes-ingress-controller/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/clientset/typed/configuration/v1/fake/fake_kongingress.go b/pkg/clientset/typed/configuration/v1/fake/fake_kongingress.go index 241d4a1863..7fba63c894 100644 --- a/pkg/clientset/typed/configuration/v1/fake/fake_kongingress.go +++ b/pkg/clientset/typed/configuration/v1/fake/fake_kongingress.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + v1 "github.com/kong/kubernetes-ingress-controller/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/clientset/typed/configuration/v1/fake/fake_kongplugin.go b/pkg/clientset/typed/configuration/v1/fake/fake_kongplugin.go index 4fc3024e34..42ebbd7945 100644 --- a/pkg/clientset/typed/configuration/v1/fake/fake_kongplugin.go +++ b/pkg/clientset/typed/configuration/v1/fake/fake_kongplugin.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + v1 "github.com/kong/kubernetes-ingress-controller/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/clientset/typed/configuration/v1/kongclusterplugin.go b/pkg/clientset/typed/configuration/v1/kongclusterplugin.go index 5ca06ed00d..48929ce562 100644 --- a/pkg/clientset/typed/configuration/v1/kongclusterplugin.go +++ b/pkg/clientset/typed/configuration/v1/kongclusterplugin.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1/kongconsumer.go b/pkg/clientset/typed/configuration/v1/kongconsumer.go index a1c487e301..2e29bc5e32 100644 --- a/pkg/clientset/typed/configuration/v1/kongconsumer.go +++ b/pkg/clientset/typed/configuration/v1/kongconsumer.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1/kongingress.go b/pkg/clientset/typed/configuration/v1/kongingress.go index 05a9933692..9a94fbfdd6 100644 --- a/pkg/clientset/typed/configuration/v1/kongingress.go +++ b/pkg/clientset/typed/configuration/v1/kongingress.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1/kongplugin.go b/pkg/clientset/typed/configuration/v1/kongplugin.go index 770bed55b3..f87a117899 100644 --- a/pkg/clientset/typed/configuration/v1/kongplugin.go +++ b/pkg/clientset/typed/configuration/v1/kongplugin.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1alpha1/configuration_client.go b/pkg/clientset/typed/configuration/v1alpha1/configuration_client.go index a3ff168534..1d8aa0f335 100644 --- a/pkg/clientset/typed/configuration/v1alpha1/configuration_client.go +++ b/pkg/clientset/typed/configuration/v1alpha1/configuration_client.go @@ -21,8 +21,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/clientset/typed/configuration/v1alpha1/fake/fake_configuration_client.go b/pkg/clientset/typed/configuration/v1alpha1/fake/fake_configuration_client.go index fe613ad77d..9d5c81a6b9 100644 --- a/pkg/clientset/typed/configuration/v1alpha1/fake/fake_configuration_client.go +++ b/pkg/clientset/typed/configuration/v1alpha1/fake/fake_configuration_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1alpha1" + v1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/clientset/typed/configuration/v1alpha1/fake/fake_ingressclassparameters.go b/pkg/clientset/typed/configuration/v1alpha1/fake/fake_ingressclassparameters.go index bf4c3f9f12..ed78ca777c 100644 --- a/pkg/clientset/typed/configuration/v1alpha1/fake/fake_ingressclassparameters.go +++ b/pkg/clientset/typed/configuration/v1alpha1/fake/fake_ingressclassparameters.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" + v1alpha1 "github.com/kong/kubernetes-ingress-controller/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/clientset/typed/configuration/v1alpha1/ingressclassparameters.go b/pkg/clientset/typed/configuration/v1alpha1/ingressclassparameters.go index 51d7531ecb..e2ac129576 100644 --- a/pkg/clientset/typed/configuration/v1alpha1/ingressclassparameters.go +++ b/pkg/clientset/typed/configuration/v1alpha1/ingressclassparameters.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1beta1/configuration_client.go b/pkg/clientset/typed/configuration/v1beta1/configuration_client.go index 7360604ae6..71fea95cdb 100644 --- a/pkg/clientset/typed/configuration/v1beta1/configuration_client.go +++ b/pkg/clientset/typed/configuration/v1beta1/configuration_client.go @@ -21,8 +21,8 @@ package v1beta1 import ( "net/http" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/clientset/typed/configuration/v1beta1/fake/fake_configuration_client.go b/pkg/clientset/typed/configuration/v1beta1/fake/fake_configuration_client.go index e812b2d151..777195cd27 100644 --- a/pkg/clientset/typed/configuration/v1beta1/fake/fake_configuration_client.go +++ b/pkg/clientset/typed/configuration/v1beta1/fake/fake_configuration_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/typed/configuration/v1beta1" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/typed/configuration/v1beta1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongconsumergroup.go b/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongconsumergroup.go index b581dae0c0..1162dcdd7e 100644 --- a/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongconsumergroup.go +++ b/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongconsumergroup.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/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/clientset/typed/configuration/v1beta1/fake/fake_kongupstreampolicy.go b/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongupstreampolicy.go index 84e1a103e9..9b169b819c 100644 --- a/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongupstreampolicy.go +++ b/pkg/clientset/typed/configuration/v1beta1/fake/fake_kongupstreampolicy.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/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/clientset/typed/configuration/v1beta1/fake/fake_tcpingress.go b/pkg/clientset/typed/configuration/v1beta1/fake/fake_tcpingress.go index 25bee9bddd..8acf45ad57 100644 --- a/pkg/clientset/typed/configuration/v1beta1/fake/fake_tcpingress.go +++ b/pkg/clientset/typed/configuration/v1beta1/fake/fake_tcpingress.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/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/clientset/typed/configuration/v1beta1/fake/fake_udpingress.go b/pkg/clientset/typed/configuration/v1beta1/fake/fake_udpingress.go index 9149f1ea71..300fe94e75 100644 --- a/pkg/clientset/typed/configuration/v1beta1/fake/fake_udpingress.go +++ b/pkg/clientset/typed/configuration/v1beta1/fake/fake_udpingress.go @@ -21,7 +21,7 @@ package fake import ( "context" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/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/clientset/typed/configuration/v1beta1/kongconsumergroup.go b/pkg/clientset/typed/configuration/v1beta1/kongconsumergroup.go index fe735cf5d6..9a061c4c01 100644 --- a/pkg/clientset/typed/configuration/v1beta1/kongconsumergroup.go +++ b/pkg/clientset/typed/configuration/v1beta1/kongconsumergroup.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1beta1/kongupstreampolicy.go b/pkg/clientset/typed/configuration/v1beta1/kongupstreampolicy.go index e440158e84..6515862982 100644 --- a/pkg/clientset/typed/configuration/v1beta1/kongupstreampolicy.go +++ b/pkg/clientset/typed/configuration/v1beta1/kongupstreampolicy.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1beta1/tcpingress.go b/pkg/clientset/typed/configuration/v1beta1/tcpingress.go index f5b5b2fc81..72549df2fd 100644 --- a/pkg/clientset/typed/configuration/v1beta1/tcpingress.go +++ b/pkg/clientset/typed/configuration/v1beta1/tcpingress.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset/typed/configuration/v1beta1/udpingress.go b/pkg/clientset/typed/configuration/v1beta1/udpingress.go index 3bdd5a325d..f990b1dea9 100644 --- a/pkg/clientset/typed/configuration/v1beta1/udpingress.go +++ b/pkg/clientset/typed/configuration/v1beta1/udpingress.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - scheme "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" + v1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + scheme "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/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/clientset_test/clientset_test.go b/pkg/clientset_test/clientset_test.go index 4f2def5d01..17fc7720d9 100644 --- a/pkg/clientset_test/clientset_test.go +++ b/pkg/clientset_test/clientset_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongfake "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/fake" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongfake "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/fake" ) func TestClientset(t *testing.T) { diff --git a/scripts/cli-arguments-docs-gen/main.go b/scripts/cli-arguments-docs-gen/main.go index 0af6a85617..9cbda93289 100644 --- a/scripts/cli-arguments-docs-gen/main.go +++ b/scripts/cli-arguments-docs-gen/main.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" "github.com/spf13/pflag" ) diff --git a/test/conformance/gateway_conformance_test.go b/test/conformance/gateway_conformance_test.go index eae2d5581e..eee05e13ab 100644 --- a/test/conformance/gateway_conformance_test.go +++ b/test/conformance/gateway_conformance_test.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/gateway-api/conformance/tests" "sigs.k8s.io/gateway-api/conformance/utils/suite" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) var commonSkippedTests = []string{ diff --git a/test/conformance/gateway_expermimental_conformance_test.go b/test/conformance/gateway_expermimental_conformance_test.go index da4e6f0f1a..70fa0e6ed7 100644 --- a/test/conformance/gateway_expermimental_conformance_test.go +++ b/test/conformance/gateway_expermimental_conformance_test.go @@ -16,8 +16,8 @@ import ( "sigs.k8s.io/gateway-api/conformance/utils/suite" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/metadata" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/metadata" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) func TestGatewayExperimentalConformance(t *testing.T) { diff --git a/test/conformance/suite_test.go b/test/conformance/suite_test.go index 579a7af1d5..034fd0eb1e 100644 --- a/test/conformance/suite_test.go +++ b/test/conformance/suite_test.go @@ -27,15 +27,15 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + testutils "github.com/kong/kubernetes-ingress-controller/v3/internal/util/test" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) var ( diff --git a/test/e2e/all_in_one_test.go b/test/e2e/all_in_one_test.go index 9da18662ab..f447b13e7a 100644 --- a/test/e2e/all_in_one_test.go +++ b/test/e2e/all_in_one_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) // ----------------------------------------------------------------------------- diff --git a/test/e2e/features_test.go b/test/e2e/features_test.go index 2d50432b3b..da94e2c568 100644 --- a/test/e2e/features_test.go +++ b/test/e2e/features_test.go @@ -26,16 +26,16 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) // ----------------------------------------------------------------------------- diff --git a/test/e2e/helpers_gateway_test.go b/test/e2e/helpers_gateway_test.go index 07ab35a0e4..763febc16f 100644 --- a/test/e2e/helpers_gateway_test.go +++ b/test/e2e/helpers_gateway_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) // deployGateway deploys a gateway with a new created gateway class and a fixed name `kong`. diff --git a/test/e2e/helpers_test.go b/test/e2e/helpers_test.go index 4bc0cee7cf..79f9513211 100644 --- a/test/e2e/helpers_test.go +++ b/test/e2e/helpers_test.go @@ -40,10 +40,10 @@ import ( "k8s.io/apimachinery/pkg/selection" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) const ( diff --git a/test/e2e/istio_test.go b/test/e2e/istio_test.go index 572c2d149e..77dd81a24f 100644 --- a/test/e2e/istio_test.go +++ b/test/e2e/istio_test.go @@ -24,14 +24,14 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + testutils "github.com/kong/kubernetes-ingress-controller/v3/internal/util/test" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) var ( diff --git a/test/e2e/konnect_test.go b/test/e2e/konnect_test.go index f7a71f6f50..71ad7c4ac3 100644 --- a/test/e2e/konnect_test.go +++ b/test/e2e/konnect_test.go @@ -27,15 +27,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect" - cp "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/controlplanes" - cpc "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/controlplanesconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/nodes" - "github.com/kong/kubernetes-ingress-controller/v2/internal/konnect/roles" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect" + cp "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/controlplanes" + cpc "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/controlplanesconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/nodes" + "github.com/kong/kubernetes-ingress-controller/v3/internal/konnect/roles" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) const ( diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go index 3b4f86f860..f0db974dce 100644 --- a/test/e2e/upgrade_test.go +++ b/test/e2e/upgrade_test.go @@ -15,7 +15,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const ( diff --git a/test/e2e/utils_test.go b/test/e2e/utils_test.go index 7b0de2c51b..9201e31366 100644 --- a/test/e2e/utils_test.go +++ b/test/e2e/utils_test.go @@ -29,8 +29,8 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) const ( diff --git a/test/envtest/adminapi_discoverer_envtest_test.go b/test/envtest/adminapi_discoverer_envtest_test.go index c354157d7f..5215d3e8b9 100644 --- a/test/envtest/adminapi_discoverer_envtest_test.go +++ b/test/envtest/adminapi_discoverer_envtest_test.go @@ -16,9 +16,9 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - cfgtypes "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + cfgtypes "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestDiscoverer_GetAdminAPIsForServiceReturnsAllAddressesCorrectlyPagingThroughResults(t *testing.T) { diff --git a/test/envtest/adminapimock.go b/test/envtest/adminapimock.go index 9f72694081..c720110dda 100644 --- a/test/envtest/adminapimock.go +++ b/test/envtest/adminapimock.go @@ -4,7 +4,7 @@ import ( "net/http/httptest" "testing" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) // StartAdminAPIServerMock starts a mock Kong Admin API server. diff --git a/test/envtest/configerrorevent_envtest_test.go b/test/envtest/configerrorevent_envtest_test.go index 3d5d95c030..815885e944 100644 --- a/test/envtest/configerrorevent_envtest_test.go +++ b/test/envtest/configerrorevent_envtest_test.go @@ -18,9 +18,9 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestConfigErrorEventGeneration(t *testing.T) { diff --git a/test/envtest/controller.go b/test/envtest/controller.go index f2946ad713..e30ca0823e 100644 --- a/test/envtest/controller.go +++ b/test/envtest/controller.go @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers" ) // StartReconcilers creates a controller manager and starts the provided reconciler diff --git a/test/envtest/crds_envtest_test.go b/test/envtest/crds_envtest_test.go index 42ea04e960..d731981e1e 100644 --- a/test/envtest/crds_envtest_test.go +++ b/test/envtest/crds_envtest_test.go @@ -21,12 +21,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) // TestGatewayAPIControllersMayBeDynamicallyStarted ensures that in case of missing CRDs installation in the diff --git a/test/envtest/gateway_envtest_test.go b/test/envtest/gateway_envtest_test.go index 308bd045ff..91542c769e 100644 --- a/test/envtest/gateway_envtest_test.go +++ b/test/envtest/gateway_envtest_test.go @@ -16,8 +16,8 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) // TestGatewayReconciliation_MoreThan100Routes verifies that if we create more diff --git a/test/envtest/gatewayclass_envtest_test.go b/test/envtest/gatewayclass_envtest_test.go index 9c3db0ac4f..fd4a7c9870 100644 --- a/test/envtest/gatewayclass_envtest_test.go +++ b/test/envtest/gatewayclass_envtest_test.go @@ -17,13 +17,13 @@ import ( gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" gatewayclientv1 "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - ctrlref "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/reference" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/conditions" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/conditions" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestGatewayWithGatewayClassReconciliation(t *testing.T) { diff --git a/test/envtest/httproute_controller_test.go b/test/envtest/httproute_controller_test.go index 1891c37e0e..3b0ea684c2 100644 --- a/test/envtest/httproute_controller_test.go +++ b/test/envtest/httproute_controller_test.go @@ -20,11 +20,11 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) func TestHTTPRouteReconcilerProperlyReactsToReferenceGrant(t *testing.T) { diff --git a/test/envtest/ingress_test.go b/test/envtest/ingress_test.go index a7fb597e00..a6f6b57dad 100644 --- a/test/envtest/ingress_test.go +++ b/test/envtest/ingress_test.go @@ -22,9 +22,9 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" ) func TestIngressWorksWithServiceBackendsSpecifyingOnlyPortNames(t *testing.T) { diff --git a/test/envtest/k8s_objects_status_envtest_test.go b/test/envtest/k8s_objects_status_envtest_test.go index 7f8823f24f..eace26a349 100644 --- a/test/envtest/k8s_objects_status_envtest_test.go +++ b/test/envtest/k8s_objects_status_envtest_test.go @@ -14,9 +14,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) func TestHTTPRouteReconciliation_DoesNotBlockSyncLoopWhenStatusQueueBufferIsExceeded(t *testing.T) { diff --git a/test/envtest/kongadminapi_controller_envtest_test.go b/test/envtest/kongadminapi_controller_envtest_test.go index 30c6279c11..d7efabe123 100644 --- a/test/envtest/kongadminapi_controller_envtest_test.go +++ b/test/envtest/kongadminapi_controller_envtest_test.go @@ -26,10 +26,10 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/configuration" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/config/types" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/configuration" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/config/types" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" ) type notifier struct { diff --git a/test/envtest/kongstate_consumer_failures_test.go b/test/envtest/kongstate_consumer_failures_test.go index 852840625d..c61148278a 100644 --- a/test/envtest/kongstate_consumer_failures_test.go +++ b/test/envtest/kongstate_consumer_failures_test.go @@ -14,8 +14,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" ) func TestKongStateFillConsumersAndCredentialsFailure(t *testing.T) { diff --git a/test/envtest/manager_debugendpoints_test.go b/test/envtest/manager_debugendpoints_test.go index f410ab3538..f56ac134ad 100644 --- a/test/envtest/manager_debugendpoints_test.go +++ b/test/envtest/manager_debugendpoints_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/client-go/kubernetes/scheme" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" ) func TestDebugEndpoints(t *testing.T) { diff --git a/test/envtest/manager_envtest_test.go b/test/envtest/manager_envtest_test.go index 8d67ce7b38..6e80c0e9b4 100644 --- a/test/envtest/manager_envtest_test.go +++ b/test/envtest/manager_envtest_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest/observer" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) // TestManagerDoesntStartUntilKubernetesAPIReachable ensures that the manager and its Runnables are not start until the diff --git a/test/envtest/metrics_envtest_test.go b/test/envtest/metrics_envtest_test.go index ba0070d3b4..e5771db32e 100644 --- a/test/envtest/metrics_envtest_test.go +++ b/test/envtest/metrics_envtest_test.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/common/expfmt" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/metrics" + "github.com/kong/kubernetes-ingress-controller/v3/internal/metrics" ) func TestMetricsAreServed(t *testing.T) { diff --git a/test/envtest/programmed_condition_envtest_test.go b/test/envtest/programmed_condition_envtest_test.go index eb92e5e0c5..368ac87454 100644 --- a/test/envtest/programmed_condition_envtest_test.go +++ b/test/envtest/programmed_condition_envtest_test.go @@ -10,11 +10,11 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/conditions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/conditions" ) func TestKongCRDs_ProgrammedCondition(t *testing.T) { diff --git a/test/envtest/run.go b/test/envtest/run.go index 8164311bd4..d8b1dc4615 100644 --- a/test/envtest/run.go +++ b/test/envtest/run.go @@ -18,12 +18,12 @@ import ( "k8s.io/client-go/rest" ctrl "sigs.k8s.io/controller-runtime" - "github.com/kong/kubernetes-ingress-controller/v2/internal/cmd/rootcmd" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/featuregates" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/mocks" + "github.com/kong/kubernetes-ingress-controller/v3/internal/cmd/rootcmd" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/featuregates" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/mocks" ) const ( diff --git a/test/envtest/scheme.go b/test/envtest/scheme.go index 629b08659d..4bc207715f 100644 --- a/test/envtest/scheme.go +++ b/test/envtest/scheme.go @@ -10,9 +10,9 @@ import ( gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" ) type SchemeOption func(t *testing.T, s *k8sruntime.Scheme) diff --git a/test/envtest/setup.go b/test/envtest/setup.go index 1b22ad671d..2b80d89826 100644 --- a/test/envtest/setup.go +++ b/test/envtest/setup.go @@ -24,11 +24,11 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) type Options struct { diff --git a/test/envtest/telemetry_test.go b/test/envtest/telemetry_test.go index 755963b27f..4ac9a67d5c 100644 --- a/test/envtest/telemetry_test.go +++ b/test/envtest/telemetry_test.go @@ -27,10 +27,10 @@ import ( "k8s.io/client-go/rest" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" ) func TestTelemetry(t *testing.T) { diff --git a/test/helpers/certificate/certificate.go b/test/helpers/certificate/certificate.go index b5211d3d35..7db3ca3311 100644 --- a/test/helpers/certificate/certificate.go +++ b/test/helpers/certificate/certificate.go @@ -11,7 +11,7 @@ import ( "math/big" "time" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" ) type SelfSignedCertificateOptions struct { diff --git a/test/helpers/conditions.go b/test/helpers/conditions.go index 917de8de3a..726d05daed 100644 --- a/test/helpers/conditions.go +++ b/test/helpers/conditions.go @@ -11,11 +11,11 @@ import ( "k8s.io/apimachinery/pkg/util/net" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" ) // TODO: for now this can stay here but ideally we'd use a common package for this -// and github.com/kong/kubernetes-ingress-controller/v2/test/interla/helpers. +// and github.com/kong/kubernetes-ingress-controller/v3/test/interla/helpers. // At the moment we can't use the test/internal package in e.g. internal/controllers // package because of how the internal packages work. // This might require a separate PR that will reorder code and put it in a top diff --git a/test/integration/consumer_group_test.go b/test/integration/consumer_group_test.go index e12bcf6775..2749971112 100644 --- a/test/integration/consumer_group_test.go +++ b/test/integration/consumer_group_test.go @@ -19,13 +19,13 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestConsumerGroup(t *testing.T) { diff --git a/test/integration/consumer_test.go b/test/integration/consumer_test.go index 244474ffb5..73d124cf12 100644 --- a/test/integration/consumer_test.go +++ b/test/integration/consumer_test.go @@ -19,12 +19,12 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestConsumerCredential(t *testing.T) { diff --git a/test/integration/examples_test.go b/test/integration/examples_test.go index d50bd7b998..78ddcdd603 100644 --- a/test/integration/examples_test.go +++ b/test/integration/examples_test.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const examplesDIR = "../../examples" diff --git a/test/integration/gateway_test.go b/test/integration/gateway_test.go index eae7d7b6f1..6f053e0d06 100644 --- a/test/integration/gateway_test.go +++ b/test/integration/gateway_test.go @@ -20,14 +20,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - gatewayapi "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + gatewayapi "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const ( diff --git a/test/integration/gateway_webhook_test.go b/test/integration/gateway_webhook_test.go index bfbc2d263f..c4a35c0478 100644 --- a/test/integration/gateway_webhook_test.go +++ b/test/integration/gateway_webhook_test.go @@ -15,9 +15,9 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestGatewayValidationWebhook(t *testing.T) { diff --git a/test/integration/grpcroute_test.go b/test/integration/grpcroute_test.go index b8fe61b69c..33bb45770d 100644 --- a/test/integration/grpcroute_test.go +++ b/test/integration/grpcroute_test.go @@ -23,11 +23,11 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func grpcbinClient(ctx context.Context, url, hostname string) (pb.GRPCBinClient, func() error, error) { diff --git a/test/integration/helpers_test.go b/test/integration/helpers_test.go index a477e43d1d..4d066a4269 100644 --- a/test/integration/helpers_test.go +++ b/test/integration/helpers_test.go @@ -18,10 +18,10 @@ import ( "k8s.io/client-go/util/retry" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/controllers/gateway" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/gateway" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" ) const ( diff --git a/test/integration/httproute_test.go b/test/integration/httproute_test.go index 5e7fdb6aca..607b0fe300 100644 --- a/test/integration/httproute_test.go +++ b/test/integration/httproute_test.go @@ -21,14 +21,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) var emptyHeaderSet = make(map[string]string) diff --git a/test/integration/httproute_webhook_test.go b/test/integration/httproute_webhook_test.go index 581d1be1f4..c670b23acd 100644 --- a/test/integration/httproute_webhook_test.go +++ b/test/integration/httproute_webhook_test.go @@ -12,9 +12,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const invalidRegexPath = "/foo[[[[" diff --git a/test/integration/ingress_https_test.go b/test/integration/ingress_https_test.go index 0d06a7c8d8..43200ce7f6 100644 --- a/test/integration/ingress_https_test.go +++ b/test/integration/ingress_https_test.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stypes "k8s.io/apimachinery/pkg/types" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestHTTPSRedirect(t *testing.T) { diff --git a/test/integration/ingress_regex_match_test.go b/test/integration/ingress_regex_match_test.go index ea363a95de..67fbd38c04 100644 --- a/test/integration/ingress_regex_match_test.go +++ b/test/integration/ingress_regex_match_test.go @@ -17,9 +17,9 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestIngressRegexMatchPath(t *testing.T) { diff --git a/test/integration/ingress_test.go b/test/integration/ingress_test.go index bfc72adfd9..731dda5f37 100644 --- a/test/integration/ingress_test.go +++ b/test/integration/ingress_test.go @@ -21,13 +21,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1alpha1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1alpha1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1alpha1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) var ingressClassMutex = sync.Mutex{} diff --git a/test/integration/ingress_webhook_test.go b/test/integration/ingress_webhook_test.go index 621dbc589b..3f7ca7a134 100644 --- a/test/integration/ingress_webhook_test.go +++ b/test/integration/ingress_webhook_test.go @@ -13,9 +13,9 @@ import ( netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) type testCaseIngressValidation struct { diff --git a/test/integration/kongingress_test.go b/test/integration/kongingress_test.go index 6f0326d9fd..b2611be1dc 100644 --- a/test/integration/kongingress_test.go +++ b/test/integration/kongingress_test.go @@ -17,10 +17,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestServiceOverrides(t *testing.T) { diff --git a/test/integration/kongingress_webhook_test.go b/test/integration/kongingress_webhook_test.go index 5ce62e0f1a..0566bbbdba 100644 --- a/test/integration/kongingress_webhook_test.go +++ b/test/integration/kongingress_webhook_test.go @@ -13,10 +13,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/net" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset/scheme" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset/scheme" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestKongIngressValidationWebhook(t *testing.T) { diff --git a/test/integration/plugin_test.go b/test/integration/plugin_test.go index d76837febb..2d1c288169 100644 --- a/test/integration/plugin_test.go +++ b/test/integration/plugin_test.go @@ -19,12 +19,12 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestPluginEssentials(t *testing.T) { diff --git a/test/integration/suite_test.go b/test/integration/suite_test.go index 8d4141b493..ae451da958 100644 --- a/test/integration/suite_test.go +++ b/test/integration/suite_test.go @@ -23,13 +23,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/store" - testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/internal/store" + testutils "github.com/kong/kubernetes-ingress-controller/v3/internal/util/test" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) // ----------------------------------------------------------------------------- diff --git a/test/integration/tcpingress_test.go b/test/integration/tcpingress_test.go index c0d7ecc242..306968a722 100644 --- a/test/integration/tcpingress_test.go +++ b/test/integration/tcpingress_test.go @@ -20,13 +20,13 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) var ( diff --git a/test/integration/tcproute_test.go b/test/integration/tcproute_test.go index de01e318d2..46f4fa5de2 100644 --- a/test/integration/tcproute_test.go +++ b/test/integration/tcproute_test.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const gatewayTCPPortName = "tcp" diff --git a/test/integration/tlsroute_test.go b/test/integration/tlsroute_test.go index d34328efb3..20777c4f82 100644 --- a/test/integration/tlsroute_test.go +++ b/test/integration/tlsroute_test.go @@ -25,12 +25,12 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const ( diff --git a/test/integration/translation_failures_test.go b/test/integration/translation_failures_test.go index 32e877dd0d..a2de057398 100644 --- a/test/integration/translation_failures_test.go +++ b/test/integration/translation_failures_test.go @@ -20,16 +20,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util" - testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util" + testutils "github.com/kong/kubernetes-ingress-controller/v3/internal/util/test" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const testTranslationFailuresObjectsPrefix = "translation-failures-" diff --git a/test/integration/udpingress_test.go b/test/integration/udpingress_test.go index 04b8f631e5..f69e93bbcd 100644 --- a/test/integration/udpingress_test.go +++ b/test/integration/udpingress_test.go @@ -19,11 +19,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) var udpMutex sync.Mutex diff --git a/test/integration/udproute_test.go b/test/integration/udproute_test.go index 34b4093dfa..7ce3cf7a70 100644 --- a/test/integration/udproute_test.go +++ b/test/integration/udproute_test.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" - "github.com/kong/kubernetes-ingress-controller/v2/internal/gatewayapi" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/gatewayapi" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) const testdomain = "konghq.com" diff --git a/test/integration/utils_test.go b/test/integration/utils_test.go index b5724c4395..b301290c97 100644 --- a/test/integration/utils_test.go +++ b/test/integration/utils_test.go @@ -10,8 +10,8 @@ import ( "github.com/kong/kubernetes-testing-framework/pkg/environments" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) // ----------------------------------------------------------------------------- diff --git a/test/integration/version_test.go b/test/integration/version_test.go index 4b8a82d475..16b660b917 100644 --- a/test/integration/version_test.go +++ b/test/integration/version_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func RunWhenKongVersion(t *testing.T, vRangeStr string, msg ...any) { diff --git a/test/integration/webhook_test.go b/test/integration/webhook_test.go index 9419072251..cb3be9311a 100644 --- a/test/integration/webhook_test.go +++ b/test/integration/webhook_test.go @@ -23,15 +23,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/kong/kubernetes-ingress-controller/v2/internal/annotations" - "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder" - testutils "github.com/kong/kubernetes-ingress-controller/v2/internal/util/test" - kongv1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1" - "github.com/kong/kubernetes-ingress-controller/v2/pkg/clientset" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers/certificate" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/annotations" + "github.com/kong/kubernetes-ingress-controller/v3/internal/util/builder" + testutils "github.com/kong/kubernetes-ingress-controller/v3/internal/util/test" + kongv1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1" + "github.com/kong/kubernetes-ingress-controller/v3/pkg/clientset" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers/certificate" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) // extraWebhookNamespace is an additional namespace used by tests when needing diff --git a/test/internal/helpers/kong.go b/test/internal/helpers/kong.go index f39a95482d..66291dd75a 100644 --- a/test/internal/helpers/kong.go +++ b/test/internal/helpers/kong.go @@ -10,9 +10,9 @@ import ( "github.com/kong/go-kong/kong" "github.com/samber/lo" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" - "github.com/kong/kubernetes-ingress-controller/v2/internal/manager/utils/kongconfig" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/manager/utils/kongconfig" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) // GetKongRootConfig gets version and root configurations of Kong from / endpoint of the provided Admin API URL. diff --git a/test/internal/helpers/ktf.go b/test/internal/helpers/ktf.go index b9474e0b11..35c357e5c8 100644 --- a/test/internal/helpers/ktf.go +++ b/test/internal/helpers/ktf.go @@ -6,8 +6,8 @@ import ( "github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/kong" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) // GenerateKongBuilder returns a Kong KTF addon builder, a string slice diff --git a/test/internal/helpers/tcp_test.go b/test/internal/helpers/tcp_test.go index 24aa05a3ae..d162be5f45 100644 --- a/test/internal/helpers/tcp_test.go +++ b/test/internal/helpers/tcp_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" ) func TestTCPProxy(t *testing.T) { diff --git a/test/internal/helpers/teardown.go b/test/internal/helpers/teardown.go index be2217d449..8d5bdaacfb 100644 --- a/test/internal/helpers/teardown.go +++ b/test/internal/helpers/teardown.go @@ -9,7 +9,7 @@ import ( "github.com/kong/kubernetes-testing-framework/pkg/clusters" "github.com/stretchr/testify/assert" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) // TeardownCluster dumps the diagnostics from the test cluster if the test failed diff --git a/test/internal/testenv/feature_gates.go b/test/internal/testenv/feature_gates.go index 6a13e7b387..3d54fc2d6c 100644 --- a/test/internal/testenv/feature_gates.go +++ b/test/internal/testenv/feature_gates.go @@ -1,6 +1,6 @@ package testenv -import "github.com/kong/kubernetes-ingress-controller/v2/test/consts" +import "github.com/kong/kubernetes-ingress-controller/v3/test/consts" func getFeatureGates() string { return consts.DefaultFeatureGates diff --git a/test/kongintegration/containers/httpbin.go b/test/kongintegration/containers/httpbin.go index ca86d0262f..eee81c5c00 100644 --- a/test/kongintegration/containers/httpbin.go +++ b/test/kongintegration/containers/httpbin.go @@ -11,7 +11,7 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "github.com/kong/kubernetes-ingress-controller/v2/test" + "github.com/kong/kubernetes-ingress-controller/v3/test" ) // HTTPBin represents a docker container running the `kong/httpbin`. diff --git a/test/kongintegration/containers/kong.go b/test/kongintegration/containers/kong.go index 8196734980..5b8947d4d8 100644 --- a/test/kongintegration/containers/kong.go +++ b/test/kongintegration/containers/kong.go @@ -14,10 +14,10 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "github.com/kong/kubernetes-ingress-controller/v2/test" - "github.com/kong/kubernetes-ingress-controller/v2/test/consts" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv" + "github.com/kong/kubernetes-ingress-controller/v3/test" + "github.com/kong/kubernetes-ingress-controller/v3/test/consts" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/testenv" ) const ( diff --git a/test/kongintegration/containers/ports.go b/test/kongintegration/containers/ports.go index 8a938fb144..a0b381fc37 100644 --- a/test/kongintegration/containers/ports.go +++ b/test/kongintegration/containers/ports.go @@ -6,7 +6,7 @@ import ( "github.com/docker/go-connections/nat" - "github.com/kong/kubernetes-ingress-controller/v2/test/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/helpers" ) // MappedLocalPort returns a port mapping for a container port that can be used to access the diff --git a/test/kongintegration/expression_router_test.go b/test/kongintegration/expression_router_test.go index a942e9ddbc..941255df52 100644 --- a/test/kongintegration/expression_router_test.go +++ b/test/kongintegration/expression_router_test.go @@ -15,10 +15,10 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/kongintegration/containers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/atc" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/kongintegration/containers" ) func TestExpressionsRouterMatchers_GenerateValidExpressions(t *testing.T) { diff --git a/test/kongintegration/inmemory_update_strategy_test.go b/test/kongintegration/inmemory_update_strategy_test.go index aa49acc9ae..00bfdf569a 100644 --- a/test/kongintegration/inmemory_update_strategy_test.go +++ b/test/kongintegration/inmemory_update_strategy_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/test/kongintegration/containers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/test/kongintegration/containers" ) // TestUpdateStrategyInMemory_PropagatesResourcesErrors ensures that sendconfig.UpdateStrategyInMemory - diff --git a/test/kongintegration/kongupstreampolicy_test.go b/test/kongintegration/kongupstreampolicy_test.go index 24bb3312fe..5c0f08ca7b 100644 --- a/test/kongintegration/kongupstreampolicy_test.go +++ b/test/kongintegration/kongupstreampolicy_test.go @@ -13,10 +13,10 @@ import ( "github.com/samber/lo" "github.com/stretchr/testify/require" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/translators" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v2/pkg/apis/configuration/v1beta1" - "github.com/kong/kubernetes-ingress-controller/v2/test/kongintegration/containers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/parser/translators" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + kongv1beta1 "github.com/kong/kubernetes-ingress-controller/v3/pkg/apis/configuration/v1beta1" + "github.com/kong/kubernetes-ingress-controller/v3/test/kongintegration/containers" ) // TestKongUpstreamPolicyTranslation ensures that the Upstream Policy CRD is translated to the Kong Upstream diff --git a/test/kongintegration/parser_golden_tests_outputs_test.go b/test/kongintegration/parser_golden_tests_outputs_test.go index 8818ec9de8..eb17caf669 100644 --- a/test/kongintegration/parser_golden_tests_outputs_test.go +++ b/test/kongintegration/parser_golden_tests_outputs_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" "sigs.k8s.io/yaml" - "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/sendconfig" - "github.com/kong/kubernetes-ingress-controller/v2/test/internal/helpers" - "github.com/kong/kubernetes-ingress-controller/v2/test/kongintegration/containers" + "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/sendconfig" + "github.com/kong/kubernetes-ingress-controller/v3/test/internal/helpers" + "github.com/kong/kubernetes-ingress-controller/v3/test/kongintegration/containers" ) // TestGoldenTestsOutputs ensures that the Parser's golden tests outputs are accepted by Kong. diff --git a/test/mocks/admin_api_client_factory.go b/test/mocks/admin_api_client_factory.go index 1b36b60f5c..63d7c0eb42 100644 --- a/test/mocks/admin_api_client_factory.go +++ b/test/mocks/admin_api_client_factory.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) // AdminAPIClientFactory is a mock implementation of adminapi.ClientFactory. diff --git a/test/mocks/admin_api_discoverer.go b/test/mocks/admin_api_discoverer.go index 2a4e12ae2c..6fa9940bd2 100644 --- a/test/mocks/admin_api_discoverer.go +++ b/test/mocks/admin_api_discoverer.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kong/kubernetes-ingress-controller/v2/internal/adminapi" + "github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi" ) // AdminAPIDiscoverer is a mock implementation of adminapi.Discoverer. diff --git a/test/mocks/admin_api_handler.go b/test/mocks/admin_api_handler.go index d4dfb83ecc..b897db48aa 100644 --- a/test/mocks/admin_api_handler.go +++ b/test/mocks/admin_api_handler.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "testing" - "github.com/kong/kubernetes-ingress-controller/v2/internal/versions" + "github.com/kong/kubernetes-ingress-controller/v3/internal/versions" ) // AdminAPIHandler is a mock implementation of the Admin API. It only implements the endpoints that are diff --git a/test/mocks/dataplane.go b/test/mocks/dataplane.go index d373c4b036..f4f099f3f2 100644 --- a/test/mocks/dataplane.go +++ b/test/mocks/dataplane.go @@ -6,7 +6,7 @@ import ( "github.com/kong/go-kong/kong" "sigs.k8s.io/controller-runtime/pkg/client" - k8sobj "github.com/kong/kubernetes-ingress-controller/v2/internal/util/kubernetes/object" + k8sobj "github.com/kong/kubernetes-ingress-controller/v3/internal/util/kubernetes/object" ) type Dataplane struct {