You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/03/16 10:18:29 UTC
[camel-k] 01/02: feat: move code to version 2
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit eb9228597203f4c46fe2f488e59b7131826e1bde
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Mar 13 10:31:02 2023 +0100
feat: move code to version 2
Closes #4086
---
addons/addons_test.go | 8 ++---
addons/keda/keda.go | 26 ++++++++---------
addons/keda/keda_test.go | 16 +++++-----
addons/master/master.go | 16 +++++-----
addons/register_3scale.go | 4 +--
addons/register_aws_secrets.go | 4 +--
addons/register_azure_key_vault.go | 4 +--
addons/register_gcp_secrets.go | 4 +--
addons/register_hashicorp_vault.go | 4 +--
addons/register_keda.go | 4 +--
addons/register_master.go | 4 +--
addons/register_opentracing.go | 4 +--
addons/register_resume.go | 4 +--
addons/register_strimzi.go | 4 +--
addons/register_telemetry.go | 4 +--
addons/resume/resume.go | 14 ++++-----
addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go | 4 +--
.../duck/client/internalclientset/clientset.go | 2 +-
.../internalclientset/fake/clientset_generated.go | 6 ++--
.../duck/client/internalclientset/fake/register.go | 2 +-
.../client/internalclientset/scheme/register.go | 2 +-
.../typed/duck/v1beta2/duck_client.go | 4 +--
.../typed/duck/v1beta2/fake/fake_duck_client.go | 2 +-
.../typed/duck/v1beta2/fake/fake_kafka.go | 2 +-
.../typed/duck/v1beta2/fake/fake_kafkatopic.go | 2 +-
.../internalclientset/typed/duck/v1beta2/kafka.go | 4 +--
.../typed/duck/v1beta2/kafkatopic.go | 4 +--
addons/strimzi/strimzi.go | 10 +++----
addons/strimzi/strimzi_test.go | 12 ++++----
addons/telemetry/discovery/jaeger.go | 6 ++--
addons/telemetry/discovery/locator.go | 6 ++--
addons/telemetry/telemetry.go | 10 +++----
addons/telemetry/telemetry_test.go | 6 ++--
addons/threescale/3scale.go | 6 ++--
addons/threescale/3scale_test.go | 8 ++---
addons/tracing/discovery/jaeger.go | 6 ++--
addons/tracing/discovery/locator.go | 6 ++--
addons/tracing/tracing.go | 10 +++----
addons/tracing/tracing_test.go | 6 ++--
addons/vault/aws/aws_secrets_manager.go | 8 ++---
addons/vault/aws/aws_secrets_manager_test.go | 6 ++--
addons/vault/azure/azure_key_vault.go | 8 ++---
addons/vault/azure/azure_key_vault_test.go | 6 ++--
addons/vault/gcp/gcp_secret_manager.go | 8 ++---
addons/vault/gcp/gcp_secret_manager_test.go | 6 ++--
addons/vault/hashicorp/hashicorp_vault.go | 8 ++---
addons/vault/hashicorp/hashicorp_vault_test.go | 6 ++--
cmd/kamel/main.go | 6 ++--
cmd/util/doc-gen/generators/traitdocgen.go | 6 ++--
cmd/util/doc-gen/generators/traitmetadatagen.go | 2 +-
cmd/util/doc-gen/main.go | 4 +--
cmd/util/json-schema-gen/main.go | 4 +--
cmd/util/license-check/main.go | 2 +-
cmd/util/vfs-gen/main.go | 6 ++--
e2e/builder/build_test.go | 6 ++--
e2e/builder/registry_test.go | 2 +-
e2e/common/cli/bind_test.go | 2 +-
e2e/common/cli/config_test.go | 6 ++--
e2e/common/cli/default.go | 2 +-
e2e/common/cli/delete_test.go | 2 +-
e2e/common/cli/describe_test.go | 4 +--
e2e/common/cli/dev_mode_test.go | 4 +--
e2e/common/cli/duplicate_parameters_test.go | 4 +--
e2e/common/cli/get_test.go | 2 +-
e2e/common/cli/help_test.go | 2 +-
e2e/common/cli/log_test.go | 2 +-
e2e/common/cli/offline_commands_test.go | 2 +-
e2e/common/cli/run_test.go | 4 +--
e2e/common/cli/version_test.go | 4 +--
e2e/common/config/config_test.go | 6 ++--
e2e/common/config/default.go | 2 +-
e2e/common/languages/default.go | 2 +-
e2e/common/languages/groovy_test.go | 4 +--
e2e/common/languages/init_test_support.go | 6 ++--
e2e/common/languages/java_test.go | 4 +--
e2e/common/languages/js_test.go | 4 +--
e2e/common/languages/kotlin_test.go | 4 +--
e2e/common/languages/polyglot_test.go | 4 +--
e2e/common/languages/xml_test.go | 4 +--
e2e/common/languages/yaml_test.go | 4 +--
e2e/common/misc/client_test.go | 6 ++--
e2e/common/misc/cron_test.go | 4 +--
e2e/common/misc/default.go | 2 +-
e2e/common/misc/integration_fail_test.go | 4 +--
e2e/common/misc/kamelet_binding_test.go | 6 ++--
e2e/common/misc/kamelet_binding_with_image_test.go | 4 +--
e2e/common/misc/kamelet_test.go | 2 +-
e2e/common/misc/kamelet_update_test.go | 4 +--
e2e/common/misc/maven_repository_test.go | 4 +--
e2e/common/misc/platformless_run_test.go | 6 ++--
e2e/common/misc/registry_maven_wagon_test.go | 6 ++--
e2e/common/misc/rest_test.go | 4 +--
e2e/common/misc/scale_binding_test.go | 10 +++----
e2e/common/misc/scale_integration_test.go | 6 ++--
e2e/common/misc/structured_logs_test.go | 4 +--
e2e/common/support/startup_test.go | 4 +--
e2e/common/support/teardown_test.go | 2 +-
e2e/common/traits/affinity_test.go | 4 +--
e2e/common/traits/builder_test.go | 4 +--
e2e/common/traits/container_test.go | 4 +--
e2e/common/traits/default.go | 2 +-
e2e/common/traits/deployment_test.go | 4 +--
e2e/common/traits/error_handler_test.go | 4 +--
e2e/common/traits/errored_trait_test.go | 6 ++--
e2e/common/traits/health_test.go | 6 ++--
e2e/common/traits/istio_test.go | 4 +--
e2e/common/traits/jolokia_test.go | 4 +--
e2e/common/traits/jvm_test.go | 4 +--
e2e/common/traits/master_test.go | 2 +-
e2e/common/traits/openapi_test.go | 2 +-
e2e/common/traits/pdb_test.go | 4 +--
e2e/common/traits/pod_test.go | 4 +--
e2e/common/traits/prometheus_test.go | 6 ++--
e2e/common/traits/pull_secret_test.go | 6 ++--
e2e/common/traits/route_test.go | 4 +--
e2e/common/traits/service_binding_test.go | 4 +--
e2e/common/traits/service_test.go | 2 +-
e2e/common/traits/toleration_test.go | 4 +--
e2e/commonwithcustominstall/builder_test.go | 4 +--
.../catalog_builder_test.go | 6 ++--
e2e/commonwithcustominstall/debug_test.go | 2 +-
e2e/commonwithcustominstall/dump_test.go | 2 +-
e2e/commonwithcustominstall/environment_test.go | 6 ++--
.../incremental_build_test.go | 6 ++--
e2e/commonwithcustominstall/kamelet_repo_test.go | 4 +--
.../maven_http_proxy_test.go | 8 ++---
.../operator_id_filtering_test.go | 8 ++---
.../operator_metrics_test.go | 6 ++--
e2e/commonwithcustominstall/promote_test.go | 4 +--
e2e/commonwithcustominstall/reset_test.go | 2 +-
.../secondary_platform_test.go | 6 ++--
e2e/commonwithcustominstall/tekton_test.go | 2 +-
e2e/install/cli/global_kamelet_test.go | 4 +--
e2e/install/cli/global_test.go | 10 +++----
e2e/install/cli/install_test.go | 14 ++++-----
e2e/install/cli/maven_ca_secret_test.go | 6 ++--
e2e/install/cli/uninstall_test.go | 4 +--
e2e/install/kustomize/common.go | 2 +-
e2e/install/kustomize/operator_test.go | 6 ++--
e2e/install/kustomize/setup_test.go | 4 +--
e2e/install/kustomize/uninstall_test.go | 4 +--
e2e/install/olm/olm_install_test.go | 10 +++----
e2e/install/olm/olm_upgrade_test.go | 8 ++---
e2e/install/olm/upgrade_test.go | 6 ++--
e2e/knative/default.go | 2 +-
e2e/knative/kamelet_test.go | 6 ++--
e2e/knative/knative_platform_test.go | 8 ++---
e2e/knative/knative_test.go | 4 +--
e2e/knative/openapi_test.go | 2 +-
e2e/knative/pod_test.go | 4 +--
e2e/knative/support/startup_test.go | 4 +--
e2e/knative/support/teardown_test.go | 2 +-
e2e/native/native_binding_test.go | 6 ++--
e2e/native/native_test.go | 4 +--
e2e/native/native_test_support.go | 7 +++--
e2e/native/native_with_sources_test.go | 4 +--
e2e/support/csv.go | 2 +-
e2e/support/test_staging_hooks.go | 2 +-
e2e/support/test_support.go | 28 +++++++++---------
e2e/support/util/dump.go | 8 ++---
e2e/support/util/temp_file.go | 2 +-
e2e/telemetry/telemetry_test.go | 2 +-
go.mod | 14 ++++-----
pkg/apis/addtoscheme_camel_v1.go | 2 +-
pkg/apis/addtoscheme_camel_v1alpha1.go | 2 +-
pkg/apis/addtoscheme_monitoring.go | 2 +-
pkg/apis/addtoscheme_openshift.go | 2 +-
pkg/apis/camel/go.mod | 2 +-
pkg/apis/camel/v1/common_types.go | 2 +-
pkg/apis/camel/v1/common_types_support_test.go | 2 +-
pkg/apis/camel/v1/integrationkit_types.go | 2 +-
pkg/apis/camel/v1/zz_generated.deepcopy.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
.../v1alpha1/kamelet_binding_types_support.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_types.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_types_support.go | 2 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 2 +-
pkg/builder/builder.go | 6 ++--
pkg/builder/builder_support.go | 2 +-
pkg/builder/builder_test.go | 6 ++--
pkg/builder/image.go | 6 ++--
pkg/builder/image_test.go | 8 ++---
pkg/builder/project.go | 12 ++++----
pkg/builder/project_test.go | 12 ++++----
pkg/builder/quarkus.go | 12 ++++----
pkg/builder/s2i.go | 8 ++---
pkg/builder/spectrum.go | 8 ++---
pkg/builder/tasks.go | 2 +-
pkg/builder/types.go | 10 +++----
pkg/builder/util.go | 2 +-
pkg/client/apply.go | 4 +--
.../applyconfiguration/camel/v1/addontrait.go | 2 +-
.../applyconfiguration/camel/v1/buildcondition.go | 2 +-
.../camel/applyconfiguration/camel/v1/buildspec.go | 2 +-
.../applyconfiguration/camel/v1/buildstatus.go | 2 +-
.../camel/v1/camelcatalogcondition.go | 2 +-
.../camel/v1/camelcatalogstatus.go | 2 +-
.../camel/applyconfiguration/camel/v1/flow.go | 2 +-
.../camel/v1/healthcheckresponse.go | 2 +-
.../camel/v1/integrationcondition.go | 2 +-
.../camel/v1/integrationkitcondition.go | 2 +-
.../camel/v1/integrationkitspec.go | 2 +-
.../camel/v1/integrationkitstatus.go | 2 +-
.../camel/v1/integrationkittraits.go | 2 +-
.../camel/v1/integrationplatformbuildspec.go | 2 +-
.../camel/v1/integrationplatformcondition.go | 2 +-
.../camel/v1/integrationplatformspec.go | 2 +-
.../camel/v1/integrationplatformstatus.go | 2 +-
.../applyconfiguration/camel/v1/integrationspec.go | 2 +-
.../camel/v1/integrationstatus.go | 2 +-
.../applyconfiguration/camel/v1/runtimespec.go | 2 +-
.../camel/applyconfiguration/camel/v1/server.go | 2 +-
.../applyconfiguration/camel/v1/sourcespec.go | 2 +-
.../camel/v1/traitconfiguration.go | 2 +-
.../camel/applyconfiguration/camel/v1/traits.go | 2 +-
.../applyconfiguration/camel/v1alpha1/endpoint.go | 2 +-
.../camel/v1alpha1/endpointproperties.go | 2 +-
.../camel/v1alpha1/errorhandlerspec.go | 2 +-
.../applyconfiguration/camel/v1alpha1/json.go | 2 +-
.../camel/v1alpha1/jsonschemaprops.go | 2 +-
.../camel/v1alpha1/kameletbindingcondition.go | 4 +--
.../camel/v1alpha1/kameletbindingspec.go | 2 +-
.../camel/v1alpha1/kameletbindingstatus.go | 2 +-
.../camel/v1alpha1/kameletcondition.go | 2 +-
.../camel/v1alpha1/kameletspec.go | 4 +--
.../camel/v1alpha1/kameletstatus.go | 2 +-
.../applyconfiguration/camel/v1alpha1/template.go | 2 +-
pkg/client/camel/applyconfiguration/utils.go | 8 ++---
pkg/client/camel/clientset/versioned/clientset.go | 4 +--
.../versioned/fake/clientset_generated.go | 10 +++----
.../camel/clientset/versioned/fake/register.go | 4 +--
.../camel/clientset/versioned/scheme/register.go | 4 +--
.../clientset/versioned/typed/camel/v1/build.go | 6 ++--
.../versioned/typed/camel/v1/camel_client.go | 4 +--
.../versioned/typed/camel/v1/camelcatalog.go | 6 ++--
.../versioned/typed/camel/v1/fake/fake_build.go | 4 +--
.../typed/camel/v1/fake/fake_camel_client.go | 2 +-
.../typed/camel/v1/fake/fake_camelcatalog.go | 4 +--
.../typed/camel/v1/fake/fake_integration.go | 4 +--
.../typed/camel/v1/fake/fake_integrationkit.go | 4 +--
.../camel/v1/fake/fake_integrationplatform.go | 4 +--
.../versioned/typed/camel/v1/integration.go | 6 ++--
.../versioned/typed/camel/v1/integrationkit.go | 6 ++--
.../typed/camel/v1/integrationplatform.go | 6 ++--
.../versioned/typed/camel/v1alpha1/camel_client.go | 4 +--
.../typed/camel/v1alpha1/fake/fake_camel_client.go | 2 +-
.../typed/camel/v1alpha1/fake/fake_kamelet.go | 4 +--
.../camel/v1alpha1/fake/fake_kameletbinding.go | 4 +--
.../versioned/typed/camel/v1alpha1/kamelet.go | 6 ++--
.../typed/camel/v1alpha1/kameletbinding.go | 6 ++--
pkg/client/camel/go.mod | 6 ++--
.../informers/externalversions/camel/interface.go | 6 ++--
.../informers/externalversions/camel/v1/build.go | 8 ++---
.../externalversions/camel/v1/camelcatalog.go | 8 ++---
.../externalversions/camel/v1/integration.go | 8 ++---
.../externalversions/camel/v1/integrationkit.go | 8 ++---
.../camel/v1/integrationplatform.go | 8 ++---
.../externalversions/camel/v1/interface.go | 2 +-
.../externalversions/camel/v1alpha1/interface.go | 2 +-
.../externalversions/camel/v1alpha1/kamelet.go | 8 ++---
.../camel/v1alpha1/kameletbinding.go | 8 ++---
.../camel/informers/externalversions/factory.go | 6 ++--
.../camel/informers/externalversions/generic.go | 4 +--
.../internalinterfaces/factory_interfaces.go | 2 +-
pkg/client/camel/listers/camel/v1/build.go | 2 +-
pkg/client/camel/listers/camel/v1/camelcatalog.go | 2 +-
pkg/client/camel/listers/camel/v1/integration.go | 2 +-
.../camel/listers/camel/v1/integrationkit.go | 2 +-
.../camel/listers/camel/v1/integrationplatform.go | 2 +-
pkg/client/camel/listers/camel/v1alpha1/kamelet.go | 2 +-
.../camel/listers/camel/v1alpha1/kameletbinding.go | 2 +-
pkg/client/client.go | 10 +++----
pkg/cmd/bind.go | 12 ++++----
pkg/cmd/bind_test.go | 6 ++--
pkg/cmd/builder.go | 2 +-
pkg/cmd/builder/builder.go | 12 ++++----
pkg/cmd/builder_test.go | 2 +-
pkg/cmd/completion_bash.go | 6 ++--
pkg/cmd/config_test.go | 2 +-
pkg/cmd/debug.go | 10 +++----
pkg/cmd/delete.go | 8 ++---
pkg/cmd/delete_test.go | 2 +-
pkg/cmd/describe.go | 4 +--
pkg/cmd/describe_integration.go | 4 +--
pkg/cmd/describe_kamelet.go | 4 +--
pkg/cmd/describe_kit.go | 4 +--
pkg/cmd/describe_platform.go | 4 +--
pkg/cmd/dump.go | 10 +++----
pkg/cmd/get.go | 2 +-
pkg/cmd/init.go | 6 ++--
pkg/cmd/install.go | 24 +++++++--------
pkg/cmd/install_test.go | 4 +--
pkg/cmd/kamelet_add_repo.go | 4 +--
pkg/cmd/kamelet_add_repo_test.go | 4 +--
pkg/cmd/kamelet_delete.go | 2 +-
pkg/cmd/kamelet_get.go | 2 +-
pkg/cmd/kamelet_remove_repo.go | 2 +-
pkg/cmd/kamelet_remove_repo_test.go | 4 +--
pkg/cmd/kit_create.go | 8 ++---
pkg/cmd/kit_create_test.go | 2 +-
pkg/cmd/kit_delete.go | 2 +-
pkg/cmd/kit_get.go | 2 +-
pkg/cmd/local.go | 2 +-
pkg/cmd/local/container.go | 4 +--
pkg/cmd/local/local.go | 16 +++++-----
pkg/cmd/local/workdir.go | 2 +-
pkg/cmd/local_build.go | 4 +--
pkg/cmd/local_build_test.go | 2 +-
pkg/cmd/local_inspect.go | 2 +-
pkg/cmd/local_inspect_test.go | 2 +-
pkg/cmd/local_run.go | 4 +--
pkg/cmd/local_run_test.go | 2 +-
pkg/cmd/log.go | 4 +--
pkg/cmd/log_test.go | 2 +-
pkg/cmd/modeline.go | 6 ++--
pkg/cmd/modeline_test.go | 2 +-
pkg/cmd/operator.go | 6 ++--
pkg/cmd/operator/operator.go | 20 ++++++-------
pkg/cmd/operator_test.go | 2 +-
pkg/cmd/promote.go | 18 ++++++------
pkg/cmd/promote_test.go | 10 +++----
pkg/cmd/rebuild.go | 4 +--
pkg/cmd/rebuild_test.go | 2 +-
pkg/cmd/reset.go | 6 ++--
pkg/cmd/root.go | 6 ++--
pkg/cmd/root_test.go | 4 +--
pkg/cmd/run.go | 34 +++++++++++-----------
pkg/cmd/run_support.go | 12 ++++----
pkg/cmd/run_support_test.go | 4 +--
pkg/cmd/run_test.go | 10 +++----
pkg/cmd/source/content.go | 4 +--
pkg/cmd/source/source.go | 2 +-
pkg/cmd/trait_help.go | 8 ++---
pkg/cmd/trait_help_test.go | 2 +-
pkg/cmd/trait_support.go | 6 ++--
pkg/cmd/uninstall.go | 6 ++--
pkg/cmd/uninstall_test.go | 2 +-
pkg/cmd/util.go | 6 ++--
pkg/cmd/util_config.go | 2 +-
pkg/cmd/version.go | 8 ++---
pkg/cmd/version_test.go | 4 +--
pkg/controller/add_build.go | 2 +-
pkg/controller/add_catalog.go | 2 +-
pkg/controller/add_integration.go | 2 +-
pkg/controller/add_integrationkit.go | 2 +-
pkg/controller/add_integrationplatform.go | 2 +-
pkg/controller/add_kamelet.go | 2 +-
pkg/controller/add_kameletbinding.go | 2 +-
pkg/controller/build/action.go | 8 ++---
pkg/controller/build/build_controller.go | 10 +++----
pkg/controller/build/build_pod.go | 10 +++----
pkg/controller/build/error.go | 2 +-
pkg/controller/build/initialize_pod.go | 2 +-
pkg/controller/build/initialize_routine.go | 2 +-
pkg/controller/build/log.go | 2 +-
pkg/controller/build/metrics.go | 2 +-
pkg/controller/build/monitor_pod.go | 6 ++--
pkg/controller/build/monitor_routine.go | 10 +++----
pkg/controller/build/recovery.go | 2 +-
pkg/controller/build/schedule.go | 6 ++--
pkg/controller/catalog/action.go | 6 ++--
pkg/controller/catalog/catalog_controller.go | 10 +++----
pkg/controller/catalog/initialize.go | 10 +++----
pkg/controller/catalog/log.go | 2 +-
pkg/controller/catalog/monitor.go | 2 +-
pkg/controller/controller.go | 2 +-
pkg/controller/integration/action.go | 6 ++--
pkg/controller/integration/build_kit.go | 8 ++---
pkg/controller/integration/health.go | 2 +-
pkg/controller/integration/health_test.go | 2 +-
pkg/controller/integration/initialize.go | 8 ++---
.../integration/integration_controller.go | 18 ++++++------
pkg/controller/integration/kits.go | 12 ++++----
pkg/controller/integration/kits_test.go | 10 +++----
pkg/controller/integration/log.go | 2 +-
pkg/controller/integration/monitor.go | 8 ++---
pkg/controller/integration/monitor_cronjob.go | 6 ++--
pkg/controller/integration/monitor_deployment.go | 4 +--
pkg/controller/integration/monitor_knative.go | 4 +--
pkg/controller/integration/platform_setup.go | 10 +++----
pkg/controller/integrationkit/action.go | 6 ++--
pkg/controller/integrationkit/build.go | 10 +++----
pkg/controller/integrationkit/error.go | 4 +--
pkg/controller/integrationkit/initialize.go | 8 ++---
.../integrationkit/integrationkit_controller.go | 14 ++++-----
pkg/controller/integrationkit/log.go | 2 +-
pkg/controller/integrationkit/monitor.go | 4 +--
pkg/controller/integrationplatform/action.go | 6 ++--
pkg/controller/integrationplatform/create.go | 10 +++----
pkg/controller/integrationplatform/create_test.go | 10 +++----
pkg/controller/integrationplatform/initialize.go | 10 +++----
.../integrationplatform/initialize_test.go | 8 ++---
.../integrationplatform_controller.go | 10 +++----
pkg/controller/integrationplatform/kaniko_cache.go | 8 ++---
pkg/controller/integrationplatform/log.go | 2 +-
pkg/controller/integrationplatform/monitor.go | 6 ++--
pkg/controller/integrationplatform/warm.go | 2 +-
pkg/controller/integrationplatform/warm_test.go | 8 ++---
pkg/controller/kamelet/action.go | 6 ++--
pkg/controller/kamelet/initialize.go | 4 +--
pkg/controller/kamelet/kamelet_controller.go | 10 +++----
pkg/controller/kamelet/log.go | 2 +-
pkg/controller/kamelet/monitor.go | 4 +--
pkg/controller/kameletbinding/action.go | 6 ++--
pkg/controller/kameletbinding/error_handler.go | 4 +--
.../kameletbinding/error_handler_test.go | 6 ++--
pkg/controller/kameletbinding/initialize.go | 10 +++----
pkg/controller/kameletbinding/integration.go | 18 ++++++------
.../kameletbinding/kamelet_binding_controller.go | 18 ++++++------
pkg/controller/kameletbinding/log.go | 2 +-
pkg/controller/kameletbinding/monitor.go | 6 ++--
pkg/event/manager.go | 10 +++----
pkg/install/builder.go | 4 +--
pkg/install/cluster.go | 8 ++---
pkg/install/common.go | 10 +++----
pkg/install/kamelets.go | 12 ++++----
pkg/install/kamelets_test.go | 2 +-
pkg/install/knative.go | 2 +-
pkg/install/openshift.go | 8 ++---
pkg/install/operator.go | 20 ++++++-------
pkg/install/optional.go | 6 ++--
pkg/install/platform.go | 2 +-
pkg/install/secret.go | 8 ++---
pkg/kamelet/initialize.go | 2 +-
pkg/kamelet/repository/composite_repository.go | 2 +-
.../repository/composite_repository_test.go | 4 +--
pkg/kamelet/repository/empty_repository.go | 2 +-
pkg/kamelet/repository/github_repository.go | 2 +-
pkg/kamelet/repository/go.mod | 10 +++----
pkg/kamelet/repository/kubernetes_repository.go | 4 +--
.../repository/kubernetes_repository_test.go | 4 +--
pkg/kamelet/repository/repository.go | 6 ++--
pkg/kamelet/repository/repository_test.go | 6 ++--
pkg/metadata/metadata.go | 6 ++--
pkg/metadata/metadata_capabilities_test.go | 4 +--
pkg/metadata/metadata_dependencies_test.go | 4 +--
pkg/metadata/metadata_http_test.go | 4 +--
pkg/metadata/metadata_uri_test.go | 4 +--
pkg/metadata/types.go | 2 +-
pkg/platform/defaults.go | 18 ++++++------
pkg/platform/operator.go | 6 ++--
pkg/platform/platform.go | 6 ++--
pkg/resources/resources.go | 17 +++++++++++
pkg/resources/resources_support.go | 2 +-
pkg/trait/affinity.go | 4 +--
pkg/trait/affinity_test.go | 2 +-
pkg/trait/builder.go | 10 +++----
pkg/trait/builder_test.go | 8 ++---
pkg/trait/camel.go | 10 +++----
pkg/trait/camel_test.go | 8 ++---
pkg/trait/container.go | 16 +++++-----
pkg/trait/container_probes_test.go | 8 ++---
pkg/trait/container_test.go | 10 +++----
pkg/trait/cron.go | 14 ++++-----
pkg/trait/cron_test.go | 10 +++----
pkg/trait/dependencies.go | 12 ++++----
pkg/trait/dependencies_test.go | 4 +--
pkg/trait/deployer.go | 4 +--
pkg/trait/deployer_test.go | 2 +-
pkg/trait/deployment.go | 6 ++--
pkg/trait/deployment_test.go | 6 ++--
pkg/trait/environment.go | 10 +++----
pkg/trait/environment_test.go | 8 ++---
pkg/trait/error_handler.go | 8 ++---
pkg/trait/error_handler_test.go | 6 ++--
pkg/trait/gc.go | 6 ++--
pkg/trait/gc_test.go | 2 +-
pkg/trait/health.go | 6 ++--
pkg/trait/ingress.go | 4 +--
pkg/trait/ingress_test.go | 4 +--
pkg/trait/init.go | 8 ++---
pkg/trait/istio.go | 2 +-
pkg/trait/istio_test.go | 8 ++---
pkg/trait/jolokia.go | 6 ++--
pkg/trait/jolokia_test.go | 4 +--
pkg/trait/jvm.go | 12 ++++----
pkg/trait/jvm_test.go | 10 +++----
pkg/trait/kamelets.go | 20 ++++++-------
pkg/trait/kamelets_test.go | 10 +++----
pkg/trait/knative.go | 16 +++++-----
pkg/trait/knative_service.go | 10 +++----
pkg/trait/knative_service_test.go | 14 ++++-----
pkg/trait/knative_test.go | 16 +++++-----
pkg/trait/logging.go | 4 +--
pkg/trait/logging_test.go | 8 ++---
pkg/trait/mount.go | 8 ++---
pkg/trait/mount_test.go | 12 ++++----
pkg/trait/openapi.go | 18 ++++++------
pkg/trait/openapi_test.go | 4 +--
pkg/trait/owner.go | 4 +--
pkg/trait/owner_test.go | 4 +--
pkg/trait/pdb.go | 4 +--
pkg/trait/pdb_test.go | 4 +--
pkg/trait/platform.go | 14 ++++-----
pkg/trait/platform_test.go | 8 ++---
pkg/trait/pod.go | 4 +--
pkg/trait/pod_test.go | 6 ++--
pkg/trait/prometheus.go | 6 ++--
pkg/trait/prometheus_test.go | 6 ++--
pkg/trait/pull_secret.go | 8 ++---
pkg/trait/pull_secret_test.go | 6 ++--
pkg/trait/quarkus.go | 12 ++++----
pkg/trait/quarkus_test.go | 6 ++--
pkg/trait/registry.go | 10 +++----
pkg/trait/route.go | 6 ++--
pkg/trait/route_test.go | 10 +++----
pkg/trait/service.go | 8 ++---
pkg/trait/service_binding.go | 8 ++---
pkg/trait/service_test.go | 10 +++----
pkg/trait/test_support.go | 6 ++--
pkg/trait/toleration.go | 4 +--
pkg/trait/trait.go | 10 +++----
pkg/trait/trait_catalog.go | 6 ++--
pkg/trait/trait_configure.go | 4 +--
pkg/trait/trait_configure_test.go | 4 +--
pkg/trait/trait_test.go | 8 ++---
pkg/trait/trait_types.go | 16 +++++-----
pkg/trait/trait_types_test.go | 2 +-
pkg/trait/util.go | 14 ++++-----
pkg/trait/util_test.go | 6 ++--
pkg/util/bindings/api.go | 6 ++--
pkg/util/bindings/bindings_test.go | 8 ++---
pkg/util/bindings/camel_uri.go | 4 +--
pkg/util/bindings/catalog.go | 2 +-
pkg/util/bindings/kamelet.go | 2 +-
pkg/util/bindings/kamelet_test.go | 6 ++--
pkg/util/bindings/knative_ref.go | 10 +++----
pkg/util/bindings/knative_uri.go | 10 +++----
pkg/util/bindings/test_support.go | 4 +--
pkg/util/camel/camel_dependencies.go | 6 ++--
pkg/util/camel/camel_runtime.go | 4 +--
pkg/util/camel/camel_runtime_catalog.go | 4 +--
pkg/util/camel/camel_types.go | 2 +-
pkg/util/camel/camel_util.go | 4 +--
pkg/util/camel/camel_util_test.go | 2 +-
pkg/util/camel/catalog.go | 14 ++++-----
pkg/util/defaults/defaults_support.go | 2 +-
pkg/util/digest/digest.go | 8 ++---
pkg/util/digest/digest_test.go | 2 +-
pkg/util/docker/docker.go | 4 +--
pkg/util/docker/docker_base.go | 2 +-
pkg/util/dsl/flow.go | 2 +-
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
pkg/util/gzip/compress.go | 2 +-
pkg/util/jitpack/jitpack.go | 2 +-
pkg/util/jitpack/jitpack_test.go | 2 +-
pkg/util/jvm/keystore.go | 4 +--
pkg/util/kamelets/util.go | 16 +++++-----
pkg/util/knative/apis.go | 4 +--
pkg/util/knative/apis_test.go | 2 +-
pkg/util/knative/enabled.go | 2 +-
pkg/util/knative/knative.go | 4 +--
pkg/util/knative/uri.go | 4 +--
pkg/util/knative/uri_test.go | 2 +-
pkg/util/kubernetes/camel.go | 2 +-
pkg/util/kubernetes/client.go | 6 ++--
pkg/util/kubernetes/collection.go | 2 +-
pkg/util/kubernetes/log/annotation_scraper.go | 2 +-
pkg/util/kubernetes/log/pod_scraper.go | 2 +-
pkg/util/kubernetes/log/util.go | 2 +-
pkg/util/kubernetes/lookup.go | 2 +-
pkg/util/kubernetes/portforward.go | 4 +--
pkg/util/kubernetes/replace.go | 4 +--
pkg/util/kubernetes/resolver.go | 4 +--
pkg/util/kubernetes/util.go | 2 +-
pkg/util/label/label.go | 2 +-
pkg/util/label/label_test.go | 2 +-
pkg/util/log/log.go | 4 +--
pkg/util/maven/maven_command.go | 4 +--
pkg/util/maven/maven_log.go | 2 +-
pkg/util/maven/maven_log_test.go | 2 +-
pkg/util/maven/maven_project.go | 2 +-
pkg/util/maven/maven_project_test.go | 4 +--
pkg/util/maven/maven_repositories.go | 2 +-
pkg/util/maven/maven_settings.go | 2 +-
pkg/util/maven/maven_settings_test.go | 4 +--
pkg/util/maven/maven_types.go | 2 +-
pkg/util/minikube/registry.go | 2 +-
pkg/util/modeline/parser.go | 2 +-
pkg/util/olm/available.go | 2 +-
pkg/util/olm/operator.go | 6 ++--
pkg/util/openshift/register.go | 2 +-
pkg/util/reference/reference.go | 2 +-
pkg/util/registry/kep_1755.go | 2 +-
pkg/util/resource/config.go | 6 ++--
pkg/util/source/inspector.go | 6 ++--
pkg/util/source/inspector_groovy.go | 4 +--
pkg/util/source/inspector_groovy_test.go | 2 +-
pkg/util/source/inspector_java_script.go | 4 +--
pkg/util/source/inspector_java_script_test.go | 2 +-
pkg/util/source/inspector_java_source.go | 4 +--
pkg/util/source/inspector_java_source_test.go | 2 +-
pkg/util/source/inspector_kotlin.go | 4 +--
pkg/util/source/inspector_kotlin_test.go | 2 +-
pkg/util/source/inspector_xml.go | 2 +-
pkg/util/source/inspector_xml_test.go | 2 +-
pkg/util/source/inspector_yaml.go | 4 +--
pkg/util/source/inspector_yaml_test.go | 8 ++---
pkg/util/source/test_support.go | 2 +-
pkg/util/sync/file.go | 2 +-
pkg/util/test/assertions.go | 2 +-
pkg/util/test/catalog_test.go | 4 +--
pkg/util/test/client.go | 12 ++++----
pkg/util/uri/uri.go | 2 +-
pkg/util/watch/watch.go | 4 +--
606 files changed, 1623 insertions(+), 1605 deletions(-)
diff --git a/addons/addons_test.go b/addons/addons_test.go
index b33e880f9..600b80c52 100644
--- a/addons/addons_test.go
+++ b/addons/addons_test.go
@@ -22,10 +22,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/addons/master"
- "github.com/apache/camel-k/addons/telemetry"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/master"
+ "github.com/apache/camel-k/v2/addons/telemetry"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 1b5aa0ab4..f85fb1359 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -25,19 +25,19 @@ import (
"strings"
"text/template"
- kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/kamelet/repository"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/property"
- "github.com/apache/camel-k/pkg/util/source"
- "github.com/apache/camel-k/pkg/util/uri"
+ kedav1alpha1 "github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/kamelet/repository"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/property"
+ "github.com/apache/camel-k/v2/pkg/util/source"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
"github.com/pkg/errors"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1"
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 75924a83d..fdfa721d9 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -22,14 +22,14 @@ import (
"encoding/json"
"testing"
- "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/controller/kameletbinding"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
diff --git a/addons/master/master.go b/addons/master/master.go
index 80d7a36ba..aad5a8af5 100644
--- a/addons/master/master.go
+++ b/addons/master/master.go
@@ -24,14 +24,14 @@ import (
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/uri"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
)
// The Master trait allows to configure the integration to automatically leverage Kubernetes resources for doing
diff --git a/addons/register_3scale.go b/addons/register_3scale.go
index aaa3cb1f4..0287b42e2 100644
--- a/addons/register_3scale.go
+++ b/addons/register_3scale.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/threescale"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/threescale"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_aws_secrets.go b/addons/register_aws_secrets.go
index b5c93ee72..f7de941ad 100644
--- a/addons/register_aws_secrets.go
+++ b/addons/register_aws_secrets.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/vault/aws"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/vault/aws"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_azure_key_vault.go b/addons/register_azure_key_vault.go
index 7c76cdbb7..af02c782e 100644
--- a/addons/register_azure_key_vault.go
+++ b/addons/register_azure_key_vault.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/vault/azure"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/vault/azure"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_gcp_secrets.go b/addons/register_gcp_secrets.go
index 1830836b6..148dbabc0 100644
--- a/addons/register_gcp_secrets.go
+++ b/addons/register_gcp_secrets.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/vault/gcp"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/vault/gcp"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_hashicorp_vault.go b/addons/register_hashicorp_vault.go
index 563cb1750..a777627de 100644
--- a/addons/register_hashicorp_vault.go
+++ b/addons/register_hashicorp_vault.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/vault/hashicorp"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/vault/hashicorp"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_keda.go b/addons/register_keda.go
index a8699ccb1..bfb03598f 100644
--- a/addons/register_keda.go
+++ b/addons/register_keda.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/keda"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/keda"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_master.go b/addons/register_master.go
index 061ee2dac..22d451662 100644
--- a/addons/register_master.go
+++ b/addons/register_master.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/master"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/master"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_opentracing.go b/addons/register_opentracing.go
index d2fb82b73..6b28d49ee 100644
--- a/addons/register_opentracing.go
+++ b/addons/register_opentracing.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/tracing"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/tracing"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_resume.go b/addons/register_resume.go
index b3deb96d8..9ededdec4 100644
--- a/addons/register_resume.go
+++ b/addons/register_resume.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/resume"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/resume"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/register_strimzi.go b/addons/register_strimzi.go
index de9c90d29..4fe8707cf 100644
--- a/addons/register_strimzi.go
+++ b/addons/register_strimzi.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/strimzi"
- "github.com/apache/camel-k/pkg/util/bindings"
+ "github.com/apache/camel-k/v2/addons/strimzi"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
)
func init() {
diff --git a/addons/register_telemetry.go b/addons/register_telemetry.go
index 9e2961522..fd451a826 100644
--- a/addons/register_telemetry.go
+++ b/addons/register_telemetry.go
@@ -18,8 +18,8 @@ limitations under the License.
package addons
import (
- "github.com/apache/camel-k/addons/telemetry"
- "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/v2/addons/telemetry"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
func init() {
diff --git a/addons/resume/resume.go b/addons/resume/resume.go
index 1554f747b..8e92dd797 100644
--- a/addons/resume/resume.go
+++ b/addons/resume/resume.go
@@ -18,13 +18,13 @@ limitations under the License.
package resume
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
"k8s.io/utils/pointer"
)
diff --git a/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go b/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
index 2a4e7e31b..5fc640085 100644
--- a/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
+++ b/addons/strimzi/addtoscheme_strimzi_duck_v1beta2.go
@@ -18,8 +18,8 @@ limitations under the License.
package strimzi
import (
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
- "github.com/apache/camel-k/pkg/apis"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
+ "github.com/apache/camel-k/v2/pkg/apis"
)
func init() {
diff --git a/addons/strimzi/duck/client/internalclientset/clientset.go b/addons/strimzi/duck/client/internalclientset/clientset.go
index dc36e60e5..357b35837 100644
--- a/addons/strimzi/duck/client/internalclientset/clientset.go
+++ b/addons/strimzi/duck/client/internalclientset/clientset.go
@@ -23,7 +23,7 @@ import (
"fmt"
"net/http"
- kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
+ kafkav1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go b/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
index 1d4d52e6b..09946104c 100644
--- a/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/clientset_generated.go
@@ -20,9 +20,9 @@ limitations under the License.
package fake
import (
- clientset "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset"
- kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
- fakekafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake"
+ clientset "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset"
+ kafkav1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
+ fakekafkav1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go b/addons/strimzi/duck/client/internalclientset/fake/register.go
index b03a9f805..53a4309e7 100644
--- a/addons/strimzi/duck/client/internalclientset/fake/register.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ kafkav1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go b/addons/strimzi/duck/client/internalclientset/scheme/register.go
index bb376affd..11f233b92 100644
--- a/addons/strimzi/duck/client/internalclientset/scheme/register.go
+++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go
@@ -20,7 +20,7 @@ limitations under the License.
package scheme
import (
- kafkav1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ kafkav1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
index 542445b16..71d1ced2a 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/duck_client.go
@@ -22,8 +22,8 @@ package v1beta2
import (
"net/http"
- "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme"
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/scheme"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
rest "k8s.io/client-go/rest"
)
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
index bdf43d57e..f2d068c00 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_duck_client.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
index 93acdff7b..dc11a28b8 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafka.go
@@ -22,7 +22,7 @@ package fake
import (
"context"
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
index 50298e6ee..40c997135 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/fake/fake_kafkatopic.go
@@ -22,7 +22,7 @@ package fake
import (
"context"
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
index e27f9c255..e4f711608 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafka.go
@@ -23,8 +23,8 @@ import (
"context"
"time"
- scheme "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme"
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ scheme "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/scheme"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
diff --git a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
index 3be380fb4..984bc9501 100644
--- a/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
+++ b/addons/strimzi/duck/client/internalclientset/typed/duck/v1beta2/kafkatopic.go
@@ -23,8 +23,8 @@ import (
"context"
"time"
- scheme "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/scheme"
- v1beta2 "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
+ scheme "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/scheme"
+ v1beta2 "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
diff --git a/addons/strimzi/strimzi.go b/addons/strimzi/strimzi.go
index 244264f2c..f414afa90 100644
--- a/addons/strimzi/strimzi.go
+++ b/addons/strimzi/strimzi.go
@@ -21,11 +21,11 @@ package strimzi
import (
"fmt"
- "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset"
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/bindings"
- "github.com/apache/camel-k/pkg/util/uri"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
diff --git a/addons/strimzi/strimzi_test.go b/addons/strimzi/strimzi_test.go
index b1df8ebdc..b99e66440 100644
--- a/addons/strimzi/strimzi_test.go
+++ b/addons/strimzi/strimzi_test.go
@@ -22,12 +22,12 @@ import (
"encoding/json"
"testing"
- "github.com/apache/camel-k/addons/strimzi/duck/client/internalclientset/fake"
- "github.com/apache/camel-k/addons/strimzi/duck/v1beta2"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/bindings"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/client/internalclientset/fake"
+ "github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/addons/telemetry/discovery/jaeger.go b/addons/telemetry/discovery/jaeger.go
index 2eebd14b3..04d508725 100644
--- a/addons/telemetry/discovery/jaeger.go
+++ b/addons/telemetry/discovery/jaeger.go
@@ -23,9 +23,9 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/addons/telemetry/discovery/locator.go b/addons/telemetry/discovery/locator.go
index 42563791e..ec30a808b 100644
--- a/addons/telemetry/discovery/locator.go
+++ b/addons/telemetry/discovery/locator.go
@@ -20,9 +20,9 @@ package discovery
import (
"context"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// TelemetryLocators contains available telemetry OTLP locators.
diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go
index b3687296c..0ad3035de 100644
--- a/addons/telemetry/telemetry.go
+++ b/addons/telemetry/telemetry.go
@@ -20,11 +20,11 @@ package telemetry
import (
"k8s.io/utils/pointer"
- "github.com/apache/camel-k/addons/telemetry/discovery"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/addons/telemetry/discovery"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
// The Telemetry trait can be used to automatically publish tracing information to an OTLP compatible collector.
diff --git a/addons/telemetry/telemetry_test.go b/addons/telemetry/telemetry_test.go
index 02070f8b2..76bea8696 100644
--- a/addons/telemetry/telemetry_test.go
+++ b/addons/telemetry/telemetry_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/addons/threescale/3scale.go b/addons/threescale/3scale.go
index 89ddef8f0..a75fa460f 100644
--- a/addons/threescale/3scale.go
+++ b/addons/threescale/3scale.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
// The 3scale trait can be used to automatically create annotations that allow
diff --git a/addons/threescale/3scale_test.go b/addons/threescale/3scale_test.go
index a6c7f4b9a..cfd802514 100644
--- a/addons/threescale/3scale_test.go
+++ b/addons/threescale/3scale_test.go
@@ -20,10 +20,10 @@ package threescale
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/addons/tracing/discovery/jaeger.go b/addons/tracing/discovery/jaeger.go
index 25eeb7f1e..27d822a2b 100644
--- a/addons/tracing/discovery/jaeger.go
+++ b/addons/tracing/discovery/jaeger.go
@@ -23,9 +23,9 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/addons/tracing/discovery/locator.go b/addons/tracing/discovery/locator.go
index bf2f752f9..a6aea7eea 100644
--- a/addons/tracing/discovery/locator.go
+++ b/addons/tracing/discovery/locator.go
@@ -20,9 +20,9 @@ package discovery
import (
"context"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// TracingLocators contains available tracing locators.
diff --git a/addons/tracing/tracing.go b/addons/tracing/tracing.go
index 667240fe2..85278a96d 100644
--- a/addons/tracing/tracing.go
+++ b/addons/tracing/tracing.go
@@ -20,11 +20,11 @@ package tracing
import (
"k8s.io/utils/pointer"
- "github.com/apache/camel-k/addons/tracing/discovery"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/addons/tracing/discovery"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
//
diff --git a/addons/tracing/tracing_test.go b/addons/tracing/tracing_test.go
index 3c5663c10..0cdaef089 100644
--- a/addons/tracing/tracing_test.go
+++ b/addons/tracing/tracing_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go
index bde547997..2b5dbcec3 100644
--- a/addons/vault/aws/aws_secrets_manager.go
+++ b/addons/vault/aws/aws_secrets_manager.go
@@ -20,10 +20,10 @@ package aws
import (
"strconv"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
"k8s.io/utils/pointer"
)
diff --git a/addons/vault/aws/aws_secrets_manager_test.go b/addons/vault/aws/aws_secrets_manager_test.go
index 759a60d45..a1084c3b0 100644
--- a/addons/vault/aws/aws_secrets_manager_test.go
+++ b/addons/vault/aws/aws_secrets_manager_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/addons/vault/azure/azure_key_vault.go b/addons/vault/azure/azure_key_vault.go
index a0723744e..24db92014 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -20,10 +20,10 @@ package azure
import (
"strconv"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
"k8s.io/utils/pointer"
)
diff --git a/addons/vault/azure/azure_key_vault_test.go b/addons/vault/azure/azure_key_vault_test.go
index b074d5589..6de912212 100644
--- a/addons/vault/azure/azure_key_vault_test.go
+++ b/addons/vault/azure/azure_key_vault_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/addons/vault/gcp/gcp_secret_manager.go b/addons/vault/gcp/gcp_secret_manager.go
index 3eb6a94ec..6de0dd9fb 100644
--- a/addons/vault/gcp/gcp_secret_manager.go
+++ b/addons/vault/gcp/gcp_secret_manager.go
@@ -20,10 +20,10 @@ package gcp
import (
"strconv"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
"k8s.io/utils/pointer"
)
diff --git a/addons/vault/gcp/gcp_secret_manager_test.go b/addons/vault/gcp/gcp_secret_manager_test.go
index 77a580ad8..a7e88ad7c 100644
--- a/addons/vault/gcp/gcp_secret_manager_test.go
+++ b/addons/vault/gcp/gcp_secret_manager_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/addons/vault/hashicorp/hashicorp_vault.go b/addons/vault/hashicorp/hashicorp_vault.go
index b5f22c294..43e678082 100644
--- a/addons/vault/hashicorp/hashicorp_vault.go
+++ b/addons/vault/hashicorp/hashicorp_vault.go
@@ -18,10 +18,10 @@ limitations under the License.
package hashicorp
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
"k8s.io/utils/pointer"
)
diff --git a/addons/vault/hashicorp/hashicorp_vault_test.go b/addons/vault/hashicorp/hashicorp_vault_test.go
index 53babdfaf..7333dffe1 100644
--- a/addons/vault/hashicorp/hashicorp_vault_test.go
+++ b/addons/vault/hashicorp/hashicorp_vault_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
)
diff --git a/cmd/kamel/main.go b/cmd/kamel/main.go
index bbce8e9de..b86a96cf6 100644
--- a/cmd/kamel/main.go
+++ b/cmd/kamel/main.go
@@ -23,9 +23,9 @@ import (
"os"
"time"
- _ "github.com/apache/camel-k/addons"
- _ "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/cmd"
+ _ "github.com/apache/camel-k/v2/addons"
+ _ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/cmd"
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go
index 2ac26acf0..08f8c69af 100644
--- a/cmd/util/doc-gen/generators/traitdocgen.go
+++ b/cmd/util/doc-gen/generators/traitdocgen.go
@@ -34,9 +34,9 @@ import (
"k8s.io/gengo/generator"
"k8s.io/gengo/types"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
const (
diff --git a/cmd/util/doc-gen/generators/traitmetadatagen.go b/cmd/util/doc-gen/generators/traitmetadatagen.go
index bf427c192..5d3f3e0ab 100644
--- a/cmd/util/doc-gen/generators/traitmetadatagen.go
+++ b/cmd/util/doc-gen/generators/traitmetadatagen.go
@@ -26,7 +26,7 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
"gopkg.in/yaml.v2"
"k8s.io/gengo/args"
diff --git a/cmd/util/doc-gen/main.go b/cmd/util/doc-gen/main.go
index 29438a4d0..b80d8bc54 100644
--- a/cmd/util/doc-gen/main.go
+++ b/cmd/util/doc-gen/main.go
@@ -18,11 +18,11 @@ limitations under the License.
package main
import (
- "github.com/apache/camel-k/cmd/util/doc-gen/generators"
+ "github.com/apache/camel-k/v2/cmd/util/doc-gen/generators"
"github.com/spf13/pflag"
"k8s.io/gengo/args"
- _ "github.com/apache/camel-k/addons"
+ _ "github.com/apache/camel-k/v2/addons"
)
func main() {
diff --git a/cmd/util/json-schema-gen/main.go b/cmd/util/json-schema-gen/main.go
index 1d905a961..d5ebe78cd 100644
--- a/cmd/util/json-schema-gen/main.go
+++ b/cmd/util/json-schema-gen/main.go
@@ -24,12 +24,12 @@ import (
"reflect"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
clientscheme "k8s.io/client-go/kubernetes/scheme"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func main() {
diff --git a/cmd/util/license-check/main.go b/cmd/util/license-check/main.go
index 1d411ee31..6d79257a6 100644
--- a/cmd/util/license-check/main.go
+++ b/cmd/util/license-check/main.go
@@ -22,7 +22,7 @@ import (
"os"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
func main() {
diff --git a/cmd/util/vfs-gen/main.go b/cmd/util/vfs-gen/main.go
index ab6e48acf..79d6f8593 100644
--- a/cmd/util/vfs-gen/main.go
+++ b/cmd/util/vfs-gen/main.go
@@ -28,10 +28,10 @@ import (
"strings"
"time"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
- "github.com/apache/camel-k/cmd/util/vfs-gen/multifs"
- "github.com/apache/camel-k/pkg/base"
+ "github.com/apache/camel-k/v2/cmd/util/vfs-gen/multifs"
+ "github.com/apache/camel-k/v2/pkg/base"
"github.com/shurcooL/httpfs/filter"
"github.com/shurcooL/vfsgen"
)
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index b4eb9a5a6..22de1dda5 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -30,9 +30,9 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
type kitOptions struct {
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index 278e3e009..b587e8262 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -30,7 +30,7 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestRunWithDockerHubRegistry(t *testing.T) {
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
index 00b87ad0b..f9a526311 100644
--- a/e2e/common/cli/bind_test.go
+++ b/e2e/common/cli/bind_test.go
@@ -29,7 +29,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelCLIBind(t *testing.T) {
diff --git a/e2e/common/cli/config_test.go b/e2e/common/cli/config_test.go
index 046acf759..c86228b9f 100644
--- a/e2e/common/cli/config_test.go
+++ b/e2e/common/cli/config_test.go
@@ -32,9 +32,9 @@ import (
. "github.com/onsi/gomega"
"github.com/stretchr/testify/assert"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/cmd"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/cmd"
)
func TestKamelCLIConfig(t *testing.T) {
diff --git a/e2e/common/cli/default.go b/e2e/common/cli/default.go
index a54257110..e19aa2686 100644
--- a/e2e/common/cli/default.go
+++ b/e2e/common/cli/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package cli
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index 0ee289db0..ea69bde92 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -29,7 +29,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelCLIDelete(t *testing.T) {
diff --git a/e2e/common/cli/describe_test.go b/e2e/common/cli/describe_test.go
index 788806883..567801a55 100644
--- a/e2e/common/cli/describe_test.go
+++ b/e2e/common/cli/describe_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func TestKamelCliDescribe(t *testing.T) {
diff --git a/e2e/common/cli/dev_mode_test.go b/e2e/common/cli/dev_mode_test.go
index 8967185e5..05596e16e 100644
--- a/e2e/common/cli/dev_mode_test.go
+++ b/e2e/common/cli/dev_mode_test.go
@@ -36,8 +36,8 @@ import (
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/e2e/support/util"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/e2e/support/util"
)
func TestRunDevMode(t *testing.T) {
diff --git a/e2e/common/cli/duplicate_parameters_test.go b/e2e/common/cli/duplicate_parameters_test.go
index cb5cdd1a1..84af397ce 100644
--- a/e2e/common/cli/duplicate_parameters_test.go
+++ b/e2e/common/cli/duplicate_parameters_test.go
@@ -28,8 +28,8 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/cmd"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/cmd"
)
func TestDuplicateParameters(t *testing.T) {
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index 78bb1d9a2..e1a461b3b 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -30,7 +30,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelCLIGet(t *testing.T) {
diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go
index a66894652..ac54e4b16 100644
--- a/e2e/common/cli/help_test.go
+++ b/e2e/common/cli/help_test.go
@@ -27,7 +27,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelCLIHelp(t *testing.T) {
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
index 71b5b506c..3396948db 100644
--- a/e2e/common/cli/log_test.go
+++ b/e2e/common/cli/log_test.go
@@ -26,7 +26,7 @@ import (
"strings"
"testing"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
)
diff --git a/e2e/common/cli/offline_commands_test.go b/e2e/common/cli/offline_commands_test.go
index b2b2ccc81..e990cb509 100644
--- a/e2e/common/cli/offline_commands_test.go
+++ b/e2e/common/cli/offline_commands_test.go
@@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/assert"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
)
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index ddfc21f25..140fc9274 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -32,8 +32,8 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
var sampleJar = "https://raw.githubusercontent.com/apache/camel-k/main/e2e/common/traits/files/jvm/sample-1.0.jar"
diff --git a/e2e/common/cli/version_test.go b/e2e/common/cli/version_test.go
index 2d7adf83d..202135e14 100644
--- a/e2e/common/cli/version_test.go
+++ b/e2e/common/cli/version_test.go
@@ -27,8 +27,8 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func TestKamelCLIVersion(t *testing.T) {
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index a936c41ef..07b239632 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -31,9 +31,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/gzip"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
)
func TestRunConfigExamples(t *testing.T) {
diff --git a/e2e/common/config/default.go b/e2e/common/config/default.go
index af7a4a5f3..c2876cba2 100644
--- a/e2e/common/config/default.go
+++ b/e2e/common/config/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package config
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/common/languages/default.go b/e2e/common/languages/default.go
index d9316a1af..9595d9ff4 100644
--- a/e2e/common/languages/default.go
+++ b/e2e/common/languages/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package languages
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index eab2ad905..8e76130ec 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleGroovyExamples(t *testing.T) {
diff --git a/e2e/common/languages/init_test_support.go b/e2e/common/languages/init_test_support.go
index d5f0794a1..c33042bcf 100644
--- a/e2e/common/languages/init_test_support.go
+++ b/e2e/common/languages/init_test_support.go
@@ -31,9 +31,9 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/e2e/support/util"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/e2e/support/util"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func RunInitGeneratedExample(t *testing.T, operatorId, ns string, lang camelv1.Language) {
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index b0ddc0efc..7de69a98f 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleJavaExamples(t *testing.T) {
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 2de409f81..da5f814bc 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleJavaScriptExamples(t *testing.T) {
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 426afadd8..770183860 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleKotlinExamples(t *testing.T) {
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index 559fa6bef..b441d4102 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunPolyglotExamples(t *testing.T) {
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 29b8266f2..5b5181ce8 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleXmlExamples(t *testing.T) {
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index 9e0ea9243..8aafc1cac 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -29,8 +29,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunSimpleYamlExamples(t *testing.T) {
diff --git a/e2e/common/misc/client_test.go b/e2e/common/misc/client_test.go
index 5f3b38d65..c3363d655 100644
--- a/e2e/common/misc/client_test.go
+++ b/e2e/common/misc/client_test.go
@@ -31,9 +31,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/config"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
. "github.com/onsi/gomega"
)
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index cd15107c0..9368108c4 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunCronExample(t *testing.T) {
diff --git a/e2e/common/misc/default.go b/e2e/common/misc/default.go
index 8909d033f..4a7285c94 100644
--- a/e2e/common/misc/default.go
+++ b/e2e/common/misc/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package misc
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 838b6a05d..d5d1444d5 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -30,8 +30,8 @@ import (
"github.com/onsi/gomega/gstruct"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestBadRouteIntegration(t *testing.T) {
diff --git a/e2e/common/misc/kamelet_binding_test.go b/e2e/common/misc/kamelet_binding_test.go
index 936e41406..79584263e 100644
--- a/e2e/common/misc/kamelet_binding_test.go
+++ b/e2e/common/misc/kamelet_binding_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestKameletBinding(t *testing.T) {
diff --git a/e2e/common/misc/kamelet_binding_with_image_test.go b/e2e/common/misc/kamelet_binding_with_image_test.go
index 01d399ff3..133cc577b 100644
--- a/e2e/common/misc/kamelet_binding_with_image_test.go
+++ b/e2e/common/misc/kamelet_binding_with_image_test.go
@@ -30,8 +30,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func TestBindingWithImage(t *testing.T) {
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index 8ceb2abec..23a5ac716 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -28,7 +28,7 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKameletClasspathLoading(t *testing.T) {
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 79830763e..665a20d05 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -28,8 +28,8 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
const customLabel = "custom-label"
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index 3f584a052..c55098641 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRunExtraRepository(t *testing.T) {
diff --git a/e2e/common/misc/platformless_run_test.go b/e2e/common/misc/platformless_run_test.go
index 9aecd08b9..6817f0267 100644
--- a/e2e/common/misc/platformless_run_test.go
+++ b/e2e/common/misc/platformless_run_test.go
@@ -31,9 +31,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestPlatformlessRun(t *testing.T) {
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 81b8fce1b..a1f4afed2 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -32,9 +32,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestImageRegistryIsAMavenRepository(t *testing.T) {
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 583c19fd3..f9b7b901f 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -34,8 +34,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestRunRest(t *testing.T) {
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 307439030..0cc2b98cc 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -33,11 +33,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestKameletBindingScale(t *testing.T) {
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index c2d165311..d3d74e8fc 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -33,9 +33,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
)
func TestIntegrationScale(t *testing.T) {
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index 5fe26f631..551a2aca0 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -30,8 +30,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestStructuredLogs(t *testing.T) {
diff --git a/e2e/common/support/startup_test.go b/e2e/common/support/startup_test.go
index b1707383e..0771e35a9 100644
--- a/e2e/common/support/startup_test.go
+++ b/e2e/common/support/startup_test.go
@@ -28,8 +28,8 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestCommonCamelKInstallStartup(t *testing.T) {
diff --git a/e2e/common/support/teardown_test.go b/e2e/common/support/teardown_test.go
index 064b44777..78546c7f7 100644
--- a/e2e/common/support/teardown_test.go
+++ b/e2e/common/support/teardown_test.go
@@ -27,7 +27,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestCommonCamelKInstallTeardown(t *testing.T) {
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 76013d2e0..19fa2ccc2 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestAffinityTrait(t *testing.T) {
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index 1cc9bb50d..e57e0ceba 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -30,8 +30,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestBuilderTrait(t *testing.T) {
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index ba66b1fb6..8a0c5420d 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestContainerTrait(t *testing.T) {
diff --git a/e2e/common/traits/default.go b/e2e/common/traits/default.go
index 81eac027c..75684eff0 100644
--- a/e2e/common/traits/default.go
+++ b/e2e/common/traits/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package traits
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 3bedae5cb..7aa82ade1 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestRecreateDeploymentStrategyTrait(t *testing.T) {
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 0542682b9..c7d86cb5d 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestErrorHandlerTrait(t *testing.T) {
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 0a17c6535..cffc8f8be 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func TestErroredTrait(t *testing.T) {
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 0e43738c6..9577b3658 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -25,7 +25,7 @@ package traits
import (
"encoding/json"
"fmt"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"testing"
"time"
@@ -33,8 +33,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestHealthTrait(t *testing.T) {
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 7e0fd5cf4..d5070c4f6 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestIstioTrait(t *testing.T) {
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index ddaf981e1..6145ffc3f 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -30,8 +30,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestJolokiaTrait(t *testing.T) {
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 62a69a62e..3d8bde71c 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestJVMTrait(t *testing.T) {
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index 3c164d737..fd53aa014 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestMasterTrait(t *testing.T) {
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 3587a2185..849f4b845 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -31,7 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestOpenAPI(t *testing.T) {
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index 83ae391bf..58d6788fa 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -37,8 +37,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestPodDisruptionBudgetTrait(t *testing.T) {
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index b24b3c51e..46a2c67bf 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestPodTrait(t *testing.T) {
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index c84e5f2c9..26a80ba86 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -36,9 +36,9 @@ import (
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestPrometheusTrait(t *testing.T) {
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index 399910a48..7e1011a45 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestPullSecretTrait(t *testing.T) {
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index 24be66492..291f56fdc 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -43,8 +43,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
const (
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 3970665e9..4d56157d7 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestServiceBindingTrait(t *testing.T) {
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index df76acb18..401eeb842 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -29,7 +29,7 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestServiceTrait(t *testing.T) {
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index ad44dc984..76a3e8770 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestTolerationTrait(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/builder_test.go b/e2e/commonwithcustominstall/builder_test.go
index 95ab7348b..a55c43a56 100644
--- a/e2e/commonwithcustominstall/builder_test.go
+++ b/e2e/commonwithcustominstall/builder_test.go
@@ -29,8 +29,8 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestBuilderPodFallback(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/catalog_builder_test.go b/e2e/commonwithcustominstall/catalog_builder_test.go
index 00862edd4..ee124db65 100644
--- a/e2e/commonwithcustominstall/catalog_builder_test.go
+++ b/e2e/commonwithcustominstall/catalog_builder_test.go
@@ -30,9 +30,9 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func TestCamelCatalogBuilder(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/debug_test.go b/e2e/commonwithcustominstall/debug_test.go
index a29fe751f..6f09316da 100644
--- a/e2e/commonwithcustominstall/debug_test.go
+++ b/e2e/commonwithcustominstall/debug_test.go
@@ -25,7 +25,7 @@ package commonwithcustominstall
import (
"context"
"fmt"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
v1 "k8s.io/api/core/v1"
"net"
diff --git a/e2e/commonwithcustominstall/dump_test.go b/e2e/commonwithcustominstall/dump_test.go
index 70ab6e905..06e176eec 100644
--- a/e2e/commonwithcustominstall/dump_test.go
+++ b/e2e/commonwithcustominstall/dump_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelCLIDump(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/environment_test.go b/e2e/commonwithcustominstall/environment_test.go
index 5999485ec..b97eda025 100644
--- a/e2e/commonwithcustominstall/environment_test.go
+++ b/e2e/commonwithcustominstall/environment_test.go
@@ -32,9 +32,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func TestEnvironmentTrait(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/incremental_build_test.go b/e2e/commonwithcustominstall/incremental_build_test.go
index 56e69d385..0af991041 100644
--- a/e2e/commonwithcustominstall/incremental_build_test.go
+++ b/e2e/commonwithcustominstall/incremental_build_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func TestRunIncrementalBuild(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/kamelet_repo_test.go b/e2e/commonwithcustominstall/kamelet_repo_test.go
index c8609115d..f9856f342 100644
--- a/e2e/commonwithcustominstall/kamelet_repo_test.go
+++ b/e2e/commonwithcustominstall/kamelet_repo_test.go
@@ -29,8 +29,8 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestKameletFromCustomRepository(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/maven_http_proxy_test.go b/e2e/commonwithcustominstall/maven_http_proxy_test.go
index 70b9d0e04..5dd74f2b6 100644
--- a/e2e/commonwithcustominstall/maven_http_proxy_test.go
+++ b/e2e/commonwithcustominstall/maven_http_proxy_test.go
@@ -36,8 +36,8 @@ import (
"testing"
"time"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/olm"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/olm"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gstruct"
@@ -51,8 +51,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
var httpdTlsMountPath = "/etc/tls/private"
diff --git a/e2e/commonwithcustominstall/operator_id_filtering_test.go b/e2e/commonwithcustominstall/operator_id_filtering_test.go
index 399f5f7db..6a056e808 100644
--- a/e2e/commonwithcustominstall/operator_id_filtering_test.go
+++ b/e2e/commonwithcustominstall/operator_id_filtering_test.go
@@ -34,10 +34,10 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/operator_metrics_test.go b/e2e/commonwithcustominstall/operator_metrics_test.go
index 0a245780f..a34830985 100644
--- a/e2e/commonwithcustominstall/operator_metrics_test.go
+++ b/e2e/commonwithcustominstall/operator_metrics_test.go
@@ -39,9 +39,9 @@ import (
prometheus "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
- . "github.com/apache/camel-k/e2e/support"
- . "github.com/apache/camel-k/e2e/support/util"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
/*
diff --git a/e2e/commonwithcustominstall/promote_test.go b/e2e/commonwithcustominstall/promote_test.go
index 8348e7e64..7b2936702 100644
--- a/e2e/commonwithcustominstall/promote_test.go
+++ b/e2e/commonwithcustominstall/promote_test.go
@@ -29,8 +29,8 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestKamelCLIPromote(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/reset_test.go b/e2e/commonwithcustominstall/reset_test.go
index 19311a8a5..75e5372fd 100644
--- a/e2e/commonwithcustominstall/reset_test.go
+++ b/e2e/commonwithcustominstall/reset_test.go
@@ -28,7 +28,7 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKamelReset(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/secondary_platform_test.go b/e2e/commonwithcustominstall/secondary_platform_test.go
index ae97080c0..c5aebb560 100644
--- a/e2e/commonwithcustominstall/secondary_platform_test.go
+++ b/e2e/commonwithcustominstall/secondary_platform_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
func TestSecondaryPlatform(t *testing.T) {
diff --git a/e2e/commonwithcustominstall/tekton_test.go b/e2e/commonwithcustominstall/tekton_test.go
index bad41c2b3..7179ec6f1 100644
--- a/e2e/commonwithcustominstall/tekton_test.go
+++ b/e2e/commonwithcustominstall/tekton_test.go
@@ -27,7 +27,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
// TestTektonLikeBehavior verifies that the kamel binary can be invoked from within the Camel K image.
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index 644c84950..092935b9e 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -31,8 +31,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestRunGlobalKamelet(t *testing.T) {
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index 111042b8f..a5bc47953 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -36,11 +36,11 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
func TestRunGlobalInstall(t *testing.T) {
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index e6dca1e91..f006ff2a9 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -34,12 +34,12 @@ import (
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/openshift"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
consolev1 "github.com/openshift/api/console/v1"
)
@@ -138,7 +138,7 @@ func TestConsoleCliDownload(t *testing.T) {
}
name := GetEnvOrDefault("CAMEL_K_CONSOLE_CLI_DOWNLOAD_NAME", install.KamelCLIDownloadName)
- downloadUrlTemplate := GetEnvOrDefault("CAMEL_K_CONSOLE_CLI_DOWNLOAD_URL_TEMPLATE", "https://github.com/apache/camel-k/releases/download/v{{ .Version}}/camel-k-client-{{ .Version}}-{{ .Platform}}-64bit.tar.gz")
+ downloadUrlTemplate := GetEnvOrDefault("CAMEL_K_CONSOLE_CLI_DOWNLOAD_URL_TEMPLATE", "https://github.com/apache/camel-k/v2/releases/download/v{{ .Version}}/camel-k-client-{{ .Version}}-{{ .Platform}}-64bit.tar.gz")
args := templateArgs{Version: defaults.Version}
templt, err := template.New("downloadLink").Parse(downloadUrlTemplate)
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index 97a11c2e8..bb37dfaaf 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -50,9 +50,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/maven"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
func TestMavenCASecret(t *testing.T) {
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index f1a2f71f1..3cc6f12d5 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -28,8 +28,8 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/util/olm"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/util/olm"
)
func TestBasicUninstall(t *testing.T) {
diff --git a/e2e/install/kustomize/common.go b/e2e/install/kustomize/common.go
index 856aa6233..64f9d9992 100644
--- a/e2e/install/kustomize/common.go
+++ b/e2e/install/kustomize/common.go
@@ -27,7 +27,7 @@ import (
"strings"
"testing"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
"github.com/onsi/gomega/gexec"
"github.com/stretchr/testify/assert"
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index 704216b15..c003dc6b6 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -29,9 +29,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- testutil "github.com/apache/camel-k/e2e/support/util"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ testutil "github.com/apache/camel-k/v2/e2e/support/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
. "github.com/onsi/gomega"
)
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index c4a6b2f92..7dc0a61f8 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -27,8 +27,8 @@ import (
"os"
"testing"
- . "github.com/apache/camel-k/e2e/support"
- testutil "github.com/apache/camel-k/e2e/support/util"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ testutil "github.com/apache/camel-k/v2/e2e/support/util"
. "github.com/onsi/gomega"
)
diff --git a/e2e/install/kustomize/uninstall_test.go b/e2e/install/kustomize/uninstall_test.go
index 5b822aab8..39c800976 100644
--- a/e2e/install/kustomize/uninstall_test.go
+++ b/e2e/install/kustomize/uninstall_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- testutil "github.com/apache/camel-k/e2e/support/util"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ testutil "github.com/apache/camel-k/v2/e2e/support/util"
. "github.com/onsi/gomega"
)
diff --git a/e2e/install/olm/olm_install_test.go b/e2e/install/olm/olm_install_test.go
index c0aab8d18..4e631f39b 100644
--- a/e2e/install/olm/olm_install_test.go
+++ b/e2e/install/olm/olm_install_test.go
@@ -27,7 +27,7 @@ import (
"os"
"testing"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
"github.com/stretchr/testify/assert"
@@ -35,10 +35,10 @@ import (
olm "github.com/operator-framework/api/pkg/operators/v1alpha1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/openshift"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
const installCatalogSourceName = "test-camel-k-source"
diff --git a/e2e/install/olm/olm_upgrade_test.go b/e2e/install/olm/olm_upgrade_test.go
index aa457f5e4..edbf71158 100644
--- a/e2e/install/olm/olm_upgrade_test.go
+++ b/e2e/install/olm/olm_upgrade_test.go
@@ -28,7 +28,7 @@ import (
"testing"
"time"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
"github.com/stretchr/testify/assert"
@@ -40,9 +40,9 @@ import (
"github.com/operator-framework/api/pkg/lib/version"
olm "github.com/operator-framework/api/pkg/operators/v1alpha1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/openshift"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
const catalogSourceName = "test-camel-k-source"
diff --git a/e2e/install/olm/upgrade_test.go b/e2e/install/olm/upgrade_test.go
index 7e235cd62..65c0acf55 100644
--- a/e2e/install/olm/upgrade_test.go
+++ b/e2e/install/olm/upgrade_test.go
@@ -31,9 +31,9 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// WARNING: this test is not OLM specific but needs certain setting we provide in OLM installation scenario
diff --git a/e2e/knative/default.go b/e2e/knative/default.go
index 280d6c93f..65fe63ef3 100644
--- a/e2e/knative/default.go
+++ b/e2e/knative/default.go
@@ -20,7 +20,7 @@ limitations under the License.
package knative
-import "github.com/apache/camel-k/e2e/support"
+import "github.com/apache/camel-k/v2/e2e/support"
var ns = support.GetCIProcessID()
var operatorID = support.GetCIProcessID()
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index b78411b4d..6f174a3ae 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -32,9 +32,9 @@ import (
messaging "knative.dev/eventing/pkg/apis/messaging/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// Test that a KameletBinding can be changed and the changes are propagated to the Integration
diff --git a/e2e/knative/knative_platform_test.go b/e2e/knative/knative_platform_test.go
index fc39544c0..b51e93ec8 100644
--- a/e2e/knative/knative_platform_test.go
+++ b/e2e/knative/knative_platform_test.go
@@ -32,10 +32,10 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/dsl"
- "github.com/apache/camel-k/pkg/util/knative"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/dsl"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
)
func TestKnativePlatformDetection(t *testing.T) {
diff --git a/e2e/knative/knative_test.go b/e2e/knative/knative_test.go
index 7bf04010f..241940efd 100644
--- a/e2e/knative/knative_test.go
+++ b/e2e/knative/knative_test.go
@@ -31,8 +31,8 @@ import (
v1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestKnative(t *testing.T) {
diff --git a/e2e/knative/openapi_test.go b/e2e/knative/openapi_test.go
index 42d6c4941..b2028f6b1 100644
--- a/e2e/knative/openapi_test.go
+++ b/e2e/knative/openapi_test.go
@@ -23,7 +23,7 @@ limitations under the License.
package knative
import (
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
. "github.com/onsi/gomega"
"testing"
)
diff --git a/e2e/knative/pod_test.go b/e2e/knative/pod_test.go
index 59938f0ac..64b39fda1 100644
--- a/e2e/knative/pod_test.go
+++ b/e2e/knative/pod_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestPodTraitWithKnative(t *testing.T) {
diff --git a/e2e/knative/support/startup_test.go b/e2e/knative/support/startup_test.go
index 6e1260f59..03b9c361b 100644
--- a/e2e/knative/support/startup_test.go
+++ b/e2e/knative/support/startup_test.go
@@ -28,8 +28,8 @@ import (
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestKNativeCamelKInstallStartup(t *testing.T) {
diff --git a/e2e/knative/support/teardown_test.go b/e2e/knative/support/teardown_test.go
index 1a141d657..af4f0c9d8 100644
--- a/e2e/knative/support/teardown_test.go
+++ b/e2e/knative/support/teardown_test.go
@@ -27,7 +27,7 @@ import (
. "github.com/onsi/gomega"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestKNativeCamelKInstallTeardown(t *testing.T) {
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index 4d0519580..d7f654bff 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -25,14 +25,14 @@ package native
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestNativeBinding(t *testing.T) {
diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go
index 18011e49d..0060b0d93 100644
--- a/e2e/native/native_test.go
+++ b/e2e/native/native_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestNativeIntegrations(t *testing.T) {
diff --git a/e2e/native/native_test_support.go b/e2e/native/native_test_support.go
index acd37558b..0332b871c 100644
--- a/e2e/native/native_test_support.go
+++ b/e2e/native/native_test_support.go
@@ -23,11 +23,12 @@ limitations under the License.
package native
import (
- corev1 "k8s.io/api/core/v1"
"strings"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ corev1 "k8s.io/api/core/v1"
+
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
var (
diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go
index b19338bd9..ab3348fca 100644
--- a/e2e/native/native_with_sources_test.go
+++ b/e2e/native/native_with_sources_test.go
@@ -29,8 +29,8 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/apache/camel-k/v2/e2e/support"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestNativeHighMemoryIntegrations(t *testing.T) {
diff --git a/e2e/support/csv.go b/e2e/support/csv.go
index 9be3ca5e9..24ffe27b5 100644
--- a/e2e/support/csv.go
+++ b/e2e/support/csv.go
@@ -37,7 +37,7 @@ import (
olm "github.com/operator-framework/api/pkg/operators/v1alpha1"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
func ClusterServiceVersion(conditions func(olm.ClusterServiceVersion) bool, ns string) func() *olm.ClusterServiceVersion {
diff --git a/e2e/support/test_staging_hooks.go b/e2e/support/test_staging_hooks.go
index 97930b284..29614dc9d 100644
--- a/e2e/support/test_staging_hooks.go
+++ b/e2e/support/test_staging_hooks.go
@@ -26,7 +26,7 @@ import (
"fmt"
"os"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
func init() {
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index e0b7db73b..fe30e81c3 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -70,22 +70,22 @@ import (
projectv1 "github.com/openshift/api/project/v1"
routev1 "github.com/openshift/api/route/v1"
- "github.com/apache/camel-k/e2e/support/util"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/cmd"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/openshift"
- "github.com/apache/camel-k/pkg/util/patch"
+ "github.com/apache/camel-k/v2/e2e/support/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/cmd"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
// let's enable addons in all tests
- _ "github.com/apache/camel-k/addons"
+ _ "github.com/apache/camel-k/v2/addons"
)
const kubeConfigEnvVar = "KUBECONFIG"
diff --git a/e2e/support/util/dump.go b/e2e/support/util/dump.go
index b40082d06..94efeac33 100644
--- a/e2e/support/util/dump.go
+++ b/e2e/support/util/dump.go
@@ -36,10 +36,10 @@ import (
routev1 "github.com/openshift/api/route/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/openshift"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
// Dump prints all information about the given namespace to debug errors
diff --git a/e2e/support/util/temp_file.go b/e2e/support/util/temp_file.go
index b6c80f40b..fc795518b 100644
--- a/e2e/support/util/temp_file.go
+++ b/e2e/support/util/temp_file.go
@@ -26,7 +26,7 @@ import (
"strings"
"testing"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
func MakeTempCopy(t *testing.T, fileName string) string {
diff --git a/e2e/telemetry/telemetry_test.go b/e2e/telemetry/telemetry_test.go
index 50623f72e..0d772e7bc 100644
--- a/e2e/telemetry/telemetry_test.go
+++ b/e2e/telemetry/telemetry_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
- . "github.com/apache/camel-k/e2e/support"
+ . "github.com/apache/camel-k/v2/e2e/support"
)
func TestTelemetryTrait(t *testing.T) {
diff --git a/go.mod b/go.mod
index 80a06cc0f..635835aa3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
-module github.com/apache/camel-k
+module github.com/apache/camel-k/v2
go 1.18
require (
github.com/Masterminds/semver v1.5.0
- github.com/apache/camel-k/pkg/apis/camel v0.0.0
- github.com/apache/camel-k/pkg/client/camel v0.0.0
- github.com/apache/camel-k/pkg/kamelet/repository v0.0.0
+ github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0
+ github.com/apache/camel-k/v2/pkg/client/camel v0.0.0
+ github.com/apache/camel-k/v2/pkg/kamelet/repository v0.0.0
github.com/container-tools/spectrum v0.6.1
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/fatih/camelcase v1.0.0
@@ -177,7 +177,7 @@ replace github.com/google/go-containerregistry => github.com/container-tools/go-
// Local modules
replace (
- github.com/apache/camel-k/pkg/apis/camel => ./pkg/apis/camel
- github.com/apache/camel-k/pkg/client/camel => ./pkg/client/camel
- github.com/apache/camel-k/pkg/kamelet/repository => ./pkg/kamelet/repository
+ github.com/apache/camel-k/v2/pkg/apis/camel => ./pkg/apis/camel
+ github.com/apache/camel-k/v2/pkg/client/camel => ./pkg/client/camel
+ github.com/apache/camel-k/v2/pkg/kamelet/repository => ./pkg/kamelet/repository
)
diff --git a/pkg/apis/addtoscheme_camel_v1.go b/pkg/apis/addtoscheme_camel_v1.go
index 4a365dd2c..9a2ae83ab 100644
--- a/pkg/apis/addtoscheme_camel_v1.go
+++ b/pkg/apis/addtoscheme_camel_v1.go
@@ -18,7 +18,7 @@ limitations under the License.
package apis
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func init() {
diff --git a/pkg/apis/addtoscheme_camel_v1alpha1.go b/pkg/apis/addtoscheme_camel_v1alpha1.go
index a56140dc6..448bf2aec 100644
--- a/pkg/apis/addtoscheme_camel_v1alpha1.go
+++ b/pkg/apis/addtoscheme_camel_v1alpha1.go
@@ -18,7 +18,7 @@ limitations under the License.
package apis
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func init() {
diff --git a/pkg/apis/addtoscheme_monitoring.go b/pkg/apis/addtoscheme_monitoring.go
index 248772d0e..50e0d3304 100644
--- a/pkg/apis/addtoscheme_monitoring.go
+++ b/pkg/apis/addtoscheme_monitoring.go
@@ -17,7 +17,7 @@ limitations under the License.
package apis
-import "github.com/apache/camel-k/pkg/util/monitoring"
+import "github.com/apache/camel-k/v2/pkg/util/monitoring"
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
diff --git a/pkg/apis/addtoscheme_openshift.go b/pkg/apis/addtoscheme_openshift.go
index 13f6b535c..974bfe1e0 100644
--- a/pkg/apis/addtoscheme_openshift.go
+++ b/pkg/apis/addtoscheme_openshift.go
@@ -17,7 +17,7 @@ limitations under the License.
package apis
-import "github.com/apache/camel-k/pkg/util/openshift"
+import "github.com/apache/camel-k/v2/pkg/util/openshift"
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
diff --git a/pkg/apis/camel/go.mod b/pkg/apis/camel/go.mod
index f6892309d..7df5bd24f 100644
--- a/pkg/apis/camel/go.mod
+++ b/pkg/apis/camel/go.mod
@@ -1,4 +1,4 @@
-module github.com/apache/camel-k/pkg/apis/camel
+module github.com/apache/camel-k/v2/pkg/apis/camel
go 1.18
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index 1fffa94b1..b8001c120 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -21,7 +21,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
const (
diff --git a/pkg/apis/camel/v1/common_types_support_test.go b/pkg/apis/camel/v1/common_types_support_test.go
index dd424a33d..a5ff49572 100644
--- a/pkg/apis/camel/v1/common_types_support_test.go
+++ b/pkg/apis/camel/v1/common_types_support_test.go
@@ -21,7 +21,7 @@ import (
"encoding/json"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go
index 885ebb8c2..4fa1d570d 100644
--- a/pkg/apis/camel/v1/integrationkit_types.go
+++ b/pkg/apis/camel/v1/integrationkit_types.go
@@ -21,7 +21,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index ff3f77d1f..1ace84bea 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -6,7 +6,7 @@
package v1
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index fe59a8791..fb1e44bc4 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -21,7 +21,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// +genclient
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
index 0e11963aa..20d55df1b 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
@@ -22,7 +22,7 @@ import (
"encoding/json"
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index 3a7f4ec48..d9bd295d7 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -21,7 +21,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
const (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
index 20c91c299..c15e5dd4b 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
@@ -20,7 +20,7 @@ package v1alpha1
import (
"sort"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index cee9e7a0f..ee2885294 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -7,7 +7,7 @@ package v1alpha1
import (
"encoding/json"
- "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
)
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index f97274ebb..ec1280eb5 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -25,9 +25,9 @@ import (
"strconv"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
type builderTask struct {
diff --git a/pkg/builder/builder_support.go b/pkg/builder/builder_support.go
index 455d5641c..beef7ef63 100644
--- a/pkg/builder/builder_support.go
+++ b/pkg/builder/builder_support.go
@@ -20,7 +20,7 @@ package builder
import (
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
type PublishStrategyOption struct {
diff --git a/pkg/builder/builder_test.go b/pkg/builder/builder_test.go
index 052cd254a..8ff60bd54 100644
--- a/pkg/builder/builder_test.go
+++ b/pkg/builder/builder_test.go
@@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/cancellable"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/cancellable"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
type errorTestSteps struct {
diff --git a/pkg/builder/image.go b/pkg/builder/image.go
index 5be8acd0c..215f3e435 100644
--- a/pkg/builder/image.go
+++ b/pkg/builder/image.go
@@ -27,9 +27,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
const (
diff --git a/pkg/builder/image_test.go b/pkg/builder/image_test.go
index cbce06926..f7a54725f 100644
--- a/pkg/builder/image_test.go
+++ b/pkg/builder/image_test.go
@@ -24,10 +24,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/cancellable"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/cancellable"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestListPublishedImages(t *testing.T) {
diff --git a/pkg/builder/project.go b/pkg/builder/project.go
index 8c325ff8b..77794014b 100644
--- a/pkg/builder/project.go
+++ b/pkg/builder/project.go
@@ -24,12 +24,12 @@ import (
"regexp"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/jvm"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/jvm"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
func init() {
diff --git a/pkg/builder/project_test.go b/pkg/builder/project_test.go
index a529f058d..d6db9edb4 100644
--- a/pkg/builder/project_test.go
+++ b/pkg/builder/project_test.go
@@ -26,11 +26,11 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/maven"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const customSettings = `<?xml version="1.0" encoding="UTF-8"?>
@@ -118,7 +118,7 @@ const expectedCustomSettingsWithExtraServers = `<?xml version="1.0" encoding="UT
<configuration>
<allowInsecureRegistries>false</allowInsecureRegistries>
</configuration>
- </server>
+ </server>
</servers>
<profiles>
diff --git a/pkg/builder/quarkus.go b/pkg/builder/quarkus.go
index 0fe32c832..8a1190757 100644
--- a/pkg/builder/quarkus.go
+++ b/pkg/builder/quarkus.go
@@ -26,12 +26,12 @@ import (
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
corev1 "k8s.io/api/core/v1"
)
diff --git a/pkg/builder/s2i.go b/pkg/builder/s2i.go
index 140d3ad95..2e1c9ed32 100644
--- a/pkg/builder/s2i.go
+++ b/pkg/builder/s2i.go
@@ -46,10 +46,10 @@ import (
buildv1 "github.com/openshift/api/build/v1"
imagev1 "github.com/openshift/api/image/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
type s2iTask struct {
diff --git a/pkg/builder/spectrum.go b/pkg/builder/spectrum.go
index 0b86edac3..9d28a95cf 100644
--- a/pkg/builder/spectrum.go
+++ b/pkg/builder/spectrum.go
@@ -32,10 +32,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
type spectrumTask struct {
diff --git a/pkg/builder/tasks.go b/pkg/builder/tasks.go
index a1a45c885..00e575e0e 100644
--- a/pkg/builder/tasks.go
+++ b/pkg/builder/tasks.go
@@ -21,7 +21,7 @@ import (
"context"
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func (b *Builder) Build(build *v1.Build) *Build {
diff --git a/pkg/builder/types.go b/pkg/builder/types.go
index bbd684d6b..e6835d488 100644
--- a/pkg/builder/types.go
+++ b/pkg/builder/types.go
@@ -20,11 +20,11 @@ package builder
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
const (
diff --git a/pkg/builder/util.go b/pkg/builder/util.go
index e75af85c9..aad11bc3a 100644
--- a/pkg/builder/util.go
+++ b/pkg/builder/util.go
@@ -18,7 +18,7 @@ limitations under the License.
package builder
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func artifactIDs(artifacts []v1.Artifact) []string {
diff --git a/pkg/client/apply.go b/pkg/client/apply.go
index ae6815cfc..abbd9d221 100644
--- a/pkg/client/apply.go
+++ b/pkg/client/apply.go
@@ -25,8 +25,8 @@ import (
"sync"
"sync/atomic"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/patch"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
"github.com/pkg/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go b/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go
index 9678c534f..9fbf3e960 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/addontrait.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// AddonTraitApplyConfiguration represents an declarative configuration of the AddonTrait type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go
index e2d79f6da..cfcd19585 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/buildcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go
index c928e89eb..9b0c1f464 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/buildspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go
index a7df3935a..8158601fd 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/buildstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go
index 977ab82e8..c51aae173 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go
index ca2cd9615..8862fae9d 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/camelcatalogstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// CamelCatalogStatusApplyConfiguration represents an declarative configuration of the CamelCatalogStatus type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/flow.go b/pkg/client/camel/applyconfiguration/camel/v1/flow.go
index 962355641..a6404bb7b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/flow.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/flow.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// FlowApplyConfiguration represents an declarative configuration of the Flow type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/healthcheckresponse.go b/pkg/client/camel/applyconfiguration/camel/v1/healthcheckresponse.go
index 49a604446..c636cb167 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/healthcheckresponse.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/healthcheckresponse.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// HealthCheckResponseApplyConfiguration represents an declarative configuration of the HealthCheckResponse type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go
index 6da7251eb..ab8ff01ea 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go
index 2493c89bb..65804325b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
index 9b408fe8d..19bd2e613 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// IntegrationKitSpecApplyConfiguration represents an declarative configuration of the IntegrationKitSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go
index 588eb0054..26791a21b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// IntegrationKitStatusApplyConfiguration represents an declarative configuration of the IntegrationKitStatus type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go
index 3143991d3..805d339f4 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkittraits.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- trait "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ trait "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
// IntegrationKitTraitsApplyConfiguration represents an declarative configuration of the IntegrationKitTraits type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go
index 554abda90..e57151e07 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformbuildspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go
index 2879f8141..e83b80842 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go
index 16577ea06..7baaa7bbd 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// IntegrationPlatformSpecApplyConfiguration represents an declarative configuration of the IntegrationPlatformSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go
index da0284e82..c14284f7d 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationplatformstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// IntegrationPlatformStatusApplyConfiguration represents an declarative configuration of the IntegrationPlatformStatus type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go
index afa204a31..5b9844549 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go
index 5b7fbc778..d17acaa2b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go b/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go
index fd7781970..5cc692311 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/runtimespec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// RuntimeSpecApplyConfiguration represents an declarative configuration of the RuntimeSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/server.go b/pkg/client/camel/applyconfiguration/camel/v1/server.go
index 0f35d6d7a..738080a75 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/server.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/server.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// ServerApplyConfiguration represents an declarative configuration of the Server type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go b/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go
index 85a703477..8c844b189 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/sourcespec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// SourceSpecApplyConfiguration represents an declarative configuration of the SourceSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go b/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go
index 9182a3180..1e6ae3104 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/traitconfiguration.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// TraitConfigurationApplyConfiguration represents an declarative configuration of the TraitConfiguration type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/traits.go b/pkg/client/camel/applyconfiguration/camel/v1/traits.go
index 9fcbdf22e..b373cf542 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/traits.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/traits.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- trait "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ trait "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
// TraitsApplyConfiguration represents an declarative configuration of the Traits type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpoint.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpoint.go
index fe962b4ea..2877f280b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpoint.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpoint.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
v1 "k8s.io/api/core/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpointproperties.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpointproperties.go
index 949e8f7ea..85f141d2b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpointproperties.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/endpointproperties.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// EndpointPropertiesApplyConfiguration represents an declarative configuration of the EndpointProperties type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/errorhandlerspec.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/errorhandlerspec.go
index cc38710e9..f79a8ac91 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/errorhandlerspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/errorhandlerspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// ErrorHandlerSpecApplyConfiguration represents an declarative configuration of the ErrorHandlerSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/json.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/json.go
index fd4d7ed22..0345d2a78 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/json.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/json.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// JSONApplyConfiguration represents an declarative configuration of the JSON type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprops.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprops.go
index d2aa07176..8f0992af9 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprops.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/jsonschemaprops.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// JSONSchemaPropsApplyConfiguration represents an declarative configuration of the JSONSchemaProps type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go
index 42180697e..68fb4e89e 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go
@@ -20,8 +20,8 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go
index 491566627..69f067698 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
)
// KameletBindingSpecApplyConfiguration represents an declarative configuration of the KameletBindingSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go
index 44844fd5a..e21665453 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// KameletBindingStatusApplyConfiguration represents an declarative configuration of the KameletBindingStatus type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletcondition.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletcondition.go
index 1e07765af..52f0fc653 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletcondition.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletspec.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletspec.go
index 8daa2ae01..6627b006f 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletspec.go
@@ -20,8 +20,8 @@ limitations under the License.
package v1alpha1
import (
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- v1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
)
// KameletSpecApplyConfiguration represents an declarative configuration of the KameletSpec type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletstatus.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletstatus.go
index 546169030..c62d7344b 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletstatus.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// KameletStatusApplyConfiguration represents an declarative configuration of the KameletStatus type for use
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/template.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/template.go
index 37b468338..ac9ac1ba6 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/template.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/template.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// TemplateApplyConfiguration represents an declarative configuration of the Template type for use
diff --git a/pkg/client/camel/applyconfiguration/utils.go b/pkg/client/camel/applyconfiguration/utils.go
index 55f88247f..215b8caa7 100644
--- a/pkg/client/camel/applyconfiguration/utils.go
+++ b/pkg/client/camel/applyconfiguration/utils.go
@@ -20,10 +20,10 @@ limitations under the License.
package applyconfiguration
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1alpha1"
schema "k8s.io/apimachinery/pkg/runtime/schema"
)
diff --git a/pkg/client/camel/clientset/versioned/clientset.go b/pkg/client/camel/clientset/versioned/clientset.go
index 935ba0d52..7dfa415c0 100644
--- a/pkg/client/camel/clientset/versioned/clientset.go
+++ b/pkg/client/camel/clientset/versioned/clientset.go
@@ -23,8 +23,8 @@ import (
"fmt"
"net/http"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/pkg/client/camel/clientset/versioned/fake/clientset_generated.go b/pkg/client/camel/clientset/versioned/fake/clientset_generated.go
index 8344d41df..fc78a9e9c 100644
--- a/pkg/client/camel/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/camel/clientset/versioned/fake/clientset_generated.go
@@ -20,11 +20,11 @@ limitations under the License.
package fake
import (
- clientset "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
- fakecamelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1/fake"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
- fakecamelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake"
+ clientset "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ fakecamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1/fake"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
+ fakecamelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
diff --git a/pkg/client/camel/clientset/versioned/fake/register.go b/pkg/client/camel/clientset/versioned/fake/register.go
index 449936a90..249a2b9e3 100644
--- a/pkg/client/camel/clientset/versioned/fake/register.go
+++ b/pkg/client/camel/clientset/versioned/fake/register.go
@@ -20,8 +20,8 @@ limitations under the License.
package fake
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/scheme/register.go b/pkg/client/camel/clientset/versioned/scheme/register.go
index 6c3443318..9366fb20c 100644
--- a/pkg/client/camel/clientset/versioned/scheme/register.go
+++ b/pkg/client/camel/clientset/versioned/scheme/register.go
@@ -20,8 +20,8 @@ limitations under the License.
package scheme
import (
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/build.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/build.go
index 07ea0a182..4dc37b536 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/build.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/build.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go
index 050322dac..19172febb 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/camel_client.go
@@ -22,8 +22,8 @@ package v1
import (
"net/http"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
rest "k8s.io/client-go/rest"
)
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/camelcatalog.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/camelcatalog.go
index 1a62417a8..177e0da5a 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/camelcatalog.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/camelcatalog.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go
index b877a9aaf..335db462c 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_build.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- applyconfigurationcamelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ applyconfigurationcamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camel_client.go
index 1117ef276..6fffa1bfe 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camel_client.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camel_client.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- v1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go
index 68dd3a4bb..76d07a4b4 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_camelcatalog.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- applyconfigurationcamelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ applyconfigurationcamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go
index 094317b3d..5cc236ac7 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integration.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- applyconfigurationcamelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ applyconfigurationcamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go
index 20c50946e..da728c8fa 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationkit.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- applyconfigurationcamelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ applyconfigurationcamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go
index 192043a27..da770ebf5 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_integrationplatform.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- applyconfigurationcamelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ applyconfigurationcamelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/integration.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/integration.go
index a759d89f0..c61753524 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/integration.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/integration.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
autoscalingv1 "k8s.io/api/autoscaling/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationkit.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationkit.go
index 1067314dd..cba6be190 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationkit.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationkit.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationplatform.go b/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationplatform.go
index 0cd26b21e..926749c1a 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationplatform.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1/integrationplatform.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go
index 675eb1224..a7728be45 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/camel_client.go
@@ -22,8 +22,8 @@ package v1alpha1
import (
"net/http"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
rest "k8s.io/client-go/rest"
)
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_camel_client.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_camel_client.go
index 8fa4d9a8d..840321205 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_camel_client.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_camel_client.go
@@ -20,7 +20,7 @@ limitations under the License.
package fake
import (
- v1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go
index 87bc20f01..c9142ede7 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kamelet.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go
index 1eaf31eed..3023497b7 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go
@@ -24,8 +24,8 @@ import (
json "encoding/json"
"fmt"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1alpha1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kamelet.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kamelet.go
index 01e2b335d..ee48b5941 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kamelet.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kamelet.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1alpha1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1alpha1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go
index ca245c030..04d4008ee 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go
@@ -25,9 +25,9 @@ import (
"fmt"
"time"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/applyconfiguration/camel/v1alpha1"
- scheme "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/scheme"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1alpha1"
+ scheme "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/scheme"
autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
diff --git a/pkg/client/camel/go.mod b/pkg/client/camel/go.mod
index f61cfa493..975c898b2 100644
--- a/pkg/client/camel/go.mod
+++ b/pkg/client/camel/go.mod
@@ -1,9 +1,9 @@
-module github.com/apache/camel-k/pkg/client/camel
+module github.com/apache/camel-k/v2/pkg/client/camel
go 1.18
require (
- github.com/apache/camel-k/pkg/apis/camel v0.0.0
+ github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0
k8s.io/api v0.25.6
k8s.io/apimachinery v0.25.6
k8s.io/client-go v0.25.6
@@ -52,4 +52,4 @@ require (
)
// Local modules
-replace github.com/apache/camel-k/pkg/apis/camel => ../../apis/camel
+replace github.com/apache/camel-k/v2/pkg/apis/camel => ../../apis/camel
diff --git a/pkg/client/camel/informers/externalversions/camel/interface.go b/pkg/client/camel/informers/externalversions/camel/interface.go
index 3cf36b9e5..bd521d232 100644
--- a/pkg/client/camel/informers/externalversions/camel/interface.go
+++ b/pkg/client/camel/informers/externalversions/camel/interface.go
@@ -20,9 +20,9 @@ limitations under the License.
package camel
import (
- v1 "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/camel/v1"
- v1alpha1 "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/camel/v1alpha1"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/camel/v1alpha1"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
)
// Interface provides access to each of this group's versions.
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/build.go b/pkg/client/camel/informers/externalversions/camel/v1/build.go
index 4bd2c4de8..1e84515e6 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/build.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/build.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go b/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go
index d76df22c0..2b7f4a451 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/camelcatalog.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integration.go b/pkg/client/camel/informers/externalversions/camel/v1/integration.go
index def058ddc..8b4c7afe6 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/integration.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/integration.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go b/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go
index bcd1ca72b..e7e648519 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/integrationkit.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go b/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go
index 872288413..87e62cfb9 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/integrationplatform.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1/interface.go b/pkg/client/camel/informers/externalversions/camel/v1/interface.go
index 144db8ee0..adb271d08 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1/interface.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1/interface.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
)
// Interface provides access to all the informers in this group version.
diff --git a/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go b/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
index 25358d932..ef032869e 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
)
// Interface provides access to all the informers in this group version.
diff --git a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kamelet.go b/pkg/client/camel/informers/externalversions/camel/v1alpha1/kamelet.go
index 8e07e0a6a..c77dc9356 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kamelet.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1alpha1/kamelet.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1alpha1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go
index e8dcd97b6..7dc014bae 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go
@@ -23,10 +23,10 @@ import (
"context"
time "time"
- camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
- v1alpha1 "github.com/apache/camel-k/pkg/client/camel/listers/camel/v1alpha1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/listers/camel/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/camel/informers/externalversions/factory.go b/pkg/client/camel/informers/externalversions/factory.go
index d2344c02d..26b69c03f 100644
--- a/pkg/client/camel/informers/externalversions/factory.go
+++ b/pkg/client/camel/informers/externalversions/factory.go
@@ -24,9 +24,9 @@ import (
sync "sync"
time "time"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- camel "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/camel"
- internalinterfaces "github.com/apache/camel-k/pkg/client/camel/informers/externalversions/internalinterfaces"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ camel "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/camel"
+ internalinterfaces "github.com/apache/camel-k/v2/pkg/client/camel/informers/externalversions/internalinterfaces"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/camel/informers/externalversions/generic.go b/pkg/client/camel/informers/externalversions/generic.go
index 1d914da20..d89c46e4a 100644
--- a/pkg/client/camel/informers/externalversions/generic.go
+++ b/pkg/client/camel/informers/externalversions/generic.go
@@ -22,8 +22,8 @@ package externalversions
import (
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
)
diff --git a/pkg/client/camel/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/camel/informers/externalversions/internalinterfaces/factory_interfaces.go
index 938ae115c..f24cee2bc 100644
--- a/pkg/client/camel/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/camel/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -22,7 +22,7 @@ package internalinterfaces
import (
time "time"
- versioned "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
+ versioned "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
cache "k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1/build.go b/pkg/client/camel/listers/camel/v1/build.go
index ca48d8259..ec72ffed3 100644
--- a/pkg/client/camel/listers/camel/v1/build.go
+++ b/pkg/client/camel/listers/camel/v1/build.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1/camelcatalog.go b/pkg/client/camel/listers/camel/v1/camelcatalog.go
index e0fbb28ba..6a06eddb2 100644
--- a/pkg/client/camel/listers/camel/v1/camelcatalog.go
+++ b/pkg/client/camel/listers/camel/v1/camelcatalog.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1/integration.go b/pkg/client/camel/listers/camel/v1/integration.go
index d0f376981..af24ae153 100644
--- a/pkg/client/camel/listers/camel/v1/integration.go
+++ b/pkg/client/camel/listers/camel/v1/integration.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1/integrationkit.go b/pkg/client/camel/listers/camel/v1/integrationkit.go
index 17b6ab422..40b429773 100644
--- a/pkg/client/camel/listers/camel/v1/integrationkit.go
+++ b/pkg/client/camel/listers/camel/v1/integrationkit.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1/integrationplatform.go b/pkg/client/camel/listers/camel/v1/integrationplatform.go
index 245bfe039..d3ba24f9b 100644
--- a/pkg/client/camel/listers/camel/v1/integrationplatform.go
+++ b/pkg/client/camel/listers/camel/v1/integrationplatform.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1
import (
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1alpha1/kamelet.go b/pkg/client/camel/listers/camel/v1alpha1/kamelet.go
index fb4e5000c..3cfce9f11 100644
--- a/pkg/client/camel/listers/camel/v1alpha1/kamelet.go
+++ b/pkg/client/camel/listers/camel/v1alpha1/kamelet.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go
index c7bd29fd1..aa53b58de 100644
--- a/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go
+++ b/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go
@@ -20,7 +20,7 @@ limitations under the License.
package v1alpha1
import (
- v1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 3822e4dbd..08282f274 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -42,11 +42,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager"
- "github.com/apache/camel-k/pkg/apis"
- camel "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
- camelv1alpha1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/apis"
+ camel "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util"
)
const (
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 59bce431a..8c013c9d6 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -23,12 +23,12 @@ import (
"fmt"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/reference"
- "github.com/apache/camel-k/pkg/util/uri"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/reference"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
"github.com/spf13/cobra"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/bind_test.go b/pkg/cmd/bind_test.go
index a04436fc1..03b1247e6 100644
--- a/pkg/cmd/bind_test.go
+++ b/pkg/cmd/bind_test.go
@@ -20,9 +20,9 @@ package cmd
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/builder.go b/pkg/cmd/builder.go
index e1702ca9f..34dd2d923 100644
--- a/pkg/cmd/builder.go
+++ b/pkg/cmd/builder.go
@@ -18,7 +18,7 @@ limitations under the License.
package cmd
import (
- "github.com/apache/camel-k/pkg/cmd/builder"
+ "github.com/apache/camel-k/v2/pkg/cmd/builder"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/builder/builder.go b/pkg/cmd/builder/builder.go
index 717b16c4a..f0b169376 100644
--- a/pkg/cmd/builder/builder.go
+++ b/pkg/cmd/builder/builder.go
@@ -33,12 +33,12 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/defaults"
- logger "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/patch"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ logger "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
)
const terminationMessagePath = "/dev/termination-log"
diff --git a/pkg/cmd/builder_test.go b/pkg/cmd/builder_test.go
index 62a568b0a..3e390d6d0 100644
--- a/pkg/cmd/builder_test.go
+++ b/pkg/cmd/builder_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/completion_bash.go b/pkg/cmd/completion_bash.go
index 1606f1268..a33231651 100644
--- a/pkg/cmd/completion_bash.go
+++ b/pkg/cmd/completion_bash.go
@@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
// ******************************
diff --git a/pkg/cmd/config_test.go b/pkg/cmd/config_test.go
index ca299d775..7f9cd27fc 100644
--- a/pkg/cmd/config_test.go
+++ b/pkg/cmd/config_test.go
@@ -24,7 +24,7 @@ import (
"strings"
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/debug.go b/pkg/cmd/debug.go
index 7d5a1de8f..de224b4da 100644
--- a/pkg/cmd/debug.go
+++ b/pkg/cmd/debug.go
@@ -23,11 +23,11 @@ import (
"os/signal"
"syscall"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- camelv1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- k8slog "github.com/apache/camel-k/pkg/util/kubernetes/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ camelv1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ k8slog "github.com/apache/camel-k/v2/pkg/util/kubernetes/log"
"github.com/pkg/errors"
"github.com/spf13/cobra"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index ff12d31b8..554a39b04 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -23,10 +23,10 @@ import (
"fmt"
"strconv"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/spf13/cobra"
k8errors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/delete_test.go b/pkg/cmd/delete_test.go
index 842122244..e2a108423 100644
--- a/pkg/cmd/delete_test.go
+++ b/pkg/cmd/delete_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/describe.go b/pkg/cmd/describe.go
index ab77c4234..a22f9a041 100644
--- a/pkg/cmd/describe.go
+++ b/pkg/cmd/describe.go
@@ -28,8 +28,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func describeObjectMeta(w *indentedwriter.Writer, om metav1.ObjectMeta) {
diff --git a/pkg/cmd/describe_integration.go b/pkg/cmd/describe_integration.go
index 70a7403c5..a97d2d513 100644
--- a/pkg/cmd/describe_integration.go
+++ b/pkg/cmd/describe_integration.go
@@ -27,8 +27,8 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func newDescribeIntegrationCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describeIntegrationCommandOptions) {
diff --git a/pkg/cmd/describe_kamelet.go b/pkg/cmd/describe_kamelet.go
index d308b13b8..fd768bafe 100644
--- a/pkg/cmd/describe_kamelet.go
+++ b/pkg/cmd/describe_kamelet.go
@@ -27,8 +27,8 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func newDescribeKameletCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describeKameletCommandOptions) {
diff --git a/pkg/cmd/describe_kit.go b/pkg/cmd/describe_kit.go
index 0492bf496..e5f01da73 100644
--- a/pkg/cmd/describe_kit.go
+++ b/pkg/cmd/describe_kit.go
@@ -26,8 +26,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func newDescribeKitCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describeKitCommandOptions) {
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index 619956cb8..9b716d8a5 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -26,8 +26,8 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func newDescribePlatformCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *describePlatformCommandOptions) {
diff --git a/pkg/cmd/dump.go b/pkg/cmd/dump.go
index 995760371..77c64d0b7 100644
--- a/pkg/cmd/dump.go
+++ b/pkg/cmd/dump.go
@@ -25,16 +25,16 @@ import (
"os"
"time"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/spf13/cobra"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/tar"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/tar"
)
func newCmdDump(rootCmdOptions *RootCmdOptions) (*cobra.Command, *dumpCmdOptions) {
diff --git a/pkg/cmd/get.go b/pkg/cmd/get.go
index 7898ba887..a560a9ed7 100644
--- a/pkg/cmd/get.go
+++ b/pkg/cmd/get.go
@@ -27,7 +27,7 @@ import (
"github.com/spf13/cobra"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
type getCmdOptions struct {
diff --git a/pkg/cmd/init.go b/pkg/cmd/init.go
index 1187b23bb..9c41df9b6 100644
--- a/pkg/cmd/init.go
+++ b/pkg/cmd/init.go
@@ -24,10 +24,10 @@ import (
"strings"
"text/template"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/resources"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/resources"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 83c049087..2f6f8bd16 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -27,7 +27,7 @@ import (
"strings"
"time"
- platformutil "github.com/apache/camel-k/pkg/platform"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -42,17 +42,17 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/maven"
- "github.com/apache/camel-k/pkg/util/olm"
- "github.com/apache/camel-k/pkg/util/patch"
- "github.com/apache/camel-k/pkg/util/registry"
- "github.com/apache/camel-k/pkg/util/watch"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/olm"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
+ "github.com/apache/camel-k/v2/pkg/util/registry"
+ "github.com/apache/camel-k/v2/pkg/util/watch"
)
const installCommand = "install"
diff --git a/pkg/cmd/install_test.go b/pkg/cmd/install_test.go
index 8982d40ff..0c53032a2 100644
--- a/pkg/cmd/install_test.go
+++ b/pkg/cmd/install_test.go
@@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const cmdInstall = "install"
diff --git a/pkg/cmd/kamelet_add_repo.go b/pkg/cmd/kamelet_add_repo.go
index bb70f569b..5f0173143 100644
--- a/pkg/cmd/kamelet_add_repo.go
+++ b/pkg/cmd/kamelet_add_repo.go
@@ -22,8 +22,8 @@ import (
"fmt"
"regexp"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- platformutil "github.com/apache/camel-k/pkg/platform"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
"github.com/spf13/cobra"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/cmd/kamelet_add_repo_test.go b/pkg/cmd/kamelet_add_repo_test.go
index fcaeeac6c..3e8895a15 100644
--- a/pkg/cmd/kamelet_add_repo_test.go
+++ b/pkg/cmd/kamelet_add_repo_test.go
@@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const cmdKameletAddRepo = "add-repo"
diff --git a/pkg/cmd/kamelet_delete.go b/pkg/cmd/kamelet_delete.go
index 4d50a859f..07ef186e2 100644
--- a/pkg/cmd/kamelet_delete.go
+++ b/pkg/cmd/kamelet_delete.go
@@ -26,7 +26,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func newKameletDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kameletDeleteCommandOptions) {
diff --git a/pkg/cmd/kamelet_get.go b/pkg/cmd/kamelet_get.go
index ced23216a..62510a1a2 100644
--- a/pkg/cmd/kamelet_get.go
+++ b/pkg/cmd/kamelet_get.go
@@ -27,7 +27,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func newKameletGetCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kameletGetCommandOptions) {
diff --git a/pkg/cmd/kamelet_remove_repo.go b/pkg/cmd/kamelet_remove_repo.go
index 1e7614881..bb479dde2 100644
--- a/pkg/cmd/kamelet_remove_repo.go
+++ b/pkg/cmd/kamelet_remove_repo.go
@@ -21,7 +21,7 @@ import (
"errors"
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/kamelet_remove_repo_test.go b/pkg/cmd/kamelet_remove_repo_test.go
index 0d77840c5..a9453b423 100644
--- a/pkg/cmd/kamelet_remove_repo_test.go
+++ b/pkg/cmd/kamelet_remove_repo_test.go
@@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const cmdKameletRemoveRepo = "remove-repo"
diff --git a/pkg/cmd/kit_create.go b/pkg/cmd/kit_create.go
index b8eca7f2d..33cdbc85b 100644
--- a/pkg/cmd/kit_create.go
+++ b/pkg/cmd/kit_create.go
@@ -28,10 +28,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func newKitCreateCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitCreateCommandOptions) {
diff --git a/pkg/cmd/kit_create_test.go b/pkg/cmd/kit_create_test.go
index 1cc5062fc..06ffa5253 100644
--- a/pkg/cmd/kit_create_test.go
+++ b/pkg/cmd/kit_create_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/kit_delete.go b/pkg/cmd/kit_delete.go
index 33515ee06..31f02609a 100644
--- a/pkg/cmd/kit_delete.go
+++ b/pkg/cmd/kit_delete.go
@@ -27,7 +27,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newKitDeleteCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitDeleteCommandOptions) {
diff --git a/pkg/cmd/kit_get.go b/pkg/cmd/kit_get.go
index 47f78268a..da8e35007 100644
--- a/pkg/cmd/kit_get.go
+++ b/pkg/cmd/kit_get.go
@@ -25,7 +25,7 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newKitGetCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *kitGetCommandOptions) {
diff --git a/pkg/cmd/local.go b/pkg/cmd/local.go
index da816af9a..4868defdf 100644
--- a/pkg/cmd/local.go
+++ b/pkg/cmd/local.go
@@ -20,7 +20,7 @@ package cmd
import (
"fmt"
- "github.com/apache/camel-k/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/local/container.go b/pkg/cmd/local/container.go
index 65ff76578..624a57c36 100644
--- a/pkg/cmd/local/container.go
+++ b/pkg/cmd/local/container.go
@@ -27,8 +27,8 @@ import (
"strings"
"syscall"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/docker"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/docker"
"github.com/pkg/errors"
)
diff --git a/pkg/cmd/local/local.go b/pkg/cmd/local/local.go
index 6ace80ab9..b347e2031 100644
--- a/pkg/cmd/local/local.go
+++ b/pkg/cmd/local/local.go
@@ -30,14 +30,14 @@ import (
"github.com/scylladb/go-set/strset"
"github.com/spf13/cobra"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/cmd/source"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/cmd/source"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
var acceptedDependencyTypes = []string{
diff --git a/pkg/cmd/local/workdir.go b/pkg/cmd/local/workdir.go
index f0676c661..97ddbde80 100644
--- a/pkg/cmd/local/workdir.go
+++ b/pkg/cmd/local/workdir.go
@@ -23,7 +23,7 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
// MavenWorkingDirectory is the directory used by Maven for an invocation of the kamel local command.
diff --git a/pkg/cmd/local_build.go b/pkg/cmd/local_build.go
index 8ebb2e00c..bbed644ae 100644
--- a/pkg/cmd/local_build.go
+++ b/pkg/cmd/local_build.go
@@ -23,8 +23,8 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/cmd/local"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/cmd/local"
+ "github.com/apache/camel-k/v2/pkg/util"
)
func newCmdLocalBuild(localCmdOptions *LocalCmdOptions) (*cobra.Command, *localBuildCmdOptions) {
diff --git a/pkg/cmd/local_build_test.go b/pkg/cmd/local_build_test.go
index 5c9db5ff2..1494c55f9 100644
--- a/pkg/cmd/local_build_test.go
+++ b/pkg/cmd/local_build_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/cmd/local_inspect.go b/pkg/cmd/local_inspect.go
index 7ffdf8af2..5cecfdab5 100644
--- a/pkg/cmd/local_inspect.go
+++ b/pkg/cmd/local_inspect.go
@@ -21,7 +21,7 @@ import (
"errors"
"fmt"
- "github.com/apache/camel-k/pkg/cmd/local"
+ "github.com/apache/camel-k/v2/pkg/cmd/local"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/local_inspect_test.go b/pkg/cmd/local_inspect_test.go
index 92fad62be..b00d07a6b 100644
--- a/pkg/cmd/local_inspect_test.go
+++ b/pkg/cmd/local_inspect_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/cmd/local_run.go b/pkg/cmd/local_run.go
index c9bf2ff88..02dc1ded4 100644
--- a/pkg/cmd/local_run.go
+++ b/pkg/cmd/local_run.go
@@ -23,8 +23,8 @@ import (
"os/signal"
"syscall"
- "github.com/apache/camel-k/pkg/cmd/local"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/cmd/local"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/local_run_test.go b/pkg/cmd/local_run_test.go
index d6bdab05e..6dfa1867e 100644
--- a/pkg/cmd/local_run_test.go
+++ b/pkg/cmd/local_run_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/cmd/log.go b/pkg/cmd/log.go
index 6faa19b35..568de170c 100644
--- a/pkg/cmd/log.go
+++ b/pkg/cmd/log.go
@@ -22,8 +22,8 @@ import (
"fmt"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- k8slog "github.com/apache/camel-k/pkg/util/kubernetes/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ k8slog "github.com/apache/camel-k/v2/pkg/util/kubernetes/log"
"github.com/spf13/cobra"
k8errors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cmd/log_test.go b/pkg/cmd/log_test.go
index 71bf267d6..28ba243bd 100644
--- a/pkg/cmd/log_test.go
+++ b/pkg/cmd/log_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestLogsAlias(t *testing.T) {
diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go
index 5a7f2a698..159847489 100644
--- a/pkg/cmd/modeline.go
+++ b/pkg/cmd/modeline.go
@@ -23,9 +23,9 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/cmd/source"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/modeline"
+ "github.com/apache/camel-k/v2/pkg/cmd/source"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/modeline"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
diff --git a/pkg/cmd/modeline_test.go b/pkg/cmd/modeline_test.go
index 033b932cb..02c710d9f 100644
--- a/pkg/cmd/modeline_test.go
+++ b/pkg/cmd/modeline_test.go
@@ -24,7 +24,7 @@ import (
"path/filepath"
"testing"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/operator.go b/pkg/cmd/operator.go
index 5a0129a71..cec593420 100644
--- a/pkg/cmd/operator.go
+++ b/pkg/cmd/operator.go
@@ -18,11 +18,11 @@ limitations under the License.
package cmd
import (
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/cmd/operator"
+ "github.com/apache/camel-k/v2/pkg/cmd/operator"
)
const operatorCommand = "operator"
diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
index 69e167baf..3ae18d967 100644
--- a/pkg/cmd/operator/operator.go
+++ b/pkg/cmd/operator/operator.go
@@ -59,16 +59,16 @@ import (
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/apis"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/controller"
- "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- logutil "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/apis"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/controller"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
)
var log = logutil.Log.WithName("cmd")
diff --git a/pkg/cmd/operator_test.go b/pkg/cmd/operator_test.go
index 2c0f0e17e..d783ffbeb 100644
--- a/pkg/cmd/operator_test.go
+++ b/pkg/cmd/operator_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
diff --git a/pkg/cmd/promote.go b/pkg/cmd/promote.go
index fba185afb..b83bcd2f0 100644
--- a/pkg/cmd/promote.go
+++ b/pkg/cmd/promote.go
@@ -26,15 +26,15 @@ import (
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kamelets"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/resource"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kamelets"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/resource"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
diff --git a/pkg/cmd/promote_test.go b/pkg/cmd/promote_test.go
index 11524aefc..40741eade 100644
--- a/pkg/cmd/promote_test.go
+++ b/pkg/cmd/promote_test.go
@@ -21,11 +21,11 @@ import (
"fmt"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index 9c402c23a..35f59677c 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -25,8 +25,8 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
)
func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdOptions) {
diff --git a/pkg/cmd/rebuild_test.go b/pkg/cmd/rebuild_test.go
index e6e0c95a4..021c1cf6b 100644
--- a/pkg/cmd/rebuild_test.go
+++ b/pkg/cmd/rebuild_test.go
@@ -20,7 +20,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index 562652bcd..f3eb15d3e 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -20,9 +20,9 @@ package cmd
import (
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index f72128903..7bf9aa3d1 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -30,9 +30,9 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- "github.com/apache/camel-k/pkg/client"
- v1 "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/typed/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
const kamelCommandLongDescription = `Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless
diff --git a/pkg/cmd/root_test.go b/pkg/cmd/root_test.go
index d2b4eb7d5..6c9afd3ce 100644
--- a/pkg/cmd/root_test.go
+++ b/pkg/cmd/root_test.go
@@ -23,8 +23,8 @@ import (
"os"
"testing"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index e36740782..1ce6e8239 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -57,23 +57,23 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/cmd/local"
- "github.com/apache/camel-k/pkg/cmd/source"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/dsl"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- k8slog "github.com/apache/camel-k/pkg/util/kubernetes/log"
- "github.com/apache/camel-k/pkg/util/maven"
- "github.com/apache/camel-k/pkg/util/property"
- "github.com/apache/camel-k/pkg/util/resource"
- "github.com/apache/camel-k/pkg/util/sync"
- "github.com/apache/camel-k/pkg/util/watch"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/cmd/local"
+ "github.com/apache/camel-k/v2/pkg/cmd/source"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/dsl"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ k8slog "github.com/apache/camel-k/v2/pkg/util/kubernetes/log"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/property"
+ "github.com/apache/camel-k/v2/pkg/util/resource"
+ "github.com/apache/camel-k/v2/pkg/util/sync"
+ "github.com/apache/camel-k/v2/pkg/util/watch"
)
const usageDependency = `A dependency that should be included, e.g., "-d camel:mail" for a Camel component, "-d mvn:org.my:app:1.0" for a Maven dependency, "-d http(s)://my-repo/my-dependency.jar|targetPath=<path>®istry=<registry_URL>&skipChecksums=<true>&skipPOM=<true>&classpath=<true>" for custom dependencies located on an http server or "file://localPath[?targetPath=<path>®istry=<registry_URL>&skipChecksums=<true>&skipPOM=<true>&classpath=<true>]" for local files`
diff --git a/pkg/cmd/run_support.go b/pkg/cmd/run_support.go
index 812c7d326..8c24588fc 100644
--- a/pkg/cmd/run_support.go
+++ b/pkg/cmd/run_support.go
@@ -29,12 +29,12 @@ import (
"strings"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/cmd/source"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/resource"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/cmd/source"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/resource"
"github.com/magiconair/properties"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/cmd/run_support_test.go b/pkg/cmd/run_support_test.go
index e0a536c7a..970e81450 100644
--- a/pkg/cmd/run_support_test.go
+++ b/pkg/cmd/run_support_test.go
@@ -24,8 +24,8 @@ import (
"strings"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/cmd/source"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/cmd/source"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index 6ab5e105f..04de9df31 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -24,11 +24,11 @@ import (
"path/filepath"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
diff --git a/pkg/cmd/source/content.go b/pkg/cmd/source/content.go
index 28e359fff..a58b612e9 100644
--- a/pkg/cmd/source/content.go
+++ b/pkg/cmd/source/content.go
@@ -26,8 +26,8 @@ import (
"regexp"
"strings"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/gzip"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
)
const (
diff --git a/pkg/cmd/source/source.go b/pkg/cmd/source/source.go
index 3f04d0061..78737a9f7 100644
--- a/pkg/cmd/source/source.go
+++ b/pkg/cmd/source/source.go
@@ -26,7 +26,7 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/spf13/cobra"
"golang.org/x/oauth2"
diff --git a/pkg/cmd/trait_help.go b/pkg/cmd/trait_help.go
index 163e1cd9a..a91e4b1e3 100644
--- a/pkg/cmd/trait_help.go
+++ b/pkg/cmd/trait_help.go
@@ -29,10 +29,10 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/indentedwriter"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/indentedwriter"
)
func newTraitHelpCmd(rootCmdOptions *RootCmdOptions) (*cobra.Command, *traitHelpCommandOptions) {
diff --git a/pkg/cmd/trait_help_test.go b/pkg/cmd/trait_help_test.go
index 63d535647..ff03882a1 100644
--- a/pkg/cmd/trait_help_test.go
+++ b/pkg/cmd/trait_help_test.go
@@ -23,7 +23,7 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestHelpForNonExistentTrait(t *testing.T) {
diff --git a/pkg/cmd/trait_support.go b/pkg/cmd/trait_support.go
index a85cc2080..f861247f8 100644
--- a/pkg/cmd/trait_support.go
+++ b/pkg/cmd/trait_support.go
@@ -25,9 +25,9 @@ import (
"regexp"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/mitchellh/mapstructure"
)
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index 7ff9279a6..bf080b497 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -33,9 +33,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/olm"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/olm"
)
func newCmdUninstall(rootCmdOptions *RootCmdOptions) (*cobra.Command, *uninstallCmdOptions) {
diff --git a/pkg/cmd/uninstall_test.go b/pkg/cmd/uninstall_test.go
index ad7e37671..2c37dc55d 100644
--- a/pkg/cmd/uninstall_test.go
+++ b/pkg/cmd/uninstall_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
)
diff --git a/pkg/cmd/util.go b/pkg/cmd/util.go
index 537bcc1b2..966eb80a9 100644
--- a/pkg/cmd/util.go
+++ b/pkg/cmd/util.go
@@ -28,9 +28,9 @@ import (
"github.com/mitchellh/mapstructure"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- platformutil "github.com/apache/camel-k/pkg/platform"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
diff --git a/pkg/cmd/util_config.go b/pkg/cmd/util_config.go
index 753285aa0..df7b7dcc8 100644
--- a/pkg/cmd/util_config.go
+++ b/pkg/cmd/util_config.go
@@ -23,7 +23,7 @@ import (
"reflect"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
p "github.com/gertd/go-pluralize"
"github.com/spf13/cobra"
diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go
index d0ba44dc9..338da99be 100644
--- a/pkg/cmd/version.go
+++ b/pkg/cmd/version.go
@@ -31,10 +31,10 @@ import (
"github.com/fatih/camelcase"
"github.com/spf13/cobra"
- "github.com/apache/camel-k/pkg/client"
- platformutil "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// VersionVariant may be overridden at build time.
diff --git a/pkg/cmd/version_test.go b/pkg/cmd/version_test.go
index 7fd7ad489..69951c442 100644
--- a/pkg/cmd/version_test.go
+++ b/pkg/cmd/version_test.go
@@ -21,8 +21,8 @@ import (
"fmt"
"testing"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/controller/add_build.go b/pkg/controller/add_build.go
index c7c04441e..1cd569e17 100644
--- a/pkg/controller/add_build.go
+++ b/pkg/controller/add_build.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/build"
+ "github.com/apache/camel-k/v2/pkg/controller/build"
)
func init() {
diff --git a/pkg/controller/add_catalog.go b/pkg/controller/add_catalog.go
index 227defa11..d56bfc27d 100644
--- a/pkg/controller/add_catalog.go
+++ b/pkg/controller/add_catalog.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/catalog"
+ "github.com/apache/camel-k/v2/pkg/controller/catalog"
)
func init() {
diff --git a/pkg/controller/add_integration.go b/pkg/controller/add_integration.go
index bddc9f6b1..3e53b82d0 100644
--- a/pkg/controller/add_integration.go
+++ b/pkg/controller/add_integration.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/integration"
+ "github.com/apache/camel-k/v2/pkg/controller/integration"
)
func init() {
diff --git a/pkg/controller/add_integrationkit.go b/pkg/controller/add_integrationkit.go
index e47f87356..111ac2dcb 100644
--- a/pkg/controller/add_integrationkit.go
+++ b/pkg/controller/add_integrationkit.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/integrationkit"
+ "github.com/apache/camel-k/v2/pkg/controller/integrationkit"
)
func init() {
diff --git a/pkg/controller/add_integrationplatform.go b/pkg/controller/add_integrationplatform.go
index e2c65aa09..16b88f91a 100644
--- a/pkg/controller/add_integrationplatform.go
+++ b/pkg/controller/add_integrationplatform.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/integrationplatform"
+ "github.com/apache/camel-k/v2/pkg/controller/integrationplatform"
)
func init() {
diff --git a/pkg/controller/add_kamelet.go b/pkg/controller/add_kamelet.go
index 0aa2facc1..bf3b2e524 100644
--- a/pkg/controller/add_kamelet.go
+++ b/pkg/controller/add_kamelet.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/kamelet"
+ "github.com/apache/camel-k/v2/pkg/controller/kamelet"
)
func init() {
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/add_kameletbinding.go
index 44efa1b04..c517b61b0 100644
--- a/pkg/controller/add_kameletbinding.go
+++ b/pkg/controller/add_kameletbinding.go
@@ -18,7 +18,7 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/pkg/controller/kameletbinding"
+ "github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
)
func init() {
diff --git a/pkg/controller/build/action.go b/pkg/controller/build/action.go
index 4fab3a382..65df81c6c 100644
--- a/pkg/controller/build/action.go
+++ b/pkg/controller/build/action.go
@@ -22,10 +22,10 @@ import (
"k8s.io/client-go/tools/record"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/build/build_controller.go b/pkg/controller/build/build_controller.go
index 3bfab58ef..e0172ab20 100644
--- a/pkg/controller/build/build_controller.go
+++ b/pkg/controller/build/build_controller.go
@@ -32,11 +32,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new Build Controller and adds it to the Manager. The Manager will set fields on the Controller
diff --git a/pkg/controller/build/build_pod.go b/pkg/controller/build/build_pod.go
index ffa11b952..7095f9881 100644
--- a/pkg/controller/build/build_pod.go
+++ b/pkg/controller/build/build_pod.go
@@ -32,11 +32,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
diff --git a/pkg/controller/build/error.go b/pkg/controller/build/error.go
index c228647b6..32d07ff17 100644
--- a/pkg/controller/build/error.go
+++ b/pkg/controller/build/error.go
@@ -20,7 +20,7 @@ package build
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newErrorAction() Action {
diff --git a/pkg/controller/build/initialize_pod.go b/pkg/controller/build/initialize_pod.go
index 41ded20c3..f8b0a8896 100644
--- a/pkg/controller/build/initialize_pod.go
+++ b/pkg/controller/build/initialize_pod.go
@@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newInitializePodAction(reader ctrl.Reader) Action {
diff --git a/pkg/controller/build/initialize_routine.go b/pkg/controller/build/initialize_routine.go
index 1977c49ba..ef6c34a6e 100644
--- a/pkg/controller/build/initialize_routine.go
+++ b/pkg/controller/build/initialize_routine.go
@@ -20,7 +20,7 @@ package build
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newInitializeRoutineAction() Action {
diff --git a/pkg/controller/build/log.go b/pkg/controller/build/log.go
index 30e23d30a..80980a0e1 100644
--- a/pkg/controller/build/log.go
+++ b/pkg/controller/build/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package build
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("build")
diff --git a/pkg/controller/build/metrics.go b/pkg/controller/build/metrics.go
index 9bdfaf9ea..f8272834d 100644
--- a/pkg/controller/build/metrics.go
+++ b/pkg/controller/build/metrics.go
@@ -25,7 +25,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
)
diff --git a/pkg/controller/build/monitor_pod.go b/pkg/controller/build/monitor_pod.go
index 9471846d6..7a3e6829b 100644
--- a/pkg/controller/build/monitor_pod.go
+++ b/pkg/controller/build/monitor_pod.go
@@ -34,9 +34,9 @@ import (
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const timeoutAnnotation = "camel.apache.org/timeout"
diff --git a/pkg/controller/build/monitor_routine.go b/pkg/controller/build/monitor_routine.go
index 2d57a5339..0a08919fc 100644
--- a/pkg/controller/build/monitor_routine.go
+++ b/pkg/controller/build/monitor_routine.go
@@ -30,11 +30,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/patch"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
)
var routines sync.Map
diff --git a/pkg/controller/build/recovery.go b/pkg/controller/build/recovery.go
index 7704dcf34..55ab7698c 100644
--- a/pkg/controller/build/recovery.go
+++ b/pkg/controller/build/recovery.go
@@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func newErrorRecoveryAction() Action {
diff --git a/pkg/controller/build/schedule.go b/pkg/controller/build/schedule.go
index 12e879d61..746db319d 100644
--- a/pkg/controller/build/schedule.go
+++ b/pkg/controller/build/schedule.go
@@ -27,9 +27,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func newScheduleAction(reader ctrl.Reader) Action {
diff --git a/pkg/controller/catalog/action.go b/pkg/controller/catalog/action.go
index e904ad9e2..c8e52f1dc 100644
--- a/pkg/controller/catalog/action.go
+++ b/pkg/controller/catalog/action.go
@@ -20,9 +20,9 @@ package catalog
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/catalog/catalog_controller.go b/pkg/controller/catalog/catalog_controller.go
index 7a8a0bbb4..8dc5e74d5 100644
--- a/pkg/controller/catalog/catalog_controller.go
+++ b/pkg/controller/catalog/catalog_controller.go
@@ -34,11 +34,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new Catalog Controller and adds it to the Manager. The Manager will set fields on the Controller
diff --git a/pkg/controller/catalog/initialize.go b/pkg/controller/catalog/initialize.go
index f151ab178..11c4d7d33 100644
--- a/pkg/controller/catalog/initialize.go
+++ b/pkg/controller/catalog/initialize.go
@@ -26,11 +26,11 @@ import (
"runtime"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- platformutil "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util"
spectrum "github.com/container-tools/spectrum/pkg/builder"
gcrv1 "github.com/google/go-containerregistry/pkg/v1"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/controller/catalog/log.go b/pkg/controller/catalog/log.go
index a9f37cff7..37f3596b3 100644
--- a/pkg/controller/catalog/log.go
+++ b/pkg/controller/catalog/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package catalog
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("catalog")
diff --git a/pkg/controller/catalog/monitor.go b/pkg/controller/catalog/monitor.go
index 250371948..6ced66b49 100644
--- a/pkg/controller/catalog/monitor.go
+++ b/pkg/controller/catalog/monitor.go
@@ -20,7 +20,7 @@ package catalog
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// NewMonitorAction returns an action that monitors the catalog after it's fully initialized.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 721c93aa3..6a800d8ee 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -22,7 +22,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
- "github.com/apache/camel-k/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/client"
)
// addToManager is a list of functions to add all Controllers to the Manager.
diff --git a/pkg/controller/integration/action.go b/pkg/controller/integration/action.go
index e56011c74..16b41cdcc 100644
--- a/pkg/controller/integration/action.go
+++ b/pkg/controller/integration/action.go
@@ -20,9 +20,9 @@ package integration
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/integration/build_kit.go b/pkg/controller/integration/build_kit.go
index df568b71f..8a291f7bc 100644
--- a/pkg/controller/integration/build_kit.go
+++ b/pkg/controller/integration/build_kit.go
@@ -22,10 +22,10 @@ import (
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func newBuildKitAction() Action {
diff --git a/pkg/controller/integration/health.go b/pkg/controller/integration/health.go
index 9e9a75948..fa2a26a26 100644
--- a/pkg/controller/integration/health.go
+++ b/pkg/controller/integration/health.go
@@ -25,7 +25,7 @@ import (
"strings"
"time"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/pkg/controller/integration/health_test.go b/pkg/controller/integration/health_test.go
index 7d27adc6e..35b4c8181 100644
--- a/pkg/controller/integration/health_test.go
+++ b/pkg/controller/integration/health_test.go
@@ -22,7 +22,7 @@ import (
"reflect"
"testing"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/controller/integration/initialize.go b/pkg/controller/integration/initialize.go
index 58cf23cb9..de8ad1d5e 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -24,10 +24,10 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// NewInitializeAction creates a new initialize action.
diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
index 48887fa8c..6b4f16042 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -45,15 +45,15 @@ import (
"knative.dev/serving/pkg/apis/serving"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
diff --git a/pkg/controller/integration/kits.go b/pkg/controller/integration/kits.go
index 433d96180..2cf22089b 100644
--- a/pkg/controller/integration/kits.go
+++ b/pkg/controller/integration/kits.go
@@ -26,14 +26,14 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
func lookupKitsForIntegration(ctx context.Context, c ctrl.Reader, integration *v1.Integration, options ...ctrl.ListOption) ([]v1.IntegrationKit, error) {
diff --git a/pkg/controller/integration/kits_test.go b/pkg/controller/integration/kits_test.go
index 694be1521..94709f977 100644
--- a/pkg/controller/integration/kits_test.go
+++ b/pkg/controller/integration/kits_test.go
@@ -24,12 +24,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/test"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/controller/integration/log.go b/pkg/controller/integration/log.go
index 5a828c3ad..e9e702253 100644
--- a/pkg/controller/integration/log.go
+++ b/pkg/controller/integration/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package integration
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("integration")
diff --git a/pkg/controller/integration/monitor.go b/pkg/controller/integration/monitor.go
index bc5880002..c9c1ccc5e 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -35,10 +35,10 @@ import (
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func NewMonitorAction() Action {
diff --git a/pkg/controller/integration/monitor_cronjob.go b/pkg/controller/integration/monitor_cronjob.go
index fcec451f8..a2f969d34 100644
--- a/pkg/controller/integration/monitor_cronjob.go
+++ b/pkg/controller/integration/monitor_cronjob.go
@@ -26,9 +26,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type cronJobController struct {
diff --git a/pkg/controller/integration/monitor_deployment.go b/pkg/controller/integration/monitor_deployment.go
index 8ba876781..ac387fc78 100644
--- a/pkg/controller/integration/monitor_deployment.go
+++ b/pkg/controller/integration/monitor_deployment.go
@@ -24,8 +24,8 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type deploymentController struct {
diff --git a/pkg/controller/integration/monitor_knative.go b/pkg/controller/integration/monitor_knative.go
index f1ef4b055..1d62eef2e 100644
--- a/pkg/controller/integration/monitor_knative.go
+++ b/pkg/controller/integration/monitor_knative.go
@@ -24,8 +24,8 @@ import (
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type knativeServiceController struct {
diff --git a/pkg/controller/integration/platform_setup.go b/pkg/controller/integration/platform_setup.go
index e18b33823..a272715ba 100644
--- a/pkg/controller/integration/platform_setup.go
+++ b/pkg/controller/integration/platform_setup.go
@@ -23,11 +23,11 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/knative"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
)
// NewPlatformSetupAction creates a new platform-setup action.
diff --git a/pkg/controller/integrationkit/action.go b/pkg/controller/integrationkit/action.go
index 980cdf7f6..ae84736d7 100644
--- a/pkg/controller/integrationkit/action.go
+++ b/pkg/controller/integrationkit/action.go
@@ -20,9 +20,9 @@ package integrationkit
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/integrationkit/build.go b/pkg/controller/integrationkit/build.go
index 69b9de52b..c98007dfb 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -23,7 +23,7 @@ import (
"strings"
"time"
- "github.com/apache/camel-k/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/pkg/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -31,10 +31,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
// NewBuildAction creates a new build request handling action for the kit.
diff --git a/pkg/controller/integrationkit/error.go b/pkg/controller/integrationkit/error.go
index 59ac2dfb4..5d2e6ef68 100644
--- a/pkg/controller/integrationkit/error.go
+++ b/pkg/controller/integrationkit/error.go
@@ -20,8 +20,8 @@ package integrationkit
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/digest"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
)
// NewErrorAction creates a new error handling action for the kit.
diff --git a/pkg/controller/integrationkit/initialize.go b/pkg/controller/integrationkit/initialize.go
index 29f063346..8f4f3e49a 100644
--- a/pkg/controller/integrationkit/initialize.go
+++ b/pkg/controller/integrationkit/initialize.go
@@ -22,10 +22,10 @@ import (
"fmt"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/trait"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"k8s.io/apimachinery/pkg/api/errors"
)
diff --git a/pkg/controller/integrationkit/integrationkit_controller.go b/pkg/controller/integrationkit/integrationkit_controller.go
index a65cf0161..7ed069e96 100644
--- a/pkg/controller/integrationkit/integrationkit_controller.go
+++ b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -36,13 +36,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new IntegrationKit Controller and adds it to the Manager. The Manager will set fields on the Controller
diff --git a/pkg/controller/integrationkit/log.go b/pkg/controller/integrationkit/log.go
index 043dd855a..e31fe92d0 100644
--- a/pkg/controller/integrationkit/log.go
+++ b/pkg/controller/integrationkit/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package integrationkit
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("integrationkit")
diff --git a/pkg/controller/integrationkit/monitor.go b/pkg/controller/integrationkit/monitor.go
index 8e4b2bef3..6852c9238 100644
--- a/pkg/controller/integrationkit/monitor.go
+++ b/pkg/controller/integrationkit/monitor.go
@@ -20,8 +20,8 @@ package integrationkit
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/digest"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
)
// NewMonitorAction creates a new monitoring handling action for the kit.
diff --git a/pkg/controller/integrationplatform/action.go b/pkg/controller/integrationplatform/action.go
index 4671dcbef..2169f19b2 100644
--- a/pkg/controller/integrationplatform/action.go
+++ b/pkg/controller/integrationplatform/action.go
@@ -20,9 +20,9 @@ package integrationplatform
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/integrationplatform/create.go b/pkg/controller/integrationplatform/create.go
index 0933fb6b3..3aba73474 100644
--- a/pkg/controller/integrationplatform/create.go
+++ b/pkg/controller/integrationplatform/create.go
@@ -23,11 +23,11 @@ import (
corev1 "k8s.io/api/core/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/install"
- platformutil "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/install"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// NewCreateAction returns a action that creates resources needed by the platform.
diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go
index 18b19299c..e51b83339 100644
--- a/pkg/controller/integrationplatform/create_test.go
+++ b/pkg/controller/integrationplatform/create_test.go
@@ -22,11 +22,11 @@ import (
"strings"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/rs/xid"
"github.com/stretchr/testify/assert"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index ae820d6a7..a38274bdb 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -25,11 +25,11 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- platformutil "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// NewInitializeAction returns a action that initializes the platform configuration when not provided by the user.
diff --git a/pkg/controller/integrationplatform/initialize_test.go b/pkg/controller/integrationplatform/initialize_test.go
index a718b1202..158815b03 100644
--- a/pkg/controller/integrationplatform/initialize_test.go
+++ b/pkg/controller/integrationplatform/initialize_test.go
@@ -26,10 +26,10 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/test"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/controller/integrationplatform/integrationplatform_controller.go b/pkg/controller/integrationplatform/integrationplatform_controller.go
index b604b389e..7d00cc431 100644
--- a/pkg/controller/integrationplatform/integrationplatform_controller.go
+++ b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -34,11 +34,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new IntegrationPlatform Controller and adds it to the Manager. The Manager will set fields
diff --git a/pkg/controller/integrationplatform/kaniko_cache.go b/pkg/controller/integrationplatform/kaniko_cache.go
index b62b0843f..4b08d3b79 100644
--- a/pkg/controller/integrationplatform/kaniko_cache.go
+++ b/pkg/controller/integrationplatform/kaniko_cache.go
@@ -27,10 +27,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
func createKanikoCacheWarmerPod(ctx context.Context, client client.Client, platform *v1.IntegrationPlatform) error {
diff --git a/pkg/controller/integrationplatform/log.go b/pkg/controller/integrationplatform/log.go
index 1a44b85e9..0110b225d 100644
--- a/pkg/controller/integrationplatform/log.go
+++ b/pkg/controller/integrationplatform/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package integrationplatform
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("integrationplatform")
diff --git a/pkg/controller/integrationplatform/monitor.go b/pkg/controller/integrationplatform/monitor.go
index 68884f7a7..9aeec89c3 100644
--- a/pkg/controller/integrationplatform/monitor.go
+++ b/pkg/controller/integrationplatform/monitor.go
@@ -20,9 +20,9 @@ package integrationplatform
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- platformutil "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ platformutil "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
)
// NewMonitorAction returns an action that monitors the integration platform after it's fully initialized.
diff --git a/pkg/controller/integrationplatform/warm.go b/pkg/controller/integrationplatform/warm.go
index 21f6608c9..c1201b23a 100644
--- a/pkg/controller/integrationplatform/warm.go
+++ b/pkg/controller/integrationplatform/warm.go
@@ -27,7 +27,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func NewWarmAction(reader ctrl.Reader) Action {
diff --git a/pkg/controller/integrationplatform/warm_test.go b/pkg/controller/integrationplatform/warm_test.go
index 3c5a6c4d3..83f963433 100644
--- a/pkg/controller/integrationplatform/warm_test.go
+++ b/pkg/controller/integrationplatform/warm_test.go
@@ -21,13 +21,13 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/platform"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/rs/xid"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/controller/kamelet/action.go b/pkg/controller/kamelet/action.go
index f0a7120db..640875749 100644
--- a/pkg/controller/kamelet/action.go
+++ b/pkg/controller/kamelet/action.go
@@ -20,9 +20,9 @@ package kamelet
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/kamelet/initialize.go b/pkg/controller/kamelet/initialize.go
index a262a1872..a0e5e31eb 100644
--- a/pkg/controller/kamelet/initialize.go
+++ b/pkg/controller/kamelet/initialize.go
@@ -20,8 +20,8 @@ package kamelet
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- kameletutils "github.com/apache/camel-k/pkg/kamelet"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ kameletutils "github.com/apache/camel-k/v2/pkg/kamelet"
)
// NewInitializeAction returns a action that initializes the kamelet configuration when not provided by the user.
diff --git a/pkg/controller/kamelet/kamelet_controller.go b/pkg/controller/kamelet/kamelet_controller.go
index c7e74cccb..2a93172ef 100644
--- a/pkg/controller/kamelet/kamelet_controller.go
+++ b/pkg/controller/kamelet/kamelet_controller.go
@@ -34,11 +34,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new Kamelet Controller and adds it to the Manager. The Manager will set fields on the Controller
diff --git a/pkg/controller/kamelet/log.go b/pkg/controller/kamelet/log.go
index 3a734fb7f..468c42b8e 100644
--- a/pkg/controller/kamelet/log.go
+++ b/pkg/controller/kamelet/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package kamelet
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("kamelet")
diff --git a/pkg/controller/kamelet/monitor.go b/pkg/controller/kamelet/monitor.go
index cf89b7fa5..11fe715e1 100644
--- a/pkg/controller/kamelet/monitor.go
+++ b/pkg/controller/kamelet/monitor.go
@@ -20,8 +20,8 @@ package kamelet
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- kameletutils "github.com/apache/camel-k/pkg/kamelet"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ kameletutils "github.com/apache/camel-k/v2/pkg/kamelet"
)
// NewMonitorAction returns an action that monitors the kamelet after it's fully initialized.
diff --git a/pkg/controller/kameletbinding/action.go b/pkg/controller/kameletbinding/action.go
index 88c120c98..f24970a86 100644
--- a/pkg/controller/kameletbinding/action.go
+++ b/pkg/controller/kameletbinding/action.go
@@ -20,9 +20,9 @@ package kameletbinding
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Action --.
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/kameletbinding/error_handler.go
index 470d3dca5..c85829a52 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -21,8 +21,8 @@ import (
"encoding/json"
"fmt"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/bindings"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
"github.com/pkg/errors"
)
diff --git a/pkg/controller/kameletbinding/error_handler_test.go b/pkg/controller/kameletbinding/error_handler_test.go
index b6dab3923..6abbf2187 100644
--- a/pkg/controller/kameletbinding/error_handler_test.go
+++ b/pkg/controller/kameletbinding/error_handler_test.go
@@ -21,7 +21,7 @@ import (
"fmt"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
@@ -84,8 +84,8 @@ func TestParseErrorHandlerSinkWithParametersDoesSucceed(t *testing.T) {
"sink": {
"endpoint": {
"uri": "someUri"
- },
- "parameters":
+ },
+ "parameters":
{"param1": "value1", "param2": "value2"}
}
}`),
diff --git a/pkg/controller/kameletbinding/initialize.go b/pkg/controller/kameletbinding/initialize.go
index 6ae2827b7..3a64e8440 100644
--- a/pkg/controller/kameletbinding/initialize.go
+++ b/pkg/controller/kameletbinding/initialize.go
@@ -21,11 +21,11 @@ import (
"context"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/kamelet/repository"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/patch"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/kamelet/repository"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
diff --git a/pkg/controller/kameletbinding/integration.go b/pkg/controller/kameletbinding/integration.go
index e058c91af..a9d4296cf 100644
--- a/pkg/controller/kameletbinding/integration.go
+++ b/pkg/controller/kameletbinding/integration.go
@@ -27,15 +27,15 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/bindings"
- "github.com/apache/camel-k/pkg/util/knative"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/property"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
var (
diff --git a/pkg/controller/kameletbinding/kamelet_binding_controller.go b/pkg/controller/kameletbinding/kamelet_binding_controller.go
index aeab73d51..a8dfda3f0 100644
--- a/pkg/controller/kameletbinding/kamelet_binding_controller.go
+++ b/pkg/controller/kameletbinding/kamelet_binding_controller.go
@@ -33,15 +33,15 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/trait"
-
- camelevent "github.com/apache/camel-k/pkg/event"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/monitoring"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/trait"
+
+ camelevent "github.com/apache/camel-k/v2/pkg/event"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/monitoring"
)
// Add creates a new KameletBinding Controller and adds it to the Manager. The Manager will set fields on the Controller
diff --git a/pkg/controller/kameletbinding/log.go b/pkg/controller/kameletbinding/log.go
index 72a1a6004..a7a70a117 100644
--- a/pkg/controller/kameletbinding/log.go
+++ b/pkg/controller/kameletbinding/log.go
@@ -17,7 +17,7 @@ limitations under the License.
package kameletbinding
-import "github.com/apache/camel-k/pkg/util/log"
+import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
var Log = log.Log.WithName("controller").WithName("kameletbinding")
diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/kameletbinding/monitor.go
index ed4fa301b..efef9afc2 100644
--- a/pkg/controller/kameletbinding/monitor.go
+++ b/pkg/controller/kameletbinding/monitor.go
@@ -29,9 +29,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/trait"
)
// NewMonitorAction returns an action that monitors the KameletBinding after it's fully initialized.
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 76150f723..053db3069 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -27,11 +27,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
const (
diff --git a/pkg/install/builder.go b/pkg/install/builder.go
index 06fc0ffca..6abd64531 100644
--- a/pkg/install/builder.go
+++ b/pkg/install/builder.go
@@ -20,8 +20,8 @@ package install
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
)
// BuilderServiceAccountRoles installs the builder service account and related roles in the given namespace.
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index 0af2e0e30..036049510 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -33,10 +33,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util/knative"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func SetupClusterWideResourcesOrCollect(
diff --git a/pkg/install/common.go b/pkg/install/common.go
index 9332bf327..78b160149 100644
--- a/pkg/install/common.go
+++ b/pkg/install/common.go
@@ -27,11 +27,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/openshift"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
const serviceAccountName = "camel-k-operator"
diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go
index 4f8102a85..b648e6ac8 100644
--- a/pkg/install/kamelets.go
+++ b/pkg/install/kamelets.go
@@ -39,12 +39,12 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/patch"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
)
const (
diff --git a/pkg/install/kamelets_test.go b/pkg/install/kamelets_test.go
index 3a459e592..23e545422 100644
--- a/pkg/install/kamelets_test.go
+++ b/pkg/install/kamelets_test.go
@@ -20,7 +20,7 @@ package install
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/install/knative.go b/pkg/install/knative.go
index cf98ef5e8..12e18c3db 100644
--- a/pkg/install/knative.go
+++ b/pkg/install/knative.go
@@ -27,7 +27,7 @@ import (
rbacv1ac "k8s.io/client-go/applyconfigurations/rbac/v1"
"k8s.io/client-go/kubernetes"
- "github.com/apache/camel-k/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
)
const knativeAddressableResolverClusterRoleName = "addressable-resolver"
diff --git a/pkg/install/openshift.go b/pkg/install/openshift.go
index 39831b4e9..2acb69f7c 100644
--- a/pkg/install/openshift.go
+++ b/pkg/install/openshift.go
@@ -30,9 +30,9 @@ import (
console "github.com/openshift/api/console/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
@@ -52,7 +52,7 @@ var (
"You can run `kamel help` to list the available commands or go to the [Camel K Website](https://camel.apache.org/projects/camel-k/) for more information."
// KamelCLIDownloadURLTemplate is the download template with 3 missing parameters (version, version, os).
- KamelCLIDownloadURLTemplate = "https://github.com/apache/camel-k/releases/download/v%s/camel-k-client-%s-%s-64bit.tar.gz"
+ KamelCLIDownloadURLTemplate = "https://github.com/apache/camel-k/v2/releases/download/v%s/camel-k-client-%s-%s-64bit.tar.gz"
)
// OpenShiftConsoleDownloadLink installs the download link for the OpenShift console.
diff --git a/pkg/install/operator.go b/pkg/install/operator.go
index 74d6edc2f..9f8c10d9c 100644
--- a/pkg/install/operator.go
+++ b/pkg/install/operator.go
@@ -37,16 +37,16 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/envvar"
- "github.com/apache/camel-k/pkg/util/knative"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/minikube"
- "github.com/apache/camel-k/pkg/util/patch"
- image "github.com/apache/camel-k/pkg/util/registry"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/minikube"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
+ image "github.com/apache/camel-k/v2/pkg/util/registry"
)
type OperatorConfiguration struct {
diff --git a/pkg/install/optional.go b/pkg/install/optional.go
index d4b9e595e..a5a1e4c6a 100644
--- a/pkg/install/optional.go
+++ b/pkg/install/optional.go
@@ -21,9 +21,9 @@ import (
"context"
"strings"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/defaults"
- logutil "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ logutil "github.com/apache/camel-k/v2/pkg/util/log"
cp "github.com/otiai10/copy"
)
diff --git a/pkg/install/platform.go b/pkg/install/platform.go
index f6f366544..0fe272388 100644
--- a/pkg/install/platform.go
+++ b/pkg/install/platform.go
@@ -20,7 +20,7 @@ package install
import (
"context"
- "github.com/apache/camel-k/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/client"
)
// IntegrationPlatformViewerRole installs the role that allows any user to access integrationplatforms in the global namespace.
diff --git a/pkg/install/secret.go b/pkg/install/secret.go
index 2c197e739..5fa1fd934 100644
--- a/pkg/install/secret.go
+++ b/pkg/install/secret.go
@@ -20,13 +20,13 @@ package install
import (
"context"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/registry"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/registry"
)
const registrySecretName = "camel-k-registry-secret"
diff --git a/pkg/kamelet/initialize.go b/pkg/kamelet/initialize.go
index cb0a93bf0..15a470115 100644
--- a/pkg/kamelet/initialize.go
+++ b/pkg/kamelet/initialize.go
@@ -23,7 +23,7 @@ import (
"fmt"
"sort"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
)
diff --git a/pkg/kamelet/repository/composite_repository.go b/pkg/kamelet/repository/composite_repository.go
index 5dc45dc6a..9d0e409e7 100644
--- a/pkg/kamelet/repository/composite_repository.go
+++ b/pkg/kamelet/repository/composite_repository.go
@@ -23,7 +23,7 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
type compositeKameletRepository struct {
diff --git a/pkg/kamelet/repository/composite_repository_test.go b/pkg/kamelet/repository/composite_repository_test.go
index aaeffae64..da368a304 100644
--- a/pkg/kamelet/repository/composite_repository_test.go
+++ b/pkg/kamelet/repository/composite_repository_test.go
@@ -21,8 +21,8 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/fake"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/fake"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/kamelet/repository/empty_repository.go b/pkg/kamelet/repository/empty_repository.go
index 6596f579f..6c9ec8e1e 100644
--- a/pkg/kamelet/repository/empty_repository.go
+++ b/pkg/kamelet/repository/empty_repository.go
@@ -20,7 +20,7 @@ package repository
import (
"context"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
type emptyKameletRepository struct {
diff --git a/pkg/kamelet/repository/github_repository.go b/pkg/kamelet/repository/github_repository.go
index 1bf226742..d07490f18 100644
--- a/pkg/kamelet/repository/github_repository.go
+++ b/pkg/kamelet/repository/github_repository.go
@@ -27,7 +27,7 @@ import (
"sort"
"strings"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/google/go-github/v32/github"
"golang.org/x/oauth2"
diff --git a/pkg/kamelet/repository/go.mod b/pkg/kamelet/repository/go.mod
index ca53bc2a3..6ce9c2457 100644
--- a/pkg/kamelet/repository/go.mod
+++ b/pkg/kamelet/repository/go.mod
@@ -1,10 +1,10 @@
-module github.com/apache/camel-k/pkg/kamelet/repository
+module github.com/apache/camel-k/v2/pkg/kamelet/repository
go 1.18
require (
- github.com/apache/camel-k/pkg/apis/camel v0.0.0
- github.com/apache/camel-k/pkg/client/camel v0.0.0
+ github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0
+ github.com/apache/camel-k/v2/pkg/client/camel v0.0.0
github.com/google/go-github/v32 v32.1.0
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7
github.com/stretchr/testify v1.8.0
@@ -58,6 +58,6 @@ require (
)
// Local modules
-replace github.com/apache/camel-k/pkg/apis/camel => ../../apis/camel
+replace github.com/apache/camel-k/v2/pkg/apis/camel => ../../apis/camel
-replace github.com/apache/camel-k/pkg/client/camel => ../../client/camel
+replace github.com/apache/camel-k/v2/pkg/client/camel => ../../client/camel
diff --git a/pkg/kamelet/repository/kubernetes_repository.go b/pkg/kamelet/repository/kubernetes_repository.go
index cf64a8fc5..cdcd865d1 100644
--- a/pkg/kamelet/repository/kubernetes_repository.go
+++ b/pkg/kamelet/repository/kubernetes_repository.go
@@ -22,8 +22,8 @@ import (
"fmt"
"sort"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/kamelet/repository/kubernetes_repository_test.go b/pkg/kamelet/repository/kubernetes_repository_test.go
index a8ca1a826..7ecd99c7c 100644
--- a/pkg/kamelet/repository/kubernetes_repository_test.go
+++ b/pkg/kamelet/repository/kubernetes_repository_test.go
@@ -21,8 +21,8 @@ import (
"context"
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/fake"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/fake"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/kamelet/repository/repository.go b/pkg/kamelet/repository/repository.go
index 6497acbc4..66ae90da7 100644
--- a/pkg/kamelet/repository/repository.go
+++ b/pkg/kamelet/repository/repository.go
@@ -22,9 +22,9 @@ import (
"fmt"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- camel "github.com/apache/camel-k/pkg/client/camel/clientset/versioned"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ camel "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/pkg/kamelet/repository/repository_test.go b/pkg/kamelet/repository/repository_test.go
index bb8d16ff2..42a712787 100644
--- a/pkg/kamelet/repository/repository_test.go
+++ b/pkg/kamelet/repository/repository_test.go
@@ -22,9 +22,9 @@ import (
"fmt"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client/camel/clientset/versioned/fake"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/fake"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go
index d73c7b221..d5a4a824f 100644
--- a/pkg/metadata/metadata.go
+++ b/pkg/metadata/metadata.go
@@ -20,9 +20,9 @@ package metadata
import (
"github.com/scylladb/go-set/strset"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- src "github.com/apache/camel-k/pkg/util/source"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ src "github.com/apache/camel-k/v2/pkg/util/source"
)
// ExtractAll returns metadata information from all listed source codes.
diff --git a/pkg/metadata/metadata_capabilities_test.go b/pkg/metadata/metadata_capabilities_test.go
index e283e9a6f..a0b770810 100644
--- a/pkg/metadata/metadata_capabilities_test.go
+++ b/pkg/metadata/metadata_capabilities_test.go
@@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestPlatformHttpCapabilities(t *testing.T) {
diff --git a/pkg/metadata/metadata_dependencies_test.go b/pkg/metadata/metadata_dependencies_test.go
index 297be6f61..6ce6f0275 100644
--- a/pkg/metadata/metadata_dependencies_test.go
+++ b/pkg/metadata/metadata_dependencies_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestDependenciesJavaSource(t *testing.T) {
diff --git a/pkg/metadata/metadata_http_test.go b/pkg/metadata/metadata_http_test.go
index 6aecde9fe..5572d6459 100644
--- a/pkg/metadata/metadata_http_test.go
+++ b/pkg/metadata/metadata_http_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestHttpJavaSource(t *testing.T) {
diff --git a/pkg/metadata/metadata_uri_test.go b/pkg/metadata/metadata_uri_test.go
index c22aa7b4a..a876f6b60 100644
--- a/pkg/metadata/metadata_uri_test.go
+++ b/pkg/metadata/metadata_uri_test.go
@@ -23,8 +23,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestJava1(t *testing.T) {
diff --git a/pkg/metadata/types.go b/pkg/metadata/types.go
index 2af13a647..bf8afb828 100644
--- a/pkg/metadata/types.go
+++ b/pkg/metadata/types.go
@@ -18,7 +18,7 @@ limitations under the License.
package metadata
import (
- "github.com/apache/camel-k/pkg/util/source"
+ "github.com/apache/camel-k/v2/pkg/util/source"
)
// IntegrationMetadata contains aggregate metadata about all Camel routes in a integrations.
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 1733f2a83..d585eb4f6 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -33,15 +33,15 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/kamelet/repository"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/openshift"
- image "github.com/apache/camel-k/pkg/util/registry"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/kamelet/repository"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
+ image "github.com/apache/camel-k/v2/pkg/util/registry"
)
// BuilderServiceAccount --.
diff --git a/pkg/platform/operator.go b/pkg/platform/operator.go
index b01b50698..16f6cb0dd 100644
--- a/pkg/platform/operator.go
+++ b/pkg/platform/operator.go
@@ -23,8 +23,8 @@ import (
"os"
"strings"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/defaults"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
coordination "k8s.io/api/coordination/v1"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -32,7 +32,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/predicate"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/log"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 2c354a4ba..311534e1a 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -20,9 +20,9 @@ package platform
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index e2228db39..6ec2c8e32 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -167,6 +167,18 @@ var assets = func() http.FileSystem {
name: "manager",
modTime: time.Time{},
},
+ "/manager/bundle": &vfsgenÛ°DirInfo{
+ name: "bundle",
+ modTime: time.Time{},
+ },
+ "/manager/bundle/manifests": &vfsgenÛ°DirInfo{
+ name: "manifests",
+ modTime: time.Time{},
+ },
+ "/manager/bundle/metadata": &vfsgenÛ°DirInfo{
+ name: "metadata",
+ modTime: time.Time{},
+ },
"/manager/operator-deployment.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
@@ -671,6 +683,7 @@ var assets = func() http.FileSystem {
fs["/crd/bases/camel.apache.org_kamelets.yaml"].(os.FileInfo),
}
fs["/manager"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
+ fs["/manager/bundle"].(os.FileInfo),
fs["/manager/operator-deployment.yaml"].(os.FileInfo),
fs["/manager/operator-pvc.yaml"].(os.FileInfo),
fs["/manager/operator-service-account.yaml"].(os.FileInfo),
@@ -684,6 +697,10 @@ var assets = func() http.FileSystem {
fs["/manager/patch-toleration.yaml"].(os.FileInfo),
fs["/manager/patch-watch-namespace-global.yaml"].(os.FileInfo),
}
+ fs["/manager/bundle"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
+ fs["/manager/bundle/manifests"].(os.FileInfo),
+ fs["/manager/bundle/metadata"].(os.FileInfo),
+ }
fs["/prometheus"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
fs["/prometheus/operator-pod-monitor.yaml"].(os.FileInfo),
fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo),
diff --git a/pkg/resources/resources_support.go b/pkg/resources/resources_support.go
index 9fffafe0f..b8c17aac8 100644
--- a/pkg/resources/resources_support.go
+++ b/pkg/resources/resources_support.go
@@ -27,7 +27,7 @@ import (
"strings"
"text/template"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
"github.com/pkg/errors"
)
diff --git a/pkg/trait/affinity.go b/pkg/trait/affinity.go
index 1fa051ac3..509d196c1 100644
--- a/pkg/trait/affinity.go
+++ b/pkg/trait/affinity.go
@@ -27,8 +27,8 @@ import (
"k8s.io/apimachinery/pkg/selection"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type affinityTrait struct {
diff --git a/pkg/trait/affinity_test.go b/pkg/trait/affinity_test.go
index c6cfc8884..86eaa74d6 100644
--- a/pkg/trait/affinity_test.go
+++ b/pkg/trait/affinity_test.go
@@ -26,7 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestConfigureAffinityTraitDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 2c0bc795e..629d1fc00 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -24,11 +24,11 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/builder"
- mvn "github.com/apache/camel-k/pkg/util/maven"
- "github.com/apache/camel-k/pkg/util/property"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ mvn "github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
type builderTrait struct {
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index 41ab8ab5a..e249d1328 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -27,10 +27,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestBuilderTraitNotAppliedBecauseOfNilKit(t *testing.T) {
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index ab78897b7..83ca30532 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -31,11 +31,11 @@ import (
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/maven"
- "github.com/apache/camel-k/pkg/util/property"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
type camelTrait struct {
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index df165f9f7..5d035ad78 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -25,10 +25,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/trait/container.go b/pkg/trait/container.go
index b42f1e2df..1ed97bbfb 100644
--- a/pkg/trait/container.go
+++ b/pkg/trait/container.go
@@ -30,14 +30,14 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/envvar"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
diff --git a/pkg/trait/container_probes_test.go b/pkg/trait/container_probes_test.go
index ea2185792..1a0d0a64b 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -25,10 +25,10 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func newTestProbesEnv(t *testing.T, integration *v1.Integration) Environment {
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index 4109653de..b1120bce4 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -30,11 +30,11 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestContainerWithDefaults(t *testing.T) {
diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go
index 7d28867bd..7e0ffdd71 100644
--- a/pkg/trait/cron.go
+++ b/pkg/trait/cron.go
@@ -28,13 +28,13 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/label"
- "github.com/apache/camel-k/pkg/util/uri"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/label"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
)
type cronTrait struct {
diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go
index 404b0c80e..d486995da 100644
--- a/pkg/trait/cron_test.go
+++ b/pkg/trait/cron_test.go
@@ -29,11 +29,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestCronFromURI(t *testing.T) {
diff --git a/pkg/trait/dependencies.go b/pkg/trait/dependencies.go
index 41f1f3d61..09197877c 100644
--- a/pkg/trait/dependencies.go
+++ b/pkg/trait/dependencies.go
@@ -22,12 +22,12 @@ import (
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type dependenciesTrait struct {
diff --git a/pkg/trait/dependencies_test.go b/pkg/trait/dependencies_test.go
index d5cb612bf..35ba5ea16 100644
--- a/pkg/trait/dependencies_test.go
+++ b/pkg/trait/dependencies_test.go
@@ -22,8 +22,8 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestDependenciesTraitApplicability(t *testing.T) {
diff --git a/pkg/trait/deployer.go b/pkg/trait/deployer.go
index 861036cb5..1a050a15b 100644
--- a/pkg/trait/deployer.go
+++ b/pkg/trait/deployer.go
@@ -31,8 +31,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/patch"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/patch"
)
type deployerTrait struct {
diff --git a/pkg/trait/deployer_test.go b/pkg/trait/deployer_test.go
index c0da1bfdd..91b05f7f5 100644
--- a/pkg/trait/deployer_test.go
+++ b/pkg/trait/deployer_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index ae4386372..229760680 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -27,9 +27,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/label"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/label"
)
type deploymentTrait struct {
diff --git a/pkg/trait/deployment_test.go b/pkg/trait/deployment_test.go
index d0235e5af..6ac6a5c2a 100644
--- a/pkg/trait/deployment_test.go
+++ b/pkg/trait/deployment_test.go
@@ -27,9 +27,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestConfigureDisabledDeploymentTraitDoesNotSucceed(t *testing.T) {
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index ab12eb817..a19b1a2a7 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -22,11 +22,11 @@ import (
"k8s.io/utils/pointer"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/envvar"
- "github.com/apache/camel-k/pkg/util/property"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
type environmentTrait struct {
diff --git a/pkg/trait/environment_test.go b/pkg/trait/environment_test.go
index 393207bb9..8510a1918 100644
--- a/pkg/trait/environment_test.go
+++ b/pkg/trait/environment_test.go
@@ -27,10 +27,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestDefaultEnvironment(t *testing.T) {
diff --git a/pkg/trait/error_handler.go b/pkg/trait/error_handler.go
index 8bf30ffd8..47f7ae0a9 100644
--- a/pkg/trait/error_handler.go
+++ b/pkg/trait/error_handler.go
@@ -25,10 +25,10 @@ import (
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util"
)
type errorHandlerTrait struct {
diff --git a/pkg/trait/error_handler_test.go b/pkg/trait/error_handler_test.go
index 4fbce93c2..1fcedb22f 100644
--- a/pkg/trait/error_handler_test.go
+++ b/pkg/trait/error_handler_test.go
@@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestErrorHandlerConfigureFromIntegrationProperty(t *testing.T) {
diff --git a/pkg/trait/gc.go b/pkg/trait/gc.go
index 500fd7663..fef7fdee4 100644
--- a/pkg/trait/gc.go
+++ b/pkg/trait/gc.go
@@ -39,9 +39,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
var (
diff --git a/pkg/trait/gc_test.go b/pkg/trait/gc_test.go
index e16823a6f..aad15f1a2 100644
--- a/pkg/trait/gc_test.go
+++ b/pkg/trait/gc_test.go
@@ -20,7 +20,7 @@ package trait
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/trait/health.go b/pkg/trait/health.go
index 7eee33b3b..48407fa68 100644
--- a/pkg/trait/health.go
+++ b/pkg/trait/health.go
@@ -24,9 +24,9 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
const (
diff --git a/pkg/trait/ingress.go b/pkg/trait/ingress.go
index 5635d9de1..f611e8667 100644
--- a/pkg/trait/ingress.go
+++ b/pkg/trait/ingress.go
@@ -25,8 +25,8 @@ import (
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type ingressTrait struct {
diff --git a/pkg/trait/ingress_test.go b/pkg/trait/ingress_test.go
index 3d620cf75..c19032376 100644
--- a/pkg/trait/ingress_test.go
+++ b/pkg/trait/ingress_test.go
@@ -28,8 +28,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestConfigureIngressTraitDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/init.go b/pkg/trait/init.go
index dbb6c8c10..7d52210f8 100644
--- a/pkg/trait/init.go
+++ b/pkg/trait/init.go
@@ -24,10 +24,10 @@ import (
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/dsl"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/dsl"
)
const flowsInternalSourceName = "camel-k-embedded-flow.yaml"
diff --git a/pkg/trait/istio.go b/pkg/trait/istio.go
index 27d559c55..26e35540b 100644
--- a/pkg/trait/istio.go
+++ b/pkg/trait/istio.go
@@ -25,7 +25,7 @@ import (
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type istioTrait struct {
diff --git a/pkg/trait/istio_test.go b/pkg/trait/istio_test.go
index 097a8a4eb..19491f067 100644
--- a/pkg/trait/istio_test.go
+++ b/pkg/trait/istio_test.go
@@ -29,10 +29,10 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func NewIstioTestEnv(t *testing.T, d *appsv1.Deployment, s *serving.Service, enabled bool) Environment {
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index eb36a61f3..22f5187eb 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -25,9 +25,9 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
type jolokiaTrait struct {
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index c5b8c6674..4b7bc9a8a 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -26,8 +26,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestConfigureJolokiaTraitInRunningPhaseDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 60a4fbac2..cc78c1f1c 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -36,12 +36,12 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/envvar"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
)
type jvmTrait struct {
diff --git a/pkg/trait/jvm_test.go b/pkg/trait/jvm_test.go
index ad2d750f2..9467c509d 100644
--- a/pkg/trait/jvm_test.go
+++ b/pkg/trait/jvm_test.go
@@ -34,11 +34,11 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
var (
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 8f93935af..f030b8e02 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -28,16 +28,16 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- kameletutils "github.com/apache/camel-k/pkg/kamelet"
- "github.com/apache/camel-k/pkg/kamelet/repository"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/dsl"
- "github.com/apache/camel-k/pkg/util/kamelets"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ kameletutils "github.com/apache/camel-k/v2/pkg/kamelet"
+ "github.com/apache/camel-k/v2/pkg/kamelet/repository"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/dsl"
+ "github.com/apache/camel-k/v2/pkg/util/kamelets"
)
type kameletsTrait struct {
diff --git a/pkg/trait/kamelets_test.go b/pkg/trait/kamelets_test.go
index 906fb6498..8a1f39055 100644
--- a/pkg/trait/kamelets_test.go
+++ b/pkg/trait/kamelets_test.go
@@ -21,11 +21,11 @@ import (
"encoding/json"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 4751fda89..1579c0a1b 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -36,14 +36,14 @@ import (
eventing "knative.dev/eventing/pkg/apis/eventing/v1"
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- knativeapi "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/envvar"
- knativeutil "github.com/apache/camel-k/pkg/util/knative"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ knativeapi "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ knativeutil "github.com/apache/camel-k/v2/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type knativeTrait struct {
diff --git a/pkg/trait/knative_service.go b/pkg/trait/knative_service.go
index 258e38bb5..9f9da95e3 100644
--- a/pkg/trait/knative_service.go
+++ b/pkg/trait/knative_service.go
@@ -27,11 +27,11 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/label"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/label"
)
const (
diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go
index 7f59faf74..5f1964fe5 100644
--- a/pkg/trait/knative_service_test.go
+++ b/pkg/trait/knative_service_test.go
@@ -30,13 +30,13 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/envvar"
- "github.com/apache/camel-k/pkg/util/gzip"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const (
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index 81a168912..fa8fe385c 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -33,14 +33,14 @@ import (
duckv1 "knative.dev/pkg/apis/duck/v1"
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- knativeapi "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/envvar"
- k8sutils "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ knativeapi "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
+ k8sutils "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestKnativeEnvConfigurationFromTrait(t *testing.T) {
diff --git a/pkg/trait/logging.go b/pkg/trait/logging.go
index aa6fa0078..37f2e09cf 100644
--- a/pkg/trait/logging.go
+++ b/pkg/trait/logging.go
@@ -20,8 +20,8 @@ package trait
import (
"k8s.io/utils/pointer"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/envvar"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/envvar"
)
const (
diff --git a/pkg/trait/logging_test.go b/pkg/trait/logging_test.go
index e09bbcfa8..d61564dc9 100644
--- a/pkg/trait/logging_test.go
+++ b/pkg/trait/logging_test.go
@@ -27,10 +27,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func createLoggingTestEnv(t *testing.T, color bool, json bool, jsonPrettyPrint bool, logLevel string, logFormat string) *Environment {
diff --git a/pkg/trait/mount.go b/pkg/trait/mount.go
index 942f1be4f..1e5bf19d0 100644
--- a/pkg/trait/mount.go
+++ b/pkg/trait/mount.go
@@ -30,10 +30,10 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- utilResource "github.com/apache/camel-k/pkg/util/resource"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ utilResource "github.com/apache/camel-k/v2/pkg/util/resource"
)
type mountTrait struct {
diff --git a/pkg/trait/mount_test.go b/pkg/trait/mount_test.go
index 1e3953c22..199597d9f 100644
--- a/pkg/trait/mount_test.go
+++ b/pkg/trait/mount_test.go
@@ -28,12 +28,12 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/gzip"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
func TestMountVolumesEmpty(t *testing.T) {
diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go
index 931298797..558c77684 100644
--- a/pkg/trait/openapi.go
+++ b/pkg/trait/openapi.go
@@ -35,15 +35,15 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/gzip"
- "github.com/apache/camel-k/pkg/util/jvm"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
+ "github.com/apache/camel-k/v2/pkg/util/jvm"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
type openAPITrait struct {
diff --git a/pkg/trait/openapi_test.go b/pkg/trait/openapi_test.go
index 24e788966..d90a27ac1 100644
--- a/pkg/trait/openapi_test.go
+++ b/pkg/trait/openapi_test.go
@@ -20,9 +20,9 @@ package trait
import (
"testing"
- "github.com/apache/camel-k/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/trait/owner.go b/pkg/trait/owner.go
index 1bd42f6e0..31066f1a2 100644
--- a/pkg/trait/owner.go
+++ b/pkg/trait/owner.go
@@ -24,8 +24,8 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type ownerTrait struct {
diff --git a/pkg/trait/owner_test.go b/pkg/trait/owner_test.go
index 5d73bac31..d1f9d8984 100644
--- a/pkg/trait/owner_test.go
+++ b/pkg/trait/owner_test.go
@@ -25,8 +25,8 @@ import (
appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
func TestOwner(t *testing.T) {
diff --git a/pkg/trait/pdb.go b/pkg/trait/pdb.go
index 78d960d9f..50093faf1 100644
--- a/pkg/trait/pdb.go
+++ b/pkg/trait/pdb.go
@@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type pdbTrait struct {
diff --git a/pkg/trait/pdb_test.go b/pkg/trait/pdb_test.go
index 63857dd05..65fec620b 100644
--- a/pkg/trait/pdb_test.go
+++ b/pkg/trait/pdb_test.go
@@ -28,8 +28,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestConfigurePdbTraitDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/platform.go b/pkg/trait/platform.go
index b6ed793cd..8850c1fb5 100644
--- a/pkg/trait/platform.go
+++ b/pkg/trait/platform.go
@@ -23,13 +23,13 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/install"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/openshift"
- image "github.com/apache/camel-k/pkg/util/registry"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/install"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
+ image "github.com/apache/camel-k/v2/pkg/util/registry"
)
type platformTrait struct {
diff --git a/pkg/trait/platform_test.go b/pkg/trait/platform_test.go
index 488cbb739..d549c99d4 100644
--- a/pkg/trait/platform_test.go
+++ b/pkg/trait/platform_test.go
@@ -20,10 +20,10 @@ package trait
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
diff --git a/pkg/trait/pod.go b/pkg/trait/pod.go
index 85ff68531..aa440548d 100644
--- a/pkg/trait/pod.go
+++ b/pkg/trait/pod.go
@@ -29,8 +29,8 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
type podTrait struct {
diff --git a/pkg/trait/pod_test.go b/pkg/trait/pod_test.go
index 7c7c3422e..0ecef59c3 100755
--- a/pkg/trait/pod_test.go
+++ b/pkg/trait/pod_test.go
@@ -29,9 +29,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/digest"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/digest"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestConfigurePodTraitDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/prometheus.go b/pkg/trait/prometheus.go
index 531dc73cb..8694cb447 100644
--- a/pkg/trait/prometheus.go
+++ b/pkg/trait/prometheus.go
@@ -26,9 +26,9 @@ import (
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util"
)
type prometheusTrait struct {
diff --git a/pkg/trait/prometheus_test.go b/pkg/trait/prometheus_test.go
index 694e1f675..8fe005233 100644
--- a/pkg/trait/prometheus_test.go
+++ b/pkg/trait/prometheus_test.go
@@ -28,9 +28,9 @@ import (
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func TestConfigurePrometheusTraitInRightPhaseDoesSucceed(t *testing.T) {
diff --git a/pkg/trait/pull_secret.go b/pkg/trait/pull_secret.go
index a53db960a..be4f6e426 100644
--- a/pkg/trait/pull_secret.go
+++ b/pkg/trait/pull_secret.go
@@ -29,10 +29,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/openshift"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/openshift"
)
type pullSecretTrait struct {
diff --git a/pkg/trait/pull_secret_test.go b/pkg/trait/pull_secret_test.go
index 1fc980368..4eddbbccb 100644
--- a/pkg/trait/pull_secret_test.go
+++ b/pkg/trait/pull_secret_test.go
@@ -21,9 +21,9 @@ import (
"context"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index 18900da9c..a7b6e145a 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -27,12 +27,12 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
const (
diff --git a/pkg/trait/quarkus_test.go b/pkg/trait/quarkus_test.go
index 3e2a2faee..193e2ca42 100644
--- a/pkg/trait/quarkus_test.go
+++ b/pkg/trait/quarkus_test.go
@@ -24,9 +24,9 @@ import (
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/builder"
- "github.com/apache/camel-k/pkg/util/camel"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/builder"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
)
func TestConfigureQuarkusTraitBuildSubmitted(t *testing.T) {
diff --git a/pkg/trait/registry.go b/pkg/trait/registry.go
index ef972169e..2e1b2fadb 100644
--- a/pkg/trait/registry.go
+++ b/pkg/trait/registry.go
@@ -26,11 +26,11 @@ import (
base64 "encoding/base64"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/registry"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/registry"
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
diff --git a/pkg/trait/route.go b/pkg/trait/route.go
index 008f71607..250816360 100644
--- a/pkg/trait/route.go
+++ b/pkg/trait/route.go
@@ -29,9 +29,9 @@ import (
routev1 "github.com/openshift/api/route/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type routeTrait struct {
diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go
index fb86a2608..07c6703c1 100644
--- a/pkg/trait/route_test.go
+++ b/pkg/trait/route_test.go
@@ -29,11 +29,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/test"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/test"
)
const (
diff --git a/pkg/trait/service.go b/pkg/trait/service.go
index 3f3410ed0..2ae926a78 100644
--- a/pkg/trait/service.go
+++ b/pkg/trait/service.go
@@ -24,10 +24,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type serviceTrait struct {
diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go
index 5cbac6b5a..f58685166 100644
--- a/pkg/trait/service_binding.go
+++ b/pkg/trait/service_binding.go
@@ -31,10 +31,10 @@ import (
"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/mapping"
"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/naming"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/reference"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/reference"
)
type serviceBindingTrait struct {
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index ac2c59263..7b4c38881 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -27,11 +27,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/gzip"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/gzip"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
diff --git a/pkg/trait/test_support.go b/pkg/trait/test_support.go
index 8bc15b37a..4db39cb04 100644
--- a/pkg/trait/test_support.go
+++ b/pkg/trait/test_support.go
@@ -28,9 +28,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/trait/toleration.go b/pkg/trait/toleration.go
index 447c7ac4e..73303a293 100644
--- a/pkg/trait/toleration.go
+++ b/pkg/trait/toleration.go
@@ -23,8 +23,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
type tolerationTrait struct {
diff --git a/pkg/trait/trait.go b/pkg/trait/trait.go
index 98d7429f0..3c484d710 100644
--- a/pkg/trait/trait.go
+++ b/pkg/trait/trait.go
@@ -25,11 +25,11 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go
index 6992abd26..ec36f8eea 100644
--- a/pkg/trait/trait_catalog.go
+++ b/pkg/trait/trait_catalog.go
@@ -25,9 +25,9 @@ import (
"github.com/fatih/structs"
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
// Catalog collects all information about traits in one place.
diff --git a/pkg/trait/trait_configure.go b/pkg/trait/trait_configure.go
index 658449b54..bc7b7284b 100644
--- a/pkg/trait/trait_configure.go
+++ b/pkg/trait/trait_configure.go
@@ -26,8 +26,8 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util"
)
// Configure reads trait configurations from environment and applies them to catalog.
diff --git a/pkg/trait/trait_configure_test.go b/pkg/trait/trait_configure_test.go
index ee646a590..66117a984 100644
--- a/pkg/trait/trait_configure_test.go
+++ b/pkg/trait/trait_configure_test.go
@@ -26,8 +26,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
)
func TestTraitConfiguration(t *testing.T) {
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index 837cc3c42..3588d5d00 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -30,10 +30,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
const (
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index ab105b42f..bb318270a 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -34,14 +34,14 @@ import (
serving "knative.dev/serving/pkg/apis/serving/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/platform"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/log"
- "github.com/apache/camel-k/pkg/util/property"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/platform"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
const (
diff --git a/pkg/trait/trait_types_test.go b/pkg/trait/trait_types_test.go
index 96bc674c2..6ea8ea9a0 100644
--- a/pkg/trait/trait_types_test.go
+++ b/pkg/trait/trait_types_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestMultilinePropertiesHandled(t *testing.T) {
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index 523d88dee..81095b252 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -33,13 +33,13 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/property"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/property"
)
func ptrFrom[T any](value T) *T {
diff --git a/pkg/trait/util_test.go b/pkg/trait/util_test.go
index 63b973a1d..4f669faf7 100644
--- a/pkg/trait/util_test.go
+++ b/pkg/trait/util_test.go
@@ -23,9 +23,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/util/bindings/api.go b/pkg/util/bindings/api.go
index f41ffebe7..6d6b5666f 100644
--- a/pkg/util/bindings/api.go
+++ b/pkg/util/bindings/api.go
@@ -21,9 +21,9 @@ package bindings
import (
"context"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
)
const (
diff --git a/pkg/util/bindings/bindings_test.go b/pkg/util/bindings/bindings_test.go
index e99413fc4..25caafe58 100644
--- a/pkg/util/bindings/bindings_test.go
+++ b/pkg/util/bindings/bindings_test.go
@@ -25,10 +25,10 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/test"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/util/bindings/camel_uri.go b/pkg/util/bindings/camel_uri.go
index 8cac3c677..cd7f777b8 100644
--- a/pkg/util/bindings/camel_uri.go
+++ b/pkg/util/bindings/camel_uri.go
@@ -18,8 +18,8 @@ limitations under the License.
package bindings
import (
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/uri"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
)
// CamelURIBindingProvider converts an explicit URI into a Camel endpoint.
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index dd2e87fc6..7e750befd 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -21,7 +21,7 @@ import (
"errors"
"sort"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
var bindingProviders []BindingProvider
diff --git a/pkg/util/bindings/kamelet.go b/pkg/util/bindings/kamelet.go
index e6682de38..ddb121ddd 100644
--- a/pkg/util/bindings/kamelet.go
+++ b/pkg/util/bindings/kamelet.go
@@ -21,7 +21,7 @@ import (
"fmt"
"net/url"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
diff --git a/pkg/util/bindings/kamelet_test.go b/pkg/util/bindings/kamelet_test.go
index b68059395..9310c710b 100644
--- a/pkg/util/bindings/kamelet_test.go
+++ b/pkg/util/bindings/kamelet_test.go
@@ -24,9 +24,9 @@ import (
corev1 "k8s.io/api/core/v1"
- camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/test"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/test"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/util/bindings/knative_ref.go b/pkg/util/bindings/knative_ref.go
index a7ba2accd..c813489f1 100644
--- a/pkg/util/bindings/knative_ref.go
+++ b/pkg/util/bindings/knative_ref.go
@@ -22,10 +22,10 @@ import (
"fmt"
"net/url"
- knativeapis "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/knative"
- "github.com/apache/camel-k/pkg/util/uri"
+ knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/knative"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
)
// KnativeRefBindingProvider converts a reference to a Kubernetes object into a Camel URI.
@@ -77,7 +77,7 @@ func (k KnativeRefBindingProvider) Translate(ctx BindingContext, endpointCtx End
serviceURI = fmt.Sprintf("knative:%s/%s", *serviceType, eventType)
} else {
if endpointCtx.Type == v1alpha1.EndpointTypeSink || endpointCtx.Type == v1alpha1.EndpointTypeAction {
- // Allowing no event type, but it can fail. See https://github.com/apache/camel-k-runtime/issues/536
+ // Allowing no event type, but it can fail. See https://github.com/apache/camel-k/v2-runtime/issues/536
serviceURI = fmt.Sprintf("knative:%s", *serviceType)
} else {
return nil, errors.New(`property "type" must be provided when reading from the Broker`)
diff --git a/pkg/util/bindings/knative_uri.go b/pkg/util/bindings/knative_uri.go
index 137fd22ee..7617c2b75 100644
--- a/pkg/util/bindings/knative_uri.go
+++ b/pkg/util/bindings/knative_uri.go
@@ -23,11 +23,11 @@ import (
"k8s.io/utils/pointer"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- knativeapis "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- traitv1 "github.com/apache/camel-k/pkg/apis/camel/v1/trait"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/util/uri"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/uri"
)
// KnativeURIBindingProvider converts a HTTP/HTTPS URI into a Camel Knative endpoint (to call it via CloudEvents).
diff --git a/pkg/util/bindings/test_support.go b/pkg/util/bindings/test_support.go
index 4913a4ab3..5dc0f52b4 100644
--- a/pkg/util/bindings/test_support.go
+++ b/pkg/util/bindings/test_support.go
@@ -21,8 +21,8 @@ import (
"encoding/json"
"net/url"
- knativeapis "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
func asEndpointProperties(props map[string]string) *v1alpha1.EndpointProperties {
diff --git a/pkg/util/camel/camel_dependencies.go b/pkg/util/camel/camel_dependencies.go
index a3b65b003..e0e48a30f 100644
--- a/pkg/util/camel/camel_dependencies.go
+++ b/pkg/util/camel/camel_dependencies.go
@@ -23,9 +23,9 @@ import (
"path/filepath"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/jitpack"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/jitpack"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
"github.com/rs/xid"
)
diff --git a/pkg/util/camel/camel_runtime.go b/pkg/util/camel/camel_runtime.go
index 9c22daee2..ed613690a 100644
--- a/pkg/util/camel/camel_runtime.go
+++ b/pkg/util/camel/camel_runtime.go
@@ -22,8 +22,8 @@ import (
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
)
// LoadCatalog --.
diff --git a/pkg/util/camel/camel_runtime_catalog.go b/pkg/util/camel/camel_runtime_catalog.go
index 321c78bc0..0bea96bbb 100644
--- a/pkg/util/camel/camel_runtime_catalog.go
+++ b/pkg/util/camel/camel_runtime_catalog.go
@@ -20,7 +20,7 @@ package camel
import (
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// NewRuntimeCatalog creates a runtime catalog with the given catalog.
@@ -40,7 +40,7 @@ func NewRuntimeCatalog(cat v1.CamelCatalog) *RuntimeCatalog {
scheme := scheme
// In case of duplicate only, choose the "org.apache.camel.quarkus" artifact (if present).
- // Workaround for https://github.com/apache/camel-k-runtime/issues/592
+ // Workaround for https://github.com/apache/camel-k/v2-runtime/issues/592
if _, duplicate := catalog.artifactByScheme[scheme.ID]; duplicate {
if artifact.GroupID != "org.apache.camel.quarkus" {
continue
diff --git a/pkg/util/camel/camel_types.go b/pkg/util/camel/camel_types.go
index fb0028d14..51c0015bb 100644
--- a/pkg/util/camel/camel_types.go
+++ b/pkg/util/camel/camel_types.go
@@ -19,7 +19,7 @@ package camel
import (
"github.com/Masterminds/semver"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// CatalogVersion --.
diff --git a/pkg/util/camel/camel_util.go b/pkg/util/camel/camel_util.go
index 4dceef9af..b5ef592e3 100644
--- a/pkg/util/camel/camel_util.go
+++ b/pkg/util/camel/camel_util.go
@@ -24,8 +24,8 @@ import (
"github.com/Masterminds/semver"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
var (
diff --git a/pkg/util/camel/camel_util_test.go b/pkg/util/camel/camel_util_test.go
index ed2f53981..945631ba0 100644
--- a/pkg/util/camel/camel_util_test.go
+++ b/pkg/util/camel/camel_util_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestFindBestMatch(t *testing.T) {
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 8927bd466..ce2948060 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -25,13 +25,13 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/resources"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/jvm"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/maven"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/resources"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/jvm"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
func DefaultCatalog() (*RuntimeCatalog, error) {
diff --git a/pkg/util/defaults/defaults_support.go b/pkg/util/defaults/defaults_support.go
index b2d67779f..1c2b28113 100644
--- a/pkg/util/defaults/defaults_support.go
+++ b/pkg/util/defaults/defaults_support.go
@@ -22,7 +22,7 @@ import (
"os"
"strconv"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
func BaseImage() string {
diff --git a/pkg/util/digest/digest.go b/pkg/util/digest/digest.go
index ddadc615b..8f252998e 100644
--- a/pkg/util/digest/digest.go
+++ b/pkg/util/digest/digest.go
@@ -32,10 +32,10 @@ import (
"strconv"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
- "github.com/apache/camel-k/pkg/util/dsl"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util/dsl"
)
const (
diff --git a/pkg/util/digest/digest_test.go b/pkg/util/digest/digest_test.go
index a5de8e32f..f015b576e 100644
--- a/pkg/util/digest/digest_test.go
+++ b/pkg/util/digest/digest_test.go
@@ -21,7 +21,7 @@ import (
"os"
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/util/docker/docker.go b/pkg/util/docker/docker.go
index 37d298190..0fdf3518b 100644
--- a/pkg/util/docker/docker.go
+++ b/pkg/util/docker/docker.go
@@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/defaults"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/defaults"
"github.com/pkg/errors"
)
diff --git a/pkg/util/docker/docker_base.go b/pkg/util/docker/docker_base.go
index f91f60bc1..ce4dd95ad 100644
--- a/pkg/util/docker/docker_base.go
+++ b/pkg/util/docker/docker_base.go
@@ -21,7 +21,7 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
// RegistryName -- the docker registry name.
diff --git a/pkg/util/dsl/flow.go b/pkg/util/dsl/flow.go
index 912d2b03b..6fd4ad4cb 100644
--- a/pkg/util/dsl/flow.go
+++ b/pkg/util/dsl/flow.go
@@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/yaml"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// FromYamlDSLString creates a slice of flows from a Camel YAML DSL string.
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 32236a43c..c86961a94 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -23,7 +23,7 @@ import (
yaml2 "gopkg.in/yaml.v2"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
// TemplateToYamlDSL converts a kamelet template into its Camel YAML DSL equivalent.
diff --git a/pkg/util/dsl/template_test.go b/pkg/util/dsl/template_test.go
index b52303372..de06c62d0 100644
--- a/pkg/util/dsl/template_test.go
+++ b/pkg/util/dsl/template_test.go
@@ -20,7 +20,7 @@ package dsl
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/util/gzip/compress.go b/pkg/util/gzip/compress.go
index d63857c2f..1e3aac27b 100644
--- a/pkg/util/gzip/compress.go
+++ b/pkg/util/gzip/compress.go
@@ -23,7 +23,7 @@ import (
"encoding/base64"
"io"
- "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util"
)
// Compress --.
diff --git a/pkg/util/jitpack/jitpack.go b/pkg/util/jitpack/jitpack.go
index e5162fab6..df25ead73 100644
--- a/pkg/util/jitpack/jitpack.go
+++ b/pkg/util/jitpack/jitpack.go
@@ -20,7 +20,7 @@ package jitpack
import (
"strings"
- "github.com/apache/camel-k/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
const (
diff --git a/pkg/util/jitpack/jitpack_test.go b/pkg/util/jitpack/jitpack_test.go
index ada06c09f..7ea911931 100644
--- a/pkg/util/jitpack/jitpack_test.go
+++ b/pkg/util/jitpack/jitpack_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apache/camel-k/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/maven"
)
func TestConversion(t *testing.T) {
diff --git a/pkg/util/jvm/keystore.go b/pkg/util/jvm/keystore.go
index 1721227b9..b9241dc94 100644
--- a/pkg/util/jvm/keystore.go
+++ b/pkg/util/jvm/keystore.go
@@ -26,8 +26,8 @@ import (
"path/filepath"
"strings"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
var (
diff --git a/pkg/util/kamelets/util.go b/pkg/util/kamelets/util.go
index c849ce729..6596aef39 100644
--- a/pkg/util/kamelets/util.go
+++ b/pkg/util/kamelets/util.go
@@ -21,14 +21,14 @@ import (
"context"
"strings"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/metadata"
- "github.com/apache/camel-k/pkg/util"
- "github.com/apache/camel-k/pkg/util/camel"
- "github.com/apache/camel-k/pkg/util/kubernetes"
- "github.com/apache/camel-k/pkg/util/source"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/metadata"
+ "github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/camel"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/util/source"
)
// ExtractKameletFromSources provide a list of Kamelets referred into the Integration sources.
diff --git a/pkg/util/knative/apis.go b/pkg/util/knative/apis.go
index a39a6ce12..67c0af09f 100644
--- a/pkg/util/knative/apis.go
+++ b/pkg/util/knative/apis.go
@@ -18,8 +18,8 @@ limitations under the License.
package knative
import (
- knativev1 "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- "github.com/apache/camel-k/pkg/util"
+ knativev1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ "github.com/apache/camel-k/v2/pkg/util"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
diff --git a/pkg/util/knative/apis_test.go b/pkg/util/knative/apis_test.go
index 9ffc295d5..a2284b54c 100644
--- a/pkg/util/knative/apis_test.go
+++ b/pkg/util/knative/apis_test.go
@@ -20,7 +20,7 @@ package knative
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
)
diff --git a/pkg/util/knative/enabled.go b/pkg/util/knative/enabled.go
index 80e94b9f8..9a62c3f6f 100644
--- a/pkg/util/knative/enabled.go
+++ b/pkg/util/knative/enabled.go
@@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
- util "github.com/apache/camel-k/pkg/util/kubernetes"
+ util "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
// IsInstalled returns true if we are connected to a cluster with Knative installed.
diff --git a/pkg/util/knative/knative.go b/pkg/util/knative/knative.go
index eae9b1c80..1d5b7462a 100644
--- a/pkg/util/knative/knative.go
+++ b/pkg/util/knative/knative.go
@@ -41,8 +41,8 @@ import (
"knative.dev/pkg/tracker"
serving "knative.dev/serving/pkg/apis/serving/v1"
- "github.com/apache/camel-k/pkg/client"
- util "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/v2/pkg/client"
+ util "github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
func CreateSubscription(channelReference corev1.ObjectReference, serviceName string, path string) *messaging.Subscription {
diff --git a/pkg/util/knative/uri.go b/pkg/util/knative/uri.go
index 8fca880b5..7e59c7a47 100644
--- a/pkg/util/knative/uri.go
+++ b/pkg/util/knative/uri.go
@@ -21,8 +21,8 @@ import (
"fmt"
"regexp"
- knativev1 "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
- uriutils "github.com/apache/camel-k/pkg/util/uri"
+ knativev1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ uriutils "github.com/apache/camel-k/v2/pkg/util/uri"
v1 "k8s.io/api/core/v1"
)
diff --git a/pkg/util/knative/uri_test.go b/pkg/util/knative/uri_test.go
index 995127889..04d064778 100644
--- a/pkg/util/knative/uri_test.go
+++ b/pkg/util/knative/uri_test.go
@@ -20,7 +20,7 @@ package knative
import (
"testing"
- "github.com/apache/camel-k/pkg/apis/camel/v1/knative"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
)
diff --git a/pkg/util/kubernetes/camel.go b/pkg/util/kubernetes/camel.go
index f0b74040b..8c069b375 100644
--- a/pkg/util/kubernetes/camel.go
+++ b/pkg/util/kubernetes/camel.go
@@ -24,7 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
const (
diff --git a/pkg/util/kubernetes/client.go b/pkg/util/kubernetes/client.go
index 2f3e3e097..ef2ffc0b7 100644
--- a/pkg/util/kubernetes/client.go
+++ b/pkg/util/kubernetes/client.go
@@ -28,9 +28,9 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/log"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/client"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
func GetIntegrationPlatform(context context.Context, client ctrl.Reader, name string, namespace string) (*v1.IntegrationPlatform, error) {
diff --git a/pkg/util/kubernetes/collection.go b/pkg/util/kubernetes/collection.go
index 00facb244..c318fce48 100644
--- a/pkg/util/kubernetes/collection.go
+++ b/pkg/util/kubernetes/collection.go
@@ -33,7 +33,7 @@ import (
routev1 "github.com/openshift/api/route/v1"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// A Collection is a container of Kubernetes resources.
diff --git a/pkg/util/kubernetes/log/annotation_scraper.go b/pkg/util/kubernetes/log/annotation_scraper.go
index 4c687ad60..b218a0d11 100644
--- a/pkg/util/kubernetes/log/annotation_scraper.go
+++ b/pkg/util/kubernetes/log/annotation_scraper.go
@@ -28,7 +28,7 @@ import (
"go.uber.org/multierr"
- klog "github.com/apache/camel-k/pkg/util/log"
+ klog "github.com/apache/camel-k/v2/pkg/util/log"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/util/kubernetes/log/pod_scraper.go b/pkg/util/kubernetes/log/pod_scraper.go
index a9fb24a89..96b63495c 100644
... 679 lines suppressed ...