From ee7fa7bc17e99b29c013f54a4fa771fcc22b755c Mon Sep 17 00:00:00 2001 From: Tim Flannagan Date: Tue, 11 Feb 2025 13:35:26 -0500 Subject: [PATCH] *: Bump module version to v2 (#10608) Signed-off-by: timflannagan --- Makefile | 4 +- .../api/v1alpha1/aiextensionstats.go | 2 +- .../api/v1alpha1/directresponse.go | 6 +- .../api/v1alpha1/gatewayparameters.go | 6 +- .../api/v1alpha1/gatewayparametersspec.go | 2 +- .../api/v1alpha1/httplistenerpolicy.go | 6 +- .../api/v1alpha1/listenerpolicy.go | 6 +- .../api/v1alpha1/routepolicy.go | 6 +- .../api/v1alpha1/upstream.go | 6 +- api/applyconfiguration/internal/internal.go | 158 +-- api/applyconfiguration/utils.go | 6 +- cmd/envoyinit/main.go | 4 +- cmd/kgateway/main.go | 4 +- cmd/modelschema/main.go | 2 +- cmd/sds/main.go | 2 +- go.mod | 2 +- hack/generate.sh | 8 +- ...y-validation-webhook-configuration_test.go | 4 +- install/test/grpc_json_transcoder_test.go | 4 +- install/test/helm_suite_test.go | 10 +- install/test/helm_test.go | 14 +- install/test/k8sgateway_test.go | 12 +- install/test/rbac_test.go | 2 +- install/test/svc_accnt_test.go | 2 +- .../envoyinit/pkg/downward/downward_test.go | 2 +- .../envoyinit/pkg/downward/template_test.go | 2 +- .../envoyinit/pkg/downward/transform_test.go | 2 +- internal/envoyinit/pkg/runner/run.go | 4 +- internal/kgateway/admin/resources.go | 4 +- internal/kgateway/admin/response_test.go | 2 +- internal/kgateway/admin/server.go | 2 +- internal/kgateway/controller/controller.go | 6 +- .../controller/controller_suite_test.go | 8 +- internal/kgateway/controller/gw_controller.go | 2 +- internal/kgateway/controller/scheme.go | 2 +- internal/kgateway/controller/start.go | 26 +- internal/kgateway/controller/typed_client.go | 2 +- internal/kgateway/deployer/deployer.go | 8 +- internal/kgateway/deployer/deployer_test.go | 16 +- internal/kgateway/deployer/merge.go | 2 +- internal/kgateway/deployer/merge_test.go | 2 +- internal/kgateway/deployer/values.go | 2 +- internal/kgateway/deployer/values_helpers.go | 4 +- .../kgateway/deployer/values_helpers_test.go | 2 +- internal/kgateway/endpoints/prioritize.go | 2 +- internal/kgateway/extensions2/common/krt.go | 10 +- internal/kgateway/extensions2/factory.go | 4 +- .../kgateway/extensions2/plugin/plugin.go | 4 +- .../extensions2/plugins/destrule/destrule.go | 2 +- .../plugins/destrule/destrule_plugin.go | 8 +- .../directresponse/direct_response_plugin.go | 12 +- .../extensions2/plugins/istio/plugin.go | 10 +- .../extensions2/plugins/kubernetes/k8s.go | 12 +- .../listenerpolicy/listener_policy_plugin.go | 14 +- .../routepolicy/route_policy_plugin.go | 14 +- .../extensions2/plugins/upstream/aws.go | 6 +- .../extensions2/plugins/upstream/plugin.go | 14 +- .../extensions2/plugins/upstream/static.go | 4 +- .../extensions2/pluginutils/pluginutils.go | 2 +- .../kgateway/extensions2/registry/registry.go | 18 +- internal/kgateway/ir/gw2.go | 2 +- internal/kgateway/ir/iface.go | 2 +- internal/kgateway/ir/model.go | 2 +- internal/kgateway/krtcollections/builtin.go | 8 +- internal/kgateway/krtcollections/endpoints.go | 8 +- .../kgateway/krtcollections/endpoints_test.go | 4 +- internal/kgateway/krtcollections/ns.go | 2 +- internal/kgateway/krtcollections/pods.go | 4 +- internal/kgateway/krtcollections/pods_test.go | 8 +- internal/kgateway/krtcollections/policy.go | 8 +- .../kgateway/krtcollections/policy_test.go | 6 +- internal/kgateway/krtcollections/secrets.go | 2 +- internal/kgateway/krtcollections/setup.go | 6 +- .../kgateway/krtcollections/uniqueclients.go | 6 +- .../krtcollections/uniqueclients_test.go | 10 +- internal/kgateway/plugins/stages.go | 4 +- internal/kgateway/ports/ports_test.go | 2 +- internal/kgateway/proxy_syncer/cla.go | 4 +- internal/kgateway/proxy_syncer/cla_test.go | 4 +- internal/kgateway/proxy_syncer/perclient.go | 4 +- .../kgateway/proxy_syncer/proxy_syncer.go | 26 +- .../proxy_syncer/proxy_syncer_test.go | 2 +- internal/kgateway/proxy_syncer/upstreams.go | 8 +- internal/kgateway/proxy_syncer/xdswrapper.go | 4 +- .../kgateway/proxy_syncer/xdswrapper_test.go | 2 +- internal/kgateway/query/backendmap.go | 2 +- internal/kgateway/query/httproute.go | 4 +- internal/kgateway/query/indexers.go | 2 +- internal/kgateway/query/mocks/mock_queries.go | 4 +- internal/kgateway/query/query.go | 6 +- internal/kgateway/query/query_test.go | 14 +- internal/kgateway/query/utils.go | 4 +- internal/kgateway/reports/reporter_test.go | 2 +- internal/kgateway/setup/controlplane.go | 2 +- internal/kgateway/setup/ggv2setup.go | 18 +- internal/kgateway/setup/ggv2setup_test.go | 8 +- .../kgateway/translator/backendref/types.go | 2 +- .../translator/gateway/gateway_translator.go | 12 +- .../gateway/gateway_translator_test.go | 4 +- .../translator/gateway/testtest_test.go | 2 +- .../gateway/testutils/test_file_loader.go | 8 +- .../gateway/translator_case_test.go | 24 +- .../translator/httproute/delegation.go | 8 +- .../httproute/delegation_helpers.go | 6 +- .../translator/httproute/delegation_test.go | 2 +- .../gateway_http_route_translator.go | 6 +- .../httproute/translate_httproute_test.go | 10 +- .../kgateway/translator/irtranslator/fc.go | 8 +- .../translator/irtranslator/gateway.go | 6 +- .../kgateway/translator/irtranslator/route.go | 10 +- .../irtranslator/translator_unit_test.go | 18 +- .../translator/irtranslator/upstream.go | 4 +- .../listener/gateway_listener_translator.go | 18 +- .../gateway_listener_translator_test.go | 12 +- .../translator/listener/validation.go | 6 +- .../translator/listener/validation_test.go | 4 +- .../translator/routeutils/sortable_route.go | 2 +- .../routeutils/sortable_route_test.go | 2 +- internal/kgateway/translator/translator.go | 20 +- internal/kgateway/utils/queue_test.go | 2 +- internal/kgateway/xds/utils.go | 2 +- internal/sds/pkg/run/run.go | 2 +- internal/sds/pkg/run/run_e2e_test.go | 6 +- internal/sds/pkg/run/run_main.go | 4 +- internal/sds/pkg/server/server_test.go | 4 +- pkg/bootstrap/leaderelector/identity_test.go | 2 +- pkg/bootstrap/leaderelector/kube/factory.go | 4 +- pkg/bootstrap/leaderelector/leader_test.go | 2 +- .../leaderelector/singlereplica/factory.go | 2 +- pkg/client/clientset/versioned/clientset.go | 2 +- .../versioned/fake/clientset_generated.go | 8 +- .../clientset/versioned/fake/register.go | 2 +- .../clientset/versioned/scheme/register.go | 2 +- .../typed/api/v1alpha1/api_client.go | 4 +- .../typed/api/v1alpha1/directresponse.go | 6 +- .../api/v1alpha1/fake/fake_api_client.go | 2 +- .../api/v1alpha1/fake/fake_directresponse.go | 4 +- .../v1alpha1/fake/fake_gatewayparameters.go | 4 +- .../v1alpha1/fake/fake_httplistenerpolicy.go | 4 +- .../api/v1alpha1/fake/fake_listenerpolicy.go | 4 +- .../api/v1alpha1/fake/fake_routepolicy.go | 4 +- .../typed/api/v1alpha1/fake/fake_upstream.go | 4 +- .../typed/api/v1alpha1/gatewayparameters.go | 6 +- .../typed/api/v1alpha1/httplistenerpolicy.go | 6 +- .../typed/api/v1alpha1/listenerpolicy.go | 6 +- .../typed/api/v1alpha1/routepolicy.go | 6 +- .../versioned/typed/api/v1alpha1/upstream.go | 6 +- pkg/generated/openapi/zz_generated.openapi.go | 1028 ++++++++--------- pkg/github-action-utils/version.go | 2 +- pkg/schemes/extended_scheme.go | 2 +- pkg/schemes/scheme.go | 2 +- pkg/utils/channelutils/wait_test.go | 2 +- pkg/utils/controllerutils/admincli/client.go | 6 +- .../controllerutils/admincli/client_test.go | 4 +- pkg/utils/envoyutils/admincli/client.go | 10 +- pkg/utils/envoyutils/admincli/client_test.go | 4 +- pkg/utils/envoyutils/bootstrap/bootstrap.go | 2 +- .../envoyutils/bootstrap/bootstrap_test.go | 2 +- pkg/utils/envoyutils/validation/validation.go | 8 +- pkg/utils/helmutils/client.go | 2 +- pkg/utils/kubeutils/kubectl/cli.go | 6 +- .../kubeutils/portforward/api_forwarder.go | 2 +- pkg/utils/namespaces/namespaces_test.go | 2 +- pkg/utils/probes/probes_test.go | 2 +- pkg/utils/regexutils/regex_test.go | 2 +- pkg/utils/requestutils/curl/request_test.go | 2 +- pkg/utils/setuputils/main_setup.go | 10 +- pkg/utils/sliceutils/sliceutils_test.go | 2 +- pkg/utils/stringutils/stringutils_test.go | 2 +- pkg/version/enterprise_version_test.go | 2 +- .../aws_credentials_suite_test.go | 2 +- test/aws_credentials/ec2_test.go | 8 +- test/debugprint/debug_print_resource.go | 2 +- test/e2e/aggregate_listener_test.go | 18 +- test/e2e/aws_ec2_test.go | 12 +- test/e2e/aws_test.go | 28 +- test/e2e/buffer_test.go | 16 +- test/e2e/connection_limit_test.go | 18 +- test/e2e/consul_test.go | 24 +- test/e2e/cors_test.go | 14 +- test/e2e/csrf_test.go | 26 +- test/e2e/custom_auth_test.go | 18 +- test/e2e/dns_test.go | 4 +- test/e2e/dynamic_forward_proxy_test.go | 18 +- test/e2e/e2e_suite_test.go | 10 +- test/e2e/example_test.go | 12 +- test/e2e/fault_injection_test.go | 12 +- test/e2e/gateway_test.go | 28 +- test/e2e/grpc_discovery_test.go | 20 +- test/e2e/grpc_json_test.go | 26 +- test/e2e/grpc_plugin_test.go | 26 +- test/e2e/gzip_test.go | 16 +- test/e2e/happypath_test.go | 26 +- test/e2e/header_validation_test.go | 12 +- test/e2e/headers_test.go | 30 +- test/e2e/health_checks_test.go | 26 +- test/e2e/http_tunneling_test.go | 24 +- test/e2e/hybrid_test.go | 22 +- test/e2e/loadbalancer_plugin_test.go | 12 +- test/e2e/local_ratelimit_test.go | 20 +- test/e2e/proxy_protocol_test.go | 16 +- test/e2e/ratelimit_test.go | 18 +- test/e2e/route_transformation_test.go | 18 +- test/e2e/staged_transformation_test.go | 20 +- test/e2e/tcp_stats_test.go | 16 +- test/e2e/test_context.go | 20 +- test/e2e/tls_ocsp_test.go | 16 +- test/e2e/vault_aws_test.go | 16 +- test/e2e/vault_test.go | 14 +- test/e2e/zipkin_test.go | 32 +- test/ginkgo/parallel/ports_test.go | 2 +- test/gomega/assertions/goroutines.go | 2 +- test/gomega/assertions/goroutines_test.go | 4 +- test/gomega/assertions/logging.go | 4 +- test/gomega/assertions/stats.go | 8 +- test/gomega/matchers/benchmark.go | 2 +- test/gomega/matchers/benchmark_test.go | 2 +- test/gomega/matchers/contain_headers.go | 2 +- test/gomega/matchers/contain_headers_test.go | 2 +- .../matchers/contain_map_elements_test.go | 2 +- .../matchers/contain_substrings_test.go | 2 +- test/gomega/matchers/custom_resource_test.go | 6 +- test/gomega/matchers/json_contains_test.go | 2 +- test/gomega/transforms/benchmark.go | 2 +- test/gomega/transforms/curl.go | 2 +- test/gomega/transforms/curl_test.go | 6 +- test/helpers/benchmark.go | 2 +- test/helpers/certs.go | 2 +- test/helpers/default_gateways.go | 4 +- test/helpers/endpoints.go | 2 +- test/helpers/glooctl_debug_dump.go | 2 +- test/helpers/kube_dump.go | 14 +- test/helpers/resource_clientset.go | 8 +- test/helpers/resources.go | 4 +- test/helpers/route_tables.go | 2 +- test/helpers/routes.go | 6 +- test/helpers/scaled_snapshots.go | 16 +- test/helpers/scaled_snapshots_test.go | 6 +- test/helpers/secrets.go | 2 +- test/helpers/snapshot_writer.go | 4 +- test/helpers/timeouts.go | 2 +- test/helpers/upstreams.go | 6 +- test/helpers/upstreams_test.go | 2 +- test/helpers/util_test.go | 4 +- test/helpers/virtual_services.go | 8 +- test/helpers/virtual_services_test.go | 12 +- test/kube2e/gateway/gateway_suite_test.go | 20 +- test/kube2e/gateway/gateway_test.go | 46 +- test/kube2e/gateway/robustness_test.go | 20 +- test/kube2e/gloo/bootstrap_clients_test.go | 20 +- test/kube2e/gloo/eds_test.go | 12 +- test/kube2e/gloo/generated_kube_types_test.go | 20 +- test/kube2e/gloo/gloo_resources_test.go | 20 +- test/kube2e/gloo/gloo_suite_test.go | 20 +- test/kube2e/gloo/happypath_test.go | 14 +- test/kube2e/gloo/kubernetes_test.go | 8 +- test/kube2e/gloo/setup_syncer_test.go | 26 +- test/kube2e/gloo/snapshot_writer_test.go | 12 +- test/kube2e/helper/curl.go | 8 +- test/kube2e/helper/curl_test.go | 4 +- test/kube2e/helper/install.go | 2 +- test/kube2e/helper/test_container.go | 2 +- test/kube2e/helper/test_container_test.go | 2 +- test/kube2e/resource_clientset.go | 14 +- .../upgrade/upgrade_data_validation_test.go | 2 +- test/kube2e/upgrade/upgrade_suite_test.go | 8 +- test/kube2e/upgrade/upgrade_test.go | 16 +- test/kube2e/util.go | 20 +- test/kubernetes/e2e/defaults/defaults.go | 4 +- .../e2e/example/info_logging_test.go | 12 +- .../e2e/features/admin_server/suite.go | 10 +- .../e2e/features/admin_server/types.go | 2 +- .../e2e/features/client_tls/suite.go | 12 +- .../e2e/features/client_tls/types.go | 4 +- .../e2e/features/crd_categories/suite.go | 4 +- .../e2e/features/crd_categories/types.go | 2 +- .../deployer/istio_integration_suite.go | 8 +- ...minimal_default_gatewayparameters_suite.go | 4 +- .../kubernetes/e2e/features/deployer/suite.go | 16 +- .../kubernetes/e2e/features/deployer/types.go | 4 +- .../e2e/features/directresponse/suite.go | 14 +- .../e2e/features/directresponse/types.go | 2 +- .../discovery_watchlabels_suite.go | 8 +- .../features/discovery_watchlabels/types.go | 2 +- test/kubernetes/e2e/features/example/suite.go | 2 +- .../headless_svc/generate/generate.go | 8 +- .../e2e/features/headless_svc/k8s_gw_suite.go | 8 +- .../e2e/features/headless_svc/resources.go | 6 +- .../e2e/features/headless_svc/types.go | 4 +- test/kubernetes/e2e/features/helm/suite.go | 10 +- test/kubernetes/e2e/features/helm/types.go | 4 +- .../e2e/features/helm_settings/suite.go | 4 +- .../http_lis_opt_suite.go | 10 +- .../http_listener_options/lis_opt_types.go | 2 +- .../istio/k8s_gateway_auto_mtls_suite.go | 6 +- .../istio/k8s_gateway_no_auto_mtls_suite.go | 6 +- .../e2e/features/istio/resources.go | 4 +- test/kubernetes/e2e/features/istio/types.go | 6 +- .../listener_options/lis_opt_suite.go | 10 +- .../listener_options/lis_opt_types.go | 6 +- test/kubernetes/e2e/features/metrics/suite.go | 20 +- test/kubernetes/e2e/features/metrics/types.go | 10 +- .../port_routing/k8s_gateway_suite.go | 6 +- .../e2e/features/port_routing/types.go | 6 +- .../e2e/features/route_delegation/suite.go | 8 +- .../e2e/features/route_delegation/types.go | 2 +- .../e2e/features/route_options/suite.go | 14 +- .../e2e/features/route_options/types.go | 4 +- .../e2e/features/server_tls/suite.go | 18 +- .../e2e/features/server_tls/types.go | 4 +- .../e2e/features/services/httproute/suite.go | 10 +- .../e2e/features/services/httproute/types.go | 6 +- .../e2e/features/services/tcproute/suite.go | 12 +- .../e2e/features/services/tcproute/types.go | 4 +- test/kubernetes/e2e/features/tracing/suite.go | 12 +- test/kubernetes/e2e/features/tracing/types.go | 2 +- test/kubernetes/e2e/features/upgrade/suite.go | 8 +- .../e2e/features/upstreams/suite.go | 8 +- .../e2e/features/upstreams/types.go | 6 +- .../e2e/features/virtualhost_options/types.go | 6 +- .../virtualhost_options/vhost_opt_suite.go | 14 +- .../watch_namespace_selector/suite.go | 4 +- .../watch_namespace_selector/types.go | 8 +- .../features/zero_downtime_rollout/suite.go | 12 +- .../features/zero_downtime_rollout/types.go | 6 +- test/kubernetes/e2e/file.go | 2 +- test/kubernetes/e2e/test.go | 16 +- .../e2e/tests/automtls_istio_test.go | 10 +- .../e2e/tests/automtls_istio_tests.go | 8 +- test/kubernetes/e2e/tests/base/base_suite.go | 4 +- ...disabled_transformation_validation_test.go | 10 +- .../e2e/tests/discovery_watchlabels_test.go | 12 +- .../e2e/tests/discovery_watchlabels_tests.go | 4 +- .../e2e/tests/full_envoy_validation_test.go | 10 +- test/kubernetes/e2e/tests/helm_test.go | 10 +- test/kubernetes/e2e/tests/helm_tests.go | 6 +- test/kubernetes/e2e/tests/k8s_gw_aws_test.go | 10 +- test/kubernetes/e2e/tests/k8s_gw_aws_tests.go | 4 +- .../kubernetes/e2e/tests/k8s_gw_istio_test.go | 10 +- .../e2e/tests/k8s_gw_istio_tests.go | 10 +- ..._minimal_default_gatewayparameters_test.go | 10 +- ...minimal_default_gatewayparameters_tests.go | 4 +- .../e2e/tests/k8s_gw_no_validation_test.go | 10 +- .../e2e/tests/k8s_gw_no_validation_tests.go | 10 +- test/kubernetes/e2e/tests/k8s_gw_test.go | 10 +- test/kubernetes/e2e/tests/k8s_gw_tests.go | 32 +- .../e2e/tests/revision_istio_k8s_gw_test.go | 10 +- .../e2e/tests/revision_istio_k8s_gw_tests.go | 4 +- test/kubernetes/e2e/tests/upgrade_test.go | 8 +- test/kubernetes/e2e/tests/upgrade_tests.go | 4 +- .../tests/watch_namespace_selector_test.go | 10 +- .../tests/watch_namespace_selector_tests.go | 4 +- .../e2e/tests/zero_downtime_test.go | 10 +- .../e2e/tests/zero_downtime_tests.go | 4 +- test/kubernetes/testutils/actions/provider.go | 10 +- test/kubernetes/testutils/assertions/curl.go | 14 +- .../testutils/assertions/deployments.go | 4 +- test/kubernetes/testutils/assertions/envoy.go | 8 +- test/kubernetes/testutils/assertions/gloo.go | 8 +- .../testutils/assertions/glooctl.go | 8 +- .../testutils/assertions/objects.go | 2 +- test/kubernetes/testutils/assertions/pods.go | 4 +- .../testutils/assertions/provider.go | 4 +- .../testutils/assertions/resources.go | 2 +- .../kubernetes/testutils/assertions/status.go | 4 +- test/kubernetes/testutils/clients/clients.go | 2 +- .../testutils/clients/rest_config.go | 2 +- test/kubernetes/testutils/cluster/context.go | 2 +- test/kubernetes/testutils/cluster/istio.go | 4 +- test/kubernetes/testutils/cluster/kind.go | 6 +- test/kubernetes/testutils/helper/install.go | 6 +- test/kubernetes/testutils/helper/util.go | 6 +- test/kubernetes/testutils/kgateway/context.go | 2 +- test/kubernetes/testutils/runtime/context.go | 4 +- test/kubernetes/testutils/runtime/output.go | 2 +- test/mocks/gloo/validation_client.go | 2 +- test/samples/route_tables.go | 8 +- test/samples/sample_gloo_api_snapshot.go | 20 +- test/services/consul.go | 4 +- test/services/docker.go | 2 +- test/services/envoy/factory.go | 12 +- test/services/envoy/instance.go | 6 +- test/services/envoy/ports.go | 4 +- test/services/gloo.go | 38 +- test/services/logging.go | 2 +- test/services/logging_test.go | 2 +- test/services/utils/download.go | 2 +- test/services/utils/download_test.go | 4 +- test/services/vault.go | 6 +- test/testutils/env.go | 2 +- test/testutils/helm_values.go | 4 +- test/testutils/http_client_test.go | 6 +- test/testutils/http_request_test.go | 4 +- test/testutils/version/changelog.go | 2 +- test/testutils/version/changelog_test.go | 2 +- test/v1helpers/ssl_proxy.go | 2 +- .../test_grpc_service/testgrpcservice.go | 2 +- test/v1helpers/test_upstream.go | 10 +- 398 files changed, 2119 insertions(+), 2119 deletions(-) diff --git a/Makefile b/Makefile index 42845f4653f..067aab8173b 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ SOURCES := $(shell find . -name "*.go" | grep -v test.go) # universal header validation has been enabled and if so, we expect # failures in `test/e2e/header_validation_test.go`. export ENVOY_IMAGE ?= quay.io/solo-io/envoy-gloo:1.31.2-patch3 -export LDFLAGS := -X 'github.com/kgateway-dev/kgateway/pkg/version.Version=$(VERSION)' +export LDFLAGS := -X 'github.com/kgateway-dev/kgateway/v2/pkg/version.Version=$(VERSION)' export GCFLAGS ?= UNAME_M := $(shell uname -m) @@ -124,7 +124,7 @@ get_sources = $(shell find $(1) -name "*.go" | grep -v test | grep -v generated. .PHONY: fmt fmt: - go run golang.org/x/tools/cmd/goimports -local "github.com/kgateway-dev/kgateway/" -w $(shell ls -d */ | grep -v vendor) + go run golang.org/x/tools/cmd/goimports -local "github.com/kgateway-dev/kgateway/v2/" -w $(shell ls -d */ | grep -v vendor) .PHONY: fmt-changed fmt-changed: diff --git a/api/applyconfiguration/api/v1alpha1/aiextensionstats.go b/api/applyconfiguration/api/v1alpha1/aiextensionstats.go index 571b3534ab8..3daac732d03 100644 --- a/api/applyconfiguration/api/v1alpha1/aiextensionstats.go +++ b/api/applyconfiguration/api/v1alpha1/aiextensionstats.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // AiExtensionStatsApplyConfiguration represents a declarative configuration of the AiExtensionStats type for use diff --git a/api/applyconfiguration/api/v1alpha1/directresponse.go b/api/applyconfiguration/api/v1alpha1/directresponse.go index c27291d43ff..82777e0f07f 100644 --- a/api/applyconfiguration/api/v1alpha1/directresponse.go +++ b/api/applyconfiguration/api/v1alpha1/directresponse.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // DirectResponseApplyConfiguration represents a declarative configuration of the DirectResponse type for use @@ -56,7 +56,7 @@ func ExtractDirectResponseStatus(directResponse *apiv1alpha1.DirectResponse, fie func extractDirectResponse(directResponse *apiv1alpha1.DirectResponse, fieldManager string, subresource string) (*DirectResponseApplyConfiguration, error) { b := &DirectResponseApplyConfiguration{} - err := managedfields.ExtractInto(directResponse, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponse"), fieldManager, b, subresource) + err := managedfields.ExtractInto(directResponse, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponse"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/api/v1alpha1/gatewayparameters.go b/api/applyconfiguration/api/v1alpha1/gatewayparameters.go index a1808855a43..89f7fdc48d1 100644 --- a/api/applyconfiguration/api/v1alpha1/gatewayparameters.go +++ b/api/applyconfiguration/api/v1alpha1/gatewayparameters.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // GatewayParametersApplyConfiguration represents a declarative configuration of the GatewayParameters type for use @@ -56,7 +56,7 @@ func ExtractGatewayParametersStatus(gatewayParameters *apiv1alpha1.GatewayParame func extractGatewayParameters(gatewayParameters *apiv1alpha1.GatewayParameters, fieldManager string, subresource string) (*GatewayParametersApplyConfiguration, error) { b := &GatewayParametersApplyConfiguration{} - err := managedfields.ExtractInto(gatewayParameters, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParameters"), fieldManager, b, subresource) + err := managedfields.ExtractInto(gatewayParameters, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParameters"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go b/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go index 07dbef55864..eb930b6272d 100644 --- a/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go +++ b/api/applyconfiguration/api/v1alpha1/gatewayparametersspec.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // GatewayParametersSpecApplyConfiguration represents a declarative configuration of the GatewayParametersSpec type for use diff --git a/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go b/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go index 4a135803ec8..2a5e57b7ed6 100644 --- a/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go +++ b/api/applyconfiguration/api/v1alpha1/httplistenerpolicy.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // HttpListenerPolicyApplyConfiguration represents a declarative configuration of the HttpListenerPolicy type for use @@ -56,7 +56,7 @@ func ExtractHttpListenerPolicyStatus(httpListenerPolicy *apiv1alpha1.HttpListene func extractHttpListenerPolicy(httpListenerPolicy *apiv1alpha1.HttpListenerPolicy, fieldManager string, subresource string) (*HttpListenerPolicyApplyConfiguration, error) { b := &HttpListenerPolicyApplyConfiguration{} - err := managedfields.ExtractInto(httpListenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.HttpListenerPolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(httpListenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.HttpListenerPolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/api/v1alpha1/listenerpolicy.go b/api/applyconfiguration/api/v1alpha1/listenerpolicy.go index 0617005ad68..48e5e7e8dfb 100644 --- a/api/applyconfiguration/api/v1alpha1/listenerpolicy.go +++ b/api/applyconfiguration/api/v1alpha1/listenerpolicy.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // ListenerPolicyApplyConfiguration represents a declarative configuration of the ListenerPolicy type for use @@ -56,7 +56,7 @@ func ExtractListenerPolicyStatus(listenerPolicy *apiv1alpha1.ListenerPolicy, fie func extractListenerPolicy(listenerPolicy *apiv1alpha1.ListenerPolicy, fieldManager string, subresource string) (*ListenerPolicyApplyConfiguration, error) { b := &ListenerPolicyApplyConfiguration{} - err := managedfields.ExtractInto(listenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.ListenerPolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(listenerPolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ListenerPolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/api/v1alpha1/routepolicy.go b/api/applyconfiguration/api/v1alpha1/routepolicy.go index eba276a921f..19eb720494c 100644 --- a/api/applyconfiguration/api/v1alpha1/routepolicy.go +++ b/api/applyconfiguration/api/v1alpha1/routepolicy.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // RoutePolicyApplyConfiguration represents a declarative configuration of the RoutePolicy type for use @@ -56,7 +56,7 @@ func ExtractRoutePolicyStatus(routePolicy *apiv1alpha1.RoutePolicy, fieldManager func extractRoutePolicy(routePolicy *apiv1alpha1.RoutePolicy, fieldManager string, subresource string) (*RoutePolicyApplyConfiguration, error) { b := &RoutePolicyApplyConfiguration{} - err := managedfields.ExtractInto(routePolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.RoutePolicy"), fieldManager, b, subresource) + err := managedfields.ExtractInto(routePolicy, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.RoutePolicy"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/api/v1alpha1/upstream.go b/api/applyconfiguration/api/v1alpha1/upstream.go index 4ea6b40b373..fe8d03ac8d0 100644 --- a/api/applyconfiguration/api/v1alpha1/upstream.go +++ b/api/applyconfiguration/api/v1alpha1/upstream.go @@ -8,8 +8,8 @@ import ( managedfields "k8s.io/apimachinery/pkg/util/managedfields" v1 "k8s.io/client-go/applyconfigurations/meta/v1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // UpstreamApplyConfiguration represents a declarative configuration of the Upstream type for use @@ -56,7 +56,7 @@ func ExtractUpstreamStatus(upstream *apiv1alpha1.Upstream, fieldManager string) func extractUpstream(upstream *apiv1alpha1.Upstream, fieldManager string, subresource string) (*UpstreamApplyConfiguration, error) { b := &UpstreamApplyConfiguration{} - err := managedfields.ExtractInto(upstream, internal.Parser().Type("com.github.kgateway-dev.kgateway.api.v1alpha1.Upstream"), fieldManager, b, subresource) + err := managedfields.ExtractInto(upstream, internal.Parser().Type("com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Upstream"), fieldManager, b, subresource) if err != nil { return nil, err } diff --git a/api/applyconfiguration/internal/internal.go b/api/applyconfiguration/internal/internal.go index 02c44197ad3..c9769fea5e0 100644 --- a/api/applyconfiguration/internal/internal.go +++ b/api/applyconfiguration/internal/internal.go @@ -23,7 +23,7 @@ func Parser() *typed.Parser { var parserOnce sync.Once var parser *typed.Parser var schemaYAML = typed.YAMLObject(`types: -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.AiExtension +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AiExtension map: fields: - name: enabled @@ -37,7 +37,7 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: atomic - name: image type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Image - name: ports type: list: @@ -52,17 +52,17 @@ var schemaYAML = typed.YAMLObject(`types: namedType: io.k8s.api.core.v1.SecurityContext - name: stats type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.AiExtensionStats -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.AiExtensionStats + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AiExtensionStats +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AiExtensionStats map: fields: - name: customLabels type: list: elementType: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.CustomLabel + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.CustomLabel elementRelationship: atomic -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.AwsUpstream +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AwsUpstream map: fields: - name: region @@ -72,7 +72,7 @@ var schemaYAML = typed.YAMLObject(`types: type: namedType: io.k8s.api.core.v1.LocalObjectReference default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.CustomLabel +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.CustomLabel map: fields: - name: keyDelimiter @@ -89,7 +89,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponse +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponse map: fields: - name: apiVersion @@ -104,13 +104,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponseSpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponseSpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponseStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponseStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponseSpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponseSpec map: fields: - name: body @@ -120,7 +120,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: numeric default: 0 -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.DirectResponseStatus +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.DirectResponseStatus map: elementType: scalar: untyped @@ -132,7 +132,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.EnvoyBootstrap +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.EnvoyBootstrap map: fields: - name: componentLogLevels @@ -143,22 +143,22 @@ var schemaYAML = typed.YAMLObject(`types: - name: logLevel type: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.EnvoyContainer +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.EnvoyContainer map: fields: - name: bootstrap type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.EnvoyBootstrap + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.EnvoyBootstrap - name: image type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Image - name: resources type: namedType: io.k8s.api.core.v1.ResourceRequirements - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParameters +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParameters map: fields: - name: apiVersion @@ -173,22 +173,22 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParametersSpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParametersSpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParametersStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParametersStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParametersSpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParametersSpec map: fields: - name: kube type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.KubernetesProxyConfig + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.KubernetesProxyConfig - name: selfManaged type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.SelfManagedGateway -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.GatewayParametersStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SelfManagedGateway +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GatewayParametersStatus map: elementType: scalar: untyped @@ -200,7 +200,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.GracefulShutdownSpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GracefulShutdownSpec map: fields: - name: enabled @@ -209,7 +209,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: sleepTimeSeconds type: scalar: numeric -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.Host +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Host map: fields: - name: host @@ -220,7 +220,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: numeric default: 0 -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.HttpListenerPolicy +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.HttpListenerPolicy map: fields: - name: apiVersion @@ -235,13 +235,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.HttpListenerPolicySpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.HttpListenerPolicySpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.HttpListenerPolicySpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.HttpListenerPolicySpec map: fields: - name: compress @@ -249,9 +249,9 @@ var schemaYAML = typed.YAMLObject(`types: scalar: boolean - name: targetRef type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.LocalPolicyTargetReference default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.Image +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Image map: fields: - name: digest @@ -269,12 +269,12 @@ var schemaYAML = typed.YAMLObject(`types: - name: tag type: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.IstioContainer +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.IstioContainer map: fields: - name: image type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Image - name: istioDiscoveryAddress type: scalar: string @@ -293,7 +293,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.IstioIntegration +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.IstioIntegration map: fields: - name: customSidecars @@ -304,41 +304,41 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: atomic - name: istioProxyContainer type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.IstioContainer -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.KubernetesProxyConfig + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.IstioContainer +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.KubernetesProxyConfig map: fields: - name: aiExtension type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.AiExtension + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AiExtension - name: deployment type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.ProxyDeployment + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ProxyDeployment - name: envoyContainer type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.EnvoyContainer + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.EnvoyContainer - name: floatingUserId type: scalar: boolean - name: istio type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.IstioIntegration + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.IstioIntegration - name: podTemplate type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Pod + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Pod - name: sdsContainer type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.SdsContainer + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SdsContainer - name: service type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Service + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Service - name: serviceAccount type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.ServiceAccount + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ServiceAccount - name: stats type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.StatsConfig -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.ListenerPolicy + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.StatsConfig +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ListenerPolicy map: fields: - name: apiVersion @@ -353,13 +353,13 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.ListenerPolicySpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ListenerPolicySpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.ListenerPolicySpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ListenerPolicySpec map: fields: - name: perConnectionBufferLimitBytes @@ -367,9 +367,9 @@ var schemaYAML = typed.YAMLObject(`types: scalar: numeric - name: targetRef type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.LocalPolicyTargetReference default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.LocalPolicyTargetReference +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.LocalPolicyTargetReference map: fields: - name: group @@ -384,7 +384,7 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.Pod +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Pod map: fields: - name: affinity @@ -402,7 +402,7 @@ var schemaYAML = typed.YAMLObject(`types: scalar: string - name: gracefulShutdown type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.GracefulShutdownSpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.GracefulShutdownSpec - name: imagePullSecrets type: list: @@ -432,7 +432,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: io.k8s.api.core.v1.Toleration elementRelationship: atomic -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyAncestorStatus +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyAncestorStatus map: fields: - name: ancestorRef @@ -451,14 +451,14 @@ var schemaYAML = typed.YAMLObject(`types: type: scalar: string default: "" -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyStatus +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyStatus map: fields: - name: ancestors type: list: elementType: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyAncestorStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyAncestorStatus elementRelationship: atomic - name: conditions type: @@ -468,13 +468,13 @@ var schemaYAML = typed.YAMLObject(`types: elementRelationship: associative keys: - type -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.ProxyDeployment +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ProxyDeployment map: fields: - name: replicas type: scalar: numeric -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.RoutePolicy +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.RoutePolicy map: fields: - name: apiVersion @@ -489,44 +489,44 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.RoutePolicySpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.RoutePolicySpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.PolicyStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.PolicyStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.RoutePolicySpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.RoutePolicySpec map: fields: - name: targetRef type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.LocalPolicyTargetReference + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.LocalPolicyTargetReference default: {} - name: timeout type: scalar: numeric -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.SdsBootstrap +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SdsBootstrap map: fields: - name: logLevel type: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.SdsContainer +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SdsContainer map: fields: - name: bootstrap type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.SdsBootstrap + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SdsBootstrap - name: image type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Image + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Image - name: resources type: namedType: io.k8s.api.core.v1.ResourceRequirements - name: securityContext type: namedType: io.k8s.api.core.v1.SecurityContext -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.SelfManagedGateway +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.SelfManagedGateway map: elementType: scalar: untyped @@ -538,7 +538,7 @@ var schemaYAML = typed.YAMLObject(`types: elementType: namedType: __untyped_deduced_ elementRelationship: separable -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.Service +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Service map: fields: - name: clusterIP @@ -557,7 +557,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: type type: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.ServiceAccount +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.ServiceAccount map: fields: - name: extraAnnotations @@ -570,16 +570,16 @@ var schemaYAML = typed.YAMLObject(`types: map: elementType: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.StaticUpstream +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.StaticUpstream map: fields: - name: hosts type: list: elementType: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.Host + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Host elementRelationship: atomic -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.StatsConfig +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.StatsConfig map: fields: - name: enableStatsRoute @@ -594,7 +594,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: statsRoutePrefixRewrite type: scalar: string -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.Upstream +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.Upstream map: fields: - name: apiVersion @@ -609,22 +609,22 @@ var schemaYAML = typed.YAMLObject(`types: default: {} - name: spec type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.UpstreamSpec + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.UpstreamSpec default: {} - name: status type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.UpstreamStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.UpstreamStatus default: {} -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.UpstreamSpec +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.UpstreamSpec map: fields: - name: aws type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.AwsUpstream + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.AwsUpstream - name: static type: - namedType: com.github.kgateway-dev.kgateway.api.v1alpha1.StaticUpstream -- name: com.github.kgateway-dev.kgateway.api.v1alpha1.UpstreamStatus + namedType: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.StaticUpstream +- name: com.github.kgateway-dev.kgateway.v2.api.v1alpha1.UpstreamStatus map: fields: - name: conditions diff --git a/api/applyconfiguration/utils.go b/api/applyconfiguration/utils.go index d56a9d94332..0c126fca923 100644 --- a/api/applyconfiguration/utils.go +++ b/api/applyconfiguration/utils.go @@ -7,9 +7,9 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - internal "github.com/kgateway-dev/kgateway/api/applyconfiguration/internal" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + internal "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/internal" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // ForKind returns an apply configuration type for the given GroupVersionKind, or nil if no diff --git a/cmd/envoyinit/main.go b/cmd/envoyinit/main.go index 0432071f513..389082ab3a2 100644 --- a/cmd/envoyinit/main.go +++ b/cmd/envoyinit/main.go @@ -6,8 +6,8 @@ import ( // The filter types are autogenerated by looking at all packages in go-control-plane and gloo // api extensions. As a result, this will need to be re-run when updating go-control-plane // or gloo extensions if new packages are added. - _ "github.com/kgateway-dev/kgateway/internal/envoyinit/hack/filter_types" - "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/runner" + _ "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/hack/filter_types" + "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/runner" ) func main() { diff --git a/cmd/kgateway/main.go b/cmd/kgateway/main.go index 16f7f246721..f13fc63e9f1 100644 --- a/cmd/kgateway/main.go +++ b/cmd/kgateway/main.go @@ -5,8 +5,8 @@ import ( "github.com/solo-io/go-utils/log" - "github.com/kgateway-dev/kgateway/internal/kgateway/setup" - "github.com/kgateway-dev/kgateway/pkg/utils/probes" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/setup" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/probes" ) func main() { diff --git a/cmd/modelschema/main.go b/cmd/modelschema/main.go index 303f0173881..1aa775028ba 100644 --- a/cmd/modelschema/main.go +++ b/cmd/modelschema/main.go @@ -8,7 +8,7 @@ import ( "os" "strings" - openapi "github.com/kgateway-dev/kgateway/pkg/generated/openapi" + openapi "github.com/kgateway-dev/kgateway/v2/pkg/generated/openapi" "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/cmd/sds/main.go b/cmd/sds/main.go index 6b1dc5396b1..602b7e87342 100644 --- a/cmd/sds/main.go +++ b/cmd/sds/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/kgateway-dev/kgateway/internal/sds/pkg/run" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/run" ) func main() { diff --git a/go.mod b/go.mod index dbafb9019db..6ee3cd33727 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kgateway-dev/kgateway +module github.com/kgateway-dev/kgateway/v2 go 1.23.6 diff --git a/hack/generate.sh b/hack/generate.sh index dda987613a3..ed9e913835e 100755 --- a/hack/generate.sh +++ b/hack/generate.sh @@ -11,8 +11,8 @@ set -o pipefail set -x readonly ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE}")"/.. && pwd)" -readonly OUTPUT_PKG=github.com/kgateway-dev/kgateway/pkg/client -readonly APIS_PKG=github.com/kgateway-dev/kgateway +readonly OUTPUT_PKG=github.com/kgateway-dev/kgateway/v2/pkg/client +readonly APIS_PKG=github.com/kgateway-dev/kgateway/v2 readonly CLIENTSET_NAME=versioned readonly CLIENTSET_PKG_NAME=clientset readonly VERSIONS=( v1alpha1 ) @@ -40,7 +40,7 @@ go run k8s.io/kube-openapi/cmd/openapi-gen \ --output-file zz_generated.openapi.go \ --report-filename "${new_report}" \ --output-dir "${ROOT_DIR}/pkg/generated/openapi" \ - --output-pkg "github.com/kgateway-dev/kgateway/pkg/generated/openapi" \ + --output-pkg "github.com/kgateway-dev/kgateway/v2/pkg/generated/openapi" \ $API_INPUT_DIRS_SPACE \ sigs.k8s.io/gateway-api/apis/v1 \ k8s.io/apimachinery/pkg/apis/meta/v1 \ @@ -53,7 +53,7 @@ go run k8s.io/kube-openapi/cmd/openapi-gen \ go run k8s.io/code-generator/cmd/applyconfiguration-gen \ --openapi-schema <(go run ${ROOT_DIR}/cmd/modelschema) \ --output-dir "${ROOT_DIR}/api/applyconfiguration" \ - --output-pkg "github.com/kgateway-dev/kgateway/api/applyconfiguration" \ + --output-pkg "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration" \ ${API_INPUT_DIRS_SPACE} go run k8s.io/code-generator/cmd/client-gen \ diff --git a/install/test/5-gateway-validation-webhook-configuration_test.go b/install/test/5-gateway-validation-webhook-configuration_test.go index 0ec677e2192..39a650afef3 100644 --- a/install/test/5-gateway-validation-webhook-configuration_test.go +++ b/install/test/5-gateway-validation-webhook-configuration_test.go @@ -13,7 +13,7 @@ import ( "github.com/onsi/gomega/types" v1 "k8s.io/api/admissionregistration/v1" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "sigs.k8s.io/yaml" - gloostringutils "github.com/kgateway-dev/kgateway/pkg/utils/stringutils" + gloostringutils "github.com/kgateway-dev/kgateway/v2/pkg/utils/stringutils" ) const ( diff --git a/install/test/grpc_json_transcoder_test.go b/install/test/grpc_json_transcoder_test.go index 3979b6e9763..b08fc0dcd2a 100644 --- a/install/test/grpc_json_transcoder_test.go +++ b/install/test/grpc_json_transcoder_test.go @@ -14,8 +14,8 @@ import ( . "github.com/solo-io/k8s-utils/manifesttestutils" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" ) var _ = Describe("GrpcJsonTranscoder helm test", func() { diff --git a/install/test/helm_suite_test.go b/install/test/helm_suite_test.go index 15e14ed1a05..278fac5aa9e 100644 --- a/install/test/helm_suite_test.go +++ b/install/test/helm_suite_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/install" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/cliutil/helm" - "github.com/kgateway-dev/kgateway/test/makefile" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/install" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/cliutil/helm" + "github.com/kgateway-dev/kgateway/v2/test/makefile" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" ) const ( diff --git a/install/test/helm_test.go b/install/test/helm_test.go index e9313421216..f1a95dd505a 100644 --- a/install/test/helm_test.go +++ b/install/test/helm_test.go @@ -33,12 +33,12 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/pointer" - values "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" - "github.com/kgateway-dev/kgateway/install/test/securitycontext" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + values "github.com/kgateway-dev/kgateway/v2/install/helm/gloo/generate" + "github.com/kgateway-dev/kgateway/v2/install/test/securitycontext" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" ) func GetPodNamespaceStats() corev1.EnvVar { @@ -7422,7 +7422,7 @@ metadata: func appendIfNilPath(queue []reflect.Type, newVal reflect.Type) []reflect.Type { if newVal.Kind() == reflect.Struct { pkgName := newVal.PkgPath() - if pkgName == "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" { + if pkgName == "github.com/kgateway-dev/kgateway/v2/install/helm/gloo/generate" { return append(queue, newVal) } } diff --git a/install/test/k8sgateway_test.go b/install/test/k8sgateway_test.go index 968a8e8ff27..151bde873e5 100644 --- a/install/test/k8sgateway_test.go +++ b/install/test/k8sgateway_test.go @@ -13,12 +13,12 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/install/utils/kuberesource" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/install/utils/kuberesource" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" ) var _ = Describe("Kubernetes Gateway API integration", func() { diff --git a/install/test/rbac_test.go b/install/test/rbac_test.go index 58ad635da34..2503cbc4ae7 100644 --- a/install/test/rbac_test.go +++ b/install/test/rbac_test.go @@ -7,7 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/install/test/svc_accnt_test.go b/install/test/svc_accnt_test.go index dc57dcc5b39..1d099ec8367 100644 --- a/install/test/svc_accnt_test.go +++ b/install/test/svc_accnt_test.go @@ -5,7 +5,7 @@ package test import ( . "github.com/onsi/ginkgo/v2" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/gomega" . "github.com/solo-io/k8s-utils/manifesttestutils" diff --git a/internal/envoyinit/pkg/downward/downward_test.go b/internal/envoyinit/pkg/downward/downward_test.go index 73eba88b736..617952cce6b 100644 --- a/internal/envoyinit/pkg/downward/downward_test.go +++ b/internal/envoyinit/pkg/downward/downward_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/downward" ) var _ = Describe("Downward", func() { diff --git a/internal/envoyinit/pkg/downward/template_test.go b/internal/envoyinit/pkg/downward/template_test.go index 573dd87679a..deee8418e5e 100644 --- a/internal/envoyinit/pkg/downward/template_test.go +++ b/internal/envoyinit/pkg/downward/template_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/downward" ) type mockDownward struct { diff --git a/internal/envoyinit/pkg/downward/transform_test.go b/internal/envoyinit/pkg/downward/transform_test.go index f27abf0d297..0bf4fc8077c 100644 --- a/internal/envoyinit/pkg/downward/transform_test.go +++ b/internal/envoyinit/pkg/downward/transform_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" "google.golang.org/protobuf/types/known/structpb" - . "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/downward" + . "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/downward" ) var _ = Describe("Transform", func() { diff --git a/internal/envoyinit/pkg/runner/run.go b/internal/envoyinit/pkg/runner/run.go index 031184e95a6..2fd375446c3 100644 --- a/internal/envoyinit/pkg/runner/run.go +++ b/internal/envoyinit/pkg/runner/run.go @@ -11,8 +11,8 @@ import ( "github.com/rotisserie/eris" "github.com/solo-io/go-utils/contextutils" - "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/downward" - "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/downward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/cmdutils" ) const ( diff --git a/internal/kgateway/admin/resources.go b/internal/kgateway/admin/resources.go index 5e52e7deded..a9cd6bede72 100644 --- a/internal/kgateway/admin/resources.go +++ b/internal/kgateway/admin/resources.go @@ -5,8 +5,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) // TODO: these need to be updated diff --git a/internal/kgateway/admin/response_test.go b/internal/kgateway/admin/response_test.go index a5e04d4a229..bf68411c12c 100644 --- a/internal/kgateway/admin/response_test.go +++ b/internal/kgateway/admin/response_test.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/admin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/admin" ) var _ = Describe("SnapshotResponseData", func() { diff --git a/internal/kgateway/admin/server.go b/internal/kgateway/admin/server.go index ae088d426a2..a5410d22618 100644 --- a/internal/kgateway/admin/server.go +++ b/internal/kgateway/admin/server.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/go-utils/contextutils" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/controller" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/controller" ) const ( diff --git a/internal/kgateway/controller/controller.go b/internal/kgateway/controller/controller.go index 95cc6cc0d7c..3d79f36038b 100644 --- a/internal/kgateway/controller/controller.go +++ b/internal/kgateway/controller/controller.go @@ -19,9 +19,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" apiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/deployer" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/deployer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) const ( diff --git a/internal/kgateway/controller/controller_suite_test.go b/internal/kgateway/controller/controller_suite_test.go index 388ad4a82f8..8a0977b8166 100644 --- a/internal/kgateway/controller/controller_suite_test.go +++ b/internal/kgateway/controller/controller_suite_test.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/config" - "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/v2/pkg/schemes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -31,9 +31,9 @@ import ( api "sigs.k8s.io/gateway-api/apis/v1" apiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/controller" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/controller" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) var ( diff --git a/internal/kgateway/controller/gw_controller.go b/internal/kgateway/controller/gw_controller.go index d7d0abe9e1e..63e7cab6ee1 100644 --- a/internal/kgateway/controller/gw_controller.go +++ b/internal/kgateway/controller/gw_controller.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" api "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/deployer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/deployer" ) const ( diff --git a/internal/kgateway/controller/scheme.go b/internal/kgateway/controller/scheme.go index e4d026ba02b..b13688802ac 100644 --- a/internal/kgateway/controller/scheme.go +++ b/internal/kgateway/controller/scheme.go @@ -12,7 +12,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // SchemeBuilder contains all the Schemes for registering the CRDs with which Gloo Gateway interacts. diff --git a/internal/kgateway/controller/start.go b/internal/kgateway/controller/start.go index cd0c1d8defe..b4816223139 100644 --- a/internal/kgateway/controller/start.go +++ b/internal/kgateway/controller/start.go @@ -9,7 +9,7 @@ import ( "github.com/solo-io/go-utils/contextutils" - glooschemes "github.com/kgateway-dev/kgateway/pkg/schemes" + glooschemes "github.com/kgateway-dev/kgateway/v2/pkg/schemes" "k8s.io/apimachinery/pkg/util/sets" ctrl "sigs.k8s.io/controller-runtime" @@ -25,18 +25,18 @@ import ( istiolog "istio.io/istio/pkg/log" apiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/deployer" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/registry" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/settings" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/proxy_syncer" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/deployer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/registry" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/settings" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/proxy_syncer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned" ) const ( diff --git a/internal/kgateway/controller/typed_client.go b/internal/kgateway/controller/typed_client.go index 2ab30873648..75999321082 100644 --- a/internal/kgateway/controller/typed_client.go +++ b/internal/kgateway/controller/typed_client.go @@ -133,7 +133,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/kgateway-dev/kgateway/internal/kgateway/controller" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/controller" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) diff --git a/internal/kgateway/deployer/deployer.go b/internal/kgateway/deployer/deployer.go index 9af7fae054b..8827c9e1909 100644 --- a/internal/kgateway/deployer/deployer.go +++ b/internal/kgateway/deployer/deployer.go @@ -27,10 +27,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" api "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/helm" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/helm" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) var ( diff --git a/internal/kgateway/deployer/deployer_test.go b/internal/kgateway/deployer/deployer_test.go index 7ebd830032f..7954bb75d91 100644 --- a/internal/kgateway/deployer/deployer_test.go +++ b/internal/kgateway/deployer/deployer_test.go @@ -23,12 +23,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" api "sigs.k8s.io/gateway-api/apis/v1" - gw2_v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/deployer" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" - "github.com/kgateway-dev/kgateway/pkg/schemes" - "github.com/kgateway-dev/kgateway/pkg/version" + gw2_v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/deployer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" + "github.com/kgateway-dev/kgateway/v2/pkg/schemes" + "github.com/kgateway-dev/kgateway/v2/pkg/version" // TODO BML tests in this suite fail if this no-op import is not imported first. // @@ -37,13 +37,13 @@ import ( // // There is some import within this package that this suite relies on. Chasing that down is // *hard* tho due to the import tree, and best done in a followup. - // _ "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" + // _ "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" // // The above TODO is a result of proto types being registered for free somewhere through // the translator import. What we really need is to register all proto types, which is // "correctly" available to use via `envoyinit`; note that the autogeneration of these types // is currently broken. see: https://github.com/kgateway-dev/kgateway/issues/10491 - _ "github.com/kgateway-dev/kgateway/internal/envoyinit/hack/filter_types" + _ "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/hack/filter_types" ) // testBootstrap implements resources.Resource in order to use protoutils.UnmarshalYAML diff --git a/internal/kgateway/deployer/merge.go b/internal/kgateway/deployer/merge.go index 3b3e2ea9d0d..4c137b1f3b7 100644 --- a/internal/kgateway/deployer/merge.go +++ b/internal/kgateway/deployer/merge.go @@ -4,7 +4,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/kgateway-dev/kgateway/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // mergePointers will decide whether to use dst or src without dereferencing or recursing diff --git a/internal/kgateway/deployer/merge_test.go b/internal/kgateway/deployer/merge_test.go index f32915d170b..2477ff9e7a8 100644 --- a/internal/kgateway/deployer/merge_test.go +++ b/internal/kgateway/deployer/merge_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/utils/ptr" - gw2_v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + gw2_v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) var _ = Describe("deepMergeGatewayParameters", func() { diff --git a/internal/kgateway/deployer/values.go b/internal/kgateway/deployer/values.go index 9704f044bf6..c46bb028aad 100644 --- a/internal/kgateway/deployer/values.go +++ b/internal/kgateway/deployer/values.go @@ -3,7 +3,7 @@ package deployer import ( corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // The top-level helm values used by the deployer. diff --git a/internal/kgateway/deployer/values_helpers.go b/internal/kgateway/deployer/values_helpers.go index 90e3005e4e5..6f5450106da 100644 --- a/internal/kgateway/deployer/values_helpers.go +++ b/internal/kgateway/deployer/values_helpers.go @@ -11,8 +11,8 @@ import ( "k8s.io/utils/ptr" api "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ports" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ports" ) // This file contains helper functions that generate helm values in the format needed diff --git a/internal/kgateway/deployer/values_helpers_test.go b/internal/kgateway/deployer/values_helpers_test.go index efdcd6afba7..5024a1844d0 100644 --- a/internal/kgateway/deployer/values_helpers_test.go +++ b/internal/kgateway/deployer/values_helpers_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/internal/kgateway/deployer" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/deployer" ) var _ = Describe("Values Helpers", func() { diff --git a/internal/kgateway/endpoints/prioritize.go b/internal/kgateway/endpoints/prioritize.go index d0249335e64..a46ae30a406 100644 --- a/internal/kgateway/endpoints/prioritize.go +++ b/internal/kgateway/endpoints/prioritize.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" "istio.io/api/networking/v1alpha3" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" diff --git a/internal/kgateway/extensions2/common/krt.go b/internal/kgateway/extensions2/common/krt.go index a78635cf649..65738fa9c44 100644 --- a/internal/kgateway/extensions2/common/krt.go +++ b/internal/kgateway/extensions2/common/krt.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/settings" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/settings" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned" ) type CommonCollections struct { diff --git a/internal/kgateway/extensions2/factory.go b/internal/kgateway/extensions2/factory.go index 0fa49b2968e..88633cba739 100644 --- a/internal/kgateway/extensions2/factory.go +++ b/internal/kgateway/extensions2/factory.go @@ -3,9 +3,9 @@ package extensions2 import ( "context" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" ) type K8sGatewayExtensionsFactory func(ctx context.Context, commoncol *common.CommonCollections) extensionsplug.Plugin diff --git a/internal/kgateway/extensions2/plugin/plugin.go b/internal/kgateway/extensions2/plugin/plugin.go index 26e105f35f5..ed68697b1df 100644 --- a/internal/kgateway/extensions2/plugin/plugin.go +++ b/internal/kgateway/extensions2/plugin/plugin.go @@ -7,12 +7,12 @@ import ( envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" "istio.io/istio/pkg/kube/krt" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) type AttachmentPoints uint diff --git a/internal/kgateway/extensions2/plugins/destrule/destrule.go b/internal/kgateway/extensions2/plugins/destrule/destrule.go index bfaadcf5828..33cd794bd7f 100644 --- a/internal/kgateway/extensions2/plugins/destrule/destrule.go +++ b/internal/kgateway/extensions2/plugins/destrule/destrule.go @@ -13,7 +13,7 @@ import ( "istio.io/istio/pkg/kube/krt" "istio.io/istio/pkg/kube/kubetypes" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type NsWithHostname struct { diff --git a/internal/kgateway/extensions2/plugins/destrule/destrule_plugin.go b/internal/kgateway/extensions2/plugins/destrule/destrule_plugin.go index 628bc724b2f..405a5a1e9a8 100644 --- a/internal/kgateway/extensions2/plugins/destrule/destrule_plugin.go +++ b/internal/kgateway/extensions2/plugins/destrule/destrule_plugin.go @@ -16,10 +16,10 @@ import ( "istio.io/istio/pkg/config/schema/gvr" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/endpoints" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/endpoints" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) const ( diff --git a/internal/kgateway/extensions2/plugins/directresponse/direct_response_plugin.go b/internal/kgateway/extensions2/plugins/directresponse/direct_response_plugin.go index 04f672219b8..b33954416bb 100644 --- a/internal/kgateway/extensions2/plugins/directresponse/direct_response_plugin.go +++ b/internal/kgateway/extensions2/plugins/directresponse/direct_response_plugin.go @@ -18,12 +18,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned" ) type directResponse struct { diff --git a/internal/kgateway/extensions2/plugins/istio/plugin.go b/internal/kgateway/extensions2/plugins/istio/plugin.go index 5c087e5cfbd..9bd08fd4648 100644 --- a/internal/kgateway/extensions2/plugins/istio/plugin.go +++ b/internal/kgateway/extensions2/plugins/istio/plugin.go @@ -19,11 +19,11 @@ import ( "github.com/solo-io/go-utils/contextutils" corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - ourwellknown "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + ourwellknown "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" ) var ( diff --git a/internal/kgateway/extensions2/plugins/kubernetes/k8s.go b/internal/kgateway/extensions2/plugins/kubernetes/k8s.go index 6f4f8fcffa6..ac6033abe54 100644 --- a/internal/kgateway/extensions2/plugins/kubernetes/k8s.go +++ b/internal/kgateway/extensions2/plugins/kubernetes/k8s.go @@ -14,12 +14,12 @@ import ( corev1 "k8s.io/api/core/v1" discoveryv1 "k8s.io/api/discovery/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/settings" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/settings" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func NewPlugin(ctx context.Context, commoncol *common.CommonCollections) extensionsplug.Plugin { diff --git a/internal/kgateway/extensions2/plugins/listenerpolicy/listener_policy_plugin.go b/internal/kgateway/extensions2/plugins/listenerpolicy/listener_policy_plugin.go index f095201a177..726812acef0 100644 --- a/internal/kgateway/extensions2/plugins/listenerpolicy/listener_policy_plugin.go +++ b/internal/kgateway/extensions2/plugins/listenerpolicy/listener_policy_plugin.go @@ -11,13 +11,13 @@ import ( wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type listenerOptsPlugin struct { diff --git a/internal/kgateway/extensions2/plugins/routepolicy/route_policy_plugin.go b/internal/kgateway/extensions2/plugins/routepolicy/route_policy_plugin.go index 79380fe3b49..0f29304ac07 100644 --- a/internal/kgateway/extensions2/plugins/routepolicy/route_policy_plugin.go +++ b/internal/kgateway/extensions2/plugins/routepolicy/route_policy_plugin.go @@ -11,13 +11,13 @@ import ( envoy_config_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type routeOptsPlugin struct { diff --git a/internal/kgateway/extensions2/plugins/upstream/aws.go b/internal/kgateway/extensions2/plugins/upstream/aws.go index 1264ec34aef..dab431742e9 100644 --- a/internal/kgateway/extensions2/plugins/upstream/aws.go +++ b/internal/kgateway/extensions2/plugins/upstream/aws.go @@ -14,9 +14,9 @@ import ( awspb "github.com/solo-io/envoy-gloo/go/config/filter/http/aws_lambda/v2" "google.golang.org/protobuf/types/known/anypb" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/pluginutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/pluginutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) const ( diff --git a/internal/kgateway/extensions2/plugins/upstream/plugin.go b/internal/kgateway/extensions2/plugins/upstream/plugin.go index b8a84093316..259d0ae728b 100644 --- a/internal/kgateway/extensions2/plugins/upstream/plugin.go +++ b/internal/kgateway/extensions2/plugins/upstream/plugin.go @@ -20,13 +20,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned" ) const ( diff --git a/internal/kgateway/extensions2/plugins/upstream/static.go b/internal/kgateway/extensions2/plugins/upstream/static.go index 231f71cc07e..8d97329e365 100644 --- a/internal/kgateway/extensions2/plugins/upstream/static.go +++ b/internal/kgateway/extensions2/plugins/upstream/static.go @@ -8,8 +8,8 @@ import ( envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) func processStatic(ctx context.Context, in *v1alpha1.StaticUpstream, out *envoy_config_cluster_v3.Cluster) { diff --git a/internal/kgateway/extensions2/pluginutils/pluginutils.go b/internal/kgateway/extensions2/pluginutils/pluginutils.go index 12360f82290..155a54ba394 100644 --- a/internal/kgateway/extensions2/pluginutils/pluginutils.go +++ b/internal/kgateway/extensions2/pluginutils/pluginutils.go @@ -8,7 +8,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) func EnvoySingleEndpointLoadAssignment(out *envoy_config_cluster_v3.Cluster, address string, port uint32) { diff --git a/internal/kgateway/extensions2/registry/registry.go b/internal/kgateway/extensions2/registry/registry.go index 83120157482..48387697c2e 100644 --- a/internal/kgateway/extensions2/registry/registry.go +++ b/internal/kgateway/extensions2/registry/registry.go @@ -7,15 +7,15 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/destrule" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/directresponse" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/istio" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/kubernetes" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/listenerpolicy" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/routepolicy" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugins/upstream" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/destrule" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/directresponse" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/istio" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/listenerpolicy" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/routepolicy" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugins/upstream" ) func mergedGw(funcs []extensionsplug.GwTranslatorFactory) extensionsplug.GwTranslatorFactory { diff --git a/internal/kgateway/ir/gw2.go b/internal/kgateway/ir/gw2.go index 849f63414f7..397848e54d8 100644 --- a/internal/kgateway/ir/gw2.go +++ b/internal/kgateway/ir/gw2.go @@ -4,7 +4,7 @@ import ( "google.golang.org/protobuf/types/known/anypb" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" ) // This is the IR that is used in the translation to XDS. it is self contained and no IO/krt is diff --git a/internal/kgateway/ir/iface.go b/internal/kgateway/ir/iface.go index f446f66d2b4..d742052f5bb 100644 --- a/internal/kgateway/ir/iface.go +++ b/internal/kgateway/ir/iface.go @@ -11,7 +11,7 @@ import ( anypb "google.golang.org/protobuf/types/known/anypb" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" ) type ListenerContext struct { diff --git a/internal/kgateway/ir/model.go b/internal/kgateway/ir/model.go index 8a7e02d5994..a44b61a88b6 100644 --- a/internal/kgateway/ir/model.go +++ b/internal/kgateway/ir/model.go @@ -10,7 +10,7 @@ import ( envoy_config_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) const KeyDelimiter = "~" diff --git a/internal/kgateway/krtcollections/builtin.go b/internal/kgateway/krtcollections/builtin.go index f16b4252bd2..f82ac351a64 100644 --- a/internal/kgateway/krtcollections/builtin.go +++ b/internal/kgateway/krtcollections/builtin.go @@ -17,10 +17,10 @@ import ( envoytype "github.com/envoyproxy/go-control-plane/envoy/type/v3" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - extensionplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" + extensionplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" ) var ( diff --git a/internal/kgateway/krtcollections/endpoints.go b/internal/kgateway/krtcollections/endpoints.go index ab244df65cc..1f4d88fd224 100644 --- a/internal/kgateway/krtcollections/endpoints.go +++ b/internal/kgateway/krtcollections/endpoints.go @@ -15,10 +15,10 @@ import ( discoveryv1 "k8s.io/api/discovery/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/settings" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/settings" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) type EndpointsSettings struct { diff --git a/internal/kgateway/krtcollections/endpoints_test.go b/internal/kgateway/krtcollections/endpoints_test.go index 8f7686eb576..a3acb1bb93f 100644 --- a/internal/kgateway/krtcollections/endpoints_test.go +++ b/internal/kgateway/krtcollections/endpoints_test.go @@ -20,8 +20,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func TestEndpointsForUpstreamOrderDoesntMatter(t *testing.T) { diff --git a/internal/kgateway/krtcollections/ns.go b/internal/kgateway/krtcollections/ns.go index 2a450371b9a..74cfc8c2383 100644 --- a/internal/kgateway/krtcollections/ns.go +++ b/internal/kgateway/krtcollections/ns.go @@ -9,7 +9,7 @@ import ( "istio.io/istio/pkg/kube/krt" corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type NamespaceMetadata struct { diff --git a/internal/kgateway/krtcollections/pods.go b/internal/kgateway/krtcollections/pods.go index 414bf25c9f5..8b6fdbd8330 100644 --- a/internal/kgateway/krtcollections/pods.go +++ b/internal/kgateway/krtcollections/pods.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type NodeMetadata struct { diff --git a/internal/kgateway/krtcollections/pods_test.go b/internal/kgateway/krtcollections/pods_test.go index c51d82da443..7e681d55ebe 100644 --- a/internal/kgateway/krtcollections/pods_test.go +++ b/internal/kgateway/krtcollections/pods_test.go @@ -11,10 +11,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - . "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + . "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func TestPods(t *testing.T) { diff --git a/internal/kgateway/krtcollections/policy.go b/internal/kgateway/krtcollections/policy.go index 163ec64ed14..08984f74681 100644 --- a/internal/kgateway/krtcollections/policy.go +++ b/internal/kgateway/krtcollections/policy.go @@ -13,10 +13,10 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/backendref" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/backendref" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) var ( diff --git a/internal/kgateway/krtcollections/policy_test.go b/internal/kgateway/krtcollections/policy_test.go index 46119fb28db..9fc68d78677 100644 --- a/internal/kgateway/krtcollections/policy_test.go +++ b/internal/kgateway/krtcollections/policy_test.go @@ -16,9 +16,9 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) var ( diff --git a/internal/kgateway/krtcollections/secrets.go b/internal/kgateway/krtcollections/secrets.go index 7fc3e163ded..378229457ee 100644 --- a/internal/kgateway/krtcollections/secrets.go +++ b/internal/kgateway/krtcollections/secrets.go @@ -5,7 +5,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) type From struct { diff --git a/internal/kgateway/krtcollections/setup.go b/internal/kgateway/krtcollections/setup.go index faa22d38745..ced4a202452 100644 --- a/internal/kgateway/krtcollections/setup.go +++ b/internal/kgateway/krtcollections/setup.go @@ -16,9 +16,9 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func registerTypes() { diff --git a/internal/kgateway/krtcollections/uniqueclients.go b/internal/kgateway/krtcollections/uniqueclients.go index 89f472f71e7..93f33e45759 100644 --- a/internal/kgateway/krtcollections/uniqueclients.go +++ b/internal/kgateway/krtcollections/uniqueclients.go @@ -17,9 +17,9 @@ import ( "istio.io/istio/pkg/kube/krt" "k8s.io/apimachinery/pkg/types" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" ) type ConnectedClient struct { diff --git a/internal/kgateway/krtcollections/uniqueclients_test.go b/internal/kgateway/krtcollections/uniqueclients_test.go index e65f6d0413d..1313fef7fbb 100644 --- a/internal/kgateway/krtcollections/uniqueclients_test.go +++ b/internal/kgateway/krtcollections/uniqueclients_test.go @@ -16,11 +16,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - . "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" + . "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" ) func TestUniqueClients(t *testing.T) { diff --git a/internal/kgateway/plugins/stages.go b/internal/kgateway/plugins/stages.go index 0f24d628ef0..0c686e77c05 100644 --- a/internal/kgateway/plugins/stages.go +++ b/internal/kgateway/plugins/stages.go @@ -11,8 +11,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/kgateway-dev/kgateway/internal/kgateway/filters" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/filters" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) var ( diff --git a/internal/kgateway/ports/ports_test.go b/internal/kgateway/ports/ports_test.go index 936bae54776..374297b0b31 100644 --- a/internal/kgateway/ports/ports_test.go +++ b/internal/kgateway/ports/ports_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/internal/kgateway/ports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ports" ) var _ = Describe("Ports", func() { diff --git a/internal/kgateway/proxy_syncer/cla.go b/internal/kgateway/proxy_syncer/cla.go index 247785795cb..d51dfa05eea 100644 --- a/internal/kgateway/proxy_syncer/cla.go +++ b/internal/kgateway/proxy_syncer/cla.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func prioritize(ep ir.EndpointsForUpstream) *envoy_config_endpoint_v3.ClusterLoadAssignment { diff --git a/internal/kgateway/proxy_syncer/cla_test.go b/internal/kgateway/proxy_syncer/cla_test.go index 2cf92fc0412..f9c4aa7ad09 100644 --- a/internal/kgateway/proxy_syncer/cla_test.go +++ b/internal/kgateway/proxy_syncer/cla_test.go @@ -8,8 +8,8 @@ import ( "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/endpoints" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/endpoints" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) func TestTranslatesDestrulesFailoverPriority(t *testing.T) { diff --git a/internal/kgateway/proxy_syncer/perclient.go b/internal/kgateway/proxy_syncer/perclient.go index dff93e926e0..c2e2fe765fa 100644 --- a/internal/kgateway/proxy_syncer/perclient.go +++ b/internal/kgateway/proxy_syncer/perclient.go @@ -8,8 +8,8 @@ import ( "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func snapshotPerClient( diff --git a/internal/kgateway/proxy_syncer/proxy_syncer.go b/internal/kgateway/proxy_syncer/proxy_syncer.go index c6e8b545e22..8e1f0963aa5 100644 --- a/internal/kgateway/proxy_syncer/proxy_syncer.go +++ b/internal/kgateway/proxy_syncer/proxy_syncer.go @@ -27,19 +27,19 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - extensions "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/irtranslator" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" - ggv2utils "github.com/kgateway-dev/kgateway/internal/kgateway/utils" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" + extensions "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/irtranslator" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" + ggv2utils "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" ) const gatewayV1A2Version = "v1alpha2" diff --git a/internal/kgateway/proxy_syncer/proxy_syncer_test.go b/internal/kgateway/proxy_syncer/proxy_syncer_test.go index 92338e88022..07fe6de061a 100644 --- a/internal/kgateway/proxy_syncer/proxy_syncer_test.go +++ b/internal/kgateway/proxy_syncer/proxy_syncer_test.go @@ -6,7 +6,7 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) func TestIsGatewayStatusEqual(t *testing.T) { diff --git a/internal/kgateway/proxy_syncer/upstreams.go b/internal/kgateway/proxy_syncer/upstreams.go index 0d02061bbff..195b3072104 100644 --- a/internal/kgateway/proxy_syncer/upstreams.go +++ b/internal/kgateway/proxy_syncer/upstreams.go @@ -9,10 +9,10 @@ import ( "go.uber.org/zap" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/irtranslator" - ggv2utils "github.com/kgateway-dev/kgateway/internal/kgateway/utils" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/irtranslator" + ggv2utils "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) type uccWithCluster struct { diff --git a/internal/kgateway/proxy_syncer/xdswrapper.go b/internal/kgateway/proxy_syncer/xdswrapper.go index 91618b229de..17deebae991 100644 --- a/internal/kgateway/proxy_syncer/xdswrapper.go +++ b/internal/kgateway/proxy_syncer/xdswrapper.go @@ -8,8 +8,8 @@ import ( envoycachetypes "github.com/envoyproxy/go-control-plane/pkg/cache/types" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" "istio.io/istio/pkg/kube/krt" diff --git a/internal/kgateway/proxy_syncer/xdswrapper_test.go b/internal/kgateway/proxy_syncer/xdswrapper_test.go index ec5ff387b7e..84aa253c40d 100644 --- a/internal/kgateway/proxy_syncer/xdswrapper_test.go +++ b/internal/kgateway/proxy_syncer/xdswrapper_test.go @@ -12,7 +12,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - . "github.com/kgateway-dev/kgateway/internal/kgateway/proxy_syncer" + . "github.com/kgateway-dev/kgateway/v2/internal/kgateway/proxy_syncer" ) func mustAny(src proto.Message) *anypb.Any { diff --git a/internal/kgateway/query/backendmap.go b/internal/kgateway/query/backendmap.go index 50e4f88191e..73eb6825995 100644 --- a/internal/kgateway/query/backendmap.go +++ b/internal/kgateway/query/backendmap.go @@ -1,7 +1,7 @@ package query import ( - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) // BackendMap is a generic type used to manage mappings of backends for Gateway API configurations. diff --git a/internal/kgateway/query/httproute.go b/internal/kgateway/query/httproute.go index 54fd5a27115..3aee87940cf 100644 --- a/internal/kgateway/query/httproute.go +++ b/internal/kgateway/query/httproute.go @@ -15,8 +15,8 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) // TODO (danehans): Rename this file to route.go since it supports different route types. diff --git a/internal/kgateway/query/indexers.go b/internal/kgateway/query/indexers.go index 19e5435384c..180514fcc42 100644 --- a/internal/kgateway/query/indexers.go +++ b/internal/kgateway/query/indexers.go @@ -9,7 +9,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) const ( diff --git a/internal/kgateway/query/mocks/mock_queries.go b/internal/kgateway/query/mocks/mock_queries.go index 3d414dc5c32..12bf592659b 100644 --- a/internal/kgateway/query/mocks/mock_queries.go +++ b/internal/kgateway/query/mocks/mock_queries.go @@ -13,8 +13,8 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" v1 "sigs.k8s.io/gateway-api/apis/v1" - ir "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - query "github.com/kgateway-dev/kgateway/internal/kgateway/query" + ir "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + query "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" ) // MockGatewayQueries is a mock of GatewayQueries interface. diff --git a/internal/kgateway/query/query.go b/internal/kgateway/query/query.go index 354f127b9b1..1869191668c 100644 --- a/internal/kgateway/query/query.go +++ b/internal/kgateway/query/query.go @@ -15,9 +15,9 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" apiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) var ( diff --git a/internal/kgateway/query/query_test.go b/internal/kgateway/query/query_test.go index 3d156086762..3e75e8b16f7 100644 --- a/internal/kgateway/query/query_test.go +++ b/internal/kgateway/query/query_test.go @@ -7,7 +7,7 @@ import ( "istio.io/istio/pkg/kube/krt" "istio.io/istio/pkg/kube/krt/krttest" - "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/v2/pkg/schemes" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -25,13 +25,13 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" apiv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) //go:generate go run github.com/golang/mock/mockgen -destination mocks/mock_queries.go -package mocks github.com/kgateway-dev/kgateway/internal/kgateway/query GatewayQueries diff --git a/internal/kgateway/query/utils.go b/internal/kgateway/query/utils.go index 8be603a1dfa..d91e9e80241 100644 --- a/internal/kgateway/query/utils.go +++ b/internal/kgateway/query/utils.go @@ -7,8 +7,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) func ProcessBackendError(err error, reporter reports.ParentRefReporter) { diff --git a/internal/kgateway/reports/reporter_test.go b/internal/kgateway/reports/reporter_test.go index 9706e258dbb..2c22f8fa63f 100644 --- a/internal/kgateway/reports/reporter_test.go +++ b/internal/kgateway/reports/reporter_test.go @@ -13,7 +13,7 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) var _ = Describe("Reporting Infrastructure", func() { diff --git a/internal/kgateway/setup/controlplane.go b/internal/kgateway/setup/controlplane.go index d279c9eb3fd..60654c63c96 100644 --- a/internal/kgateway/setup/controlplane.go +++ b/internal/kgateway/setup/controlplane.go @@ -18,7 +18,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/reflection" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" ) func NewControlPlane( diff --git a/internal/kgateway/setup/ggv2setup.go b/internal/kgateway/setup/ggv2setup.go index e5d31364d0d..276401a6577 100644 --- a/internal/kgateway/setup/ggv2setup.go +++ b/internal/kgateway/setup/ggv2setup.go @@ -19,15 +19,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" zaputil "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/kgateway-dev/kgateway/internal/kgateway/admin" - "github.com/kgateway-dev/kgateway/internal/kgateway/controller" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/namespaces" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/admin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/controller" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/namespaces" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) const ( diff --git a/internal/kgateway/setup/ggv2setup_test.go b/internal/kgateway/setup/ggv2setup_test.go index 46441b65b08..5b6568731e5 100644 --- a/internal/kgateway/setup/ggv2setup_test.go +++ b/internal/kgateway/setup/ggv2setup_test.go @@ -45,10 +45,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/yaml" - "github.com/kgateway-dev/kgateway/internal/kgateway/controller" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/proxy_syncer" - ggv2setup "github.com/kgateway-dev/kgateway/internal/kgateway/setup" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/controller" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/proxy_syncer" + ggv2setup "github.com/kgateway-dev/kgateway/v2/internal/kgateway/setup" ) func getAssetsDir(t *testing.T) string { diff --git a/internal/kgateway/translator/backendref/types.go b/internal/kgateway/translator/backendref/types.go index 9120225a216..22fad6a4ecd 100644 --- a/internal/kgateway/translator/backendref/types.go +++ b/internal/kgateway/translator/backendref/types.go @@ -5,7 +5,7 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) // RefIsHTTPRoute checks if the BackendObjectReference is an HTTPRoute diff --git a/internal/kgateway/translator/gateway/gateway_translator.go b/internal/kgateway/translator/gateway/gateway_translator.go index c675fdb8acb..6e1bff6b147 100644 --- a/internal/kgateway/translator/gateway/gateway_translator.go +++ b/internal/kgateway/translator/gateway/gateway_translator.go @@ -6,16 +6,16 @@ import ( "github.com/solo-io/go-utils/contextutils" "istio.io/istio/pkg/kube/krt" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/listener" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/listener" ) func NewTranslator(queries query.GatewayQueries) extensionsplug.KGwTranslator { diff --git a/internal/kgateway/translator/gateway/gateway_translator_test.go b/internal/kgateway/translator/gateway/gateway_translator_test.go index 9129749cad3..19ba72dac2b 100644 --- a/internal/kgateway/translator/gateway/gateway_translator_test.go +++ b/internal/kgateway/translator/gateway/gateway_translator_test.go @@ -13,9 +13,9 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) type translatorTestCase struct { diff --git a/internal/kgateway/translator/gateway/testtest_test.go b/internal/kgateway/translator/gateway/testtest_test.go index 288020da5ac..46d689becef 100644 --- a/internal/kgateway/translator/gateway/testtest_test.go +++ b/internal/kgateway/translator/gateway/testtest_test.go @@ -19,7 +19,7 @@ import ( "istio.io/istio/pkg/kube/kclient/clienttest" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" ) func xTestRun(t *testing.T) { diff --git a/internal/kgateway/translator/gateway/testutils/test_file_loader.go b/internal/kgateway/translator/gateway/testutils/test_file_loader.go index cbf66f912cc..ee840b91a18 100644 --- a/internal/kgateway/translator/gateway/testutils/test_file_loader.go +++ b/internal/kgateway/translator/gateway/testutils/test_file_loader.go @@ -9,14 +9,14 @@ import ( "path/filepath" "strings" - "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/v2/pkg/schemes" "github.com/rotisserie/eris" "google.golang.org/protobuf/proto" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/irtranslator" - "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/irtranslator" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/protoutils" "github.com/ghodss/yaml" "github.com/pkg/errors" diff --git a/internal/kgateway/translator/gateway/translator_case_test.go b/internal/kgateway/translator/gateway/translator_case_test.go index 88044d2c545..0534fa0b97e 100644 --- a/internal/kgateway/translator/gateway/translator_case_test.go +++ b/internal/kgateway/translator/gateway/translator_case_test.go @@ -24,18 +24,18 @@ import ( "istio.io/istio/pkg/kube/kclient/clienttest" "istio.io/istio/pkg/kube/krt" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/registry" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/gateway/testutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/irtranslator" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils/krtutil" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/fake" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/registry" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/gateway/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/irtranslator" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils/krtutil" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/fake" ) type TestCase struct { diff --git a/internal/kgateway/translator/httproute/delegation.go b/internal/kgateway/translator/httproute/delegation.go index cb70b29c0cf..8157ae9f3a6 100644 --- a/internal/kgateway/translator/httproute/delegation.go +++ b/internal/kgateway/translator/httproute/delegation.go @@ -15,10 +15,10 @@ import ( "github.com/rotisserie/eris" "github.com/solo-io/go-utils/contextutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) type DelegationCtx struct { diff --git a/internal/kgateway/translator/httproute/delegation_helpers.go b/internal/kgateway/translator/httproute/delegation_helpers.go index a03199b2e5c..80c31f297ca 100644 --- a/internal/kgateway/translator/httproute/delegation_helpers.go +++ b/internal/kgateway/translator/httproute/delegation_helpers.go @@ -10,9 +10,9 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) // inheritMatcherAnnotation is the annotation used on an child HTTPRoute that diff --git a/internal/kgateway/translator/httproute/delegation_test.go b/internal/kgateway/translator/httproute/delegation_test.go index e012915683b..1681f629762 100644 --- a/internal/kgateway/translator/httproute/delegation_test.go +++ b/internal/kgateway/translator/httproute/delegation_test.go @@ -8,7 +8,7 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) func TestIsDelegatedRouteMatch(t *testing.T) { diff --git a/internal/kgateway/translator/httproute/gateway_http_route_translator.go b/internal/kgateway/translator/httproute/gateway_http_route_translator.go index d3faaca6d92..b1279e8cc19 100644 --- a/internal/kgateway/translator/httproute/gateway_http_route_translator.go +++ b/internal/kgateway/translator/httproute/gateway_http_route_translator.go @@ -11,10 +11,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) var ( diff --git a/internal/kgateway/translator/httproute/translate_httproute_test.go b/internal/kgateway/translator/httproute/translate_httproute_test.go index ed6158a690d..0f35287d54c 100644 --- a/internal/kgateway/translator/httproute/translate_httproute_test.go +++ b/internal/kgateway/translator/httproute/translate_httproute_test.go @@ -13,11 +13,11 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/httproute" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/httproute" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) var _ = Describe("GatewayHttpRouteTranslator", func() { diff --git a/internal/kgateway/translator/irtranslator/fc.go b/internal/kgateway/translator/irtranslator/fc.go index 542897aa2c7..0a5f257b073 100644 --- a/internal/kgateway/translator/irtranslator/fc.go +++ b/internal/kgateway/translator/irtranslator/fc.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/plugins" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/plugins" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) const ( diff --git a/internal/kgateway/translator/irtranslator/gateway.go b/internal/kgateway/translator/irtranslator/gateway.go index 4b27d4e46ea..c57771dcb13 100644 --- a/internal/kgateway/translator/irtranslator/gateway.go +++ b/internal/kgateway/translator/irtranslator/gateway.go @@ -7,9 +7,9 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/runtime/schema" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" ) type Translator struct { diff --git a/internal/kgateway/translator/irtranslator/route.go b/internal/kgateway/translator/irtranslator/route.go index 0eff30ee4b1..573956d8274 100644 --- a/internal/kgateway/translator/irtranslator/route.go +++ b/internal/kgateway/translator/irtranslator/route.go @@ -15,11 +15,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/routeutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" - "github.com/kgateway-dev/kgateway/pkg/utils/regexutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/routeutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/regexutils" ) type httpRouteConfigurationTranslator struct { diff --git a/internal/kgateway/translator/irtranslator/translator_unit_test.go b/internal/kgateway/translator/irtranslator/translator_unit_test.go index 2910c6e4887..7322213cc43 100644 --- a/internal/kgateway/translator/irtranslator/translator_unit_test.go +++ b/internal/kgateway/translator/irtranslator/translator_unit_test.go @@ -12,15 +12,15 @@ package irtranslator_test // core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" -// v1 "github.com/kgateway-dev/kgateway/internal/controller/pkg/api/v1" -// solokubev1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" -// gwquery "github.com/kgateway-dev/kgateway/internal/kgateway/query" -// . "github.com/kgateway-dev/kgateway/internal/kgateway/translator" -// httplisquery "github.com/kgateway-dev/kgateway/internal/kgateway/translator/plugins/httplisteneroptions/query" -// lisquery "github.com/kgateway-dev/kgateway/internal/kgateway/translator/plugins/listeneroptions/query" -// rtoptquery "github.com/kgateway-dev/kgateway/internal/kgateway/translator/plugins/routeoptions/query" -// vhoptquery "github.com/kgateway-dev/kgateway/internal/kgateway/translator/plugins/virtualhostoptions/query" -// "github.com/kgateway-dev/kgateway/internal/kgateway/translator/testutils" +// v1 "github.com/kgateway-dev/kgateway/v2/internal/controller/pkg/api/v1" +// solokubev1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" +// gwquery "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" +// . "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator" +// httplisquery "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/plugins/httplisteneroptions/query" +// lisquery "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/plugins/listeneroptions/query" +// rtoptquery "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/plugins/routeoptions/query" +// vhoptquery "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/plugins/virtualhostoptions/query" +// "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/testutils" // ) // func CompareProxy2(expectedFile string, actualProxy *v1.Proxy) (string, error) { diff --git a/internal/kgateway/translator/irtranslator/upstream.go b/internal/kgateway/translator/irtranslator/upstream.go index aaafb2ebf56..fd7cf6565f0 100644 --- a/internal/kgateway/translator/irtranslator/upstream.go +++ b/internal/kgateway/translator/irtranslator/upstream.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) var ( diff --git a/internal/kgateway/translator/listener/gateway_listener_translator.go b/internal/kgateway/translator/listener/gateway_listener_translator.go index 4427ad4602d..2de3b1c3a23 100644 --- a/internal/kgateway/translator/listener/gateway_listener_translator.go +++ b/internal/kgateway/translator/listener/gateway_listener_translator.go @@ -18,15 +18,15 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/ports" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - route "github.com/kgateway-dev/kgateway/internal/kgateway/translator/httproute" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/routeutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/sslutils" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + route "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/httproute" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/routeutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/sslutils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) // TranslateListeners translates the set of gloo listeners required to produce a full output proxy (either form one Gateway or multiple merged Gateways) diff --git a/internal/kgateway/translator/listener/gateway_listener_translator_test.go b/internal/kgateway/translator/listener/gateway_listener_translator_test.go index 65752ff41ac..2c5544621b5 100644 --- a/internal/kgateway/translator/listener/gateway_listener_translator_test.go +++ b/internal/kgateway/translator/listener/gateway_listener_translator_test.go @@ -13,12 +13,12 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/query/mocks" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/listener" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query/mocks" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/listener" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) var ( diff --git a/internal/kgateway/translator/listener/validation.go b/internal/kgateway/translator/listener/validation.go index 44f517e8d26..8a681ce609c 100644 --- a/internal/kgateway/translator/listener/validation.go +++ b/internal/kgateway/translator/listener/validation.go @@ -6,9 +6,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) const NormalizedHTTPSTLSType = "HTTPS/TLS" diff --git a/internal/kgateway/translator/listener/validation_test.go b/internal/kgateway/translator/listener/validation_test.go index 1c3aea0749c..8a8e555f388 100644 --- a/internal/kgateway/translator/listener/validation_test.go +++ b/internal/kgateway/translator/listener/validation_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/kgateway/translator/routeutils/sortable_route.go b/internal/kgateway/translator/routeutils/sortable_route.go index 4962a01f1de..5d67fa9914e 100644 --- a/internal/kgateway/translator/routeutils/sortable_route.go +++ b/internal/kgateway/translator/routeutils/sortable_route.go @@ -6,7 +6,7 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) type SortableRoute struct { diff --git a/internal/kgateway/translator/routeutils/sortable_route_test.go b/internal/kgateway/translator/routeutils/sortable_route_test.go index a0952c49f7e..05710470ae2 100644 --- a/internal/kgateway/translator/routeutils/sortable_route_test.go +++ b/internal/kgateway/translator/routeutils/sortable_route_test.go @@ -7,7 +7,7 @@ import ( "k8s.io/utils/ptr" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" ) func defaultMatcher() gwv1.HTTPRouteMatch { diff --git a/internal/kgateway/translator/translator.go b/internal/kgateway/translator/translator.go index c047e0c16e7..a2c5d89c397 100644 --- a/internal/kgateway/translator/translator.go +++ b/internal/kgateway/translator/translator.go @@ -14,16 +14,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/endpoints" - "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/common" - extensionsplug "github.com/kgateway-dev/kgateway/internal/kgateway/extensions2/plugin" - "github.com/kgateway-dev/kgateway/internal/kgateway/ir" - "github.com/kgateway-dev/kgateway/internal/kgateway/krtcollections" - "github.com/kgateway-dev/kgateway/internal/kgateway/query" - "github.com/kgateway-dev/kgateway/internal/kgateway/reports" - gwtranslator "github.com/kgateway-dev/kgateway/internal/kgateway/translator/gateway" - "github.com/kgateway-dev/kgateway/internal/kgateway/translator/irtranslator" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/endpoints" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/common" + extensionsplug "github.com/kgateway-dev/kgateway/v2/internal/kgateway/extensions2/plugin" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/ir" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/krtcollections" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/query" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/reports" + gwtranslator "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/gateway" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/translator/irtranslator" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) // Combines all the translators needed for xDS translation. diff --git a/internal/kgateway/utils/queue_test.go b/internal/kgateway/utils/queue_test.go index 5a38aca5522..9a8ba98178e 100644 --- a/internal/kgateway/utils/queue_test.go +++ b/internal/kgateway/utils/queue_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + . "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) type testType struct { diff --git a/internal/kgateway/xds/utils.go b/internal/kgateway/xds/utils.go index aa6f62cd6fe..6881efc0ae6 100644 --- a/internal/kgateway/xds/utils.go +++ b/internal/kgateway/xds/utils.go @@ -8,7 +8,7 @@ import ( cache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" "google.golang.org/protobuf/proto" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" ) var _ cache.NodeHash = new(nodeRoleHasher) diff --git a/internal/sds/pkg/run/run.go b/internal/sds/pkg/run/run.go index f2b8ef8627a..35ff125c7b3 100644 --- a/internal/sds/pkg/run/run.go +++ b/internal/sds/pkg/run/run.go @@ -12,7 +12,7 @@ import ( "github.com/solo-io/go-utils/contextutils" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/server" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/server" ) func Run(ctx context.Context, secrets []server.Secret, sdsClient, sdsServerAddress string) error { diff --git a/internal/sds/pkg/run/run_e2e_test.go b/internal/sds/pkg/run/run_e2e_test.go index 43c7dffde4d..9080de88a92 100644 --- a/internal/sds/pkg/run/run_e2e_test.go +++ b/internal/sds/pkg/run/run_e2e_test.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/afero" "google.golang.org/grpc" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/run" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/server" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/run" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/server" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/sds/pkg/run/run_main.go b/internal/sds/pkg/run/run_main.go index c12455edd1f..a0a69a6a81c 100644 --- a/internal/sds/pkg/run/run_main.go +++ b/internal/sds/pkg/run/run_main.go @@ -13,8 +13,8 @@ import ( "github.com/solo-io/go-utils/contextutils" "github.com/solo-io/go-utils/stats" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/server" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/server" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) var ( diff --git a/internal/sds/pkg/server/server_test.go b/internal/sds/pkg/server/server_test.go index fc9c43f04dd..e1bd35e7817 100644 --- a/internal/sds/pkg/server/server_test.go +++ b/internal/sds/pkg/server/server_test.go @@ -13,8 +13,8 @@ import ( "github.com/spf13/afero" "google.golang.org/grpc" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/server" - "github.com/kgateway-dev/kgateway/internal/sds/pkg/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/server" + "github.com/kgateway-dev/kgateway/v2/internal/sds/pkg/testutils" ) var _ = Describe("SDS Server", func() { diff --git a/pkg/bootstrap/leaderelector/identity_test.go b/pkg/bootstrap/leaderelector/identity_test.go index 0741173e8a2..934e773b35b 100644 --- a/pkg/bootstrap/leaderelector/identity_test.go +++ b/pkg/bootstrap/leaderelector/identity_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" ) var _ = Describe("Identity", func() { diff --git a/pkg/bootstrap/leaderelector/kube/factory.go b/pkg/bootstrap/leaderelector/kube/factory.go index 060d81ae5d0..112fe573a87 100644 --- a/pkg/bootstrap/leaderelector/kube/factory.go +++ b/pkg/bootstrap/leaderelector/kube/factory.go @@ -11,8 +11,8 @@ import ( k8sleaderelection "k8s.io/client-go/tools/leaderelection" "sigs.k8s.io/controller-runtime/pkg/leaderelection" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" ) var _ leaderelector.ElectionFactory = new(kubeElectionFactory) diff --git a/pkg/bootstrap/leaderelector/leader_test.go b/pkg/bootstrap/leaderelector/leader_test.go index f075e5a7a99..76e4b56dc1d 100644 --- a/pkg/bootstrap/leaderelector/leader_test.go +++ b/pkg/bootstrap/leaderelector/leader_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" ) var _ = Describe("Leader Startup Action", func() { diff --git a/pkg/bootstrap/leaderelector/singlereplica/factory.go b/pkg/bootstrap/leaderelector/singlereplica/factory.go index 0f72f537bfe..224935495ab 100644 --- a/pkg/bootstrap/leaderelector/singlereplica/factory.go +++ b/pkg/bootstrap/leaderelector/singlereplica/factory.go @@ -5,7 +5,7 @@ import ( "github.com/solo-io/go-utils/contextutils" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" ) var _ leaderelector.ElectionFactory = new(singleReplicaElectionFactory) diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index f37f9717e93..6988de60697 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -10,7 +10,7 @@ import ( rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - gatewayv1alpha1 "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/typed/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/typed/api/v1alpha1" ) type Interface interface { diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 394bed68a4d..287b7d5382b 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -9,10 +9,10 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - applyconfiguration "github.com/kgateway-dev/kgateway/api/applyconfiguration" - clientset "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned" - gatewayv1alpha1 "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/typed/api/v1alpha1" - fakegatewayv1alpha1 "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/typed/api/v1alpha1/fake" + applyconfiguration "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration" + clientset "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/typed/api/v1alpha1" + fakegatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/typed/api/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 8670f50a361..cca1527a75f 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -9,7 +9,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - gatewayv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 15b6f4ed99d..80797f75c27 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -9,7 +9,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - gatewayv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + gatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go index 5abd07f0b6f..e61e3162564 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/api_client.go @@ -7,8 +7,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) type GatewayV1alpha1Interface interface { diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go index 74f53df5bab..7cd7267430b 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/directresponse.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // DirectResponsesGetter has a method to return a DirectResponseInterface. diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go index 600b3725840..d5917129cee 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_api_client.go @@ -6,7 +6,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/typed/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/typed/api/v1alpha1" ) type FakeGatewayV1alpha1 struct { diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go index f27a4108f53..7fab6dae7b4 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_directresponse.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeDirectResponses implements DirectResponseInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go index 22875c8036e..1be5cfdc379 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_gatewayparameters.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeGatewayParameterses implements GatewayParametersInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go index f7575d9a4ad..232a621fbc0 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_httplistenerpolicy.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeHttpListenerPolicies implements HttpListenerPolicyInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go index 9900bcfb74d..27e7f8dee8a 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_listenerpolicy.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeListenerPolicies implements ListenerPolicyInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go index 084aa1dc49e..02e3359bcc1 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_routepolicy.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeRoutePolicies implements RoutePolicyInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go index 225d93aa1d1..04fa365a04e 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/fake/fake_upstream.go @@ -13,8 +13,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // FakeUpstreams implements UpstreamInterface diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go index ac534df8922..423200a9972 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/gatewayparameters.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // GatewayParametersesGetter has a method to return a GatewayParametersInterface. diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go index 15d073d5ef9..8b6d6b8fdfa 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/httplistenerpolicy.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // HttpListenerPoliciesGetter has a method to return a HttpListenerPolicyInterface. diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go index cb275485cc8..0fbe8d3f0c0 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/listenerpolicy.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // ListenerPoliciesGetter has a method to return a ListenerPolicyInterface. diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go index 123f2fd7b61..c271e9dc70a 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/routepolicy.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // RoutePoliciesGetter has a method to return a RoutePolicyInterface. diff --git a/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go b/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go index a4b45bd900f..65ea820cfca 100644 --- a/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go +++ b/pkg/client/clientset/versioned/typed/api/v1alpha1/upstream.go @@ -10,9 +10,9 @@ import ( watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - apiv1alpha1 "github.com/kgateway-dev/kgateway/api/applyconfiguration/api/v1alpha1" - v1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" - scheme "github.com/kgateway-dev/kgateway/pkg/client/clientset/versioned/scheme" + apiv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/applyconfiguration/api/v1alpha1" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + scheme "github.com/kgateway-dev/kgateway/v2/pkg/client/clientset/versioned/scheme" ) // UpstreamsGetter has a method to return a UpstreamInterface. diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 518b7a741cf..3abdf0ce449 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -16,403 +16,403 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtension": schema_kgateway_dev_kgateway_api_v1alpha1_AiExtension(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtensionStats": schema_kgateway_dev_kgateway_api_v1alpha1_AiExtensionStats(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.AwsUpstream": schema_kgateway_dev_kgateway_api_v1alpha1_AwsUpstream(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.CustomLabel": schema_kgateway_dev_kgateway_api_v1alpha1_CustomLabel(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponse": schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponse(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseList": schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseSpec": schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseSpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseStatus": schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseStatus(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyBootstrap": schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyBootstrap(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyContainer": schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyContainer(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParameters": schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParameters(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersList": schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersSpec": schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersSpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersStatus": schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersStatus(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.GracefulShutdownSpec": schema_kgateway_dev_kgateway_api_v1alpha1_GracefulShutdownSpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.Host": schema_kgateway_dev_kgateway_api_v1alpha1_Host(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicy": schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicy(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicyList": schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicyList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicySpec": schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicySpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.Image": schema_kgateway_dev_kgateway_api_v1alpha1_Image(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.IstioContainer": schema_kgateway_dev_kgateway_api_v1alpha1_IstioContainer(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.IstioIntegration": schema_kgateway_dev_kgateway_api_v1alpha1_IstioIntegration(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.KubernetesProxyConfig": schema_kgateway_dev_kgateway_api_v1alpha1_KubernetesProxyConfig(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicy": schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicy(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicyList": schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicyList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicySpec": schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicySpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference": schema_kgateway_dev_kgateway_api_v1alpha1_LocalPolicyTargetReference(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.Pod": schema_kgateway_dev_kgateway_api_v1alpha1_Pod(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyAncestorStatus": schema_kgateway_dev_kgateway_api_v1alpha1_PolicyAncestorStatus(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus": schema_kgateway_dev_kgateway_api_v1alpha1_PolicyStatus(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.ProxyDeployment": schema_kgateway_dev_kgateway_api_v1alpha1_ProxyDeployment(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicy": schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicy(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicyList": schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicyList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicySpec": schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicySpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.SdsBootstrap": schema_kgateway_dev_kgateway_api_v1alpha1_SdsBootstrap(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.SdsContainer": schema_kgateway_dev_kgateway_api_v1alpha1_SdsContainer(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.SelfManagedGateway": schema_kgateway_dev_kgateway_api_v1alpha1_SelfManagedGateway(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.Service": schema_kgateway_dev_kgateway_api_v1alpha1_Service(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.ServiceAccount": schema_kgateway_dev_kgateway_api_v1alpha1_ServiceAccount(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.StaticUpstream": schema_kgateway_dev_kgateway_api_v1alpha1_StaticUpstream(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.StatsConfig": schema_kgateway_dev_kgateway_api_v1alpha1_StatsConfig(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.Upstream": schema_kgateway_dev_kgateway_api_v1alpha1_Upstream(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamList": schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamList(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamSpec": schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamSpec(ref), - "github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamStatus": schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamStatus(ref), - "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), - "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), - "k8s.io/api/core/v1.AppArmorProfile": schema_k8sio_api_core_v1_AppArmorProfile(ref), - "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), - "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), - "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), - "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), - "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), - "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), - "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), - "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), - "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), - "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), - "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), - "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), - "k8s.io/api/core/v1.ClusterTrustBundleProjection": schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref), - "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), - "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), - "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), - "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), - "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), - "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), - "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), - "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), - "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), - "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), - "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), - "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), - "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), - "k8s.io/api/core/v1.ContainerResizePolicy": schema_k8sio_api_core_v1_ContainerResizePolicy(ref), - "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), - "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), - "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), - "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), - "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), - "k8s.io/api/core/v1.ContainerUser": schema_k8sio_api_core_v1_ContainerUser(ref), - "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), - "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), - "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), - "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), - "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), - "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), - "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), - "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), - "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), - "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), - "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), - "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), - "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), - "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), - "k8s.io/api/core/v1.EphemeralVolumeSource": schema_k8sio_api_core_v1_EphemeralVolumeSource(ref), - "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), - "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), - "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), - "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), - "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), - "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), - "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), - "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), - "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), - "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.GRPCAction": schema_k8sio_api_core_v1_GRPCAction(ref), - "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), - "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), - "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), - "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), - "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), - "k8s.io/api/core/v1.HostIP": schema_k8sio_api_core_v1_HostIP(ref), - "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), - "k8s.io/api/core/v1.ImageVolumeSource": schema_k8sio_api_core_v1_ImageVolumeSource(ref), - "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), - "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), - "k8s.io/api/core/v1.LifecycleHandler": schema_k8sio_api_core_v1_LifecycleHandler(ref), - "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), - "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), - "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), - "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), - "k8s.io/api/core/v1.LinuxContainerUser": schema_k8sio_api_core_v1_LinuxContainerUser(ref), - "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), - "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), - "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), - "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), - "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), - "k8s.io/api/core/v1.ModifyVolumeStatus": schema_k8sio_api_core_v1_ModifyVolumeStatus(ref), - "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), - "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), - "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), - "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), - "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), - "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), - "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), - "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), - "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), - "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), - "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), - "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), - "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), - "k8s.io/api/core/v1.NodeFeatures": schema_k8sio_api_core_v1_NodeFeatures(ref), - "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), - "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), - "k8s.io/api/core/v1.NodeRuntimeHandler": schema_k8sio_api_core_v1_NodeRuntimeHandler(ref), - "k8s.io/api/core/v1.NodeRuntimeHandlerFeatures": schema_k8sio_api_core_v1_NodeRuntimeHandlerFeatures(ref), - "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), - "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), - "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), - "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), - "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), - "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), - "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), - "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), - "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), - "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimTemplate": schema_k8sio_api_core_v1_PersistentVolumeClaimTemplate(ref), - "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), - "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), - "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), - "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), - "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), - "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), - "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), - "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), - "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), - "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), - "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), - "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), - "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), - "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), - "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), - "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), - "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), - "k8s.io/api/core/v1.PodOS": schema_k8sio_api_core_v1_PodOS(ref), - "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), - "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), - "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), - "k8s.io/api/core/v1.PodResourceClaim": schema_k8sio_api_core_v1_PodResourceClaim(ref), - "k8s.io/api/core/v1.PodResourceClaimStatus": schema_k8sio_api_core_v1_PodResourceClaimStatus(ref), - "k8s.io/api/core/v1.PodSchedulingGate": schema_k8sio_api_core_v1_PodSchedulingGate(ref), - "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), - "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), - "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), - "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), - "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), - "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), - "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), - "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), - "k8s.io/api/core/v1.PortStatus": schema_k8sio_api_core_v1_PortStatus(ref), - "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), - "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), - "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), - "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), - "k8s.io/api/core/v1.ProbeHandler": schema_k8sio_api_core_v1_ProbeHandler(ref), - "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), - "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), - "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), - "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), - "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), - "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), - "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), - "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), - "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), - "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), - "k8s.io/api/core/v1.ResourceClaim": schema_k8sio_api_core_v1_ResourceClaim(ref), - "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), - "k8s.io/api/core/v1.ResourceHealth": schema_k8sio_api_core_v1_ResourceHealth(ref), - "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), - "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), - "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), - "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), - "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), - "k8s.io/api/core/v1.ResourceStatus": schema_k8sio_api_core_v1_ResourceStatus(ref), - "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), - "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), - "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), - "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), - "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), - "k8s.io/api/core/v1.SeccompProfile": schema_k8sio_api_core_v1_SeccompProfile(ref), - "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), - "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), - "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), - "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), - "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), - "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), - "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), - "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), - "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), - "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), - "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), - "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), - "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), - "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), - "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), - "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), - "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), - "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), - "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), - "k8s.io/api/core/v1.SleepAction": schema_k8sio_api_core_v1_SleepAction(ref), - "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), - "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), - "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), - "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), - "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), - "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), - "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), - "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), - "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), - "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), - "k8s.io/api/core/v1.TypedObjectReference": schema_k8sio_api_core_v1_TypedObjectReference(ref), - "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), - "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), - "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), - "k8s.io/api/core/v1.VolumeMountStatus": schema_k8sio_api_core_v1_VolumeMountStatus(ref), - "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), - "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), - "k8s.io/api/core/v1.VolumeResourceRequirements": schema_k8sio_api_core_v1_VolumeResourceRequirements(ref), - "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), - "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), - "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), - "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), - "k8s.io/apimachinery/pkg/api/resource.Quantity": schema_apimachinery_pkg_api_resource_Quantity(ref), - "k8s.io/apimachinery/pkg/api/resource.int64Amount": schema_apimachinery_pkg_api_resource_int64Amount(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions": schema_pkg_apis_meta_v1_ApplyOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldSelectorRequirement": schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), - "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), - "sigs.k8s.io/gateway-api/apis/v1.AllowedRoutes": schema_sigsk8sio_gateway_api_apis_v1_AllowedRoutes(ref), - "sigs.k8s.io/gateway-api/apis/v1.BackendObjectReference": schema_sigsk8sio_gateway_api_apis_v1_BackendObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.BackendRef": schema_sigsk8sio_gateway_api_apis_v1_BackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.CommonRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_CommonRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.CookieConfig": schema_sigsk8sio_gateway_api_apis_v1_CookieConfig(ref), - "sigs.k8s.io/gateway-api/apis/v1.Fraction": schema_sigsk8sio_gateway_api_apis_v1_Fraction(ref), - "sigs.k8s.io/gateway-api/apis/v1.FrontendTLSValidation": schema_sigsk8sio_gateway_api_apis_v1_FrontendTLSValidation(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCBackendRef": schema_sigsk8sio_gateway_api_apis_v1_GRPCBackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCHeaderMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCMethodMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCMethodMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRoute": schema_sigsk8sio_gateway_api_apis_v1_GRPCRoute(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteList": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteRule": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteRule(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.Gateway": schema_sigsk8sio_gateway_api_apis_v1_Gateway(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayAddress(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayBackendTLS": schema_sigsk8sio_gateway_api_apis_v1_GatewayBackendTLS(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClass": schema_sigsk8sio_gateway_api_apis_v1_GatewayClass(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassList": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassSpec": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayClassStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayInfrastructure": schema_sigsk8sio_gateway_api_apis_v1_GatewayInfrastructure(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayList": schema_sigsk8sio_gateway_api_apis_v1_GatewayList(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewaySpec": schema_sigsk8sio_gateway_api_apis_v1_GatewaySpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayStatusAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatusAddress(ref), - "sigs.k8s.io/gateway-api/apis/v1.GatewayTLSConfig": schema_sigsk8sio_gateway_api_apis_v1_GatewayTLSConfig(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPBackendRef": schema_sigsk8sio_gateway_api_apis_v1_HTTPBackendRef(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeader": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeader(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPPathMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPPathModifier": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathModifier(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPQueryParamMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPQueryParamMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestMirrorFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestMirrorFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestRedirectFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestRedirectFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRoute": schema_sigsk8sio_gateway_api_apis_v1_HTTPRoute(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteList": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteList(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteMatch(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRetry": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRetry(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRule": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRule(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteSpec(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteTimeouts": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteTimeouts(ref), - "sigs.k8s.io/gateway-api/apis/v1.HTTPURLRewriteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPURLRewriteFilter(ref), - "sigs.k8s.io/gateway-api/apis/v1.Listener": schema_sigsk8sio_gateway_api_apis_v1_Listener(ref), - "sigs.k8s.io/gateway-api/apis/v1.ListenerStatus": schema_sigsk8sio_gateway_api_apis_v1_ListenerStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.LocalObjectReference": schema_sigsk8sio_gateway_api_apis_v1_LocalObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.LocalParametersReference": schema_sigsk8sio_gateway_api_apis_v1_LocalParametersReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ObjectReference": schema_sigsk8sio_gateway_api_apis_v1_ObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ParametersReference": schema_sigsk8sio_gateway_api_apis_v1_ParametersReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.ParentReference": schema_sigsk8sio_gateway_api_apis_v1_ParentReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteGroupKind": schema_sigsk8sio_gateway_api_apis_v1_RouteGroupKind(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteNamespaces": schema_sigsk8sio_gateway_api_apis_v1_RouteNamespaces(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteParentStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteParentStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.RouteStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteStatus(ref), - "sigs.k8s.io/gateway-api/apis/v1.SecretObjectReference": schema_sigsk8sio_gateway_api_apis_v1_SecretObjectReference(ref), - "sigs.k8s.io/gateway-api/apis/v1.SessionPersistence": schema_sigsk8sio_gateway_api_apis_v1_SessionPersistence(ref), - "sigs.k8s.io/gateway-api/apis/v1.SupportedFeature": schema_sigsk8sio_gateway_api_apis_v1_SupportedFeature(ref), - } -} - -func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtension(ref common.ReferenceCallback) common.OpenAPIDefinition { + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtension": schema_kgateway_v2_api_v1alpha1_AiExtension(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtensionStats": schema_kgateway_v2_api_v1alpha1_AiExtensionStats(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AwsUpstream": schema_kgateway_v2_api_v1alpha1_AwsUpstream(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.CustomLabel": schema_kgateway_v2_api_v1alpha1_CustomLabel(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponse": schema_kgateway_v2_api_v1alpha1_DirectResponse(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseList": schema_kgateway_v2_api_v1alpha1_DirectResponseList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseSpec": schema_kgateway_v2_api_v1alpha1_DirectResponseSpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseStatus": schema_kgateway_v2_api_v1alpha1_DirectResponseStatus(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyBootstrap": schema_kgateway_v2_api_v1alpha1_EnvoyBootstrap(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyContainer": schema_kgateway_v2_api_v1alpha1_EnvoyContainer(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParameters": schema_kgateway_v2_api_v1alpha1_GatewayParameters(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersList": schema_kgateway_v2_api_v1alpha1_GatewayParametersList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersSpec": schema_kgateway_v2_api_v1alpha1_GatewayParametersSpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersStatus": schema_kgateway_v2_api_v1alpha1_GatewayParametersStatus(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GracefulShutdownSpec": schema_kgateway_v2_api_v1alpha1_GracefulShutdownSpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Host": schema_kgateway_v2_api_v1alpha1_Host(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicy": schema_kgateway_v2_api_v1alpha1_HttpListenerPolicy(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicyList": schema_kgateway_v2_api_v1alpha1_HttpListenerPolicyList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicySpec": schema_kgateway_v2_api_v1alpha1_HttpListenerPolicySpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image": schema_kgateway_v2_api_v1alpha1_Image(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioContainer": schema_kgateway_v2_api_v1alpha1_IstioContainer(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioIntegration": schema_kgateway_v2_api_v1alpha1_IstioIntegration(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.KubernetesProxyConfig": schema_kgateway_v2_api_v1alpha1_KubernetesProxyConfig(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicy": schema_kgateway_v2_api_v1alpha1_ListenerPolicy(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicyList": schema_kgateway_v2_api_v1alpha1_ListenerPolicyList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicySpec": schema_kgateway_v2_api_v1alpha1_ListenerPolicySpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference": schema_kgateway_v2_api_v1alpha1_LocalPolicyTargetReference(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Pod": schema_kgateway_v2_api_v1alpha1_Pod(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyAncestorStatus": schema_kgateway_v2_api_v1alpha1_PolicyAncestorStatus(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus": schema_kgateway_v2_api_v1alpha1_PolicyStatus(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ProxyDeployment": schema_kgateway_v2_api_v1alpha1_ProxyDeployment(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicy": schema_kgateway_v2_api_v1alpha1_RoutePolicy(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicyList": schema_kgateway_v2_api_v1alpha1_RoutePolicyList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicySpec": schema_kgateway_v2_api_v1alpha1_RoutePolicySpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsBootstrap": schema_kgateway_v2_api_v1alpha1_SdsBootstrap(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsContainer": schema_kgateway_v2_api_v1alpha1_SdsContainer(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SelfManagedGateway": schema_kgateway_v2_api_v1alpha1_SelfManagedGateway(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Service": schema_kgateway_v2_api_v1alpha1_Service(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ServiceAccount": schema_kgateway_v2_api_v1alpha1_ServiceAccount(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StaticUpstream": schema_kgateway_v2_api_v1alpha1_StaticUpstream(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StatsConfig": schema_kgateway_v2_api_v1alpha1_StatsConfig(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Upstream": schema_kgateway_v2_api_v1alpha1_Upstream(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamList": schema_kgateway_v2_api_v1alpha1_UpstreamList(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamSpec": schema_kgateway_v2_api_v1alpha1_UpstreamSpec(ref), + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamStatus": schema_kgateway_v2_api_v1alpha1_UpstreamStatus(ref), + "k8s.io/api/core/v1.AWSElasticBlockStoreVolumeSource": schema_k8sio_api_core_v1_AWSElasticBlockStoreVolumeSource(ref), + "k8s.io/api/core/v1.Affinity": schema_k8sio_api_core_v1_Affinity(ref), + "k8s.io/api/core/v1.AppArmorProfile": schema_k8sio_api_core_v1_AppArmorProfile(ref), + "k8s.io/api/core/v1.AttachedVolume": schema_k8sio_api_core_v1_AttachedVolume(ref), + "k8s.io/api/core/v1.AvoidPods": schema_k8sio_api_core_v1_AvoidPods(ref), + "k8s.io/api/core/v1.AzureDiskVolumeSource": schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref), + "k8s.io/api/core/v1.AzureFilePersistentVolumeSource": schema_k8sio_api_core_v1_AzureFilePersistentVolumeSource(ref), + "k8s.io/api/core/v1.AzureFileVolumeSource": schema_k8sio_api_core_v1_AzureFileVolumeSource(ref), + "k8s.io/api/core/v1.Binding": schema_k8sio_api_core_v1_Binding(ref), + "k8s.io/api/core/v1.CSIPersistentVolumeSource": schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CSIVolumeSource": schema_k8sio_api_core_v1_CSIVolumeSource(ref), + "k8s.io/api/core/v1.Capabilities": schema_k8sio_api_core_v1_Capabilities(ref), + "k8s.io/api/core/v1.CephFSPersistentVolumeSource": schema_k8sio_api_core_v1_CephFSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CephFSVolumeSource": schema_k8sio_api_core_v1_CephFSVolumeSource(ref), + "k8s.io/api/core/v1.CinderPersistentVolumeSource": schema_k8sio_api_core_v1_CinderPersistentVolumeSource(ref), + "k8s.io/api/core/v1.CinderVolumeSource": schema_k8sio_api_core_v1_CinderVolumeSource(ref), + "k8s.io/api/core/v1.ClientIPConfig": schema_k8sio_api_core_v1_ClientIPConfig(ref), + "k8s.io/api/core/v1.ClusterTrustBundleProjection": schema_k8sio_api_core_v1_ClusterTrustBundleProjection(ref), + "k8s.io/api/core/v1.ComponentCondition": schema_k8sio_api_core_v1_ComponentCondition(ref), + "k8s.io/api/core/v1.ComponentStatus": schema_k8sio_api_core_v1_ComponentStatus(ref), + "k8s.io/api/core/v1.ComponentStatusList": schema_k8sio_api_core_v1_ComponentStatusList(ref), + "k8s.io/api/core/v1.ConfigMap": schema_k8sio_api_core_v1_ConfigMap(ref), + "k8s.io/api/core/v1.ConfigMapEnvSource": schema_k8sio_api_core_v1_ConfigMapEnvSource(ref), + "k8s.io/api/core/v1.ConfigMapKeySelector": schema_k8sio_api_core_v1_ConfigMapKeySelector(ref), + "k8s.io/api/core/v1.ConfigMapList": schema_k8sio_api_core_v1_ConfigMapList(ref), + "k8s.io/api/core/v1.ConfigMapNodeConfigSource": schema_k8sio_api_core_v1_ConfigMapNodeConfigSource(ref), + "k8s.io/api/core/v1.ConfigMapProjection": schema_k8sio_api_core_v1_ConfigMapProjection(ref), + "k8s.io/api/core/v1.ConfigMapVolumeSource": schema_k8sio_api_core_v1_ConfigMapVolumeSource(ref), + "k8s.io/api/core/v1.Container": schema_k8sio_api_core_v1_Container(ref), + "k8s.io/api/core/v1.ContainerImage": schema_k8sio_api_core_v1_ContainerImage(ref), + "k8s.io/api/core/v1.ContainerPort": schema_k8sio_api_core_v1_ContainerPort(ref), + "k8s.io/api/core/v1.ContainerResizePolicy": schema_k8sio_api_core_v1_ContainerResizePolicy(ref), + "k8s.io/api/core/v1.ContainerState": schema_k8sio_api_core_v1_ContainerState(ref), + "k8s.io/api/core/v1.ContainerStateRunning": schema_k8sio_api_core_v1_ContainerStateRunning(ref), + "k8s.io/api/core/v1.ContainerStateTerminated": schema_k8sio_api_core_v1_ContainerStateTerminated(ref), + "k8s.io/api/core/v1.ContainerStateWaiting": schema_k8sio_api_core_v1_ContainerStateWaiting(ref), + "k8s.io/api/core/v1.ContainerStatus": schema_k8sio_api_core_v1_ContainerStatus(ref), + "k8s.io/api/core/v1.ContainerUser": schema_k8sio_api_core_v1_ContainerUser(ref), + "k8s.io/api/core/v1.DaemonEndpoint": schema_k8sio_api_core_v1_DaemonEndpoint(ref), + "k8s.io/api/core/v1.DownwardAPIProjection": schema_k8sio_api_core_v1_DownwardAPIProjection(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeFile": schema_k8sio_api_core_v1_DownwardAPIVolumeFile(ref), + "k8s.io/api/core/v1.DownwardAPIVolumeSource": schema_k8sio_api_core_v1_DownwardAPIVolumeSource(ref), + "k8s.io/api/core/v1.EmptyDirVolumeSource": schema_k8sio_api_core_v1_EmptyDirVolumeSource(ref), + "k8s.io/api/core/v1.EndpointAddress": schema_k8sio_api_core_v1_EndpointAddress(ref), + "k8s.io/api/core/v1.EndpointPort": schema_k8sio_api_core_v1_EndpointPort(ref), + "k8s.io/api/core/v1.EndpointSubset": schema_k8sio_api_core_v1_EndpointSubset(ref), + "k8s.io/api/core/v1.Endpoints": schema_k8sio_api_core_v1_Endpoints(ref), + "k8s.io/api/core/v1.EndpointsList": schema_k8sio_api_core_v1_EndpointsList(ref), + "k8s.io/api/core/v1.EnvFromSource": schema_k8sio_api_core_v1_EnvFromSource(ref), + "k8s.io/api/core/v1.EnvVar": schema_k8sio_api_core_v1_EnvVar(ref), + "k8s.io/api/core/v1.EnvVarSource": schema_k8sio_api_core_v1_EnvVarSource(ref), + "k8s.io/api/core/v1.EphemeralContainer": schema_k8sio_api_core_v1_EphemeralContainer(ref), + "k8s.io/api/core/v1.EphemeralContainerCommon": schema_k8sio_api_core_v1_EphemeralContainerCommon(ref), + "k8s.io/api/core/v1.EphemeralVolumeSource": schema_k8sio_api_core_v1_EphemeralVolumeSource(ref), + "k8s.io/api/core/v1.Event": schema_k8sio_api_core_v1_Event(ref), + "k8s.io/api/core/v1.EventList": schema_k8sio_api_core_v1_EventList(ref), + "k8s.io/api/core/v1.EventSeries": schema_k8sio_api_core_v1_EventSeries(ref), + "k8s.io/api/core/v1.EventSource": schema_k8sio_api_core_v1_EventSource(ref), + "k8s.io/api/core/v1.ExecAction": schema_k8sio_api_core_v1_ExecAction(ref), + "k8s.io/api/core/v1.FCVolumeSource": schema_k8sio_api_core_v1_FCVolumeSource(ref), + "k8s.io/api/core/v1.FlexPersistentVolumeSource": schema_k8sio_api_core_v1_FlexPersistentVolumeSource(ref), + "k8s.io/api/core/v1.FlexVolumeSource": schema_k8sio_api_core_v1_FlexVolumeSource(ref), + "k8s.io/api/core/v1.FlockerVolumeSource": schema_k8sio_api_core_v1_FlockerVolumeSource(ref), + "k8s.io/api/core/v1.GCEPersistentDiskVolumeSource": schema_k8sio_api_core_v1_GCEPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.GRPCAction": schema_k8sio_api_core_v1_GRPCAction(ref), + "k8s.io/api/core/v1.GitRepoVolumeSource": schema_k8sio_api_core_v1_GitRepoVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsPersistentVolumeSource": schema_k8sio_api_core_v1_GlusterfsPersistentVolumeSource(ref), + "k8s.io/api/core/v1.GlusterfsVolumeSource": schema_k8sio_api_core_v1_GlusterfsVolumeSource(ref), + "k8s.io/api/core/v1.HTTPGetAction": schema_k8sio_api_core_v1_HTTPGetAction(ref), + "k8s.io/api/core/v1.HTTPHeader": schema_k8sio_api_core_v1_HTTPHeader(ref), + "k8s.io/api/core/v1.HostAlias": schema_k8sio_api_core_v1_HostAlias(ref), + "k8s.io/api/core/v1.HostIP": schema_k8sio_api_core_v1_HostIP(ref), + "k8s.io/api/core/v1.HostPathVolumeSource": schema_k8sio_api_core_v1_HostPathVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIPersistentVolumeSource": schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ISCSIVolumeSource": schema_k8sio_api_core_v1_ISCSIVolumeSource(ref), + "k8s.io/api/core/v1.ImageVolumeSource": schema_k8sio_api_core_v1_ImageVolumeSource(ref), + "k8s.io/api/core/v1.KeyToPath": schema_k8sio_api_core_v1_KeyToPath(ref), + "k8s.io/api/core/v1.Lifecycle": schema_k8sio_api_core_v1_Lifecycle(ref), + "k8s.io/api/core/v1.LifecycleHandler": schema_k8sio_api_core_v1_LifecycleHandler(ref), + "k8s.io/api/core/v1.LimitRange": schema_k8sio_api_core_v1_LimitRange(ref), + "k8s.io/api/core/v1.LimitRangeItem": schema_k8sio_api_core_v1_LimitRangeItem(ref), + "k8s.io/api/core/v1.LimitRangeList": schema_k8sio_api_core_v1_LimitRangeList(ref), + "k8s.io/api/core/v1.LimitRangeSpec": schema_k8sio_api_core_v1_LimitRangeSpec(ref), + "k8s.io/api/core/v1.LinuxContainerUser": schema_k8sio_api_core_v1_LinuxContainerUser(ref), + "k8s.io/api/core/v1.List": schema_k8sio_api_core_v1_List(ref), + "k8s.io/api/core/v1.LoadBalancerIngress": schema_k8sio_api_core_v1_LoadBalancerIngress(ref), + "k8s.io/api/core/v1.LoadBalancerStatus": schema_k8sio_api_core_v1_LoadBalancerStatus(ref), + "k8s.io/api/core/v1.LocalObjectReference": schema_k8sio_api_core_v1_LocalObjectReference(ref), + "k8s.io/api/core/v1.LocalVolumeSource": schema_k8sio_api_core_v1_LocalVolumeSource(ref), + "k8s.io/api/core/v1.ModifyVolumeStatus": schema_k8sio_api_core_v1_ModifyVolumeStatus(ref), + "k8s.io/api/core/v1.NFSVolumeSource": schema_k8sio_api_core_v1_NFSVolumeSource(ref), + "k8s.io/api/core/v1.Namespace": schema_k8sio_api_core_v1_Namespace(ref), + "k8s.io/api/core/v1.NamespaceCondition": schema_k8sio_api_core_v1_NamespaceCondition(ref), + "k8s.io/api/core/v1.NamespaceList": schema_k8sio_api_core_v1_NamespaceList(ref), + "k8s.io/api/core/v1.NamespaceSpec": schema_k8sio_api_core_v1_NamespaceSpec(ref), + "k8s.io/api/core/v1.NamespaceStatus": schema_k8sio_api_core_v1_NamespaceStatus(ref), + "k8s.io/api/core/v1.Node": schema_k8sio_api_core_v1_Node(ref), + "k8s.io/api/core/v1.NodeAddress": schema_k8sio_api_core_v1_NodeAddress(ref), + "k8s.io/api/core/v1.NodeAffinity": schema_k8sio_api_core_v1_NodeAffinity(ref), + "k8s.io/api/core/v1.NodeCondition": schema_k8sio_api_core_v1_NodeCondition(ref), + "k8s.io/api/core/v1.NodeConfigSource": schema_k8sio_api_core_v1_NodeConfigSource(ref), + "k8s.io/api/core/v1.NodeConfigStatus": schema_k8sio_api_core_v1_NodeConfigStatus(ref), + "k8s.io/api/core/v1.NodeDaemonEndpoints": schema_k8sio_api_core_v1_NodeDaemonEndpoints(ref), + "k8s.io/api/core/v1.NodeFeatures": schema_k8sio_api_core_v1_NodeFeatures(ref), + "k8s.io/api/core/v1.NodeList": schema_k8sio_api_core_v1_NodeList(ref), + "k8s.io/api/core/v1.NodeProxyOptions": schema_k8sio_api_core_v1_NodeProxyOptions(ref), + "k8s.io/api/core/v1.NodeRuntimeHandler": schema_k8sio_api_core_v1_NodeRuntimeHandler(ref), + "k8s.io/api/core/v1.NodeRuntimeHandlerFeatures": schema_k8sio_api_core_v1_NodeRuntimeHandlerFeatures(ref), + "k8s.io/api/core/v1.NodeSelector": schema_k8sio_api_core_v1_NodeSelector(ref), + "k8s.io/api/core/v1.NodeSelectorRequirement": schema_k8sio_api_core_v1_NodeSelectorRequirement(ref), + "k8s.io/api/core/v1.NodeSelectorTerm": schema_k8sio_api_core_v1_NodeSelectorTerm(ref), + "k8s.io/api/core/v1.NodeSpec": schema_k8sio_api_core_v1_NodeSpec(ref), + "k8s.io/api/core/v1.NodeStatus": schema_k8sio_api_core_v1_NodeStatus(ref), + "k8s.io/api/core/v1.NodeSystemInfo": schema_k8sio_api_core_v1_NodeSystemInfo(ref), + "k8s.io/api/core/v1.ObjectFieldSelector": schema_k8sio_api_core_v1_ObjectFieldSelector(ref), + "k8s.io/api/core/v1.ObjectReference": schema_k8sio_api_core_v1_ObjectReference(ref), + "k8s.io/api/core/v1.PersistentVolume": schema_k8sio_api_core_v1_PersistentVolume(ref), + "k8s.io/api/core/v1.PersistentVolumeClaim": schema_k8sio_api_core_v1_PersistentVolumeClaim(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimCondition": schema_k8sio_api_core_v1_PersistentVolumeClaimCondition(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimList": schema_k8sio_api_core_v1_PersistentVolumeClaimList(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimSpec": schema_k8sio_api_core_v1_PersistentVolumeClaimSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimStatus": schema_k8sio_api_core_v1_PersistentVolumeClaimStatus(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimTemplate": schema_k8sio_api_core_v1_PersistentVolumeClaimTemplate(ref), + "k8s.io/api/core/v1.PersistentVolumeClaimVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeClaimVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeList": schema_k8sio_api_core_v1_PersistentVolumeList(ref), + "k8s.io/api/core/v1.PersistentVolumeSource": schema_k8sio_api_core_v1_PersistentVolumeSource(ref), + "k8s.io/api/core/v1.PersistentVolumeSpec": schema_k8sio_api_core_v1_PersistentVolumeSpec(ref), + "k8s.io/api/core/v1.PersistentVolumeStatus": schema_k8sio_api_core_v1_PersistentVolumeStatus(ref), + "k8s.io/api/core/v1.PhotonPersistentDiskVolumeSource": schema_k8sio_api_core_v1_PhotonPersistentDiskVolumeSource(ref), + "k8s.io/api/core/v1.Pod": schema_k8sio_api_core_v1_Pod(ref), + "k8s.io/api/core/v1.PodAffinity": schema_k8sio_api_core_v1_PodAffinity(ref), + "k8s.io/api/core/v1.PodAffinityTerm": schema_k8sio_api_core_v1_PodAffinityTerm(ref), + "k8s.io/api/core/v1.PodAntiAffinity": schema_k8sio_api_core_v1_PodAntiAffinity(ref), + "k8s.io/api/core/v1.PodAttachOptions": schema_k8sio_api_core_v1_PodAttachOptions(ref), + "k8s.io/api/core/v1.PodCondition": schema_k8sio_api_core_v1_PodCondition(ref), + "k8s.io/api/core/v1.PodDNSConfig": schema_k8sio_api_core_v1_PodDNSConfig(ref), + "k8s.io/api/core/v1.PodDNSConfigOption": schema_k8sio_api_core_v1_PodDNSConfigOption(ref), + "k8s.io/api/core/v1.PodExecOptions": schema_k8sio_api_core_v1_PodExecOptions(ref), + "k8s.io/api/core/v1.PodIP": schema_k8sio_api_core_v1_PodIP(ref), + "k8s.io/api/core/v1.PodList": schema_k8sio_api_core_v1_PodList(ref), + "k8s.io/api/core/v1.PodLogOptions": schema_k8sio_api_core_v1_PodLogOptions(ref), + "k8s.io/api/core/v1.PodOS": schema_k8sio_api_core_v1_PodOS(ref), + "k8s.io/api/core/v1.PodPortForwardOptions": schema_k8sio_api_core_v1_PodPortForwardOptions(ref), + "k8s.io/api/core/v1.PodProxyOptions": schema_k8sio_api_core_v1_PodProxyOptions(ref), + "k8s.io/api/core/v1.PodReadinessGate": schema_k8sio_api_core_v1_PodReadinessGate(ref), + "k8s.io/api/core/v1.PodResourceClaim": schema_k8sio_api_core_v1_PodResourceClaim(ref), + "k8s.io/api/core/v1.PodResourceClaimStatus": schema_k8sio_api_core_v1_PodResourceClaimStatus(ref), + "k8s.io/api/core/v1.PodSchedulingGate": schema_k8sio_api_core_v1_PodSchedulingGate(ref), + "k8s.io/api/core/v1.PodSecurityContext": schema_k8sio_api_core_v1_PodSecurityContext(ref), + "k8s.io/api/core/v1.PodSignature": schema_k8sio_api_core_v1_PodSignature(ref), + "k8s.io/api/core/v1.PodSpec": schema_k8sio_api_core_v1_PodSpec(ref), + "k8s.io/api/core/v1.PodStatus": schema_k8sio_api_core_v1_PodStatus(ref), + "k8s.io/api/core/v1.PodStatusResult": schema_k8sio_api_core_v1_PodStatusResult(ref), + "k8s.io/api/core/v1.PodTemplate": schema_k8sio_api_core_v1_PodTemplate(ref), + "k8s.io/api/core/v1.PodTemplateList": schema_k8sio_api_core_v1_PodTemplateList(ref), + "k8s.io/api/core/v1.PodTemplateSpec": schema_k8sio_api_core_v1_PodTemplateSpec(ref), + "k8s.io/api/core/v1.PortStatus": schema_k8sio_api_core_v1_PortStatus(ref), + "k8s.io/api/core/v1.PortworxVolumeSource": schema_k8sio_api_core_v1_PortworxVolumeSource(ref), + "k8s.io/api/core/v1.PreferAvoidPodsEntry": schema_k8sio_api_core_v1_PreferAvoidPodsEntry(ref), + "k8s.io/api/core/v1.PreferredSchedulingTerm": schema_k8sio_api_core_v1_PreferredSchedulingTerm(ref), + "k8s.io/api/core/v1.Probe": schema_k8sio_api_core_v1_Probe(ref), + "k8s.io/api/core/v1.ProbeHandler": schema_k8sio_api_core_v1_ProbeHandler(ref), + "k8s.io/api/core/v1.ProjectedVolumeSource": schema_k8sio_api_core_v1_ProjectedVolumeSource(ref), + "k8s.io/api/core/v1.QuobyteVolumeSource": schema_k8sio_api_core_v1_QuobyteVolumeSource(ref), + "k8s.io/api/core/v1.RBDPersistentVolumeSource": schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref), + "k8s.io/api/core/v1.RBDVolumeSource": schema_k8sio_api_core_v1_RBDVolumeSource(ref), + "k8s.io/api/core/v1.RangeAllocation": schema_k8sio_api_core_v1_RangeAllocation(ref), + "k8s.io/api/core/v1.ReplicationController": schema_k8sio_api_core_v1_ReplicationController(ref), + "k8s.io/api/core/v1.ReplicationControllerCondition": schema_k8sio_api_core_v1_ReplicationControllerCondition(ref), + "k8s.io/api/core/v1.ReplicationControllerList": schema_k8sio_api_core_v1_ReplicationControllerList(ref), + "k8s.io/api/core/v1.ReplicationControllerSpec": schema_k8sio_api_core_v1_ReplicationControllerSpec(ref), + "k8s.io/api/core/v1.ReplicationControllerStatus": schema_k8sio_api_core_v1_ReplicationControllerStatus(ref), + "k8s.io/api/core/v1.ResourceClaim": schema_k8sio_api_core_v1_ResourceClaim(ref), + "k8s.io/api/core/v1.ResourceFieldSelector": schema_k8sio_api_core_v1_ResourceFieldSelector(ref), + "k8s.io/api/core/v1.ResourceHealth": schema_k8sio_api_core_v1_ResourceHealth(ref), + "k8s.io/api/core/v1.ResourceQuota": schema_k8sio_api_core_v1_ResourceQuota(ref), + "k8s.io/api/core/v1.ResourceQuotaList": schema_k8sio_api_core_v1_ResourceQuotaList(ref), + "k8s.io/api/core/v1.ResourceQuotaSpec": schema_k8sio_api_core_v1_ResourceQuotaSpec(ref), + "k8s.io/api/core/v1.ResourceQuotaStatus": schema_k8sio_api_core_v1_ResourceQuotaStatus(ref), + "k8s.io/api/core/v1.ResourceRequirements": schema_k8sio_api_core_v1_ResourceRequirements(ref), + "k8s.io/api/core/v1.ResourceStatus": schema_k8sio_api_core_v1_ResourceStatus(ref), + "k8s.io/api/core/v1.SELinuxOptions": schema_k8sio_api_core_v1_SELinuxOptions(ref), + "k8s.io/api/core/v1.ScaleIOPersistentVolumeSource": schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref), + "k8s.io/api/core/v1.ScaleIOVolumeSource": schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref), + "k8s.io/api/core/v1.ScopeSelector": schema_k8sio_api_core_v1_ScopeSelector(ref), + "k8s.io/api/core/v1.ScopedResourceSelectorRequirement": schema_k8sio_api_core_v1_ScopedResourceSelectorRequirement(ref), + "k8s.io/api/core/v1.SeccompProfile": schema_k8sio_api_core_v1_SeccompProfile(ref), + "k8s.io/api/core/v1.Secret": schema_k8sio_api_core_v1_Secret(ref), + "k8s.io/api/core/v1.SecretEnvSource": schema_k8sio_api_core_v1_SecretEnvSource(ref), + "k8s.io/api/core/v1.SecretKeySelector": schema_k8sio_api_core_v1_SecretKeySelector(ref), + "k8s.io/api/core/v1.SecretList": schema_k8sio_api_core_v1_SecretList(ref), + "k8s.io/api/core/v1.SecretProjection": schema_k8sio_api_core_v1_SecretProjection(ref), + "k8s.io/api/core/v1.SecretReference": schema_k8sio_api_core_v1_SecretReference(ref), + "k8s.io/api/core/v1.SecretVolumeSource": schema_k8sio_api_core_v1_SecretVolumeSource(ref), + "k8s.io/api/core/v1.SecurityContext": schema_k8sio_api_core_v1_SecurityContext(ref), + "k8s.io/api/core/v1.SerializedReference": schema_k8sio_api_core_v1_SerializedReference(ref), + "k8s.io/api/core/v1.Service": schema_k8sio_api_core_v1_Service(ref), + "k8s.io/api/core/v1.ServiceAccount": schema_k8sio_api_core_v1_ServiceAccount(ref), + "k8s.io/api/core/v1.ServiceAccountList": schema_k8sio_api_core_v1_ServiceAccountList(ref), + "k8s.io/api/core/v1.ServiceAccountTokenProjection": schema_k8sio_api_core_v1_ServiceAccountTokenProjection(ref), + "k8s.io/api/core/v1.ServiceList": schema_k8sio_api_core_v1_ServiceList(ref), + "k8s.io/api/core/v1.ServicePort": schema_k8sio_api_core_v1_ServicePort(ref), + "k8s.io/api/core/v1.ServiceProxyOptions": schema_k8sio_api_core_v1_ServiceProxyOptions(ref), + "k8s.io/api/core/v1.ServiceSpec": schema_k8sio_api_core_v1_ServiceSpec(ref), + "k8s.io/api/core/v1.ServiceStatus": schema_k8sio_api_core_v1_ServiceStatus(ref), + "k8s.io/api/core/v1.SessionAffinityConfig": schema_k8sio_api_core_v1_SessionAffinityConfig(ref), + "k8s.io/api/core/v1.SleepAction": schema_k8sio_api_core_v1_SleepAction(ref), + "k8s.io/api/core/v1.StorageOSPersistentVolumeSource": schema_k8sio_api_core_v1_StorageOSPersistentVolumeSource(ref), + "k8s.io/api/core/v1.StorageOSVolumeSource": schema_k8sio_api_core_v1_StorageOSVolumeSource(ref), + "k8s.io/api/core/v1.Sysctl": schema_k8sio_api_core_v1_Sysctl(ref), + "k8s.io/api/core/v1.TCPSocketAction": schema_k8sio_api_core_v1_TCPSocketAction(ref), + "k8s.io/api/core/v1.Taint": schema_k8sio_api_core_v1_Taint(ref), + "k8s.io/api/core/v1.Toleration": schema_k8sio_api_core_v1_Toleration(ref), + "k8s.io/api/core/v1.TopologySelectorLabelRequirement": schema_k8sio_api_core_v1_TopologySelectorLabelRequirement(ref), + "k8s.io/api/core/v1.TopologySelectorTerm": schema_k8sio_api_core_v1_TopologySelectorTerm(ref), + "k8s.io/api/core/v1.TopologySpreadConstraint": schema_k8sio_api_core_v1_TopologySpreadConstraint(ref), + "k8s.io/api/core/v1.TypedLocalObjectReference": schema_k8sio_api_core_v1_TypedLocalObjectReference(ref), + "k8s.io/api/core/v1.TypedObjectReference": schema_k8sio_api_core_v1_TypedObjectReference(ref), + "k8s.io/api/core/v1.Volume": schema_k8sio_api_core_v1_Volume(ref), + "k8s.io/api/core/v1.VolumeDevice": schema_k8sio_api_core_v1_VolumeDevice(ref), + "k8s.io/api/core/v1.VolumeMount": schema_k8sio_api_core_v1_VolumeMount(ref), + "k8s.io/api/core/v1.VolumeMountStatus": schema_k8sio_api_core_v1_VolumeMountStatus(ref), + "k8s.io/api/core/v1.VolumeNodeAffinity": schema_k8sio_api_core_v1_VolumeNodeAffinity(ref), + "k8s.io/api/core/v1.VolumeProjection": schema_k8sio_api_core_v1_VolumeProjection(ref), + "k8s.io/api/core/v1.VolumeResourceRequirements": schema_k8sio_api_core_v1_VolumeResourceRequirements(ref), + "k8s.io/api/core/v1.VolumeSource": schema_k8sio_api_core_v1_VolumeSource(ref), + "k8s.io/api/core/v1.VsphereVirtualDiskVolumeSource": schema_k8sio_api_core_v1_VsphereVirtualDiskVolumeSource(ref), + "k8s.io/api/core/v1.WeightedPodAffinityTerm": schema_k8sio_api_core_v1_WeightedPodAffinityTerm(ref), + "k8s.io/api/core/v1.WindowsSecurityContextOptions": schema_k8sio_api_core_v1_WindowsSecurityContextOptions(ref), + "k8s.io/apimachinery/pkg/api/resource.Quantity": schema_apimachinery_pkg_api_resource_Quantity(ref), + "k8s.io/apimachinery/pkg/api/resource.int64Amount": schema_apimachinery_pkg_api_resource_int64Amount(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions": schema_pkg_apis_meta_v1_ApplyOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldSelectorRequirement": schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "k8s.io/apimachinery/pkg/util/intstr.IntOrString": schema_apimachinery_pkg_util_intstr_IntOrString(ref), + "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "sigs.k8s.io/gateway-api/apis/v1.AllowedRoutes": schema_sigsk8sio_gateway_api_apis_v1_AllowedRoutes(ref), + "sigs.k8s.io/gateway-api/apis/v1.BackendObjectReference": schema_sigsk8sio_gateway_api_apis_v1_BackendObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.BackendRef": schema_sigsk8sio_gateway_api_apis_v1_BackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.CommonRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_CommonRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.CookieConfig": schema_sigsk8sio_gateway_api_apis_v1_CookieConfig(ref), + "sigs.k8s.io/gateway-api/apis/v1.Fraction": schema_sigsk8sio_gateway_api_apis_v1_Fraction(ref), + "sigs.k8s.io/gateway-api/apis/v1.FrontendTLSValidation": schema_sigsk8sio_gateway_api_apis_v1_FrontendTLSValidation(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCBackendRef": schema_sigsk8sio_gateway_api_apis_v1_GRPCBackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCHeaderMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCMethodMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCMethodMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRoute": schema_sigsk8sio_gateway_api_apis_v1_GRPCRoute(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteList": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteRule": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteRule(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GRPCRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_GRPCRouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.Gateway": schema_sigsk8sio_gateway_api_apis_v1_Gateway(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayAddress(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayBackendTLS": schema_sigsk8sio_gateway_api_apis_v1_GatewayBackendTLS(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClass": schema_sigsk8sio_gateway_api_apis_v1_GatewayClass(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassList": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassSpec": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayClassStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayClassStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayInfrastructure": schema_sigsk8sio_gateway_api_apis_v1_GatewayInfrastructure(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayList": schema_sigsk8sio_gateway_api_apis_v1_GatewayList(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewaySpec": schema_sigsk8sio_gateway_api_apis_v1_GatewaySpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayStatus": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayStatusAddress": schema_sigsk8sio_gateway_api_apis_v1_GatewayStatusAddress(ref), + "sigs.k8s.io/gateway-api/apis/v1.GatewayTLSConfig": schema_sigsk8sio_gateway_api_apis_v1_GatewayTLSConfig(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPBackendRef": schema_sigsk8sio_gateway_api_apis_v1_HTTPBackendRef(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeader": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeader(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPHeaderMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPHeaderMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPPathMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPPathModifier": schema_sigsk8sio_gateway_api_apis_v1_HTTPPathModifier(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPQueryParamMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPQueryParamMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestMirrorFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestMirrorFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRequestRedirectFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRequestRedirectFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRoute": schema_sigsk8sio_gateway_api_apis_v1_HTTPRoute(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteList": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteList(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteMatch": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteMatch(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRetry": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRetry(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteRule": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteRule(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteSpec": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteSpec(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteStatus": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPRouteTimeouts": schema_sigsk8sio_gateway_api_apis_v1_HTTPRouteTimeouts(ref), + "sigs.k8s.io/gateway-api/apis/v1.HTTPURLRewriteFilter": schema_sigsk8sio_gateway_api_apis_v1_HTTPURLRewriteFilter(ref), + "sigs.k8s.io/gateway-api/apis/v1.Listener": schema_sigsk8sio_gateway_api_apis_v1_Listener(ref), + "sigs.k8s.io/gateway-api/apis/v1.ListenerStatus": schema_sigsk8sio_gateway_api_apis_v1_ListenerStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.LocalObjectReference": schema_sigsk8sio_gateway_api_apis_v1_LocalObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.LocalParametersReference": schema_sigsk8sio_gateway_api_apis_v1_LocalParametersReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ObjectReference": schema_sigsk8sio_gateway_api_apis_v1_ObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ParametersReference": schema_sigsk8sio_gateway_api_apis_v1_ParametersReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.ParentReference": schema_sigsk8sio_gateway_api_apis_v1_ParentReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteGroupKind": schema_sigsk8sio_gateway_api_apis_v1_RouteGroupKind(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteNamespaces": schema_sigsk8sio_gateway_api_apis_v1_RouteNamespaces(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteParentStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteParentStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.RouteStatus": schema_sigsk8sio_gateway_api_apis_v1_RouteStatus(ref), + "sigs.k8s.io/gateway-api/apis/v1.SecretObjectReference": schema_sigsk8sio_gateway_api_apis_v1_SecretObjectReference(ref), + "sigs.k8s.io/gateway-api/apis/v1.SessionPersistence": schema_sigsk8sio_gateway_api_apis_v1_SessionPersistence(ref), + "sigs.k8s.io/gateway-api/apis/v1.SupportedFeature": schema_sigsk8sio_gateway_api_apis_v1_SupportedFeature(ref), + } +} + +func schema_kgateway_v2_api_v1alpha1_AiExtension(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -429,7 +429,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtension(ref common.ReferenceC "image": { SchemaProps: spec.SchemaProps{ Description: "The extension's container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -475,18 +475,18 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtension(ref common.ReferenceC "stats": { SchemaProps: spec.SchemaProps{ Description: "Additional stats config for AI Extension. This config can be useful for adding custom labels to the request metrics.\n\nExample: ```yaml stats:\n customLabels:\n - name: \"subject\"\n metadataNamespace: \"envoy.filters.http.jwt_authn\"\n metadataKey: \"principal:sub\"\n - name: \"issuer\"\n metadataNamespace: \"envoy.filters.http.jwt_authn\"\n metadataKey: \"principal:iss\"\n```", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtensionStats"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtensionStats"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtensionStats", "github.com/kgateway-dev/kgateway/api/v1alpha1.Image", "k8s.io/api/core/v1.ContainerPort", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtensionStats", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image", "k8s.io/api/core/v1.ContainerPort", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtensionStats(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_AiExtensionStats(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -499,7 +499,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtensionStats(ref common.Refer Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.CustomLabel"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.CustomLabel"), }, }, }, @@ -509,11 +509,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_AiExtensionStats(ref common.Refer }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.CustomLabel"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.CustomLabel"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_AwsUpstream(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_AwsUpstream(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -539,7 +539,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_AwsUpstream(ref common.ReferenceC } } -func schema_kgateway_dev_kgateway_api_v1alpha1_CustomLabel(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_CustomLabel(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -582,7 +582,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_CustomLabel(ref common.ReferenceC } } -func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponse(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_DirectResponse(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -612,24 +612,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponse(ref common.Referen "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseSpec", "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponseStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseSpec", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponseStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_DirectResponseList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -662,7 +662,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseList(ref common.Ref Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponse"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponse"), }, }, }, @@ -673,11 +673,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseList(ref common.Ref }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.DirectResponse", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.DirectResponse", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_DirectResponseSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -706,7 +706,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseSpec(ref common.Ref } } -func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_DirectResponseStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -717,7 +717,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_DirectResponseStatus(ref common.R } } -func schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyBootstrap(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_EnvoyBootstrap(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -753,7 +753,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyBootstrap(ref common.Referen } } -func schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_EnvoyContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -763,13 +763,13 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyContainer(ref common.Referen "bootstrap": { SchemaProps: spec.SchemaProps{ Description: "Initial envoy configuration.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyBootstrap"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyBootstrap"), }, }, "image": { SchemaProps: spec.SchemaProps{ Description: "The envoy container image. See https://kubernetes.io/docs/concepts/containers/images for details.\n\nDefault values, which may be overridden individually:\n\n\tregistry: quay.io/solo-io\n\trepository: gloo-envoy-wrapper (OSS) / gloo-ee-envoy-wrapper (EE)\n\ttag: (OSS) / (EE)\n\tpullPolicy: IfNotPresent", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -788,11 +788,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_EnvoyContainer(ref common.Referen }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyBootstrap", "github.com/kgateway-dev/kgateway/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyBootstrap", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParameters(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_GatewayParameters(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -822,24 +822,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParameters(ref common.Refe "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersSpec", "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParametersStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersSpec", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParametersStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_GatewayParametersList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -872,7 +872,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersList(ref common. Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParameters"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParameters"), }, }, }, @@ -883,11 +883,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersList(ref common. }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.GatewayParameters", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GatewayParameters", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_GatewayParametersSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -897,24 +897,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersSpec(ref common. "kube": { SchemaProps: spec.SchemaProps{ Description: "The proxy will be deployed on Kubernetes.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.KubernetesProxyConfig"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.KubernetesProxyConfig"), }, }, "selfManaged": { SchemaProps: spec.SchemaProps{ Description: "The proxy will be self-managed and not auto-provisioned.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.SelfManagedGateway"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SelfManagedGateway"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.KubernetesProxyConfig", "github.com/kgateway-dev/kgateway/api/v1alpha1.SelfManagedGateway"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.KubernetesProxyConfig", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SelfManagedGateway"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_GatewayParametersStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -925,7 +925,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GatewayParametersStatus(ref commo } } -func schema_kgateway_dev_kgateway_api_v1alpha1_GracefulShutdownSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_GracefulShutdownSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -951,7 +951,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_GracefulShutdownSpec(ref common.R } } -func schema_kgateway_dev_kgateway_api_v1alpha1_Host(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_Host(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -978,7 +978,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Host(ref common.ReferenceCallback } } -func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_HttpListenerPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1007,24 +1007,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicy(ref common.Ref "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicySpec", "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicySpec", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_HttpListenerPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1057,7 +1057,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicyList(ref common Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicy"), }, }, }, @@ -1068,11 +1068,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicyList(ref common }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.HttpListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.HttpListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_HttpListenerPolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1081,7 +1081,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicySpec(ref common "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "compress": { @@ -1094,11 +1094,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_HttpListenerPolicySpec(ref common }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_Image(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_Image(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1147,7 +1147,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Image(ref common.ReferenceCallbac } } -func schema_kgateway_dev_kgateway_api_v1alpha1_IstioContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_IstioContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1157,7 +1157,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_IstioContainer(ref common.Referen "image": { SchemaProps: spec.SchemaProps{ Description: "The envoy container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -1204,11 +1204,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_IstioContainer(ref common.Referen }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_IstioIntegration(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_IstioIntegration(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1218,7 +1218,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_IstioIntegration(ref common.Refer "istioProxyContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running istio-proxy. Note that if Istio integration is not enabled, the istio container will not be injected into the gateway proxy deployment.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.IstioContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioContainer"), }, }, "customSidecars": { @@ -1239,11 +1239,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_IstioIntegration(ref common.Refer }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.IstioContainer", "k8s.io/api/core/v1.Container"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioContainer", "k8s.io/api/core/v1.Container"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_KubernetesProxyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_KubernetesProxyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1253,55 +1253,55 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_KubernetesProxyConfig(ref common. "deployment": { SchemaProps: spec.SchemaProps{ Description: "Use a Kubernetes deployment as the proxy workload type. Currently, this is the only supported workload type.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.ProxyDeployment"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ProxyDeployment"), }, }, "envoyContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running Envoy.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyContainer"), }, }, "sdsContainer": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the container running the Secret Discovery Service (SDS).", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.SdsContainer"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsContainer"), }, }, "podTemplate": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the pods that will be created.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Pod"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Pod"), }, }, "service": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Kubernetes Service that exposes the Envoy proxy over the network.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Service"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Service"), }, }, "serviceAccount": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Kubernetes ServiceAccount used by the Envoy pod.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.ServiceAccount"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ServiceAccount"), }, }, "istio": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the Istio integration.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.IstioIntegration"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioIntegration"), }, }, "stats": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the stats server.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.StatsConfig"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StatsConfig"), }, }, "aiExtension": { SchemaProps: spec.SchemaProps{ Description: "Configuration for the AI extension.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtension"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtension"), }, }, "floatingUserId": { @@ -1315,11 +1315,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_KubernetesProxyConfig(ref common. }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.AiExtension", "github.com/kgateway-dev/kgateway/api/v1alpha1.EnvoyContainer", "github.com/kgateway-dev/kgateway/api/v1alpha1.IstioIntegration", "github.com/kgateway-dev/kgateway/api/v1alpha1.Pod", "github.com/kgateway-dev/kgateway/api/v1alpha1.ProxyDeployment", "github.com/kgateway-dev/kgateway/api/v1alpha1.SdsContainer", "github.com/kgateway-dev/kgateway/api/v1alpha1.Service", "github.com/kgateway-dev/kgateway/api/v1alpha1.ServiceAccount", "github.com/kgateway-dev/kgateway/api/v1alpha1.StatsConfig"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AiExtension", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.EnvoyContainer", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.IstioIntegration", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Pod", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ProxyDeployment", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsContainer", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Service", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ServiceAccount", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StatsConfig"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_ListenerPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1348,24 +1348,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicy(ref common.Referen "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicySpec", "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicySpec", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_ListenerPolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1398,7 +1398,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicyList(ref common.Ref Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicy"), }, }, }, @@ -1409,11 +1409,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicyList(ref common.Ref }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.ListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.ListenerPolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_ListenerPolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1422,7 +1422,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicySpec(ref common.Ref "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "perConnectionBufferLimitBytes": { @@ -1435,11 +1435,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ListenerPolicySpec(ref common.Ref }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_LocalPolicyTargetReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_LocalPolicyTargetReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1477,7 +1477,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_LocalPolicyTargetReference(ref co } } -func schema_kgateway_dev_kgateway_api_v1alpha1_Pod(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_Pod(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1575,7 +1575,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Pod(ref common.ReferenceCallback) "gracefulShutdown": { SchemaProps: spec.SchemaProps{ Description: "If specified, the pod's graceful shutdown spec.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.GracefulShutdownSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GracefulShutdownSpec"), }, }, "terminationGracePeriodSeconds": { @@ -1601,11 +1601,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Pod(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.GracefulShutdownSpec", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.Toleration"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.GracefulShutdownSpec", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.Toleration"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_PolicyAncestorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_PolicyAncestorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1657,7 +1657,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_PolicyAncestorStatus(ref common.R } } -func schema_kgateway_dev_kgateway_api_v1alpha1_PolicyStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_PolicyStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1691,7 +1691,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_PolicyStatus(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyAncestorStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyAncestorStatus"), }, }, }, @@ -1702,11 +1702,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_PolicyStatus(ref common.Reference }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyAncestorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyAncestorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_ProxyDeployment(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_ProxyDeployment(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1726,7 +1726,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ProxyDeployment(ref common.Refere } } -func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_RoutePolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1755,24 +1755,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicy(ref common.ReferenceC "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicySpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicySpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.PolicyStatus", "github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicySpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.PolicyStatus", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicySpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_RoutePolicyList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1805,7 +1805,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicyList(ref common.Refere Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicy"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicy"), }, }, }, @@ -1816,11 +1816,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicyList(ref common.Refere }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.RoutePolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.RoutePolicy", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_RoutePolicySpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1829,7 +1829,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicySpec(ref common.Refere "targetRef": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"), }, }, "timeout": { @@ -1842,11 +1842,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_RoutePolicySpec(ref common.Refere }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.LocalPolicyTargetReference"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.LocalPolicyTargetReference"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_SdsBootstrap(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_SdsBootstrap(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1866,7 +1866,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_SdsBootstrap(ref common.Reference } } -func schema_kgateway_dev_kgateway_api_v1alpha1_SdsContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_SdsContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1876,7 +1876,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_SdsContainer(ref common.Reference "image": { SchemaProps: spec.SchemaProps{ Description: "The SDS container image. See https://kubernetes.io/docs/concepts/containers/images for details.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Image"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image"), }, }, "securityContext": { @@ -1894,18 +1894,18 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_SdsContainer(ref common.Reference "bootstrap": { SchemaProps: spec.SchemaProps{ Description: "Initial SDS container configuration.", - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.SdsBootstrap"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsBootstrap"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.Image", "github.com/kgateway-dev/kgateway/api/v1alpha1.SdsBootstrap", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Image", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.SdsBootstrap", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_SelfManagedGateway(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_SelfManagedGateway(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1915,7 +1915,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_SelfManagedGateway(ref common.Ref } } -func schema_kgateway_dev_kgateway_api_v1alpha1_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_Service(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1975,7 +1975,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Service(ref common.ReferenceCallb } } -func schema_kgateway_dev_kgateway_api_v1alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_ServiceAccount(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2019,7 +2019,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_ServiceAccount(ref common.Referen } } -func schema_kgateway_dev_kgateway_api_v1alpha1_StaticUpstream(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_StaticUpstream(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2032,7 +2032,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_StaticUpstream(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Host"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Host"), }, }, }, @@ -2042,11 +2042,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_StaticUpstream(ref common.Referen }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.Host"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Host"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_StatsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_StatsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2087,7 +2087,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_StatsConfig(ref common.ReferenceC } } -func schema_kgateway_dev_kgateway_api_v1alpha1_Upstream(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_Upstream(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2116,24 +2116,24 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_Upstream(ref common.ReferenceCall "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamSpec"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamStatus"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamSpec", "github.com/kgateway-dev/kgateway/api/v1alpha1.UpstreamStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamSpec", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.UpstreamStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_UpstreamList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2166,7 +2166,7 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamList(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.Upstream"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Upstream"), }, }, }, @@ -2177,11 +2177,11 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamList(ref common.Reference }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.Upstream", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.Upstream", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_UpstreamSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2189,23 +2189,23 @@ func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamSpec(ref common.Reference Properties: map[string]spec.Schema{ "aws": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.AwsUpstream"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AwsUpstream"), }, }, "static": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/kgateway-dev/kgateway/api/v1alpha1.StaticUpstream"), + Ref: ref("github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StaticUpstream"), }, }, }, }, }, Dependencies: []string{ - "github.com/kgateway-dev/kgateway/api/v1alpha1.AwsUpstream", "github.com/kgateway-dev/kgateway/api/v1alpha1.StaticUpstream"}, + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.AwsUpstream", "github.com/kgateway-dev/kgateway/v2/api/v1alpha1.StaticUpstream"}, } } -func schema_kgateway_dev_kgateway_api_v1alpha1_UpstreamStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kgateway_v2_api_v1alpha1_UpstreamStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/pkg/github-action-utils/version.go b/pkg/github-action-utils/version.go index c4b7eb1eddc..dc9a5066c87 100644 --- a/pkg/github-action-utils/version.go +++ b/pkg/github-action-utils/version.go @@ -10,7 +10,7 @@ import ( "github.com/solo-io/go-utils/versionutils" "github.com/solo-io/go-utils/vfsutils" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) // GetLatestEnterpriseVersion computes the latest Gloo Enterprise version. diff --git a/pkg/schemes/extended_scheme.go b/pkg/schemes/extended_scheme.go index c3e4d25e040..26a2938d04d 100644 --- a/pkg/schemes/extended_scheme.go +++ b/pkg/schemes/extended_scheme.go @@ -9,7 +9,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/rest" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" ) diff --git a/pkg/schemes/scheme.go b/pkg/schemes/scheme.go index 4dc500f8c75..b8d681c70e3 100644 --- a/pkg/schemes/scheme.go +++ b/pkg/schemes/scheme.go @@ -12,7 +12,7 @@ import ( gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" gwv1b1 "sigs.k8s.io/gateway-api/apis/v1beta1" - sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/api/v1alpha1" + sologatewayv1alpha1 "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" ) // SchemeBuilder contains all the Schemes for registering the CRDs with which Gloo Gateway interacts. diff --git a/pkg/utils/channelutils/wait_test.go b/pkg/utils/channelutils/wait_test.go index 957f8492775..bc0352c3221 100644 --- a/pkg/utils/channelutils/wait_test.go +++ b/pkg/utils/channelutils/wait_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/pkg/utils/channelutils" + . "github.com/kgateway-dev/kgateway/v2/pkg/utils/channelutils" ) var _ = Describe("Wait", func() { diff --git a/pkg/utils/controllerutils/admincli/client.go b/pkg/utils/controllerutils/admincli/client.go index 1fc693c2c74..3c7dab76648 100644 --- a/pkg/utils/controllerutils/admincli/client.go +++ b/pkg/utils/controllerutils/admincli/client.go @@ -8,9 +8,9 @@ import ( "github.com/rotisserie/eris" "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/internal/kgateway/admin" - "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/admin" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) const ( diff --git a/pkg/utils/controllerutils/admincli/client_test.go b/pkg/utils/controllerutils/admincli/client_test.go index 221396671a0..2b91cca2c98 100644 --- a/pkg/utils/controllerutils/admincli/client_test.go +++ b/pkg/utils/controllerutils/admincli/client_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/pkg/utils/controllerutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/controllerutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) var _ = Describe("Client", func() { diff --git a/pkg/utils/envoyutils/admincli/client.go b/pkg/utils/envoyutils/admincli/client.go index 54b02b511d1..993f0ce2a47 100644 --- a/pkg/utils/envoyutils/admincli/client.go +++ b/pkg/utils/envoyutils/admincli/client.go @@ -12,12 +12,12 @@ import ( listenerv3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" - "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/protoutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" ) const ( diff --git a/pkg/utils/envoyutils/admincli/client_test.go b/pkg/utils/envoyutils/admincli/client_test.go index 0bd3ed17952..165dcfdab7a 100644 --- a/pkg/utils/envoyutils/admincli/client_test.go +++ b/pkg/utils/envoyutils/admincli/client_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) var _ = Describe("Client", func() { diff --git a/pkg/utils/envoyutils/bootstrap/bootstrap.go b/pkg/utils/envoyutils/bootstrap/bootstrap.go index df7c2e86e6a..a365707be0a 100644 --- a/pkg/utils/envoyutils/bootstrap/bootstrap.go +++ b/pkg/utils/envoyutils/bootstrap/bootstrap.go @@ -18,7 +18,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" ) var ( diff --git a/pkg/utils/envoyutils/bootstrap/bootstrap_test.go b/pkg/utils/envoyutils/bootstrap/bootstrap_test.go index e70135ab604..ae7f73d7cb8 100644 --- a/pkg/utils/envoyutils/bootstrap/bootstrap_test.go +++ b/pkg/utils/envoyutils/bootstrap/bootstrap_test.go @@ -5,7 +5,7 @@ import ( envoytransformation "github.com/solo-io/envoy-gloo/go/config/filter/http/transformation/v2" - "github.com/kgateway-dev/kgateway/internal/kgateway/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/utils" "github.com/envoyproxy/go-control-plane/pkg/cache/types" envoycache "github.com/envoyproxy/go-control-plane/pkg/cache/v3" diff --git a/pkg/utils/envoyutils/validation/validation.go b/pkg/utils/envoyutils/validation/validation.go index 5b15d7fb908..08dc62a60fd 100644 --- a/pkg/utils/envoyutils/validation/validation.go +++ b/pkg/utils/envoyutils/validation/validation.go @@ -7,10 +7,10 @@ import ( "github.com/rotisserie/eris" "github.com/solo-io/go-utils/contextutils" - "github.com/kgateway-dev/kgateway/internal/envoyinit/pkg/runner" - "github.com/kgateway-dev/kgateway/internal/kgateway/xds" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/bootstrap" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/internal/envoyinit/pkg/runner" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/xds" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/bootstrap" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" ) const ( diff --git a/pkg/utils/helmutils/client.go b/pkg/utils/helmutils/client.go index 6cb1be74b60..381ec4aed54 100644 --- a/pkg/utils/helmutils/client.go +++ b/pkg/utils/helmutils/client.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/cmdutils" ) // Client is a utility for executing `helm` commands diff --git a/pkg/utils/kubeutils/kubectl/cli.go b/pkg/utils/kubeutils/kubectl/cli.go index e0801a6d3ef..974e0490616 100644 --- a/pkg/utils/kubeutils/kubectl/cli.go +++ b/pkg/utils/kubeutils/kubectl/cli.go @@ -10,12 +10,12 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/cmdutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/cmdutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" "github.com/avast/retry-go/v4" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" ) // Cli is a utility for executing `kubectl` commands diff --git a/pkg/utils/kubeutils/portforward/api_forwarder.go b/pkg/utils/kubeutils/portforward/api_forwarder.go index 2a8bcf2dedf..c6858d2600a 100644 --- a/pkg/utils/kubeutils/portforward/api_forwarder.go +++ b/pkg/utils/kubeutils/portforward/api_forwarder.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" "k8s.io/client-go/rest" diff --git a/pkg/utils/namespaces/namespaces_test.go b/pkg/utils/namespaces/namespaces_test.go index aa7b9b7ac0a..7a305c2c6ac 100644 --- a/pkg/utils/namespaces/namespaces_test.go +++ b/pkg/utils/namespaces/namespaces_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/pkg/utils/namespaces" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/namespaces" ) var _ = Describe("Namespaces", func() { diff --git a/pkg/utils/probes/probes_test.go b/pkg/utils/probes/probes_test.go index ffb49b5e3c0..859a346b86d 100644 --- a/pkg/utils/probes/probes_test.go +++ b/pkg/utils/probes/probes_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/pkg/utils/probes" + . "github.com/kgateway-dev/kgateway/v2/pkg/utils/probes" ) var _ = Describe("Probes", func() { diff --git a/pkg/utils/regexutils/regex_test.go b/pkg/utils/regexutils/regex_test.go index 814698f435a..c0e52cf29ec 100644 --- a/pkg/utils/regexutils/regex_test.go +++ b/pkg/utils/regexutils/regex_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/pkg/utils/regexutils" + . "github.com/kgateway-dev/kgateway/v2/pkg/utils/regexutils" ) var _ = Describe("Regex", func() { diff --git a/pkg/utils/requestutils/curl/request_test.go b/pkg/utils/requestutils/curl/request_test.go index 638e3a388b6..1a1f6f8a2b6 100644 --- a/pkg/utils/requestutils/curl/request_test.go +++ b/pkg/utils/requestutils/curl/request_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" . "github.com/onsi/ginkgo/v2" ) diff --git a/pkg/utils/setuputils/main_setup.go b/pkg/utils/setuputils/main_setup.go index 6b61ca3b104..f58a4227ada 100644 --- a/pkg/utils/setuputils/main_setup.go +++ b/pkg/utils/setuputils/main_setup.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" "github.com/go-logr/zapr" "github.com/solo-io/go-utils/contextutils" @@ -14,10 +14,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" zaputil "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" - kube2 "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/kube" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" + kube2 "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector/kube" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) func startLeaderElection(ctx context.Context, settingsDir string, electionConfig *leaderelector.ElectionConfig) (leaderelector.Identity, error) { diff --git a/pkg/utils/sliceutils/sliceutils_test.go b/pkg/utils/sliceutils/sliceutils_test.go index da093dcd63a..5015e34abbe 100644 --- a/pkg/utils/sliceutils/sliceutils_test.go +++ b/pkg/utils/sliceutils/sliceutils_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/pkg/utils/sliceutils" + . "github.com/kgateway-dev/kgateway/v2/pkg/utils/sliceutils" ) var _ = Describe("SliceUtils", func() { diff --git a/pkg/utils/stringutils/stringutils_test.go b/pkg/utils/stringutils/stringutils_test.go index d3d6110ba8f..bc9b77dde8a 100644 --- a/pkg/utils/stringutils/stringutils_test.go +++ b/pkg/utils/stringutils/stringutils_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/pkg/utils/stringutils" + . "github.com/kgateway-dev/kgateway/v2/pkg/utils/stringutils" ) var _ = Describe("StringUtils", func() { diff --git a/pkg/version/enterprise_version_test.go b/pkg/version/enterprise_version_test.go index 9f9ccf67ca5..fe85c8a89f0 100644 --- a/pkg/version/enterprise_version_test.go +++ b/pkg/version/enterprise_version_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/kgateway-dev/kgateway/pkg/version" + "github.com/kgateway-dev/kgateway/v2/pkg/version" ) var _ = Describe("LatestVersionFromRepo", func() { diff --git a/test/aws_credentials/aws_credentials_suite_test.go b/test/aws_credentials/aws_credentials_suite_test.go index 3823d108d11..4b841f26ec4 100644 --- a/test/aws_credentials/aws_credentials_suite_test.go +++ b/test/aws_credentials/aws_credentials_suite_test.go @@ -5,7 +5,7 @@ package aws_credentials import ( "testing" - testhelpers "github.com/kgateway-dev/kgateway/test/testutils" + testhelpers "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" "github.com/solo-io/solo-kit/test/helpers" diff --git a/test/aws_credentials/ec2_test.go b/test/aws_credentials/ec2_test.go index 3b6ddde830e..b165856db04 100644 --- a/test/aws_credentials/ec2_test.go +++ b/test/aws_credentials/ec2_test.go @@ -7,25 +7,25 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients/memory" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/rotisserie/eris" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/aws/ec2" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/aws/ec2" ec2api "github.com/aws/aws-sdk-go/service/ec2" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - glooec2 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/aws/ec2" + glooec2 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/aws/ec2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("", func() { diff --git a/test/debugprint/debug_print_resource.go b/test/debugprint/debug_print_resource.go index dff43e7d1f1..63c48c3b707 100644 --- a/test/debugprint/debug_print_resource.go +++ b/test/debugprint/debug_print_resource.go @@ -13,7 +13,7 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources" "sigs.k8s.io/yaml" - "github.com/kgateway-dev/kgateway/pkg/utils/protoutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/protoutils" ) func PrintYaml(ress ...proto.Message) { diff --git a/test/e2e/aggregate_listener_test.go b/test/e2e/aggregate_listener_test.go index c4747974332..669ce40edad 100644 --- a/test/e2e/aggregate_listener_test.go +++ b/test/e2e/aggregate_listener_test.go @@ -5,25 +5,25 @@ package e2e_test import ( "net/http" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" "github.com/golang/protobuf/ptypes/duration" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/selectors" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/selectors" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("Aggregate Listener", func() { diff --git a/test/e2e/aws_ec2_test.go b/test/e2e/aws_ec2_test.go index de2e50be919..7fcc255ff39 100644 --- a/test/e2e/aws_ec2_test.go +++ b/test/e2e/aws_ec2_test.go @@ -10,13 +10,13 @@ import ( "os" "strings" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" "github.com/aws/aws-sdk-go/aws/credentials" . "github.com/onsi/ginkgo/v2" @@ -25,9 +25,9 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - glooec2 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/aws/ec2" - "github.com/kgateway-dev/kgateway/test/services" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + glooec2 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/aws/ec2" + "github.com/kgateway-dev/kgateway/v2/test/services" ) /* diff --git a/test/e2e/aws_test.go b/test/e2e/aws_test.go index 091ddf1a179..a0fa71472d4 100644 --- a/test/e2e/aws_test.go +++ b/test/e2e/aws_test.go @@ -13,9 +13,9 @@ import ( "os" "time" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" errors "github.com/rotisserie/eris" @@ -25,30 +25,30 @@ import ( "github.com/form3tech-oss/jwt-go" "google.golang.org/protobuf/types/known/wrapperspb" - aws2 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/extensions/aws" - "github.com/kgateway-dev/kgateway/test/helpers" + aws2 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/extensions/aws" + "github.com/kgateway-dev/kgateway/v2/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gw1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gwdefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + gw1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - aws_plugin "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/aws" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/hcm" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + aws_plugin "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/aws" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" "github.com/aws/aws-sdk-go/aws/credentials" ) diff --git a/test/e2e/buffer_test.go b/test/e2e/buffer_test.go index fc6a38250de..cad177f793f 100644 --- a/test/e2e/buffer_test.go +++ b/test/e2e/buffer_test.go @@ -6,22 +6,22 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - buffer "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/extensions/filters/http/buffer/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + buffer "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/extensions/filters/http/buffer/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("buffer", func() { diff --git a/test/e2e/connection_limit_test.go b/test/e2e/connection_limit_test.go index bbdfe2729f7..17b280bb8ca 100644 --- a/test/e2e/connection_limit_test.go +++ b/test/e2e/connection_limit_test.go @@ -9,15 +9,15 @@ import ( "github.com/solo-io/solo-kit/pkg/utils/prototime" "google.golang.org/protobuf/types/known/wrapperspb" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/connection_limit" - fault "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/faultinjection" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/testutils" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/connection_limit" + fault "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/faultinjection" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/consul_test.go b/test/e2e/consul_test.go index 4634d60bea8..6a1e47c9d9e 100644 --- a/test/e2e/consul_test.go +++ b/test/e2e/consul_test.go @@ -7,32 +7,32 @@ import ( "errors" "time" - "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/decorators" "github.com/golang/protobuf/ptypes/duration" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - consulplugin "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/consul" + consulplugin "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/consul" "google.golang.org/protobuf/types/known/wrapperspb" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/hashicorp/consul/api" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - consulapi "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/consul" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/upstreams/consul" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + consulapi "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/consul" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/upstreams/consul" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("Consul e2e", decorators.Consul, func() { diff --git a/test/e2e/cors_test.go b/test/e2e/cors_test.go index 8f87fb9d528..d78908cd444 100644 --- a/test/e2e/cors_test.go +++ b/test/e2e/cors_test.go @@ -6,21 +6,21 @@ import ( "net/http" "strings" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" "github.com/envoyproxy/go-control-plane/pkg/wellknown" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/cors" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/cors" ) const ( diff --git a/test/e2e/csrf_test.go b/test/e2e/csrf_test.go index 217f58cf5b9..18f4ad42cf2 100644 --- a/test/e2e/csrf_test.go +++ b/test/e2e/csrf_test.go @@ -7,29 +7,29 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloo_config_core "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/core/v3" - csrf "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/extensions/filters/http/csrf/v3" - gloo_type_matcher "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/type/matcher/v3" - glootype "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/type/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloo_config_core "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/core/v3" + csrf "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/extensions/filters/http/csrf/v3" + gloo_type_matcher "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/type/matcher/v3" + glootype "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/type/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" ) const ( diff --git a/test/e2e/custom_auth_test.go b/test/e2e/custom_auth_test.go index bbc1908c997..819eac8e914 100644 --- a/test/e2e/custom_auth_test.go +++ b/test/e2e/custom_auth_test.go @@ -8,11 +8,11 @@ import ( "net" "net/http" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" pb "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3" "github.com/gogo/googleapis/google/rpc" @@ -24,13 +24,13 @@ import ( "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("CustomAuth", func() { diff --git a/test/e2e/dns_test.go b/test/e2e/dns_test.go index 07aa1702e87..fee41cbb473 100644 --- a/test/e2e/dns_test.go +++ b/test/e2e/dns_test.go @@ -11,8 +11,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" ) var _ = Describe("DNS E2E Test", func() { diff --git a/test/e2e/dynamic_forward_proxy_test.go b/test/e2e/dynamic_forward_proxy_test.go index 1ddff4fee75..32b3aaa84c2 100644 --- a/test/e2e/dynamic_forward_proxy_test.go +++ b/test/e2e/dynamic_forward_proxy_test.go @@ -3,26 +3,26 @@ package e2e_test import ( - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - defaults2 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" + defaults2 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" "net/http" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/helpers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/dynamic_forward_proxy" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/dynamic_forward_proxy" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("dynamic forward proxy", func() { diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index aeb2956a943..29c95143997 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -5,11 +5,11 @@ package e2e_test import ( "testing" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/ginkgo/labels" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/labels" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -18,9 +18,9 @@ import ( "github.com/solo-io/go-utils/contextutils" "github.com/solo-io/solo-kit/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" ) func TestE2e(t *testing.T) { diff --git a/test/e2e/example_test.go b/test/e2e/example_test.go index c15913b325d..a42aae0637d 100644 --- a/test/e2e/example_test.go +++ b/test/e2e/example_test.go @@ -6,17 +6,17 @@ import ( "fmt" "net/http" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/v1helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("Example E2E Test For Developers", Label(), func() { diff --git a/test/e2e/fault_injection_test.go b/test/e2e/fault_injection_test.go index 9652c4a4bac..50183e40a14 100644 --- a/test/e2e/fault_injection_test.go +++ b/test/e2e/fault_injection_test.go @@ -6,19 +6,19 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/utils/prototime" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - fault "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/faultinjection" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + fault "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/faultinjection" ) var _ = Describe("Fault Injection", func() { diff --git a/test/e2e/gateway_test.go b/test/e2e/gateway_test.go index ef6d0b21141..e617995d5f9 100644 --- a/test/e2e/gateway_test.go +++ b/test/e2e/gateway_test.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/rotisserie/eris" "google.golang.org/protobuf/types/known/wrapperspb" @@ -24,19 +24,19 @@ import ( "github.com/solo-io/solo-kit/pkg/utils/kubeutils" corev1 "k8s.io/api/core/v1" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - v3 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/core/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - extauthv1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" - "github.com/kgateway-dev/kgateway/pkg/utils/statsutils/metrics" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + v3 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/core/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + extauthv1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/statsutils/metrics" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) const ( diff --git a/test/e2e/grpc_discovery_test.go b/test/e2e/grpc_discovery_test.go index 76d363e716a..42a8a22524c 100644 --- a/test/e2e/grpc_discovery_test.go +++ b/test/e2e/grpc_discovery_test.go @@ -5,27 +5,27 @@ package e2e_test import ( "context" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/grpc" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/grpc" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Discovery", func() { diff --git a/test/e2e/grpc_json_test.go b/test/e2e/grpc_json_test.go index a98c89cdb6b..0abe2b4f16f 100644 --- a/test/e2e/grpc_json_test.go +++ b/test/e2e/grpc_json_test.go @@ -10,11 +10,11 @@ import ( "net/http" "os" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" "github.com/onsi/gomega/format" @@ -25,17 +25,17 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gwdefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/grpc_json" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" - - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/grpc_json" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" + + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Envoy API", func() { diff --git a/test/e2e/grpc_plugin_test.go b/test/e2e/grpc_plugin_test.go index 305f1322f5b..64435a9f93c 100644 --- a/test/e2e/grpc_plugin_test.go +++ b/test/e2e/grpc_plugin_test.go @@ -11,32 +11,32 @@ import ( "net/http" "os" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options" "github.com/golang/protobuf/ptypes/wrappers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gwdefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/grpc" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gwdefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/grpc" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" ) var _ = Describe("GRPC to JSON Transcoding Plugin - Gloo API", func() { diff --git a/test/e2e/gzip_test.go b/test/e2e/gzip_test.go index 3ebc63eca8e..eb1405e7a3a 100644 --- a/test/e2e/gzip_test.go +++ b/test/e2e/gzip_test.go @@ -3,23 +3,23 @@ package e2e_test import ( - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "net/http" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloogzip "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/filter/http/gzip/v2" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gloogzip "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/filter/http/gzip/v2" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("gzip", func() { diff --git a/test/e2e/happypath_test.go b/test/e2e/happypath_test.go index b56ffdc6475..311ad61c8e0 100644 --- a/test/e2e/happypath_test.go +++ b/test/e2e/happypath_test.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "google.golang.org/protobuf/types/known/wrapperspb" @@ -23,18 +23,18 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/healthcheck" - routerV1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/router" - static_plugin_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/stats" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - testhelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/healthcheck" + routerV1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/router" + static_plugin_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/stats" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + testhelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("Happy path", func() { diff --git a/test/e2e/header_validation_test.go b/test/e2e/header_validation_test.go index e9b53a9952a..67645468004 100644 --- a/test/e2e/header_validation_test.go +++ b/test/e2e/header_validation_test.go @@ -5,17 +5,17 @@ package e2e_test import ( "net/http" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - header_validation "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/header_validation" - "github.com/kgateway-dev/kgateway/test/e2e" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + header_validation "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/header_validation" + "github.com/kgateway-dev/kgateway/v2/test/e2e" ) var _ = Describe("Header Validation", Label(), func() { diff --git a/test/e2e/headers_test.go b/test/e2e/headers_test.go index 6977b6b4c1f..b18d890c982 100644 --- a/test/e2e/headers_test.go +++ b/test/e2e/headers_test.go @@ -22,21 +22,21 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" coreV1 "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - envoytrace_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/trace/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/hcm" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/headers" - static_plugin_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/tracing" - "github.com/kgateway-dev/kgateway/pkg/utils/api_conversion" - "github.com/kgateway-dev/kgateway/test/e2e" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/kgateway-dev/kgateway/test/v1helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + envoytrace_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/trace/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/headers" + static_plugin_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/tracing" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/api_conversion" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("HeaderManipulation", func() { diff --git a/test/e2e/health_checks_test.go b/test/e2e/health_checks_test.go index d744bdcfb5c..0bae02cb7ed 100644 --- a/test/e2e/health_checks_test.go +++ b/test/e2e/health_checks_test.go @@ -11,19 +11,19 @@ import ( "regexp" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - v3 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/core/v3" + v3 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/core/v3" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" "github.com/golang/protobuf/ptypes/wrappers" @@ -35,14 +35,14 @@ import ( . "github.com/onsi/gomega/gstruct" "github.com/solo-io/solo-kit/pkg/api/v1/clients" - gwdefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" - "github.com/kgateway-dev/kgateway/pkg/utils/api_conversion" - . "github.com/kgateway-dev/kgateway/test/gomega" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gwdefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/api_conversion" + . "github.com/kgateway-dev/kgateway/v2/test/gomega" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("Health Checks", func() { diff --git a/test/e2e/http_tunneling_test.go b/test/e2e/http_tunneling_test.go index 74413463b02..858f4680599 100644 --- a/test/e2e/http_tunneling_test.go +++ b/test/e2e/http_tunneling_test.go @@ -19,32 +19,32 @@ import ( "syscall" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/v1helpers" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" "github.com/golang/protobuf/ptypes/wrappers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - static_plugin_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + static_plugin_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - testhelpers "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + testhelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/clients" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/services" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/services" ) var _ = Describe("tunneling", func() { diff --git a/test/e2e/hybrid_test.go b/test/e2e/hybrid_test.go index f47c66829c7..d2f99c81c88 100644 --- a/test/e2e/hybrid_test.go +++ b/test/e2e/hybrid_test.go @@ -15,22 +15,22 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - v3 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/core/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/headers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/proxy_protocol" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/test/e2e" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + v3 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/core/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/headers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/proxy_protocol" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/test/e2e" ) type ClientConnectionProperties struct { diff --git a/test/e2e/loadbalancer_plugin_test.go b/test/e2e/loadbalancer_plugin_test.go index 38f11ec7972..40c0f291a51 100644 --- a/test/e2e/loadbalancer_plugin_test.go +++ b/test/e2e/loadbalancer_plugin_test.go @@ -3,18 +3,18 @@ package e2e_test import ( - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" envoy_admin_v3 "github.com/envoyproxy/go-control-plane/envoy/admin/v3" envoy_config_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - glooV1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + glooV1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) // setupLBPluginTest sets up a test context with a virtual service that uses the provided load balancer config diff --git a/test/e2e/local_ratelimit_test.go b/test/e2e/local_ratelimit_test.go index fef248f0d95..8539baf69a6 100644 --- a/test/e2e/local_ratelimit_test.go +++ b/test/e2e/local_ratelimit_test.go @@ -9,16 +9,16 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - gloo_matchers "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/ratelimit" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/local_ratelimit" - local_ratelimit_plugin "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/local_ratelimit" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/testutils" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + gloo_matchers "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/ratelimit" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/local_ratelimit" + local_ratelimit_plugin "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/local_ratelimit" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/proxy_protocol_test.go b/test/e2e/proxy_protocol_test.go index 193a6ff3705..71b4052fb9e 100644 --- a/test/e2e/proxy_protocol_test.go +++ b/test/e2e/proxy_protocol_test.go @@ -5,21 +5,21 @@ package e2e_test import ( "net/http" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/test/e2e" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var ( diff --git a/test/e2e/ratelimit_test.go b/test/e2e/ratelimit_test.go index 1f8871b579c..72607fed39c 100644 --- a/test/e2e/ratelimit_test.go +++ b/test/e2e/ratelimit_test.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -28,13 +28,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/reflection" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/ratelimit" - gloov1static "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/ratelimit" + gloov1static "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) type acceptOrDenyRateLimitServer struct { diff --git a/test/e2e/route_transformation_test.go b/test/e2e/route_transformation_test.go index 36de6ec0064..bc96a71dd16 100644 --- a/test/e2e/route_transformation_test.go +++ b/test/e2e/route_transformation_test.go @@ -8,23 +8,23 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/golang/protobuf/ptypes/wrappers" "github.com/onsi/gomega/gstruct" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/e2e" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/v1helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" ) var _ = Describe("Transformations", func() { diff --git a/test/e2e/staged_transformation_test.go b/test/e2e/staged_transformation_test.go index ec796136a9b..524f61c3001 100644 --- a/test/e2e/staged_transformation_test.go +++ b/test/e2e/staged_transformation_test.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap/zapcore" "google.golang.org/protobuf/types/known/wrapperspb" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" structpb "github.com/golang/protobuf/ptypes/struct" "github.com/golang/protobuf/ptypes/wrappers" @@ -17,22 +17,22 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - extauthv1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - gloov1static "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + gloov1static "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" "net/http" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/e2e" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" ) var _ = Describe("Staged Transformation", FlakeAttempts(3), func() { diff --git a/test/e2e/tcp_stats_test.go b/test/e2e/tcp_stats_test.go index 12d5d5d709e..d9f18cba9e0 100644 --- a/test/e2e/tcp_stats_test.go +++ b/test/e2e/tcp_stats_test.go @@ -3,21 +3,21 @@ package e2e_test import ( - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/test/e2e" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("TCP Stats transport_socket", func() { diff --git a/test/e2e/test_context.go b/test/e2e/test_context.go index eb31b0c4518..27e950da02e 100644 --- a/test/e2e/test_context.go +++ b/test/e2e/test_context.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" @@ -18,14 +18,14 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) const ( diff --git a/test/e2e/tls_ocsp_test.go b/test/e2e/tls_ocsp_test.go index fffccfba70d..c4d998d15ef 100644 --- a/test/e2e/tls_ocsp_test.go +++ b/test/e2e/tls_ocsp_test.go @@ -11,14 +11,14 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "golang.org/x/crypto/ocsp" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/testutils" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) var _ = Describe("TLS OCSP e2e", func() { diff --git a/test/e2e/vault_aws_test.go b/test/e2e/vault_aws_test.go index 917238b9403..33437e2604a 100644 --- a/test/e2e/vault_aws_test.go +++ b/test/e2e/vault_aws_test.go @@ -12,14 +12,14 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "go.opencensus.io/stats/view" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - bootstrap "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients/vault" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" - "github.com/kgateway-dev/kgateway/test/testutils" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + bootstrap "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) const ( diff --git a/test/e2e/vault_test.go b/test/e2e/vault_test.go index e568530b3a4..e4dd47aacfe 100644 --- a/test/e2e/vault_test.go +++ b/test/e2e/vault_test.go @@ -6,13 +6,13 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - bootstrap "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients/vault" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/ginkgo/decorators" - "github.com/kgateway-dev/kgateway/test/services" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + bootstrap "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/decorators" + "github.com/kgateway-dev/kgateway/v2/test/services" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/zipkin_test.go b/test/e2e/zipkin_test.go index e771ddfef9e..ad9efc1af6b 100644 --- a/test/e2e/zipkin_test.go +++ b/test/e2e/zipkin_test.go @@ -10,35 +10,35 @@ import ( "net/http" "time" - "github.com/kgateway-dev/kgateway/test/e2e" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/e2e" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/hcm" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - envoytrace_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/trace/v3" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - static_plugin_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/tracing" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + envoytrace_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/trace/v3" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + static_plugin_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/tracing" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/test/gomega" + . "github.com/kgateway-dev/kgateway/v2/test/gomega" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" ) const ( diff --git a/test/ginkgo/parallel/ports_test.go b/test/ginkgo/parallel/ports_test.go index 081c2bd9687..6c164bc691d 100644 --- a/test/ginkgo/parallel/ports_test.go +++ b/test/ginkgo/parallel/ports_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" "github.com/rotisserie/eris" - "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/parallel" ) var _ = Describe("Ports", func() { diff --git a/test/gomega/assertions/goroutines.go b/test/gomega/assertions/goroutines.go index 6af1cbab8a7..645e23e0c91 100644 --- a/test/gomega/assertions/goroutines.go +++ b/test/gomega/assertions/goroutines.go @@ -9,7 +9,7 @@ import ( "github.com/onsi/gomega/gleak" "github.com/onsi/gomega/types" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) // GoRoutineMonitor is a helper for monitoring goroutine leaks in tests diff --git a/test/gomega/assertions/goroutines_test.go b/test/gomega/assertions/goroutines_test.go index 9dbdc3dc9cd..7845e54140b 100644 --- a/test/gomega/assertions/goroutines_test.go +++ b/test/gomega/assertions/goroutines_test.go @@ -10,7 +10,7 @@ import ( "github.com/onsi/gomega/gleak" "github.com/onsi/gomega/types" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" ) var _ = Describe("GoRoutineMonitor", func() { @@ -42,7 +42,7 @@ var _ = Describe("GoRoutineMonitor", func() { monitor.ExpectNoLeaks(&assertions.ExpectNoLeaksArgs{ AllowedRoutines: []types.GomegaMatcher{ - gleak.IgnoringInBacktrace("github.com/kgateway-dev/kgateway/test/gomega/assertions_test.init"), + gleak.IgnoringInBacktrace("github.com/kgateway-dev/kgateway/v2/test/gomega/assertions_test.init"), }, }) diff --git a/test/gomega/assertions/logging.go b/test/gomega/assertions/logging.go index f65fde978a7..c47bc3bc0d2 100644 --- a/test/gomega/assertions/logging.go +++ b/test/gomega/assertions/logging.go @@ -6,14 +6,14 @@ import ( "fmt" "net/http" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" "github.com/solo-io/go-utils/stats" "go.uber.org/zap/zapcore" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) // LogLevelAssertion returns an Assertion to verify that the dynamic log level matches the provided value diff --git a/test/gomega/assertions/stats.go b/test/gomega/assertions/stats.go index 4f3b4d50c3e..11b43845505 100644 --- a/test/gomega/assertions/stats.go +++ b/test/gomega/assertions/stats.go @@ -14,16 +14,16 @@ import ( "k8s.io/utils/pointer" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" "github.com/solo-io/go-utils/stats" - "github.com/kgateway-dev/kgateway/pkg/cliutil" + "github.com/kgateway-dev/kgateway/v2/pkg/cliutil" ) // Gloo Edge exports statistics to provide details about how the system is behaving diff --git a/test/gomega/matchers/benchmark.go b/test/gomega/matchers/benchmark.go index 0480e36b19f..5dc72894899 100644 --- a/test/gomega/matchers/benchmark.go +++ b/test/gomega/matchers/benchmark.go @@ -5,7 +5,7 @@ package matchers import ( "time" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" "github.com/onsi/gomega" "github.com/onsi/gomega/types" diff --git a/test/gomega/matchers/benchmark_test.go b/test/gomega/matchers/benchmark_test.go index b3a0dd88aae..1a3f63de3bd 100644 --- a/test/gomega/matchers/benchmark_test.go +++ b/test/gomega/matchers/benchmark_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("Benchmark", func() { diff --git a/test/gomega/matchers/contain_headers.go b/test/gomega/matchers/contain_headers.go index f8d4c8233ff..dd00ededba9 100644 --- a/test/gomega/matchers/contain_headers.go +++ b/test/gomega/matchers/contain_headers.go @@ -10,7 +10,7 @@ import ( "github.com/onsi/gomega/gstruct" "github.com/onsi/gomega/types" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" ) // ContainHeaders produces a matcher that will only match if all provided headers diff --git a/test/gomega/matchers/contain_headers_test.go b/test/gomega/matchers/contain_headers_test.go index d3d16b5f405..cedd21cb45a 100644 --- a/test/gomega/matchers/contain_headers_test.go +++ b/test/gomega/matchers/contain_headers_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("ContainHeaders", func() { diff --git a/test/gomega/matchers/contain_map_elements_test.go b/test/gomega/matchers/contain_map_elements_test.go index 07353733b11..d1662817c6e 100644 --- a/test/gomega/matchers/contain_map_elements_test.go +++ b/test/gomega/matchers/contain_map_elements_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("ContainMapElements", func() { diff --git a/test/gomega/matchers/contain_substrings_test.go b/test/gomega/matchers/contain_substrings_test.go index 85ffbf459d4..c7203c00503 100644 --- a/test/gomega/matchers/contain_substrings_test.go +++ b/test/gomega/matchers/contain_substrings_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("ContainSubstrings", func() { diff --git a/test/gomega/matchers/custom_resource_test.go b/test/gomega/matchers/custom_resource_test.go index 837fd0c88dd..8f18d2fc8a7 100644 --- a/test/gomega/matchers/custom_resource_test.go +++ b/test/gomega/matchers/custom_resource_test.go @@ -11,9 +11,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("CustomResource", func() { diff --git a/test/gomega/matchers/json_contains_test.go b/test/gomega/matchers/json_contains_test.go index 9aff138db39..3ca7b95a311 100644 --- a/test/gomega/matchers/json_contains_test.go +++ b/test/gomega/matchers/json_contains_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var _ = Describe("JSON", func() { diff --git a/test/gomega/transforms/benchmark.go b/test/gomega/transforms/benchmark.go index 681b573c172..34f15b3b31f 100644 --- a/test/gomega/transforms/benchmark.go +++ b/test/gomega/transforms/benchmark.go @@ -6,7 +6,7 @@ import ( "sort" "time" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) // WithPercentile returns a function that extracts the value at the given percentile from a slice of durations diff --git a/test/gomega/transforms/curl.go b/test/gomega/transforms/curl.go index cdb328f5b71..6e3b21abf17 100644 --- a/test/gomega/transforms/curl.go +++ b/test/gomega/transforms/curl.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) const ( diff --git a/test/gomega/transforms/curl_test.go b/test/gomega/transforms/curl_test.go index 8be72b3211f..765b0209e74 100644 --- a/test/gomega/transforms/curl_test.go +++ b/test/gomega/transforms/curl_test.go @@ -6,12 +6,12 @@ import ( "fmt" "net/http" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" "github.com/onsi/gomega/gstruct" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/helpers/benchmark.go b/test/helpers/benchmark.go index 104731591ec..dde35daaee1 100644 --- a/test/helpers/benchmark.go +++ b/test/helpers/benchmark.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/onsi/gomega/types" ) diff --git a/test/helpers/certs.go b/test/helpers/certs.go index a7c3c3c642c..f8fc4e768ce 100644 --- a/test/helpers/certs.go +++ b/test/helpers/certs.go @@ -24,7 +24,7 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" corev1 "k8s.io/api/core/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" "golang.org/x/crypto/ocsp" diff --git a/test/helpers/default_gateways.go b/test/helpers/default_gateways.go index c4961c631dd..a6bd1816d79 100644 --- a/test/helpers/default_gateways.go +++ b/test/helpers/default_gateways.go @@ -5,8 +5,8 @@ package helpers import ( "github.com/solo-io/solo-kit/pkg/api/v1/clients" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" ) func WriteDefaultGateways(writeNamespace string, gatewayClient v1.GatewayClient) error { diff --git a/test/helpers/endpoints.go b/test/helpers/endpoints.go index 8ea8c88930a..886c4ae7403 100644 --- a/test/helpers/endpoints.go +++ b/test/helpers/endpoints.go @@ -2,7 +2,7 @@ package helpers -import v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" +import v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" // EndpointBuilder contains options for building Endpoints to be included in scaled Snapshots // there are no options currently configurable for the endpointBuilder diff --git a/test/helpers/glooctl_debug_dump.go b/test/helpers/glooctl_debug_dump.go index df1f40052f1..89a83ccea7c 100644 --- a/test/helpers/glooctl_debug_dump.go +++ b/test/helpers/glooctl_debug_dump.go @@ -8,7 +8,7 @@ import ( "github.com/solo-io/go-utils/testutils" - "github.com/kgateway-dev/kgateway/pkg/cliutil" + "github.com/kgateway-dev/kgateway/v2/pkg/cliutil" ) func RegisterGlooDebugLogPrintHandlerAndClearLogs() { diff --git a/test/helpers/kube_dump.go b/test/helpers/kube_dump.go index 444620f0c25..44ff7e585ed 100644 --- a/test/helpers/kube_dump.go +++ b/test/helpers/kube_dump.go @@ -17,13 +17,13 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/internal/kgateway/admin" - kgatewayAdminCli "github.com/kgateway-dev/kgateway/pkg/utils/controllerutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/admin" + kgatewayAdminCli "github.com/kgateway-dev/kgateway/v2/pkg/utils/controllerutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) // StandardKgatewayDumpOnFail creates a dump of the kubernetes state and certain envoy data from diff --git a/test/helpers/resource_clientset.go b/test/helpers/resource_clientset.go index 44050891d18..9e1ee6264d1 100644 --- a/test/helpers/resource_clientset.go +++ b/test/helpers/resource_clientset.go @@ -3,10 +3,10 @@ package helpers import ( - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - externalrl "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/solo/ratelimit" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - extauthv1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + externalrl "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/solo/ratelimit" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" ) type ResourceClientSet interface { diff --git a/test/helpers/resources.go b/test/helpers/resources.go index 097c8840468..73a079db367 100644 --- a/test/helpers/resources.go +++ b/test/helpers/resources.go @@ -7,9 +7,9 @@ import ( "github.com/onsi/gomega/types" - "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/statusutils" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" diff --git a/test/helpers/route_tables.go b/test/helpers/route_tables.go index 51d24603ec2..7f098165b7c 100644 --- a/test/helpers/route_tables.go +++ b/test/helpers/route_tables.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" ) // RouteTableBuilder simplifies the process of generating RouteTables in tests diff --git a/test/helpers/routes.go b/test/helpers/routes.go index eda3e6ec7f7..843fa8852dc 100644 --- a/test/helpers/routes.go +++ b/test/helpers/routes.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" ) const ( diff --git a/test/helpers/scaled_snapshots.go b/test/helpers/scaled_snapshots.go index 5815b9fb455..cd48eb4a58e 100644 --- a/test/helpers/scaled_snapshots.go +++ b/test/helpers/scaled_snapshots.go @@ -5,20 +5,20 @@ package helpers import ( "fmt" - v12 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + v12 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/golang/protobuf/ptypes/wrappers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v3 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/config/core/v3" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - v1static "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" + v3 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/config/core/v3" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + v1static "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" ) // ScaledSnapshotBuilder enumerates the number of each type of resource that should be included in a snapshot and diff --git a/test/helpers/scaled_snapshots_test.go b/test/helpers/scaled_snapshots_test.go index 19a599c081e..29397ba39ca 100644 --- a/test/helpers/scaled_snapshots_test.go +++ b/test/helpers/scaled_snapshots_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/test/helpers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("ScaledSnapshotBuilder", func() { diff --git a/test/helpers/secrets.go b/test/helpers/secrets.go index 076d65b3eba..3a22514fd8b 100644 --- a/test/helpers/secrets.go +++ b/test/helpers/secrets.go @@ -2,7 +2,7 @@ package helpers -import v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" +import v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" // SecretBuilder contains options for building Secrets to be included in scaled Snapshots // there are no options currently configurable for the SecretBuilder diff --git a/test/helpers/snapshot_writer.go b/test/helpers/snapshot_writer.go index 9f7da71786e..3c40ccd3c01 100644 --- a/test/helpers/snapshot_writer.go +++ b/test/helpers/snapshot_writer.go @@ -7,13 +7,13 @@ import ( "github.com/onsi/ginkgo/v2" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/avast/retry-go" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/errors" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" ) var _ SnapshotWriter = new(SnapshotWriterImpl) diff --git a/test/helpers/timeouts.go b/test/helpers/timeouts.go index 6d7a66c15ab..2ade5f2e66e 100644 --- a/test/helpers/timeouts.go +++ b/test/helpers/timeouts.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega" + "github.com/kgateway-dev/kgateway/v2/test/gomega" ) const ( diff --git a/test/helpers/upstreams.go b/test/helpers/upstreams.go index 28b2a074f6d..207141e3779 100644 --- a/test/helpers/upstreams.go +++ b/test/helpers/upstreams.go @@ -5,9 +5,9 @@ package helpers import ( "fmt" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/envoy/api/v2/core" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/envoy/api/v2/core" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" ) // UpstreamBuilder contains options for building Upstreams to be included in scaled Snapshots diff --git a/test/helpers/upstreams_test.go b/test/helpers/upstreams_test.go index 90cb09cbc93..b0f90b8c3a4 100644 --- a/test/helpers/upstreams_test.go +++ b/test/helpers/upstreams_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("UpstreamBuilder", func() { diff --git a/test/helpers/util_test.go b/test/helpers/util_test.go index c18d8fdb7b8..309b3b3fad3 100644 --- a/test/helpers/util_test.go +++ b/test/helpers/util_test.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/gomega" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("PercentileIndex", func() { diff --git a/test/helpers/virtual_services.go b/test/helpers/virtual_services.go index abb4bea6a5d..cd0122db7aa 100644 --- a/test/helpers/virtual_services.go +++ b/test/helpers/virtual_services.go @@ -9,10 +9,10 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" ) // VirtualServiceBuilder simplifies the process of generating VirtualServices in tests diff --git a/test/helpers/virtual_services_test.go b/test/helpers/virtual_services_test.go index 2e51dad5100..facfbe3f2e5 100644 --- a/test/helpers/virtual_services_test.go +++ b/test/helpers/virtual_services_test.go @@ -9,12 +9,12 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/test/matchers" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/cors" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" - "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/cors" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ = Describe("VirtualServiceBuilder", func() { diff --git a/test/kube2e/gateway/gateway_suite_test.go b/test/kube2e/gateway/gateway_suite_test.go index c1e687c930c..3cc9a1bd5f0 100644 --- a/test/kube2e/gateway/gateway_suite_test.go +++ b/test/kube2e/gateway/gateway_suite_test.go @@ -11,24 +11,24 @@ import ( "github.com/solo-io/skv2/codegen/util" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/cluster" - kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/clients" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" - kubeutils2 "github.com/kgateway-dev/kgateway/test/testutils" + kubeutils2 "github.com/kgateway-dev/kgateway/v2/test/testutils" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" - gloodefaults "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + gloodefaults "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" skhelpers "github.com/solo-io/solo-kit/test/helpers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" - testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" + testruntime "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/runtime" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/kube2e/gateway/gateway_test.go b/test/kube2e/gateway/gateway_test.go index 517373cb7a8..5ecbf275f37 100644 --- a/test/kube2e/gateway/gateway_test.go +++ b/test/kube2e/gateway/gateway_test.go @@ -8,23 +8,23 @@ import ( "os" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/google/uuid" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/compress" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/compress" gloo_matchers "github.com/solo-io/solo-kit/test/matchers" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/utils" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/utils" "google.golang.org/grpc" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/grpc/debug" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/grpc/debug" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "sigs.k8s.io/controller-runtime/pkg/client" @@ -45,22 +45,22 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "sigs.k8s.io/yaml" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - gloov1plugins "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/cors" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/headers" - glootransformation "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/transformation" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - defaults2 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - kubernetesplugin "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/kubernetes" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/linkerd" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + gloov1plugins "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/cors" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/headers" + glootransformation "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/transformation" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + defaults2 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + kubernetesplugin "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/linkerd" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" ) var _ = Describe("Kube2e: gateway", func() { diff --git a/test/kube2e/gateway/robustness_test.go b/test/kube2e/gateway/robustness_test.go index b016c4c3d99..4ed2ef48f44 100644 --- a/test/kube2e/gateway/robustness_test.go +++ b/test/kube2e/gateway/robustness_test.go @@ -15,25 +15,25 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" - gloostatusutils "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" + gloostatusutils "github.com/kgateway-dev/kgateway/v2/pkg/utils/statusutils" "github.com/rotisserie/eris" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/services/k8sadmission" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/services/k8sadmission" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" testutils "github.com/solo-io/k8s-utils/testutils/kube" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" "k8s.io/apimachinery/pkg/labels" @@ -45,8 +45,8 @@ import ( "k8s.io/client-go/kubernetes" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) var _ = Describe("Robustness tests", func() { diff --git a/test/kube2e/gloo/bootstrap_clients_test.go b/test/kube2e/gloo/bootstrap_clients_test.go index 4207094c0d2..eb5c0b0799b 100644 --- a/test/kube2e/gloo/bootstrap_clients_test.go +++ b/test/kube2e/gloo/bootstrap_clients_test.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/kube" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" - kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector/kube" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" + kubetestclients "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/clients" "github.com/onsi/gomega/gstruct" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" @@ -27,22 +27,22 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - vault_client "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients/vault" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + vault_client "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/kgateway-dev/kgateway/test/gomega" + . "github.com/kgateway-dev/kgateway/v2/test/gomega" vaultapi "github.com/hashicorp/vault/api" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients" ) // Kubernetes tests for clients generated from projects/gloo/pkg/bootstrap/clients diff --git a/test/kube2e/gloo/eds_test.go b/test/kube2e/gloo/eds_test.go index ee20c13b2f0..0c5ce1e81b3 100644 --- a/test/kube2e/gloo/eds_test.go +++ b/test/kube2e/gloo/eds_test.go @@ -10,12 +10,12 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" "github.com/solo-io/solo-kit/pkg/api/v1/clients" ) diff --git a/test/kube2e/gloo/generated_kube_types_test.go b/test/kube2e/gloo/generated_kube_types_test.go index 1ccbf263bf6..4e9a1fe0e04 100644 --- a/test/kube2e/gloo/generated_kube_types_test.go +++ b/test/kube2e/gloo/generated_kube_types_test.go @@ -9,16 +9,16 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" - - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gatewayv1kubetypes "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - gatewayv1kube "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1/kube/client/clientset/versioned/typed/gateway.solo.io/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - gloov1kubetypes "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - gloov1kube "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/kube/client/clientset/versioned/typed/gloo.solo.io/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" + kubetestclients "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/clients" + + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gatewayv1kubetypes "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + gatewayv1kube "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1/kube/client/clientset/versioned/typed/gateway.solo.io/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + gloov1kubetypes "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + gloov1kube "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/kube/client/clientset/versioned/typed/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" ) // Tests generated code in projects/gateway/pkg/api/v1/kube diff --git a/test/kube2e/gloo/gloo_resources_test.go b/test/kube2e/gloo/gloo_resources_test.go index 67516eae591..9b204332863 100644 --- a/test/kube2e/gloo/gloo_resources_test.go +++ b/test/kube2e/gloo/gloo_resources_test.go @@ -16,16 +16,16 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/solo-io/solo-kit/test/matchers" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/kubernetes" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/kubernetes/serviceconverter" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/kubernetes" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/kubernetes/serviceconverter" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" ) var _ = Describe("GlooResourcesTest", func() { diff --git a/test/kube2e/gloo/gloo_suite_test.go b/test/kube2e/gloo/gloo_suite_test.go index 37900bbe1a9..b3f38e74501 100644 --- a/test/kube2e/gloo/gloo_suite_test.go +++ b/test/kube2e/gloo/gloo_suite_test.go @@ -11,25 +11,25 @@ import ( "github.com/solo-io/skv2/codegen/util" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/cluster" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" "github.com/avast/retry-go" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" "github.com/solo-io/go-utils/testutils" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" - testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" - glootestutils "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" + testruntime "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/runtime" + glootestutils "github.com/kgateway-dev/kgateway/v2/test/testutils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/kube2e/gloo/happypath_test.go b/test/kube2e/gloo/happypath_test.go index 8b0efe00fc1..0aeacd8bd15 100644 --- a/test/kube2e/gloo/happypath_test.go +++ b/test/kube2e/gloo/happypath_test.go @@ -7,11 +7,11 @@ import ( "net" "strings" - kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/clients" corev1 "k8s.io/api/core/v1" - "github.com/kgateway-dev/kgateway/test/services/envoy" + "github.com/kgateway-dev/kgateway/v2/test/services/envoy" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" @@ -24,11 +24,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - gatewaydefaults "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - testhelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/services" - "github.com/kgateway-dev/kgateway/test/v1helpers" + gatewaydefaults "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + testhelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/services" + "github.com/kgateway-dev/kgateway/v2/test/v1helpers" ) var _ = Describe("Happy path", func() { diff --git a/test/kube2e/gloo/kubernetes_test.go b/test/kube2e/gloo/kubernetes_test.go index fc1fdd9de2b..22bed4b1c0d 100644 --- a/test/kube2e/gloo/kubernetes_test.go +++ b/test/kube2e/gloo/kubernetes_test.go @@ -18,10 +18,10 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - kubepluginapi "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/kubernetes" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/discovery" - kubeplugin "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/kubernetes" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + kubepluginapi "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/kubernetes" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/discovery" + kubeplugin "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/kubernetes" "k8s.io/client-go/kubernetes" ) diff --git a/test/kube2e/gloo/setup_syncer_test.go b/test/kube2e/gloo/setup_syncer_test.go index 2224e2ec242..8b08867c99f 100644 --- a/test/kube2e/gloo/setup_syncer_test.go +++ b/test/kube2e/gloo/setup_syncer_test.go @@ -8,21 +8,21 @@ import ( "sync" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" - "github.com/kgateway-dev/kgateway/pkg/utils/settingsutil" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/settingsutil" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/syncer/setup" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/xds" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" - "github.com/kgateway-dev/kgateway/pkg/utils/setuputils" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/xds" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/setuputils" "github.com/solo-io/solo-kit/pkg/api/v1/clients" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/golang/protobuf/ptypes/wrappers" . "github.com/onsi/ginkgo/v2" @@ -32,9 +32,9 @@ import ( "github.com/solo-io/solo-kit/pkg/utils/prototime" "google.golang.org/grpc" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/grpc/validation" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/grpc/validation" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" ) var _ = Describe("Setup Syncer", func() { diff --git a/test/kube2e/gloo/snapshot_writer_test.go b/test/kube2e/gloo/snapshot_writer_test.go index 837736a9159..ee0af4008f2 100644 --- a/test/kube2e/gloo/snapshot_writer_test.go +++ b/test/kube2e/gloo/snapshot_writer_test.go @@ -8,16 +8,16 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/helpers" "github.com/solo-io/solo-kit/pkg/api/v1/clients" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" ) // This tests the gloo/test/helpers/snapshot_writer.go functionality in a Kubernetes cluster diff --git a/test/kube2e/helper/curl.go b/test/kube2e/helper/curl.go index 192a352308c..da402fb9965 100644 --- a/test/kube2e/helper/curl.go +++ b/test/kube2e/helper/curl.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega/types" @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" "github.com/solo-io/go-utils/log" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" ) const ( diff --git a/test/kube2e/helper/curl_test.go b/test/kube2e/helper/curl_test.go index f00b1bdd554..850d14a14de 100644 --- a/test/kube2e/helper/curl_test.go +++ b/test/kube2e/helper/curl_test.go @@ -5,8 +5,8 @@ package helper_test import ( "time" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" - . "github.com/kgateway-dev/kgateway/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" + . "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/kube2e/helper/install.go b/test/kube2e/helper/install.go index 0e0e2b28ac7..5ef340b4489 100644 --- a/test/kube2e/helper/install.go +++ b/test/kube2e/helper/install.go @@ -21,7 +21,7 @@ import ( "github.com/solo-io/go-utils/testutils/exec" "github.com/solo-io/k8s-utils/testutils/kube" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) const ( diff --git a/test/kube2e/helper/test_container.go b/test/kube2e/helper/test_container.go index 06c009e50d0..d79b88c6967 100644 --- a/test/kube2e/helper/test_container.go +++ b/test/kube2e/helper/test_container.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" "github.com/pkg/errors" "github.com/solo-io/go-utils/log" diff --git a/test/kube2e/helper/test_container_test.go b/test/kube2e/helper/test_container_test.go index 2735e8e0592..ef76618c6a9 100644 --- a/test/kube2e/helper/test_container_test.go +++ b/test/kube2e/helper/test_container_test.go @@ -8,7 +8,7 @@ import ( "os" "time" - . "github.com/kgateway-dev/kgateway/test/kube2e/helper" + . "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" "github.com/solo-io/go-utils/log" "github.com/solo-io/go-utils/testutils" diff --git a/test/kube2e/resource_clientset.go b/test/kube2e/resource_clientset.go index ae606e71848..dc6b44cf0e5 100644 --- a/test/kube2e/resource_clientset.go +++ b/test/kube2e/resource_clientset.go @@ -5,7 +5,7 @@ package kube2e import ( "context" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" "github.com/solo-io/solo-kit/pkg/api/external/kubernetes/service" "github.com/solo-io/solo-kit/pkg/api/v1/clients/factory" @@ -17,12 +17,12 @@ import ( gwclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned" gatewayclient "sigs.k8s.io/gateway-api/pkg/client/clientset/versioned/typed/apis/v1" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - kubeconverters "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/converters/kube" - externalrl "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/solo/ratelimit" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - extauthv1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - "github.com/kgateway-dev/kgateway/test/helpers" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + kubeconverters "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/converters/kube" + externalrl "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/solo/ratelimit" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + extauthv1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) var _ helpers.ResourceClientSet = new(KubeResourceClientSet) diff --git a/test/kube2e/upgrade/upgrade_data_validation_test.go b/test/kube2e/upgrade/upgrade_data_validation_test.go index 662d3f91b29..d3b1a116e95 100644 --- a/test/kube2e/upgrade/upgrade_data_validation_test.go +++ b/test/kube2e/upgrade/upgrade_data_validation_test.go @@ -5,7 +5,7 @@ package upgrade_test import ( "time" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" ) // this package follows the current strategy in enterprise upgrade tests of using curl to test validity of traffic routing. diff --git a/test/kube2e/upgrade/upgrade_suite_test.go b/test/kube2e/upgrade/upgrade_suite_test.go index 4f8bfab39f1..29ba9beb27b 100644 --- a/test/kube2e/upgrade/upgrade_suite_test.go +++ b/test/kube2e/upgrade/upgrade_suite_test.go @@ -8,19 +8,19 @@ import ( "path/filepath" "testing" - "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/helmutils" . "github.com/onsi/gomega" "github.com/solo-io/go-utils/versionutils" "github.com/solo-io/skv2/codegen/util" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" . "github.com/onsi/ginkgo/v2" skhelpers "github.com/solo-io/solo-kit/test/helpers" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) func TestUpgrade(t *testing.T) { diff --git a/test/kube2e/upgrade/upgrade_test.go b/test/kube2e/upgrade/upgrade_test.go index 52212b95f6b..ed7b4f84cad 100644 --- a/test/kube2e/upgrade/upgrade_test.go +++ b/test/kube2e/upgrade/upgrade_test.go @@ -15,25 +15,25 @@ import ( "github.com/solo-io/skv2/codegen/util" - "github.com/kgateway-dev/kgateway/pkg/cliutil" - "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/v2/pkg/cliutil" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/helmutils" - kubetestclients "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/clients" + kubetestclients "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/clients" exec_utils "github.com/solo-io/go-utils/testutils/exec" "github.com/solo-io/solo-kit/pkg/api/v1/clients" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/helpers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/version" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/kube2e" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/version" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/kube2e" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/kube2e/util.go b/test/kube2e/util.go index 276c42bb63f..25521934c58 100644 --- a/test/kube2e/util.go +++ b/test/kube2e/util.go @@ -18,16 +18,16 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "go.uber.org/zap/zapcore" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/check" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/options" - clienthelpers "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/helpers" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/printers" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" - "github.com/kgateway-dev/kgateway/test/kube2e/helper" - newhelper "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/check" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/options" + clienthelpers "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/helpers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/printers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/test/kube2e/helper" + newhelper "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) const ( diff --git a/test/kubernetes/e2e/defaults/defaults.go b/test/kubernetes/e2e/defaults/defaults.go index 4290da074bf..86aa752d2e9 100644 --- a/test/kubernetes/e2e/defaults/defaults.go +++ b/test/kubernetes/e2e/defaults/defaults.go @@ -8,8 +8,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) var ( diff --git a/test/kubernetes/e2e/example/info_logging_test.go b/test/kubernetes/e2e/example/info_logging_test.go index e929221dbe4..f31d0813e98 100644 --- a/test/kubernetes/e2e/example/info_logging_test.go +++ b/test/kubernetes/e2e/example/info_logging_test.go @@ -11,16 +11,16 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/example" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/example" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" ) // TestInstallationWithInfoLogLevel is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/features/admin_server/suite.go b/test/kubernetes/e2e/features/admin_server/suite.go index 61e5413d745..e4ef0f77834 100644 --- a/test/kubernetes/e2e/features/admin_server/suite.go +++ b/test/kubernetes/e2e/features/admin_server/suite.go @@ -5,16 +5,16 @@ package admin_server import ( "context" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/admin_server/types.go b/test/kubernetes/e2e/features/admin_server/types.go index cd504967ce0..e7da5e640ce 100644 --- a/test/kubernetes/e2e/features/admin_server/types.go +++ b/test/kubernetes/e2e/features/admin_server/types.go @@ -7,7 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/client_tls/suite.go b/test/kubernetes/e2e/features/client_tls/suite.go index c5acad56ba1..cafef347ab0 100644 --- a/test/kubernetes/e2e/features/client_tls/suite.go +++ b/test/kubernetes/e2e/features/client_tls/suite.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/client_tls/types.go b/test/kubernetes/e2e/features/client_tls/types.go index c784cecddc5..eec225110e1 100644 --- a/test/kubernetes/e2e/features/client_tls/types.go +++ b/test/kubernetes/e2e/features/client_tls/types.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/crd_categories/suite.go b/test/kubernetes/e2e/features/crd_categories/suite.go index 0aad5d0ad43..fc8f7a4340c 100644 --- a/test/kubernetes/e2e/features/crd_categories/suite.go +++ b/test/kubernetes/e2e/features/crd_categories/suite.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/helm" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/crd_categories/types.go b/test/kubernetes/e2e/features/crd_categories/types.go index 90031f5681e..5588ac50aa2 100644 --- a/test/kubernetes/e2e/features/crd_categories/types.go +++ b/test/kubernetes/e2e/features/crd_categories/types.go @@ -5,7 +5,7 @@ package crd_categories import ( "path/filepath" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/deployer/istio_integration_suite.go b/test/kubernetes/e2e/features/deployer/istio_integration_suite.go index f485c1cadf4..d56fda2d814 100644 --- a/test/kubernetes/e2e/features/deployer/istio_integration_suite.go +++ b/test/kubernetes/e2e/features/deployer/istio_integration_suite.go @@ -8,15 +8,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" "github.com/onsi/gomega" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/istio" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/istio" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewIstioIntegrationTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go b/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go index 512d537aadd..29652e9fc21 100644 --- a/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go +++ b/test/kubernetes/e2e/features/deployer/minimal_default_gatewayparameters_suite.go @@ -7,12 +7,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewMinimalDefaultGatewayParametersTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/suite.go b/test/kubernetes/e2e/features/deployer/suite.go index e6b31d11dd1..efd3ce21436 100644 --- a/test/kubernetes/e2e/features/deployer/suite.go +++ b/test/kubernetes/e2e/features/deployer/suite.go @@ -19,14 +19,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/syncer/setup" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/utils" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/utils" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/deployer/types.go b/test/kubernetes/e2e/features/deployer/types.go index aae159ab298..726a675ddaa 100644 --- a/test/kubernetes/e2e/features/deployer/types.go +++ b/test/kubernetes/e2e/features/deployer/types.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/directresponse/suite.go b/test/kubernetes/e2e/features/directresponse/suite.go index ecced13d35b..565b39dff7c 100644 --- a/test/kubernetes/e2e/features/directresponse/suite.go +++ b/test/kubernetes/e2e/features/directresponse/suite.go @@ -12,13 +12,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/api/v1alpha1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/api/v1alpha1" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) type testingSuite struct { diff --git a/test/kubernetes/e2e/features/directresponse/types.go b/test/kubernetes/e2e/features/directresponse/types.go index ad851cb9fdf..60c89e96648 100644 --- a/test/kubernetes/e2e/features/directresponse/types.go +++ b/test/kubernetes/e2e/features/directresponse/types.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go b/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go index dc353a01a74..922ceb52723 100644 --- a/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go +++ b/test/kubernetes/e2e/features/discovery_watchlabels/discovery_watchlabels_suite.go @@ -9,15 +9,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/plugins/kubernetes" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/plugins/kubernetes" "github.com/solo-io/solo-kit/pkg/api/v1/clients" "github.com/solo-io/solo-kit/pkg/api/v1/resources" "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewDiscoveryWatchlabelsSuite diff --git a/test/kubernetes/e2e/features/discovery_watchlabels/types.go b/test/kubernetes/e2e/features/discovery_watchlabels/types.go index c82005a7030..5b64f03c609 100644 --- a/test/kubernetes/e2e/features/discovery_watchlabels/types.go +++ b/test/kubernetes/e2e/features/discovery_watchlabels/types.go @@ -5,7 +5,7 @@ package discovery_watchlabels import ( "path/filepath" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/example/suite.go b/test/kubernetes/e2e/features/example/suite.go index 9494e15596a..bca2d83bfc3 100644 --- a/test/kubernetes/e2e/features/example/suite.go +++ b/test/kubernetes/e2e/features/example/suite.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/headless_svc/generate/generate.go b/test/kubernetes/e2e/features/headless_svc/generate/generate.go index f3e4c462025..a534e61a6a9 100644 --- a/test/kubernetes/e2e/features/headless_svc/generate/generate.go +++ b/test/kubernetes/e2e/features/headless_svc/generate/generate.go @@ -8,10 +8,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/resources" ) // Dev tool to generate the manifest files for the test suite for demo and docs purposes diff --git a/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go b/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go index 98b0dc8931d..3e6a092513c 100644 --- a/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go +++ b/test/kubernetes/e2e/features/headless_svc/k8s_gw_suite.go @@ -10,10 +10,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/resources" ) var _ e2e.NewSuiteFunc = NewK8sGatewayHeadlessSvcSuite diff --git a/test/kubernetes/e2e/features/headless_svc/resources.go b/test/kubernetes/e2e/features/headless_svc/resources.go index bf6d11ee0c7..51315ca01f1 100644 --- a/test/kubernetes/e2e/features/headless_svc/resources.go +++ b/test/kubernetes/e2e/features/headless_svc/resources.go @@ -17,10 +17,10 @@ import ( soloapis_kubernetes "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/options/kubernetes" gloocore "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/resources" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/resources" ) const ( diff --git a/test/kubernetes/e2e/features/headless_svc/types.go b/test/kubernetes/e2e/features/headless_svc/types.go index c89be643d2d..e10b66e1c5a 100644 --- a/test/kubernetes/e2e/features/headless_svc/types.go +++ b/test/kubernetes/e2e/features/headless_svc/types.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/helm/suite.go b/test/kubernetes/e2e/features/helm/suite.go index 988e62ec0b9..cc2105f0835 100644 --- a/test/kubernetes/e2e/features/helm/suite.go +++ b/test/kubernetes/e2e/features/helm/suite.go @@ -18,11 +18,11 @@ import ( "github.com/solo-io/solo-kit/pkg/code-generator/schemagen" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/helm/types.go b/test/kubernetes/e2e/features/helm/types.go index 377ab0b9e7b..3595bc12ce6 100644 --- a/test/kubernetes/e2e/features/helm/types.go +++ b/test/kubernetes/e2e/features/helm/types.go @@ -5,8 +5,8 @@ package helm import ( "path/filepath" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" ) var ( diff --git a/test/kubernetes/e2e/features/helm_settings/suite.go b/test/kubernetes/e2e/features/helm_settings/suite.go index d463c6427ae..0b4afef4d48 100644 --- a/test/kubernetes/e2e/features/helm_settings/suite.go +++ b/test/kubernetes/e2e/features/helm_settings/suite.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go b/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go index b36694845e0..de1af93c7b3 100644 --- a/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go +++ b/test/kubernetes/e2e/features/http_listener_options/http_lis_opt_suite.go @@ -11,11 +11,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go b/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go index 6533ff1eee8..349524f711d 100644 --- a/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go +++ b/test/kubernetes/e2e/features/http_listener_options/lis_opt_types.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go index 311fbd916a6..3bc40bd1445 100644 --- a/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/k8s_gateway_auto_mtls_suite.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewIstioAutoMtlsSuite diff --git a/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go b/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go index 799096bb92f..e96d43b5428 100644 --- a/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go +++ b/test/kubernetes/e2e/features/istio/k8s_gateway_no_auto_mtls_suite.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/istio/resources.go b/test/kubernetes/e2e/features/istio/resources.go index 6bdb2226626..398f536933e 100644 --- a/test/kubernetes/e2e/features/istio/resources.go +++ b/test/kubernetes/e2e/features/istio/resources.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/internal/gloo/constants" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/constants" v1 "github.com/solo-io/solo-apis/pkg/api/gateway.solo.io/v1" soloapis_gloov1 "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1" @@ -19,7 +19,7 @@ import ( "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/ssl" gloocore "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" ) type UpstreamConfigOpts struct { diff --git a/test/kubernetes/e2e/features/istio/types.go b/test/kubernetes/e2e/features/istio/types.go index 6c89663bf65..8f450d41a90 100644 --- a/test/kubernetes/e2e/features/istio/types.go +++ b/test/kubernetes/e2e/features/istio/types.go @@ -11,10 +11,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) var ( diff --git a/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go b/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go index eca607eaf21..8ea2a49ee7d 100644 --- a/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go +++ b/test/kubernetes/e2e/features/listener_options/lis_opt_suite.go @@ -11,11 +11,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go index 2f3c704bad7..f77d57c0302 100644 --- a/test/kubernetes/e2e/features/listener_options/lis_opt_types.go +++ b/test/kubernetes/e2e/features/listener_options/lis_opt_types.go @@ -11,9 +11,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + e2edefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var ( diff --git a/test/kubernetes/e2e/features/metrics/suite.go b/test/kubernetes/e2e/features/metrics/suite.go index d6bde211d22..3aa35fd6734 100644 --- a/test/kubernetes/e2e/features/metrics/suite.go +++ b/test/kubernetes/e2e/features/metrics/suite.go @@ -13,16 +13,16 @@ import ( "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/translator" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/upstreams/kubernetes" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/upstreams/kubernetes" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/metrics/types.go b/test/kubernetes/e2e/features/metrics/types.go index 614fad0a20b..2f34a33e47b 100644 --- a/test/kubernetes/e2e/features/metrics/types.go +++ b/test/kubernetes/e2e/features/metrics/types.go @@ -12,11 +12,11 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/kubernetes" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/kubernetes" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" ) var ( diff --git a/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go b/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go index 9a805746670..bbff9222c7e 100644 --- a/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go +++ b/test/kubernetes/e2e/features/port_routing/k8s_gateway_suite.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewK8sGatewayTestingSuite diff --git a/test/kubernetes/e2e/features/port_routing/types.go b/test/kubernetes/e2e/features/port_routing/types.go index db67ae3058b..f7a98fe752b 100644 --- a/test/kubernetes/e2e/features/port_routing/types.go +++ b/test/kubernetes/e2e/features/port_routing/types.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) type testManifest struct { diff --git a/test/kubernetes/e2e/features/route_delegation/suite.go b/test/kubernetes/e2e/features/route_delegation/suite.go index 284021a585f..036e0fe7819 100644 --- a/test/kubernetes/e2e/features/route_delegation/suite.go +++ b/test/kubernetes/e2e/features/route_delegation/suite.go @@ -12,10 +12,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/route_delegation/types.go b/test/kubernetes/e2e/features/route_delegation/types.go index 2ea7fc2fcc4..563bed1ca9e 100644 --- a/test/kubernetes/e2e/features/route_delegation/types.go +++ b/test/kubernetes/e2e/features/route_delegation/types.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gwv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) const ( diff --git a/test/kubernetes/e2e/features/route_options/suite.go b/test/kubernetes/e2e/features/route_options/suite.go index 2705e99d777..ceda379995c 100644 --- a/test/kubernetes/e2e/features/route_options/suite.go +++ b/test/kubernetes/e2e/features/route_options/suite.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/route_options/types.go b/test/kubernetes/e2e/features/route_options/types.go index 04db34f80d9..0ecf6759667 100644 --- a/test/kubernetes/e2e/features/route_options/types.go +++ b/test/kubernetes/e2e/features/route_options/types.go @@ -12,8 +12,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/server_tls/suite.go b/test/kubernetes/e2e/features/server_tls/suite.go index 61034b50409..f78da741d2e 100644 --- a/test/kubernetes/e2e/features/server_tls/suite.go +++ b/test/kubernetes/e2e/features/server_tls/suite.go @@ -10,15 +10,15 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/server_tls/types.go b/test/kubernetes/e2e/features/server_tls/types.go index 59d53d46ff0..736bfb709d2 100644 --- a/test/kubernetes/e2e/features/server_tls/types.go +++ b/test/kubernetes/e2e/features/server_tls/types.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/services/httproute/suite.go b/test/kubernetes/e2e/features/services/httproute/suite.go index eeb912ec716..14404fb5bbb 100644 --- a/test/kubernetes/e2e/features/services/httproute/suite.go +++ b/test/kubernetes/e2e/features/services/httproute/suite.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/internal/kgateway/wellknown" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/wellknown" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) // testingSuite is the entire Suite of tests for testing K8s Service-specific features/fixes diff --git a/test/kubernetes/e2e/features/services/httproute/types.go b/test/kubernetes/e2e/features/services/httproute/types.go index 4f87fdc5f23..faf776f1645 100644 --- a/test/kubernetes/e2e/features/services/httproute/types.go +++ b/test/kubernetes/e2e/features/services/httproute/types.go @@ -6,16 +6,16 @@ import ( "net/http" "path/filepath" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" "github.com/onsi/gomega/gstruct" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/kgateway/crds" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/crds" ) var ( diff --git a/test/kubernetes/e2e/features/services/tcproute/suite.go b/test/kubernetes/e2e/features/services/tcproute/suite.go index a01b1758c8b..7e0d19c7d17 100644 --- a/test/kubernetes/e2e/features/services/tcproute/suite.go +++ b/test/kubernetes/e2e/features/services/tcproute/suite.go @@ -13,12 +13,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) // testingSuite is the entire suite of tests for testing K8s Service-specific features/fixes diff --git a/test/kubernetes/e2e/features/services/tcproute/types.go b/test/kubernetes/e2e/features/services/tcproute/types.go index a3f86a21c44..39b8f2f324e 100644 --- a/test/kubernetes/e2e/features/services/tcproute/types.go +++ b/test/kubernetes/e2e/features/services/tcproute/types.go @@ -8,9 +8,9 @@ import ( "path/filepath" "time" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/test/kubernetes/e2e/features/tracing/suite.go b/test/kubernetes/e2e/features/tracing/suite.go index 6767cf3c526..bc543f8f3ef 100644 --- a/test/kubernetes/e2e/features/tracing/suite.go +++ b/test/kubernetes/e2e/features/tracing/suite.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/suite" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - gloo_defaults "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + gloo_defaults "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/tracing/types.go b/test/kubernetes/e2e/features/tracing/types.go index d74b351640e..279d0477288 100644 --- a/test/kubernetes/e2e/features/tracing/types.go +++ b/test/kubernetes/e2e/features/tracing/types.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) const ( diff --git a/test/kubernetes/e2e/features/upgrade/suite.go b/test/kubernetes/e2e/features/upgrade/suite.go index 91a8683ea80..7819e4e59d5 100644 --- a/test/kubernetes/e2e/features/upgrade/suite.go +++ b/test/kubernetes/e2e/features/upgrade/suite.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/upstreams/suite.go b/test/kubernetes/e2e/features/upstreams/suite.go index b2b4f67e882..897d7270d1f 100644 --- a/test/kubernetes/e2e/features/upstreams/suite.go +++ b/test/kubernetes/e2e/features/upstreams/suite.go @@ -10,10 +10,10 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/upstreams/types.go b/test/kubernetes/e2e/features/upstreams/types.go index 1f63806b3d2..a7732242d13 100644 --- a/test/kubernetes/e2e/features/upstreams/types.go +++ b/test/kubernetes/e2e/features/upstreams/types.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" ) var ( diff --git a/test/kubernetes/e2e/features/virtualhost_options/types.go b/test/kubernetes/e2e/features/virtualhost_options/types.go index 171c1b3c3d4..8fbb70958d9 100644 --- a/test/kubernetes/e2e/features/virtualhost_options/types.go +++ b/test/kubernetes/e2e/features/virtualhost_options/types.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + e2edefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var ( diff --git a/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go b/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go index 8948a9d72d5..e77bd7dad2a 100644 --- a/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go +++ b/test/kubernetes/e2e/features/virtualhost_options/vhost_opt_suite.go @@ -15,13 +15,13 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - testdefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + testdefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/watch_namespace_selector/suite.go b/test/kubernetes/e2e/features/watch_namespace_selector/suite.go index dc830b035b2..535b91b70e2 100644 --- a/test/kubernetes/e2e/features/watch_namespace_selector/suite.go +++ b/test/kubernetes/e2e/features/watch_namespace_selector/suite.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" ) var _ e2e.NewSuiteFunc = NewTestingSuite diff --git a/test/kubernetes/e2e/features/watch_namespace_selector/types.go b/test/kubernetes/e2e/features/watch_namespace_selector/types.go index dcf6cb38a3c..8e465e815ac 100644 --- a/test/kubernetes/e2e/features/watch_namespace_selector/types.go +++ b/test/kubernetes/e2e/features/watch_namespace_selector/types.go @@ -8,13 +8,13 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" - e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1/kube/apis/gateway.solo.io/v1" + e2edefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) var ( diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go b/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go index 34d64a65206..42856396ab4 100644 --- a/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go +++ b/test/kubernetes/e2e/features/zero_downtime_rollout/suite.go @@ -10,12 +10,12 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/suite" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - testmatchers "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + testmatchers "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" ) type testingSuite struct { diff --git a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go index 30644864a38..aea63b704de 100644 --- a/test/kubernetes/e2e/features/zero_downtime_rollout/types.go +++ b/test/kubernetes/e2e/features/zero_downtime_rollout/types.go @@ -7,10 +7,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests/base" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests/base" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/kubernetes/e2e/file.go b/test/kubernetes/e2e/file.go index 99f77f8b69c..f1e816edd9a 100644 --- a/test/kubernetes/e2e/file.go +++ b/test/kubernetes/e2e/file.go @@ -5,7 +5,7 @@ package e2e import ( "path/filepath" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) var ( diff --git a/test/kubernetes/e2e/test.go b/test/kubernetes/e2e/test.go index fa1478630a7..ec7506133cf 100644 --- a/test/kubernetes/e2e/test.go +++ b/test/kubernetes/e2e/test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/actions" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/assertions" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - testruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/actions" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/assertions" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + testruntime "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // MustTestHelper returns the SoloTestHelper used for e2e tests diff --git a/test/kubernetes/e2e/tests/automtls_istio_test.go b/test/kubernetes/e2e/tests/automtls_istio_test.go index a12fc701587..97a6a0f0202 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_test.go +++ b/test/kubernetes/e2e/tests/automtls_istio_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayIstioAutoMtls is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/automtls_istio_tests.go b/test/kubernetes/e2e/tests/automtls_istio_tests.go index 684940abac6..bbf2412345d 100644 --- a/test/kubernetes/e2e/tests/automtls_istio_tests.go +++ b/test/kubernetes/e2e/tests/automtls_istio_tests.go @@ -3,10 +3,10 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/port_routing" ) func AutomtlsIstioSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/base/base_suite.go b/test/kubernetes/e2e/tests/base/base_suite.go index bf3ada1bb98..cd134e54dd9 100644 --- a/test/kubernetes/e2e/tests/base/base_suite.go +++ b/test/kubernetes/e2e/tests/base/base_suite.go @@ -14,8 +14,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" ) // This defines a test case used by the BaseTestingSuite diff --git a/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go b/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go index 77674c0ab1a..f515e6bfdd4 100644 --- a/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go +++ b/test/kubernetes/e2e/tests/disabled_transformation_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestTransformationValidationDisabled is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go index 652f3b91ad6..6bf43d0acad 100644 --- a/test/kubernetes/e2e/tests/discovery_watchlabels_test.go +++ b/test/kubernetes/e2e/tests/discovery_watchlabels_test.go @@ -9,12 +9,12 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestDiscoveryWatchlabels is the function which executes a series of tests against a given installation where diff --git a/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go b/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go index 53e2b64cf69..d1d4a143770 100644 --- a/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go +++ b/test/kubernetes/e2e/tests/discovery_watchlabels_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/discovery_watchlabels" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/discovery_watchlabels" ) func DiscoveryWatchlabelsSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/full_envoy_validation_test.go b/test/kubernetes/e2e/tests/full_envoy_validation_test.go index 7295d2b6dec..154806ba43a 100644 --- a/test/kubernetes/e2e/tests/full_envoy_validation_test.go +++ b/test/kubernetes/e2e/tests/full_envoy_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestFullEnvoyValidation is the function which executes a series of tests against a given diff --git a/test/kubernetes/e2e/tests/helm_test.go b/test/kubernetes/e2e/tests/helm_test.go index 04efdee1edb..f09ac6700c3 100644 --- a/test/kubernetes/e2e/tests/helm_test.go +++ b/test/kubernetes/e2e/tests/helm_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestHelm is the function which executes a series of helm tests diff --git a/test/kubernetes/e2e/tests/helm_tests.go b/test/kubernetes/e2e/tests/helm_tests.go index e950d1fe78e..504a668c6e4 100644 --- a/test/kubernetes/e2e/tests/helm_tests.go +++ b/test/kubernetes/e2e/tests/helm_tests.go @@ -3,9 +3,9 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/helm_settings" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/helm" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/helm_settings" ) func HelmSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_aws_test.go b/test/kubernetes/e2e/tests/k8s_gw_aws_test.go index fd07f14fc1b..1c551290dd3 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_aws_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_aws_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayAws is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go b/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go index 6b2b27d1184..8c6846fa587 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_aws_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/deployer" ) func KubeGatewayAwsSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_istio_test.go b/test/kubernetes/e2e/tests/k8s_gw_istio_test.go index 64e73c78960..f1dacbcc173 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_istio_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_istio_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayIstio is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go b/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go index dab2ec8fb4d..edacfce7a51 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_istio_tests.go @@ -3,11 +3,11 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/port_routing" ) func IstioSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go index b71cd6985f7..697b32f2702 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayMinimalDefaultGatewayParameters is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go index fe8d05b7b5c..73289895185 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_minimal_default_gatewayparameters_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/deployer" ) func KubeGatewayMinimalDefaultGatewayParametersSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go b/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go index f4cdd973ed1..ee1dac55c7a 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_no_validation_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayNoValidation executes tests against a K8s Gateway gloo install with validation disabled diff --git a/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go b/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go index 4d1bf6be1fe..ed82c9c3c86 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_no_validation_tests.go @@ -3,11 +3,11 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/listener_options" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_options" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/virtualhost_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/listener_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/route_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/virtualhost_options" ) func KubeGatewayNoValidationSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/k8s_gw_test.go b/test/kubernetes/e2e/tests/k8s_gw_test.go index 9967a5d1383..407ba1f90da 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_test.go +++ b/test/kubernetes/e2e/tests/k8s_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGateway is the function which executes a series of tests against a given installation diff --git a/test/kubernetes/e2e/tests/k8s_gw_tests.go b/test/kubernetes/e2e/tests/k8s_gw_tests.go index 1afd51c451a..97f68b61ef7 100644 --- a/test/kubernetes/e2e/tests/k8s_gw_tests.go +++ b/test/kubernetes/e2e/tests/k8s_gw_tests.go @@ -3,22 +3,22 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/admin_server" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/crd_categories" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/deployer" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/directresponse" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/headless_svc" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/http_listener_options" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/listener_options" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/metrics" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/port_routing" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_delegation" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/route_options" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/services/httproute" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/services/tcproute" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/upstreams" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/virtualhost_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/admin_server" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/crd_categories" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/deployer" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/directresponse" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/headless_svc" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/http_listener_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/listener_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/metrics" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/port_routing" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/route_delegation" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/route_options" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/services/httproute" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/services/tcproute" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/upstreams" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/virtualhost_options" ) func KubeGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go index 55f86cfb45b..3b8c947e0c3 100644 --- a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go +++ b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // TestK8sGatewayIstioRevision is the function which executes a series of tests against a given installation with diff --git a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go index 7206a6b5e1a..271bc5bcb00 100644 --- a/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go +++ b/test/kubernetes/e2e/tests/revision_istio_k8s_gw_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/istio" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/istio" ) func RevisionIstioK8sGatewaySuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/upgrade_test.go b/test/kubernetes/e2e/tests/upgrade_test.go index d7fb24e799d..23ab8dc9f12 100644 --- a/test/kubernetes/e2e/tests/upgrade_test.go +++ b/test/kubernetes/e2e/tests/upgrade_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/helper" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/helper" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" ) // The upgrade tests delegate the installs, upgrades and deletions to each individual test within the suite diff --git a/test/kubernetes/e2e/tests/upgrade_tests.go b/test/kubernetes/e2e/tests/upgrade_tests.go index 23e2bd57f33..725fc488146 100644 --- a/test/kubernetes/e2e/tests/upgrade_tests.go +++ b/test/kubernetes/e2e/tests/upgrade_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/upgrade" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/upgrade" ) func UpgradeSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/watch_namespace_selector_test.go b/test/kubernetes/e2e/tests/watch_namespace_selector_test.go index 12775b9b0b7..8fd89365d10 100644 --- a/test/kubernetes/e2e/tests/watch_namespace_selector_test.go +++ b/test/kubernetes/e2e/tests/watch_namespace_selector_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) func TestWatchNamespaceSelector(t *testing.T) { diff --git a/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go b/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go index 80c9d805f12..1f292dd1dc1 100644 --- a/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go +++ b/test/kubernetes/e2e/tests/watch_namespace_selector_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/watch_namespace_selector" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/watch_namespace_selector" ) func WatchNamespaceSelectorSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/e2e/tests/zero_downtime_test.go b/test/kubernetes/e2e/tests/zero_downtime_test.go index a8603d01e3a..94dcc45fa0e 100644 --- a/test/kubernetes/e2e/tests/zero_downtime_test.go +++ b/test/kubernetes/e2e/tests/zero_downtime_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - . "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/tests" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + . "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/tests" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) func TestZeroDowntimeRollout(t *testing.T) { diff --git a/test/kubernetes/e2e/tests/zero_downtime_tests.go b/test/kubernetes/e2e/tests/zero_downtime_tests.go index 6cd681ac9f5..367d6bad572 100644 --- a/test/kubernetes/e2e/tests/zero_downtime_tests.go +++ b/test/kubernetes/e2e/tests/zero_downtime_tests.go @@ -3,8 +3,8 @@ package tests import ( - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e" - "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/features/zero_downtime_rollout" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/features/zero_downtime_rollout" ) func ZeroDowntimeRolloutSuiteRunner() e2e.SuiteRunner { diff --git a/test/kubernetes/testutils/actions/provider.go b/test/kubernetes/testutils/actions/provider.go index 2df1032df14..629292eb3ba 100644 --- a/test/kubernetes/testutils/actions/provider.go +++ b/test/kubernetes/testutils/actions/provider.go @@ -3,11 +3,11 @@ package actions import ( - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/testutils" - "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/testutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" ) // Provider is the entity that creates actions. diff --git a/test/kubernetes/testutils/assertions/curl.go b/test/kubernetes/testutils/assertions/curl.go index abb41a99daa..426f61d911f 100644 --- a/test/kubernetes/testutils/assertions/curl.go +++ b/test/kubernetes/testutils/assertions/curl.go @@ -13,13 +13,13 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/gomega/transforms" - "github.com/kgateway-dev/kgateway/test/helpers" - e2edefaults "github.com/kgateway-dev/kgateway/test/kubernetes/e2e/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/transforms" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + e2edefaults "github.com/kgateway-dev/kgateway/v2/test/kubernetes/e2e/defaults" ) const ( diff --git a/test/kubernetes/testutils/assertions/deployments.go b/test/kubernetes/testutils/assertions/deployments.go index 4016a582d28..9c3fa19bc8d 100644 --- a/test/kubernetes/testutils/assertions/deployments.go +++ b/test/kubernetes/testutils/assertions/deployments.go @@ -6,8 +6,8 @@ import ( "context" "time" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" "github.com/solo-io/go-utils/stats" diff --git a/test/kubernetes/testutils/assertions/envoy.go b/test/kubernetes/testutils/assertions/envoy.go index 9cf22685715..4c6a3826059 100644 --- a/test/kubernetes/testutils/assertions/envoy.go +++ b/test/kubernetes/testutils/assertions/envoy.go @@ -11,10 +11,10 @@ import ( . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) func (p *Provider) AssertEnvoyAdminApi( diff --git a/test/kubernetes/testutils/assertions/gloo.go b/test/kubernetes/testutils/assertions/gloo.go index b5002f29f48..3cfec549645 100644 --- a/test/kubernetes/testutils/assertions/gloo.go +++ b/test/kubernetes/testutils/assertions/gloo.go @@ -14,10 +14,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kgateway-dev/kgateway/internal/kgateway/admin" - "github.com/kgateway-dev/kgateway/pkg/utils/controllerutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/portforward" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/internal/kgateway/admin" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/controllerutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/portforward" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" ) func (p *Provider) AssertGlooAdminApi( diff --git a/test/kubernetes/testutils/assertions/glooctl.go b/test/kubernetes/testutils/assertions/glooctl.go index b1358738258..2f3b91e50b2 100644 --- a/test/kubernetes/testutils/assertions/glooctl.go +++ b/test/kubernetes/testutils/assertions/glooctl.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/check" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/options" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/cmd/version" - "github.com/kgateway-dev/kgateway/internal/gloo/cli/pkg/printers" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/check" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/options" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/cmd/version" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/cli/pkg/printers" ) // EventuallyCheckResourcesOk asserts that `glooctl check` eventually responds Ok diff --git a/test/kubernetes/testutils/assertions/objects.go b/test/kubernetes/testutils/assertions/objects.go index 1313ca32934..0023642fb27 100644 --- a/test/kubernetes/testutils/assertions/objects.go +++ b/test/kubernetes/testutils/assertions/objects.go @@ -14,7 +14,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) func (p *Provider) EventuallyObjectsExist(ctx context.Context, objects ...client.Object) { diff --git a/test/kubernetes/testutils/assertions/pods.go b/test/kubernetes/testutils/assertions/pods.go index 43ac52e161f..cf8c88fefec 100644 --- a/test/kubernetes/testutils/assertions/pods.go +++ b/test/kubernetes/testutils/assertions/pods.go @@ -12,8 +12,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) // EventuallyPodsRunning asserts that the pod(s) are in the ready state diff --git a/test/kubernetes/testutils/assertions/provider.go b/test/kubernetes/testutils/assertions/provider.go index 3c1bd1efd25..6a4c206a89a 100644 --- a/test/kubernetes/testutils/assertions/provider.go +++ b/test/kubernetes/testutils/assertions/provider.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/cluster" - "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/kgateway" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/cluster" + "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/kgateway" ) // Provider is the entity that provides methods which assert behaviors of a Kubernetes Cluster diff --git a/test/kubernetes/testutils/assertions/resources.go b/test/kubernetes/testutils/assertions/resources.go index a602a2a8d95..eaf51176e87 100644 --- a/test/kubernetes/testutils/assertions/resources.go +++ b/test/kubernetes/testutils/assertions/resources.go @@ -9,7 +9,7 @@ import ( "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) func (p *Provider) EventuallyResourceExists(getter helpers.ResourceGetter, timeout ...time.Duration) { diff --git a/test/kubernetes/testutils/assertions/status.go b/test/kubernetes/testutils/assertions/status.go index 9b845cc828b..a14377344b8 100644 --- a/test/kubernetes/testutils/assertions/status.go +++ b/test/kubernetes/testutils/assertions/status.go @@ -17,8 +17,8 @@ import ( gwv1 "sigs.k8s.io/gateway-api/apis/v1" gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) // Checks GetNamespacedStatuses status for gloo installation namespace diff --git a/test/kubernetes/testutils/clients/clients.go b/test/kubernetes/testutils/clients/clients.go index 3e4744cdbf3..ffc9d1fbbc4 100644 --- a/test/kubernetes/testutils/clients/clients.go +++ b/test/kubernetes/testutils/clients/clients.go @@ -5,7 +5,7 @@ package clients import ( "k8s.io/client-go/kubernetes" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" ) // MustClientset returns the Kubernetes Clientset, or panics diff --git a/test/kubernetes/testutils/clients/rest_config.go b/test/kubernetes/testutils/clients/rest_config.go index 844a883b0d6..cfafbcbfc53 100644 --- a/test/kubernetes/testutils/clients/rest_config.go +++ b/test/kubernetes/testutils/clients/rest_config.go @@ -5,7 +5,7 @@ package clients import ( "k8s.io/client-go/rest" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" ) // MustRestConfig returns MustRestConfigWithContext with an empty Kubernetes Context diff --git a/test/kubernetes/testutils/cluster/context.go b/test/kubernetes/testutils/cluster/context.go index 0bda142127a..2b606b567ec 100644 --- a/test/kubernetes/testutils/cluster/context.go +++ b/test/kubernetes/testutils/cluster/context.go @@ -7,7 +7,7 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) // Context contains the metadata about a Kubernetes cluster diff --git a/test/kubernetes/testutils/cluster/istio.go b/test/kubernetes/testutils/cluster/istio.go index 3ad3e5c3d31..b4e307f2920 100644 --- a/test/kubernetes/testutils/cluster/istio.go +++ b/test/kubernetes/testutils/cluster/istio.go @@ -14,8 +14,8 @@ import ( "github.com/rotisserie/eris" "github.com/solo-io/go-utils/contextutils" - glooruntime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" - "github.com/kgateway-dev/kgateway/test/testutils" + glooruntime "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) const ( diff --git a/test/kubernetes/testutils/cluster/kind.go b/test/kubernetes/testutils/cluster/kind.go index 845787051e3..2c82a6e626b 100644 --- a/test/kubernetes/testutils/cluster/kind.go +++ b/test/kubernetes/testutils/cluster/kind.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/kgateway-dev/kgateway/pkg/schemes" + "github.com/kgateway-dev/kgateway/v2/pkg/schemes" "k8s.io/apimachinery/pkg/runtime" @@ -15,8 +15,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" ) // MustKindContext returns the Context for a KinD cluster with the given name diff --git a/test/kubernetes/testutils/helper/install.go b/test/kubernetes/testutils/helper/install.go index c75a8c6d61f..1b245f212b0 100644 --- a/test/kubernetes/testutils/helper/install.go +++ b/test/kubernetes/testutils/helper/install.go @@ -21,9 +21,9 @@ import ( "github.com/solo-io/go-utils/log" "github.com/solo-io/go-utils/testutils/exec" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/pkg/utils/kubeutils/kubectl" - test_runtime "github.com/kgateway-dev/kgateway/test/kubernetes/testutils/runtime" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/kubeutils/kubectl" + test_runtime "github.com/kgateway-dev/kgateway/v2/test/kubernetes/testutils/runtime" ) // Default test configuration diff --git a/test/kubernetes/testutils/helper/util.go b/test/kubernetes/testutils/helper/util.go index 1d46f76ce1d..a6160b55b75 100644 --- a/test/kubernetes/testutils/helper/util.go +++ b/test/kubernetes/testutils/helper/util.go @@ -18,9 +18,9 @@ import ( "github.com/solo-io/go-utils/githubutils" "github.com/solo-io/go-utils/versionutils" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/kgateway-dev/kgateway/test/testutils/version" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils/version" ) // Deprecated; if this is needed create a resource yaml for it. diff --git a/test/kubernetes/testutils/kgateway/context.go b/test/kubernetes/testutils/kgateway/context.go index a112eaf512e..e92cea2aa81 100644 --- a/test/kubernetes/testutils/kgateway/context.go +++ b/test/kubernetes/testutils/kgateway/context.go @@ -5,7 +5,7 @@ package kgateway import ( "github.com/rotisserie/eris" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // Context contains the set of properties for a given installation of Gloo Gateway diff --git a/test/kubernetes/testutils/runtime/context.go b/test/kubernetes/testutils/runtime/context.go index 0fb9607507d..7c392f661fa 100644 --- a/test/kubernetes/testutils/runtime/context.go +++ b/test/kubernetes/testutils/runtime/context.go @@ -5,9 +5,9 @@ package runtime import ( "os" - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // Context contains the set of properties that are defined at runtime by whoever is invoking tests. diff --git a/test/kubernetes/testutils/runtime/output.go b/test/kubernetes/testutils/runtime/output.go index b193cf57aa0..c777294ea12 100644 --- a/test/kubernetes/testutils/runtime/output.go +++ b/test/kubernetes/testutils/runtime/output.go @@ -5,7 +5,7 @@ package runtime import ( "path/filepath" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // PathToBugReport returns the absolute path to the directory where the bug_report will be stored diff --git a/test/mocks/gloo/validation_client.go b/test/mocks/gloo/validation_client.go index 4c3acd74bd7..e30223ae8fc 100644 --- a/test/mocks/gloo/validation_client.go +++ b/test/mocks/gloo/validation_client.go @@ -13,7 +13,7 @@ import ( gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" - validation "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/grpc/validation" + validation "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/grpc/validation" ) // MockGlooValidationServiceClient is a mock of GlooValidationServiceClient interface. diff --git a/test/samples/route_tables.go b/test/samples/route_tables.go index 359fcac80fd..243ec6fc879 100644 --- a/test/samples/route_tables.go +++ b/test/samples/route_tables.go @@ -7,10 +7,10 @@ import ( "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - v1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" ) func LinkedRouteTablesWithVirtualService(vsName, namespace string) (*v1.VirtualService, v1.RouteTableList) { diff --git a/test/samples/sample_gloo_api_snapshot.go b/test/samples/sample_gloo_api_snapshot.go index 6637dc65b48..2ab1f28bccd 100644 --- a/test/samples/sample_gloo_api_snapshot.go +++ b/test/samples/sample_gloo_api_snapshot.go @@ -6,16 +6,16 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "github.com/solo-io/solo-kit/pkg/api/v1/resources/core" - gwv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/defaults" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/core/matchers" - v1snap "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/hcm" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/ssl" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" + gwv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/defaults" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/core/matchers" + v1snap "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/hcm" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/ssl" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" ) func SimpleUpstream() *v1.Upstream { diff --git a/test/services/consul.go b/test/services/consul.go index 899e725c45b..ede0487b329 100644 --- a/test/services/consul.go +++ b/test/services/consul.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/consul/api" - "github.com/kgateway-dev/kgateway/test/services/utils" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/services/utils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) type ConsulFactory struct { diff --git a/test/services/docker.go b/test/services/docker.go index 3c10f64f910..0c78f7407c4 100644 --- a/test/services/docker.go +++ b/test/services/docker.go @@ -8,7 +8,7 @@ import ( "os/exec" "time" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" "github.com/avast/retry-go" diff --git a/test/services/envoy/factory.go b/test/services/envoy/factory.go index a87d11b435a..0eb7daf6671 100644 --- a/test/services/envoy/factory.go +++ b/test/services/envoy/factory.go @@ -15,17 +15,17 @@ import ( "go.uber.org/zap/zapcore" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" "github.com/onsi/ginkgo/v2" errors "github.com/rotisserie/eris" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" - "github.com/kgateway-dev/kgateway/test/services/utils" - "github.com/kgateway-dev/kgateway/test/testutils" - "github.com/kgateway-dev/kgateway/test/testutils/version" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/test/services/utils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils/version" ) var _ Factory = new(factoryImpl) diff --git a/test/services/envoy/instance.go b/test/services/envoy/instance.go index dc0d45c4e17..bc09985447d 100644 --- a/test/services/envoy/instance.go +++ b/test/services/envoy/instance.go @@ -12,10 +12,10 @@ import ( "github.com/solo-io/go-utils/threadsafe" - "github.com/kgateway-dev/kgateway/pkg/utils/envoyutils/admincli" - "github.com/kgateway-dev/kgateway/pkg/utils/requestutils/curl" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envoyutils/admincli" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/requestutils/curl" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" "sync" "text/template" diff --git a/test/services/envoy/ports.go b/test/services/envoy/ports.go index 9b54251d212..428e122ef35 100644 --- a/test/services/envoy/ports.go +++ b/test/services/envoy/ports.go @@ -3,9 +3,9 @@ package envoy import ( - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" - "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/parallel" ) var ( diff --git a/test/services/gloo.go b/test/services/gloo.go index a91daffa650..0bbc84e0d8a 100644 --- a/test/services/gloo.go +++ b/test/services/gloo.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - v1alpha1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/external/solo/ratelimit" - extauthv1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" - graphqlv1beta1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/enterprise/options/graphql/v1beta1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap/clients/vault" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/xds" + v1alpha1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/external/solo/ratelimit" + extauthv1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/extauth/v1" + graphqlv1beta1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/enterprise/options/graphql/v1beta1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap/clients/vault" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/xds" "net" "net/http" @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/consul/api" - "github.com/kgateway-dev/kgateway/test/ginkgo/parallel" + "github.com/kgateway-dev/kgateway/v2/test/ginkgo/parallel" "github.com/golang/protobuf/proto" @@ -30,19 +30,19 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" - "github.com/kgateway-dev/kgateway/pkg/bootstrap/leaderelector/singlereplica" + "github.com/kgateway-dev/kgateway/v2/pkg/bootstrap/leaderelector/singlereplica" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/gloosnapshot" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/gloosnapshot" - "github.com/kgateway-dev/kgateway/pkg/utils/settingsutil" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/settingsutil" - "github.com/kgateway-dev/kgateway/pkg/utils/statusutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/statusutils" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/syncer/setup" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/syncer/setup" - "github.com/kgateway-dev/kgateway/internal/gateway/pkg/translator" + "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/translator" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/upstreams/consul" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/upstreams/consul" "github.com/solo-io/solo-kit/pkg/api/external/kubernetes/service" "github.com/solo-io/solo-kit/pkg/api/v1/clients/kube/cache" @@ -58,9 +58,9 @@ import ( "google.golang.org/grpc" - gatewayv1 "github.com/kgateway-dev/kgateway/internal/gateway/pkg/api/v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/bootstrap" + gatewayv1 "github.com/kgateway-dev/kgateway/v2/internal/gateway/pkg/api/v1" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/bootstrap" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" "go.uber.org/zap" @@ -72,9 +72,9 @@ import ( . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes" - fds_syncer "github.com/kgateway-dev/kgateway/internal/discovery/pkg/fds/syncer" - uds_syncer "github.com/kgateway-dev/kgateway/internal/discovery/pkg/uds/syncer" - "github.com/kgateway-dev/kgateway/internal/gloo/pkg/defaults" + fds_syncer "github.com/kgateway-dev/kgateway/v2/internal/discovery/pkg/fds/syncer" + uds_syncer "github.com/kgateway-dev/kgateway/v2/internal/discovery/pkg/uds/syncer" + "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/defaults" ) var glooPortBase = uint32(30400) diff --git a/test/services/logging.go b/test/services/logging.go index 0da57409aaa..073f272e821 100644 --- a/test/services/logging.go +++ b/test/services/logging.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) const ( diff --git a/test/services/logging_test.go b/test/services/logging_test.go index bffdd41319f..0083986d980 100644 --- a/test/services/logging_test.go +++ b/test/services/logging_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" "go.uber.org/zap/zapcore" - "github.com/kgateway-dev/kgateway/test/services" + "github.com/kgateway-dev/kgateway/v2/test/services" ) var _ = Describe("Logging", func() { diff --git a/test/services/utils/download.go b/test/services/utils/download.go index f922c63d899..e7418f44bf1 100644 --- a/test/services/utils/download.go +++ b/test/services/utils/download.go @@ -14,7 +14,7 @@ import ( "github.com/onsi/ginkgo/v2" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) // ExecLookPathWrapper is a wrapper around exec.LookPath so it can be mocked in tests. diff --git a/test/services/utils/download_test.go b/test/services/utils/download_test.go index 874adf890e3..11d49a006cc 100644 --- a/test/services/utils/download_test.go +++ b/test/services/utils/download_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/kgateway-dev/kgateway/test/services/utils" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/services/utils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) func TestGetBinaryFromEnv(t *testing.T) { diff --git a/test/services/vault.go b/test/services/vault.go index 2d76c340587..a0026b7f896 100644 --- a/test/services/vault.go +++ b/test/services/vault.go @@ -18,10 +18,10 @@ import ( "github.com/onsi/gomega" "github.com/solo-io/solo-kit/pkg/utils/protoutils" - "github.com/kgateway-dev/kgateway/test/services/utils" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/services/utils" + "github.com/kgateway-dev/kgateway/v2/test/testutils" - v1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" + v1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega/gexec" diff --git a/test/testutils/env.go b/test/testutils/env.go index 9bfc9de981e..f2e23a37bc7 100644 --- a/test/testutils/env.go +++ b/test/testutils/env.go @@ -3,7 +3,7 @@ package testutils import ( - "github.com/kgateway-dev/kgateway/pkg/utils/envutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/envutils" ) const ( diff --git a/test/testutils/helm_values.go b/test/testutils/helm_values.go index 648229cf53b..12f817a009e 100644 --- a/test/testutils/helm_values.go +++ b/test/testutils/helm_values.go @@ -10,8 +10,8 @@ import ( "knative.dev/pkg/test/helpers" k8syamlutil "sigs.k8s.io/yaml" - "github.com/kgateway-dev/kgateway/install/helm/gloo/generate" - "github.com/kgateway-dev/kgateway/pkg/utils/helmutils" + "github.com/kgateway-dev/kgateway/v2/install/helm/gloo/generate" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/helmutils" ) // HelmValues is a struct that holds the values that will be passed to a Helm chart diff --git a/test/testutils/http_client_test.go b/test/testutils/http_client_test.go index 13dcef2d862..e9184416a58 100644 --- a/test/testutils/http_client_test.go +++ b/test/testutils/http_client_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" - gloohelpers "github.com/kgateway-dev/kgateway/test/helpers" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" + gloohelpers "github.com/kgateway-dev/kgateway/v2/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) var _ = Describe("HttpClientBuilder", func() { diff --git a/test/testutils/http_request_test.go b/test/testutils/http_request_test.go index 79d634bd8ec..e93d5ee680d 100644 --- a/test/testutils/http_request_test.go +++ b/test/testutils/http_request_test.go @@ -5,8 +5,8 @@ package testutils_test import ( . "github.com/onsi/ginkgo/v2" - "github.com/kgateway-dev/kgateway/test/gomega/assertions" - "github.com/kgateway-dev/kgateway/test/testutils" + "github.com/kgateway-dev/kgateway/v2/test/gomega/assertions" + "github.com/kgateway-dev/kgateway/v2/test/testutils" ) var _ = Describe("HttpRequestBuilder", func() { diff --git a/test/testutils/version/changelog.go b/test/testutils/version/changelog.go index 49dc53722a1..bdcda39d146 100644 --- a/test/testutils/version/changelog.go +++ b/test/testutils/version/changelog.go @@ -11,7 +11,7 @@ import ( "github.com/solo-io/go-utils/changelogutils" "github.com/solo-io/go-utils/versionutils" - "github.com/kgateway-dev/kgateway/pkg/utils/fsutils" + "github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils" ) // GetLastReleaseOfCurrentBranch returns the Version of the latest patch version for the current minor version diff --git a/test/testutils/version/changelog_test.go b/test/testutils/version/changelog_test.go index fbc11c4c6a9..fa47a356fa4 100644 --- a/test/testutils/version/changelog_test.go +++ b/test/testutils/version/changelog_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" - "github.com/kgateway-dev/kgateway/test/testutils/version" + "github.com/kgateway-dev/kgateway/v2/test/testutils/version" ) type mockDirEntry struct { diff --git a/test/v1helpers/ssl_proxy.go b/test/v1helpers/ssl_proxy.go index f03a76bc00a..8b24088fedc 100644 --- a/test/v1helpers/ssl_proxy.go +++ b/test/v1helpers/ssl_proxy.go @@ -13,7 +13,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/kgateway-dev/kgateway/test/helpers" + "github.com/kgateway-dev/kgateway/v2/test/helpers" ) func StartSslProxy(ctx context.Context, port uint32) uint32 { diff --git a/test/v1helpers/test_grpc_service/testgrpcservice.go b/test/v1helpers/test_grpc_service/testgrpcservice.go index 75094a37c6f..85d24e4f14b 100644 --- a/test/v1helpers/test_grpc_service/testgrpcservice.go +++ b/test/v1helpers/test_grpc_service/testgrpcservice.go @@ -17,7 +17,7 @@ import ( healthpb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/reflection" - glootest "github.com/kgateway-dev/kgateway/test/v1helpers/test_grpc_service/glootest/protos" + glootest "github.com/kgateway-dev/kgateway/v2/test/v1helpers/test_grpc_service/glootest/protos" ) // For reflection to work, this uses the golang/proto plugin. To install it, run this command: diff --git a/test/v1helpers/test_upstream.go b/test/v1helpers/test_upstream.go index b0e80583ed9..5040a848c8b 100644 --- a/test/v1helpers/test_upstream.go +++ b/test/v1helpers/test_upstream.go @@ -16,7 +16,7 @@ import ( "strconv" "time" - "github.com/kgateway-dev/kgateway/test/gomega/matchers" + "github.com/kgateway-dev/kgateway/v2/test/gomega/matchers" "github.com/golang/protobuf/ptypes/wrappers" @@ -29,10 +29,10 @@ import ( "google.golang.org/grpc/credentials" healthpb "google.golang.org/grpc/health/grpc_health_v1" - gloov1 "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1" - static_plugin_gloo "github.com/kgateway-dev/kgateway/internal/gloo/pkg/api/v1/options/static" - "github.com/kgateway-dev/kgateway/test/helpers" - testgrpcservice "github.com/kgateway-dev/kgateway/test/v1helpers/test_grpc_service" + gloov1 "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1" + static_plugin_gloo "github.com/kgateway-dev/kgateway/v2/internal/gloo/pkg/api/v1/options/static" + "github.com/kgateway-dev/kgateway/v2/test/helpers" + testgrpcservice "github.com/kgateway-dev/kgateway/v2/test/v1helpers/test_grpc_service" ) // TestUpstream is a testing utility (used in in-memory e2e tests) to compose the following concepts: