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/04/26 08:51:16 UTC
[camel-k] branch main updated (72f03661c -> 2b7280f7f)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 72f03661c chore(doc): Update Monitoring documentation to fit the migration of prometheus trait from microprofile to micrometer
new bff24b760 feat: change KameletBinding name to Binding
new 0c41d301f fix(olm): bundles
new 1a3a7f758 chore(test): add some CSVs dump info
new a7f480562 feat(api): promote Kamelets to v1
new 46aad9b0c chore(api): add a deprecation notice
new 981fcd135 chore: lint complains
new 4573f3787 chore: add deprecated notice
new 6aa610979 feat(api): promote kamelet to v1
new ae40de400 fix(install): add kameletbinding for kustomize
new cb2758bcc chore(cmd): rebuild replaces Bindings
new 167395a87 chore(controller): keep KameletBindings reconciliation loop
new f6806a8fb chore(e2e): crds number is 8 now
new 24fd12de9 fix(lint): various
new 23dfdea9f chore(api): rename Binding to Pipe
new 8072d0f99 chore(e2e): revert usage of KameletBinding
new f3815aac6 chore: more replacements
new 247a8296f fix(kamelets): register v1alpha1 binding providers
new 2b7280f7f feat: error handler validation
The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../kamel-cleanup/clean-orphan-resources.sh | 2 +-
PROJECT | 7 +-
addons/keda/keda.go | 15 +-
addons/keda/keda_test.go | 45 +-
addons/register_strimzi.go | 1 +
addons/strimzi/strimzi.go | 110 +-
addons/strimzi/strimzi_test.go | 14 +-
.../crd/bases/camel.apache.org_integrations.yaml | 1 -
.../bases/camel.apache.org_kameletbindings.yaml | 4 +-
config/crd/bases/camel.apache.org_kamelets.yaml | 699 +++++-
.../crd/bases/camel.apache.org_pipes.yaml | 43 +-
config/crd/kustomization.yaml | 3 +-
.../bases/camel-k.clusterserviceversion.yaml | 10 +-
config/rbac/openshift/operator-role-openshift.yaml | 1 +
config/rbac/operator-role.yaml | 5 +
config/rbac/user-cluster-role.yaml | 5 +
...l_v1_kameletbinding.yaml => camel_v1_pipe.yaml} | 4 +-
...ing.yaml => camel_v1alpha1_kameletbinding.yaml} | 0
config/samples/kustomization.yaml | 3 +-
docs/modules/ROOT/nav.adoc | 4 +-
.../kamelets/kameletbindings-error-handler.adoc | 38 +-
docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 26 +-
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 36 +-
docs/modules/ROOT/pages/kamelets/kamelets.adoc | 2 +-
docs/modules/ROOT/pages/running/knative-sink.adoc | 4 +-
docs/modules/ROOT/pages/scaling/binding.adoc | 24 +-
.../ROOT/pages/troubleshooting/debugging.adoc | 4 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2427 +++++++++++++++-----
docs/modules/ROOT/partials/apis/crds-html.adoc | 204 +-
.../kamelets/timer-custom-source.kamelet.yaml | 2 +-
e2e/common/misc/files/my-timer-source.kamelet.yaml | 2 +-
e2e/common/misc/kamelet_binding_test.go | 36 +-
e2e/common/misc/kamelet_binding_with_image_test.go | 8 +-
e2e/common/misc/kamelet_update_test.go | 6 +-
e2e/common/misc/scale_binding_test.go | 51 +-
e2e/common/traits/errored_trait_test.go | 15 +-
e2e/common/traits/health_test.go | 10 +-
e2e/common/traits/service_binding_test.go | 2 +-
.../operator_id_filtering_test.go | 4 +-
e2e/commonwithcustominstall/promote_test.go | 8 +-
e2e/install/kustomize/common.go | 5 +-
e2e/install/kustomize/setup_test.go | 3 +
e2e/install/kustomize/uninstall_test.go | 4 +
e2e/knative/kamelet_test.go | 31 +-
e2e/native/native_binding_test.go | 14 +-
e2e/support/test_support.go | 107 +-
e2e/support/util/dump.go | 17 +
.../common/kamelet-beans/beans-source.kamelet.yaml | 2 +-
.../timer-source.kamelet.yaml | 2 +-
.../logger-sink-binding.yaml | 2 +-
.../logger-sink.kamelet.yaml | 2 +-
.../timer-source-binding.yaml | 2 +-
.../timer-source.kamelet.yaml | 2 +-
.../common/kamelet-binding-http/kamelet.feature | 2 +-
.../timer-source-binding-display.yaml | 2 +-
.../kamelet-binding-http/timer-source.kamelet.yaml | 2 +-
.../properties-binding.yaml | 2 +-
.../timer-source.kamelet.yaml | 2 +-
.../kamelet-binding/logger-sink-binding.yaml | 2 +-
.../kamelet-binding/logger-sink.kamelet.yaml | 2 +-
.../kamelet-binding/timer-source-binding.yaml | 2 +-
.../kamelet-binding/timer-source.kamelet.yaml | 2 +-
.../data-type-action.kamelet.yaml | 2 +-
.../common/kamelet-data-types/event-binding.yaml | 6 +-
.../kamelet-data-types/event-sink.kamelet.yaml | 2 +-
.../kamelet-data-types/event-source.kamelet.yaml | 2 +-
.../common/kamelet-data-types/timer-to-log.yaml | 6 +-
.../kamelet-steps/prefix-action.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 6 +-
.../common/kamelet-steps/timer-source.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet/echo-sink.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet/timer-source.kamelet.yaml | 2 +-
.../yaml.txt => helm/camel-k/crds/crd-binding.yaml | 1 +
helm/camel-k/crds/crd-integration.yaml | 1 -
helm/camel-k/crds/crd-kamelet-binding.yaml | 4 +-
helm/camel-k/crds/crd-kamelet.yaml | 699 +++++-
.../{crd-kamelet-binding.yaml => crd-pipe.yaml} | 43 +-
helm/camel-k/templates/operator-cluster-roles.yaml | 14 +-
helm/camel-k/templates/operator-role.yaml | 8 +-
pkg/apis/addtoscheme_camel_v1alpha1.go | 4 +-
pkg/apis/camel/v1/common_types.go | 2 +-
pkg/apis/camel/v1/common_types_support.go | 15 +
.../camel/{v1alpha1 => v1}/error_handler_types.go | 2 +-
.../error_handler_types_support.go | 2 +-
.../camel/{v1alpha1 => v1}/jsonschema_types.go | 43 +-
pkg/apis/camel/{v1alpha1 => v1}/kamelet_types.go | 7 +-
.../{v1alpha1 => v1}/kamelet_types_support.go | 7 +-
.../kamelet_binding_types.go => v1/pipe_types.go} | 102 +-
.../pipe_types_support.go} | 53 +-
.../pipe_types_support_test.go} | 2 +-
pkg/apis/camel/v1/register.go | 4 +
pkg/apis/camel/v1/zz_generated.deepcopy.go | 852 ++++++-
pkg/apis/camel/v1alpha1/error_handler_types.go | 2 +
.../camel/v1alpha1/error_handler_types_support.go | 2 +
pkg/apis/camel/v1alpha1/jsonschema_types.go | 2 +
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 3 +
.../v1alpha1/kamelet_binding_types_support.go | 2 +
.../v1alpha1/kamelet_binding_types_support_test.go | 2 +
pkg/apis/camel/v1alpha1/kamelet_types.go | 3 +
pkg/apis/camel/v1alpha1/kamelet_types_support.go | 2 +
pkg/apis/camel/v1alpha1/register.go | 2 +
.../camel/{v1alpha1 => v1}/datatypereference.go | 2 +-
.../camel/{v1alpha1 => v1}/datatypespec.go | 2 +-
.../camel/{v1alpha1 => v1}/datatypesspec.go | 2 +-
.../camel/{v1alpha1 => v1}/endpoint.go | 22 +-
.../camel/{v1alpha1 => v1}/endpointproperties.go | 6 +-
.../camel/{v1alpha1 => v1}/errorhandlerspec.go | 6 +-
.../camel/{v1alpha1 => v1}/eventtypespec.go | 2 +-
.../{v1alpha1 => v1}/externaldocumentation.go | 2 +-
.../camel/{v1alpha1 => v1}/headerspec.go | 2 +-
.../camel/{v1alpha1 => v1}/json.go | 6 +-
.../camel/{v1alpha1 => v1}/jsonschemaprop.go | 2 +-
.../camel/{v1alpha1 => v1}/jsonschemaprops.go | 8 +-
.../camel/{v1alpha1 => v1}/kamelet.go | 4 +-
.../camel/{v1alpha1 => v1}/kameletcondition.go | 22 +-
.../camel/{v1alpha1 => v1}/kameletproperty.go | 2 +-
.../camel/{v1alpha1 => v1}/kameletspec.go | 27 +-
.../camel/{v1alpha1 => v1}/kameletstatus.go | 8 +-
.../camel/v1/{build.go => pipe.go} | 52 +-
.../{integrationcondition.go => pipecondition.go} | 35 +-
.../kameletbindingspec.go => v1/pipespec.go} | 44 +-
.../kameletbindingstatus.go => v1/pipestatus.go} | 34 +-
.../camel/{v1alpha1 => v1}/template.go | 6 +-
pkg/client/camel/applyconfiguration/utils.go | 44 +
.../versioned/typed/camel/v1/camel_client.go | 10 +
.../typed/camel/v1/fake/fake_camel_client.go | 8 +
.../camel/{v1alpha1 => v1}/fake/fake_kamelet.go | 64 +-
.../versioned/typed/camel/v1/fake/fake_pipe.go | 214 ++
.../typed/camel/v1/generated_expansion.go | 4 +
.../typed/camel/{v1alpha1 => v1}/kamelet.go | 70 +-
.../clientset/versioned/typed/camel/v1/pipe.go | 290 +++
.../externalversions/camel/v1/interface.go | 14 +
.../camel/{v1alpha1 => v1}/kamelet.go | 26 +-
.../camel/v1/{build.go => pipe.go} | 38 +-
.../camel/informers/externalversions/generic.go | 4 +
.../camel/listers/camel/v1/expansion_generated.go | 16 +
.../listers/camel/{v1alpha1 => v1}/kamelet.go | 24 +-
pkg/client/camel/listers/camel/v1/pipe.go | 100 +
pkg/cmd/bind.go | 44 +-
pkg/cmd/bind_test.go | 28 +-
pkg/cmd/delete.go | 18 +-
pkg/cmd/describe_kamelet.go | 7 +-
pkg/cmd/kamelet_delete.go | 12 +-
pkg/cmd/kamelet_get.go | 20 +-
pkg/cmd/promote.go | 41 +-
pkg/cmd/promote_test.go | 15 +-
pkg/cmd/rebuild.go | 1 -
pkg/cmd/reset.go | 36 +-
pkg/cmd/uninstall.go | 5 +-
pkg/controller/{add_build.go => add_pipe.go} | 6 +-
pkg/controller/kamelet/action.go | 6 +-
pkg/controller/kamelet/initialize.go | 8 +-
pkg/controller/kamelet/kamelet_controller.go | 21 +-
pkg/controller/kamelet/monitor.go | 8 +-
pkg/controller/kameletbinding/action.go | 6 +-
pkg/controller/kameletbinding/error_handler.go | 4 +-
.../kameletbinding/error_handler_test.go | 10 +-
pkg/controller/kameletbinding/initialize.go | 31 +-
pkg/controller/kameletbinding/integration.go | 66 +-
..._controller.go => kameletbinding_controller.go} | 10 +-
pkg/controller/kameletbinding/monitor.go | 46 +-
pkg/controller/{catalog => pipe}/action.go | 8 +-
.../{kameletbinding => pipe}/error_handler.go | 34 +-
.../{kameletbinding => pipe}/error_handler_test.go | 34 +-
.../{kameletbinding => pipe}/initialize.go | 45 +-
.../{kameletbinding => pipe}/integration.go | 60 +-
pkg/controller/{build => pipe}/log.go | 4 +-
pkg/controller/{kameletbinding => pipe}/monitor.go | 79 +-
.../pipe_controller.go} | 70 +-
pkg/event/manager.go | 55 +-
pkg/install/cluster.go | 66 +-
pkg/install/kamelets.go | 9 +-
pkg/install/kamelets_test.go | 6 +-
pkg/kamelet/initialize.go | 31 +-
pkg/kamelet/repository/composite_repository.go | 4 +-
.../repository/composite_repository_test.go | 6 +-
pkg/kamelet/repository/empty_repository.go | 4 +-
pkg/kamelet/repository/github_repository.go | 8 +-
pkg/kamelet/repository/kubernetes_repository.go | 8 +-
.../repository/kubernetes_repository_test.go | 6 +-
pkg/kamelet/repository/repository.go | 3 +-
pkg/kamelet/repository/repository_test.go | 5 +-
pkg/resources/resources.go | 65 +-
pkg/resources/resources_test.go | 3 +-
pkg/trait/error_handler.go | 6 +-
pkg/trait/error_handler_test.go | 8 +-
pkg/trait/kamelets.go | 16 +-
pkg/trait/kamelets_test.go | 66 +-
pkg/trait/util.go | 71 +-
pkg/trait/util_test.go | 59 +-
pkg/util/bindings/api.go | 8 +-
pkg/util/bindings/api_support.go | 10 +
pkg/util/bindings/{api.go => api_v1alpha1.go} | 35 +-
pkg/util/bindings/bindings_test.go | 68 +-
pkg/util/bindings/camel_uri.go | 46 +-
pkg/util/bindings/catalog.go | 52 +-
pkg/util/bindings/kamelet.go | 169 +-
pkg/util/bindings/kamelet_test.go | 44 +-
pkg/util/bindings/knative_ref.go | 89 +-
pkg/util/bindings/knative_uri.go | 83 +-
pkg/util/bindings/test_support.go | 6 +-
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
pkg/util/kamelets/util.go | 4 +-
pkg/util/log/log.go | 13 +-
pkg/util/reference/reference.go | 4 +-
pkg/util/reference/reference_test.go | 12 +-
script/gen_crd.sh | 1 +
script/prepare-operators.sh | 6 +-
209 files changed, 7049 insertions(+), 2128 deletions(-)
copy helm/camel-k/crds/crd-kamelet-binding.yaml => config/crd/bases/camel.apache.org_pipes.yaml (99%)
copy config/samples/bases/{camel_v1_kameletbinding.yaml => camel_v1_pipe.yaml} (95%)
rename config/samples/bases/{camel_v1_kameletbinding.yaml => camel_v1alpha1_kameletbinding.yaml} (100%)
copy script/headers/yaml.txt => helm/camel-k/crds/crd-binding.yaml (99%)
copy helm/camel-k/crds/{crd-kamelet-binding.yaml => crd-pipe.yaml} (99%)
copy pkg/apis/camel/{v1alpha1 => v1}/error_handler_types.go (99%)
copy pkg/apis/camel/{v1alpha1 => v1}/error_handler_types_support.go (99%)
copy pkg/apis/camel/{v1alpha1 => v1}/jsonschema_types.go (85%)
copy pkg/apis/camel/{v1alpha1 => v1}/kamelet_types.go (98%)
copy pkg/apis/camel/{v1alpha1 => v1}/kamelet_types_support.go (96%)
copy pkg/apis/camel/{v1alpha1/kamelet_binding_types.go => v1/pipe_types.go} (65%)
copy pkg/apis/camel/{v1alpha1/kamelet_binding_types_support.go => v1/pipe_types_support.go} (71%)
copy pkg/apis/camel/{v1alpha1/kamelet_binding_types_support_test.go => v1/pipe_types_support_test.go} (98%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/datatypereference.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/datatypespec.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/datatypesspec.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/endpoint.go (80%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/endpointproperties.go (91%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/errorhandlerspec.go (90%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/eventtypespec.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/externaldocumentation.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/headerspec.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/json.go (90%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/jsonschemaprop.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/jsonschemaprops.go (96%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/kamelet.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/kameletcondition.go (81%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/kameletproperty.go (99%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/kameletspec.go (79%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/kameletstatus.go (92%)
copy pkg/client/camel/applyconfiguration/camel/v1/{build.go => pipe.go} (78%)
copy pkg/client/camel/applyconfiguration/camel/v1/{integrationcondition.go => pipecondition.go} (66%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1/kameletbindingspec.go => v1/pipespec.go} (60%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1/kameletbindingstatus.go => v1/pipestatus.go} (61%)
copy pkg/client/camel/applyconfiguration/camel/{v1alpha1 => v1}/template.go (90%)
copy pkg/client/camel/clientset/versioned/typed/camel/{v1alpha1 => v1}/fake/fake_kamelet.go (72%)
create mode 100644 pkg/client/camel/clientset/versioned/typed/camel/v1/fake/fake_pipe.go
copy pkg/client/camel/clientset/versioned/typed/camel/{v1alpha1 => v1}/kamelet.go (69%)
create mode 100644 pkg/client/camel/clientset/versioned/typed/camel/v1/pipe.go
copy pkg/client/camel/informers/externalversions/camel/{v1alpha1 => v1}/kamelet.go (79%)
copy pkg/client/camel/informers/externalversions/camel/v1/{build.go => pipe.go} (62%)
copy pkg/client/camel/listers/camel/{v1alpha1 => v1}/kamelet.go (83%)
create mode 100644 pkg/client/camel/listers/camel/v1/pipe.go
copy pkg/controller/{add_build.go => add_pipe.go} (87%)
copy pkg/controller/kameletbinding/{kamelet_binding_controller.go => kameletbinding_controller.go} (96%)
copy pkg/controller/{catalog => pipe}/action.go (87%)
copy pkg/controller/{kameletbinding => pipe}/error_handler.go (73%)
copy pkg/controller/{kameletbinding => pipe}/error_handler_test.go (72%)
copy pkg/controller/{kameletbinding => pipe}/initialize.go (69%)
copy pkg/controller/{kameletbinding => pipe}/integration.go (78%)
copy pkg/controller/{build => pipe}/log.go (91%)
copy pkg/controller/{kameletbinding => pipe}/monitor.go (60%)
rename pkg/controller/{kameletbinding/kamelet_binding_controller.go => pipe/pipe_controller.go} (70%)
copy pkg/util/bindings/{api.go => api_v1alpha1.go} (60%)
[camel-k] 04/18: feat(api): promote Kamelets to v1
Posted by pc...@apache.org.
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 a7f48056294612abb35026926759485c2e79411d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Mar 28 15:54:45 2023 +0200
feat(api): promote Kamelets to v1
We'll keep v1alpha1 in order to simplify any upgrade from Camel K v1 to v2
---
PROJECT | 4 +-
addons/keda/keda.go | 12 +-
addons/keda/keda_test.go | 16 +-
addons/strimzi/strimzi.go | 5 +-
addons/strimzi/strimzi_test.go | 14 +-
config/crd/bases/camel.apache.org_bindings.yaml | 14 +-
....yaml => camel.apache.org_kameletbindings.yaml} | 49 +-
config/crd/bases/camel.apache.org_kamelets.yaml | 709 +++++-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2401 +++++++++++++++-----
docs/modules/ROOT/partials/apis/crds-html.adoc | 90 +-
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 444 ++--
.../kamelets/timer-custom-source.kamelet.yaml | 2 +-
e2e/common/misc/files/my-timer-source.kamelet.yaml | 2 +-
e2e/common/misc/kamelet_binding_test.go | 24 +-
e2e/common/misc/kamelet_binding_with_image_test.go | 6 +-
e2e/common/misc/kamelet_update_test.go | 6 +-
e2e/common/misc/scale_binding_test.go | 15 +-
e2e/common/traits/errored_trait_test.go | 9 +-
e2e/common/traits/health_test.go | 10 +-
e2e/install/kustomize/common.go | 2 +-
e2e/knative/kamelet_test.go | 7 +-
e2e/native/native_binding_test.go | 12 +-
e2e/support/test_support.go | 81 +-
.../common/kamelet-beans/beans-source.kamelet.yaml | 2 +-
.../timer-source.kamelet.yaml | 2 +-
.../logger-sink-binding.yaml | 4 +-
.../logger-sink.kamelet.yaml | 2 +-
.../timer-source-binding.yaml | 4 +-
.../timer-source.kamelet.yaml | 2 +-
.../timer-source-binding-display.yaml | 4 +-
.../kamelet-binding-http/timer-source.kamelet.yaml | 2 +-
.../properties-binding.yaml | 4 +-
.../timer-source.kamelet.yaml | 2 +-
.../kamelet-binding/logger-sink-binding.yaml | 4 +-
.../kamelet-binding/logger-sink.kamelet.yaml | 2 +-
.../kamelet-binding/timer-source-binding.yaml | 4 +-
.../kamelet-binding/timer-source.kamelet.yaml | 2 +-
.../data-type-action.kamelet.yaml | 2 +-
.../common/kamelet-data-types/event-binding.yaml | 8 +-
.../kamelet-data-types/event-sink.kamelet.yaml | 2 +-
.../kamelet-data-types/event-source.kamelet.yaml | 2 +-
.../common/kamelet-data-types/timer-to-log.yaml | 8 +-
.../kamelet-steps/prefix-action.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 8 +-
.../common/kamelet-steps/timer-source.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet/echo-sink.kamelet.yaml | 2 +-
e2e/yaks/common/kamelet/timer-source.kamelet.yaml | 2 +-
helm/camel-k/crds/crd-binding.yaml | 14 +-
helm/camel-k/crds/crd-kamelet.yaml | 709 +++++-
pkg/apis/addtoscheme_camel_v1alpha1.go | 4 +-
pkg/apis/camel/{v1alpha1 => v1}/binding_types.go | 8 +-
.../{v1alpha1 => v1}/binding_types_support.go | 9 +-
.../{v1alpha1 => v1}/binding_types_support_test.go | 2 +-
pkg/apis/camel/v1/common_types_support.go | 15 +
pkg/apis/camel/v1/error_handler_types.go | 55 +
pkg/apis/camel/v1/error_handler_types_support.go | 128 ++
pkg/apis/camel/v1/jsonschema_types.go | 108 +
pkg/apis/camel/v1/kamelet_types.go | 234 ++
.../kamelet_types_support.go} | 120 +-
pkg/apis/camel/v1/register.go | 4 +
pkg/apis/camel/v1/zz_generated.deepcopy.go | 812 ++++++-
.../{binding_types.go => kamelet_binding_types.go} | 82 +-
...support.go => kamelet_binding_types_support.go} | 46 +-
...st.go => kamelet_binding_types_support_test.go} | 0
pkg/apis/camel/v1alpha1/register.go | 4 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 298 +--
.../camel/{v1alpha1 => v1}/binding.go | 4 +-
.../camel/{v1alpha1 => v1}/bindingcondition.go | 27 +-
.../camel/{v1alpha1 => v1}/bindingspec.go | 22 +-
.../camel/{v1alpha1 => v1}/bindingstatus.go | 8 +-
.../camel/v1/datatypereference.go | 49 +
.../applyconfiguration/camel/v1/datatypespec.go | 102 +
.../applyconfiguration/camel/v1/datatypesspec.go | 70 +
.../camel/applyconfiguration/camel/v1/endpoint.go | 93 +
.../camel/v1/endpointproperties.go} | 34 +-
.../camel/v1/errorhandlerspec.go} | 34 +-
.../applyconfiguration/camel/v1/eventtypespec.go | 49 +
.../camel/v1/externaldocumentation.go | 49 +
.../applyconfiguration/camel/v1/headerspec.go | 76 +
.../camel/v1/json.go} | 26 +-
.../applyconfiguration/camel/v1/jsonschemaprop.go | 258 +++
.../applyconfiguration/camel/v1/jsonschemaprops.go | 124 +
.../camel/{v1alpha1/binding.go => v1/kamelet.go} | 56 +-
.../bindingcondition.go => v1/kameletcondition.go} | 55 +-
.../applyconfiguration/camel/v1/kameletproperty.go | 49 +
.../applyconfiguration/camel/v1/kameletspec.go | 108 +
.../bindingstatus.go => v1/kameletstatus.go} | 50 +-
.../camel/v1/template.go} | 26 +-
.../v1alpha1/{binding.go => kameletbinding.go} | 52 +-
...dingcondition.go => kameletbindingcondition.go} | 26 +-
.../{bindingspec.go => kameletbindingspec.go} | 24 +-
.../{bindingstatus.go => kameletbindingstatus.go} | 30 +-
pkg/client/camel/applyconfiguration/utils.go | 60 +-
.../typed/camel/{v1alpha1 => v1}/binding.go | 78 +-
.../versioned/typed/camel/v1/camel_client.go | 10 +
.../camel/{v1alpha1 => v1}/fake/fake_binding.go | 64 +-
.../typed/camel/v1/fake/fake_camel_client.go | 8 +
.../versioned/typed/camel/v1/fake/fake_kamelet.go | 191 ++
.../typed/camel/v1/generated_expansion.go | 4 +
.../clientset/versioned/typed/camel/v1/kamelet.go | 257 +++
.../versioned/typed/camel/v1alpha1/camel_client.go | 10 +-
.../typed/camel/v1alpha1/fake/fake_camel_client.go | 8 +-
.../camel/v1alpha1/fake/fake_kameletbinding.go | 214 ++
.../typed/camel/v1alpha1/generated_expansion.go | 4 +-
.../typed/camel/v1alpha1/kameletbinding.go | 290 +++
.../camel/{v1alpha1 => v1}/binding.go | 26 +-
.../externalversions/camel/v1/interface.go | 14 +
.../camel/{v1alpha1/binding.go => v1/kamelet.go} | 50 +-
.../externalversions/camel/v1alpha1/interface.go | 14 +-
.../v1alpha1/{binding.go => kameletbinding.go} | 38 +-
.../camel/informers/externalversions/generic.go | 8 +-
.../listers/camel/{v1alpha1 => v1}/binding.go | 24 +-
.../camel/listers/camel/v1/expansion_generated.go | 16 +
pkg/client/camel/listers/camel/v1/kamelet.go | 100 +
.../listers/camel/v1alpha1/expansion_generated.go | 16 +-
.../camel/listers/camel/v1alpha1/kameletbinding.go | 100 +
pkg/cmd/bind.go | 32 +-
pkg/cmd/bind_test.go | 16 +-
pkg/cmd/delete.go | 10 +-
pkg/cmd/describe_kamelet.go | 7 +-
pkg/cmd/kamelet_delete.go | 12 +-
pkg/cmd/kamelet_get.go | 20 +-
pkg/cmd/promote.go | 11 +-
pkg/cmd/promote_test.go | 9 +-
pkg/cmd/reset.go | 3 +-
pkg/cmd/uninstall.go | 5 +-
pkg/controller/binding/action.go | 6 +-
pkg/controller/binding/binding_controller.go | 20 +-
pkg/controller/binding/error_handler.go | 32 +-
pkg/controller/binding/error_handler_test.go | 32 +-
pkg/controller/binding/initialize.go | 25 +-
pkg/controller/binding/integration.go | 14 +-
pkg/controller/binding/monitor.go | 43 +-
pkg/controller/kamelet/action.go | 6 +-
pkg/controller/kamelet/initialize.go | 8 +-
pkg/controller/kamelet/kamelet_controller.go | 21 +-
pkg/controller/kamelet/monitor.go | 8 +-
pkg/event/manager.go | 13 +-
pkg/install/kamelets.go | 9 +-
pkg/install/kamelets_test.go | 6 +-
pkg/kamelet/initialize.go | 31 +-
pkg/kamelet/repository/composite_repository.go | 4 +-
.../repository/composite_repository_test.go | 6 +-
pkg/kamelet/repository/empty_repository.go | 4 +-
pkg/kamelet/repository/github_repository.go | 8 +-
pkg/kamelet/repository/kubernetes_repository.go | 8 +-
.../repository/kubernetes_repository_test.go | 6 +-
pkg/kamelet/repository/repository.go | 3 +-
pkg/kamelet/repository/repository_test.go | 5 +-
pkg/resources/resources.go | 16 +-
pkg/trait/error_handler.go | 6 +-
pkg/trait/error_handler_test.go | 8 +-
pkg/trait/kamelets.go | 16 +-
pkg/trait/kamelets_test.go | 66 +-
pkg/trait/util.go | 7 +-
pkg/trait/util_test.go | 45 +-
pkg/util/bindings/api.go | 6 +-
pkg/util/bindings/bindings_test.go | 57 +-
pkg/util/bindings/camel_uri.go | 4 +-
pkg/util/bindings/catalog.go | 6 +-
pkg/util/bindings/kamelet.go | 27 +-
pkg/util/bindings/kamelet_test.go | 36 +-
pkg/util/bindings/knative_ref.go | 7 +-
pkg/util/bindings/knative_uri.go | 6 +-
pkg/util/bindings/test_support.go | 6 +-
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
pkg/util/kamelets/util.go | 4 +-
pkg/util/log/log.go | 5 +-
pkg/util/reference/reference.go | 2 +-
pkg/util/reference/reference_test.go | 12 +-
171 files changed, 8469 insertions(+), 2089 deletions(-)
diff --git a/PROJECT b/PROJECT
index 9173437e1..fc4169d99 100644
--- a/PROJECT
+++ b/PROJECT
@@ -20,10 +20,10 @@ resources:
version: v1
- group: camel
kind: Binding
- version: v1alpha1
+ version: v1
- group: camel
kind: Kamelet
- version: v1alpha1
+ version: v1
version: "3"
plugins:
go.sdk.operatorframework.io/v2-alpha: {}
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index e597ce0e0..4e4ca5b17 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -27,8 +27,8 @@ import (
kedav1alpha1 "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/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"
@@ -279,7 +279,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
if err != nil {
return err
}
- if ctrlRef.Kind == camelv1alpha1.BindingKind {
+ if ctrlRef.Kind == camelv1.BindingKind {
scale.ObjectMeta.Name = ctrlRef.Name
_, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
if err != nil {
@@ -297,7 +297,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectReference {
for _, o := range e.Integration.OwnerReferences {
- if o.Kind == camelv1alpha1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
+ if o.Kind == camelv1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
return &v1.ObjectReference{
APIVersion: o.APIVersion,
Kind: o.Kind,
@@ -401,7 +401,7 @@ func (t *kedaTrait) populateTriggersFromKamelet(e *trait.Environment, repo repos
return nil
}
-func (t *kedaTrait) populateTriggersFromKameletURI(e *trait.Environment, kamelet *camelv1alpha1.Kamelet, triggerType string, kedaParamToProperty map[string]string, requiredKEDAParam map[string]bool, authenticationParams map[string]bool, kameletURI string) error {
+func (t *kedaTrait) populateTriggersFromKameletURI(e *trait.Environment, kamelet *camelv1.Kamelet, triggerType string, kedaParamToProperty map[string]string, requiredKEDAParam map[string]bool, authenticationParams map[string]bool, kameletURI string) error {
metaValues := make(map[string]string, len(kedaParamToProperty))
for metaParam, prop := range kedaParamToProperty {
v, err := t.getKameletPropertyValue(e, kamelet, kameletURI, prop)
@@ -450,7 +450,7 @@ func (t *kedaTrait) populateTriggersFromKameletURI(e *trait.Environment, kamelet
return nil
}
-func (t *kedaTrait) evaluateTemplateParameters(e *trait.Environment, kamelet *camelv1alpha1.Kamelet, kameletURI string) (map[string]string, map[string]bool, error) {
+func (t *kedaTrait) evaluateTemplateParameters(e *trait.Environment, kamelet *camelv1.Kamelet, kameletURI string) (map[string]string, map[string]bool, error) {
paramTemplates := make(map[string]string)
authenticationParam := make(map[string]bool)
for annotation, expr := range kamelet.Annotations {
@@ -492,7 +492,7 @@ func (t *kedaTrait) evaluateTemplateParameters(e *trait.Environment, kamelet *ca
return paramValues, authenticationParam, nil
}
-func (t *kedaTrait) getKameletPropertyValue(e *trait.Environment, kamelet *camelv1alpha1.Kamelet, kameletURI, prop string) (string, error) {
+func (t *kedaTrait) getKameletPropertyValue(e *trait.Environment, kamelet *camelv1.Kamelet, kameletURI, prop string) (string, error) {
// From top priority to lowest
if v := uri.GetQueryParameter(kameletURI, prop); v != "" {
return v, nil
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 9c64b3f1b..420f72d05 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -24,7 +24,7 @@ import (
"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"
+ camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/controller/binding"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util/camel"
@@ -117,7 +117,7 @@ func TestKameletAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
keda.Enabled = pointer.Bool(true)
env := createBasicTestEnvironment(
- &camelv1alpha1.Kamelet{
+ &camelv1.Kamelet{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-kamelet",
@@ -125,7 +125,7 @@ func TestKameletAutoDetection(t *testing.T) {
"camel.apache.org/keda.type": "my-scaler",
},
},
- Spec: camelv1alpha1.KameletSpec{
+ Spec: camelv1.KameletSpec{
Definition: &camelv1alpha1.JSONSchemaProps{
Properties: map[string]camelv1alpha1.JSONSchemaProp{
"a": {
@@ -207,12 +207,12 @@ func TestBindingAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
keda.Enabled = pointer.Bool(true)
logEndpoint := "log:info"
- klb := camelv1alpha1.Binding{
+ klb := camelv1.Binding{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-binding",
},
- Spec: camelv1alpha1.BindingSpec{
+ Spec: camelv1.BindingSpec{
Source: camelv1alpha1.Endpoint{
Ref: &corev1.ObjectReference{
Kind: "Kamelet",
@@ -232,7 +232,7 @@ func TestBindingAutoDetection(t *testing.T) {
}
env := createBasicTestEnvironment(
- &camelv1alpha1.Kamelet{
+ &camelv1.Kamelet{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-kamelet",
@@ -240,7 +240,7 @@ func TestBindingAutoDetection(t *testing.T) {
"camel.apache.org/keda.type": "my-scaler",
},
},
- Spec: camelv1alpha1.KameletSpec{
+ Spec: camelv1.KameletSpec{
Definition: &camelv1alpha1.JSONSchemaProps{
Properties: map[string]camelv1alpha1.JSONSchemaProp{
"a": {
@@ -362,7 +362,7 @@ func TestHackKLBReplicas(t *testing.T) {
})
keda.HackControllerReplicas = pointer.Bool(true)
env := createBasicTestEnvironment(
- &camelv1alpha1.Binding{
+ &camelv1.Binding{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-klb",
diff --git a/addons/strimzi/strimzi.go b/addons/strimzi/strimzi.go
index d10193f07..4207f191a 100644
--- a/addons/strimzi/strimzi.go
+++ b/addons/strimzi/strimzi.go
@@ -23,7 +23,8 @@ import (
"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"
+
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"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"
@@ -39,7 +40,7 @@ func (s BindingProvider) ID() string {
return "strimzi"
}
-func (s BindingProvider) Translate(ctx bindings.BindingContext, _ bindings.EndpointContext, endpoint v1alpha1.Endpoint) (*bindings.Binding, error) {
+func (s BindingProvider) Translate(ctx bindings.BindingContext, _ bindings.EndpointContext, endpoint camelv1.Endpoint) (*bindings.Binding, error) {
if endpoint.Ref == nil {
// React only on refs
return nil, nil
diff --git a/addons/strimzi/strimzi_test.go b/addons/strimzi/strimzi_test.go
index b99e66440..ba35e1941 100644
--- a/addons/strimzi/strimzi_test.go
+++ b/addons/strimzi/strimzi_test.go
@@ -25,7 +25,7 @@ import (
"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"
@@ -47,7 +47,7 @@ func TestStrimziDirect(t *testing.T) {
Profile: camelv1.TraitProfileKubernetes,
}
- endpoint := v1alpha1.Endpoint{
+ endpoint := camelv1.Endpoint{
Ref: &v1.ObjectReference{
Kind: "KafkaTopic",
Name: "mytopic",
@@ -59,7 +59,7 @@ func TestStrimziDirect(t *testing.T) {
}
binding, err := BindingProvider{}.Translate(bindingContext, bindings.EndpointContext{
- Type: v1alpha1.EndpointTypeSink,
+ Type: camelv1.EndpointTypeSink,
}, endpoint)
assert.NoError(t, err)
assert.NotNil(t, binding)
@@ -110,7 +110,7 @@ func TestStrimziLookup(t *testing.T) {
Profile: camelv1.TraitProfileKubernetes,
}
- endpoint := v1alpha1.Endpoint{
+ endpoint := camelv1.Endpoint{
Ref: &v1.ObjectReference{
Kind: "KafkaTopic",
Name: "mytopicy",
@@ -119,7 +119,7 @@ func TestStrimziLookup(t *testing.T) {
}
binding, err := provider.Translate(bindingContext, bindings.EndpointContext{
- Type: v1alpha1.EndpointTypeSink,
+ Type: camelv1.EndpointTypeSink,
}, endpoint)
assert.NoError(t, err)
assert.NotNil(t, binding)
@@ -127,12 +127,12 @@ func TestStrimziLookup(t *testing.T) {
assert.Equal(t, camelv1.Traits{}, binding.Traits)
}
-func asEndpointProperties(props map[string]string) *v1alpha1.EndpointProperties {
+func asEndpointProperties(props map[string]string) *camelv1.EndpointProperties {
serialized, err := json.Marshal(props)
if err != nil {
panic(err)
}
- return &v1alpha1.EndpointProperties{
+ return &camelv1.EndpointProperties{
RawMessage: serialized,
}
}
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/crd/bases/camel.apache.org_bindings.yaml
index b1b019aa4..eecb595e9 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/crd/bases/camel.apache.org_bindings.yaml
@@ -47,7 +47,7 @@ spec:
jsonPath: .status.replicas
name: Replicas
type: integer
- name: v1alpha1
+ name: v1
schema:
openAPIV3Schema:
description: Binding is the Schema for the kamelets binding API
@@ -7777,6 +7777,7 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -7795,6 +7796,7 @@ spec:
default:
description: default is a default value for undefined
object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -7806,6 +7808,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -7813,6 +7816,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8012,6 +8016,7 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8030,6 +8035,7 @@ spec:
default:
description: default is a default value for undefined
object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8041,6 +8047,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8048,6 +8055,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8252,6 +8260,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8270,6 +8279,7 @@ spec:
default:
description: default is a default value for
undefined object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8281,6 +8291,7 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8288,6 +8299,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
similarity index 99%
copy from config/crd/bases/camel.apache.org_bindings.yaml
copy to config/crd/bases/camel.apache.org_kameletbindings.yaml
index b1b019aa4..8269eee53 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -1,45 +1,28 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
+---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
- labels:
- app: camel-k
- name: bindings.camel.apache.org
+ name: kameletbindings.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: Binding
- listKind: BindingList
- plural: bindings
+ kind: KameletBinding
+ listKind: KameletBindingList
+ plural: kameletbindings
shortNames:
- klb
- singular: binding
+ singular: kameletbinding
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: TheBinding phase
+ - description: The Kamelet Binding phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +33,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: Binding is the Schema for the kamelets binding API
+ description: KameletBinding is the Schema for the kamelets binding API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +48,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a Binding
+ description: the specification of a KameletBinding
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8393,12 @@ spec:
type: array
type: object
status:
- description: the status of a Binding
+ description: the status of a KameletBinding
properties:
conditions:
description: Conditions --
items:
- description: BindingCondition describes the state of a resource
+ description: KameletBindingCondition describes the state of a resource
at a certain point.
properties:
lastTransitionTime:
@@ -8498,7 +8481,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of binding condition.
+ description: Type of kameletBinding condition.
type: string
required:
- status
@@ -8507,7 +8490,7 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this Binding.
+ for this KameletBinding.
format: int64
type: integer
phase:
@@ -8530,3 +8513,9 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
+status:
+ acceptedNames:
+ kind: ""
+ plural: ""
+ conditions: []
+ storedVersions: []
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index 41dcba0e4..9eae88378 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -38,6 +38,713 @@ spec:
singular: kamelet
scope: Namespaced
versions:
+ - additionalPrinterColumns:
+ - description: The Kamelet phase
+ jsonPath: .status.phase
+ name: Phase
+ type: string
+ name: v1
+ schema:
+ openAPIV3Schema:
+ description: Kamelet is the Schema for the kamelets API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: the desired specification
+ properties:
+ dataTypes:
+ additionalProperties:
+ description: DataTypesSpec represents the specification for a set
+ of data types
+ properties:
+ default:
+ description: the default data type for this Kamelet
+ type: string
+ headers:
+ additionalProperties:
+ description: HeaderSpec represents the specification for a
+ header used in the Kamelet
+ properties:
+ default:
+ type: string
+ description:
+ type: string
+ required:
+ type: boolean
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ description: one to many header specifications
+ type: object
+ types:
+ additionalProperties:
+ description: DataTypeSpec represents the specification for
+ a data type
+ properties:
+ dependencies:
+ description: the list of Camel or Maven dependencies required
+ by the data type
+ items:
+ type: string
+ type: array
+ description:
+ description: optional description
+ type: string
+ format:
+ description: the data type format name
+ type: string
+ headers:
+ additionalProperties:
+ description: HeaderSpec represents the specification
+ for a header used in the Kamelet
+ properties:
+ default:
+ type: string
+ description:
+ type: string
+ required:
+ type: boolean
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ description: one to many header specifications
+ type: object
+ mediaType:
+ description: media type as expected for HTTP media types
+ (ie, application/json)
+ type: string
+ schema:
+ description: the expected schema for the data type
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{} and
+ nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing
+ an external resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for
+ undefined object fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON
+ value. These types are supported: bool,
+ int64, float64, string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON
+ value. These types are supported: bool, int64,
+ float64, string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format
+ string. Unknown formats are ignored. The following
+ formats are validated: \n - bsonobjectid:
+ a bson object ID, i.e. a 24 characters hex
+ string - uri: an URI as parsed by Golang net/url.ParseRequestURI
+ - email: an email address as parsed by Golang
+ net/mail.ParseAddress - hostname: a valid
+ representation for an Internet host name,
+ as defined by RFC 1034, section 3.1 [RFC1034].
+ - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+ - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+ - cidr: a CIDR as parsed by Golang net.ParseCIDR
+ - mac: a MAC address as parsed by Golang net.ParseMAC
+ - uuid: an UUID that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string
+ like \"0321751043\" or \"978-0321751041\"
+ - isbn10: an ISBN10 number string like \"0321751043\"
+ - isbn13: an ISBN13 number string like \"978-0321751041\"
+ - creditcard: a credit card number defined
+ by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn:
+ a U.S. social security number following the
+ regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$
+ - hexcolor: an hexadecimal color code like
+ \"#FFFFFF\" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+ - rgbcolor: an RGB color code like rgb like
+ \"rgb(255,255,255)\" - byte: base64 encoded
+ binary data - password: any kind of string
+ - date: a date string like \"2006-01-02\"
+ as defined by full-date in RFC3339 - duration:
+ a duration string like \"22 ns\" as parsed
+ by Golang time.ParseDuration or compatible
+ with Scala duration format - datetime: a date
+ time string like \"2014-12-15T19:30:20.000Z\"
+ as defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended
+ properties that trigger a custom behavior
+ in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ scheme:
+ description: the data type component scheme
+ type: string
+ type: object
+ description: one to many data type specifications
+ type: object
+ type: object
+ description: data specification types for the events consumed/produced
+ by the Kamelet
+ type: object
+ definition:
+ description: defines the formal configuration of the Kamelet
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value. These types
+ are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing an external
+ resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for undefined object
+ fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format string. Unknown
+ formats are ignored. The following formats are validated:
+ \n - bsonobjectid: a bson object ID, i.e. a 24 characters
+ hex string - uri: an URI as parsed by Golang net/url.ParseRequestURI
+ - email: an email address as parsed by Golang net/mail.ParseAddress
+ - hostname: a valid representation for an Internet host
+ name, as defined by RFC 1034, section 3.1 [RFC1034]. -
+ ipv4: an IPv4 IP as parsed by Golang net.ParseIP - ipv6:
+ an IPv6 IP as parsed by Golang net.ParseIP - cidr: a CIDR
+ as parsed by Golang net.ParseCIDR - mac: a MAC address
+ as parsed by Golang net.ParseMAC - uuid: an UUID that
+ allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string like \"0321751043\"
+ or \"978-0321751041\" - isbn10: an ISBN10 number string
+ like \"0321751043\" - isbn13: an ISBN13 number string
+ like \"978-0321751041\" - creditcard: a credit card number
+ defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn: a U.S. social
+ security number following the regex ^\\\\d{3}[- ]?\\\\d{2}[-
+ ]?\\\\d{4}$ - hexcolor: an hexadecimal color code like
+ \"#FFFFFF\" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+ - rgbcolor: an RGB color code like rgb like \"rgb(255,255,255)\"
+ - byte: base64 encoded binary data - password: any kind
+ of string - date: a date string like \"2006-01-02\" as
+ defined by full-date in RFC3339 - duration: a duration
+ string like \"22 ns\" as parsed by Golang time.ParseDuration
+ or compatible with Scala duration format - datetime: a
+ date time string like \"2014-12-15T19:30:20.000Z\" as
+ defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended properties
+ that trigger a custom behavior in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ dependencies:
+ description: Camel dependencies needed by the Kamelet
+ items:
+ type: string
+ type: array
+ sources:
+ description: sources in any Camel DSL supported
+ items:
+ description: SourceSpec defines the configuration for one or more
+ routes to be executed in a certain Camel DSL language
+ properties:
+ compression:
+ description: if the content is compressed (base64 encrypted)
+ type: boolean
+ content:
+ description: the source code (plain text)
+ type: string
+ contentKey:
+ description: the confimap key holding the source content
+ type: string
+ contentRef:
+ description: the confimap reference holding the source content
+ type: string
+ contentType:
+ description: the content type (tipically text or binary)
+ type: string
+ interceptors:
+ description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader
+ uses to pre/post process sources
+ items:
+ type: string
+ type: array
+ language:
+ description: specify which is the language (Camel DSL) used
+ to interpret this source code
+ type: string
+ loader:
+ description: Loader is an optional id of the org.apache.camel.k.RoutesLoader
+ that will interpret this source at runtime
+ type: string
+ name:
+ description: the name of the specification
+ type: string
+ path:
+ description: the path where the file is stored
+ type: string
+ property-names:
+ description: List of property names defined in the source (e.g.
+ if type is "template")
+ items:
+ type: string
+ type: array
+ rawContent:
+ description: the source code (binary)
+ format: byte
+ type: string
+ type:
+ description: Type defines the kind of source described by this
+ object
+ type: string
+ type: object
+ type: array
+ template:
+ description: the main source in YAML DSL
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ types:
+ additionalProperties:
+ description: 'EventTypeSpec represents a specification for an event
+ type Deprecated: In favor of using DataTypeSpec'
+ properties:
+ mediaType:
+ description: media type as expected for HTTP media types (ie,
+ application/json)
+ type: string
+ schema:
+ description: the expected schema for the event
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing an
+ external resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for undefined
+ object fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{} and
+ nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format string.
+ Unknown formats are ignored. The following formats
+ are validated: \n - bsonobjectid: a bson object
+ ID, i.e. a 24 characters hex string - uri: an URI
+ as parsed by Golang net/url.ParseRequestURI - email:
+ an email address as parsed by Golang net/mail.ParseAddress
+ - hostname: a valid representation for an Internet
+ host name, as defined by RFC 1034, section 3.1 [RFC1034].
+ - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+ - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+ - cidr: a CIDR as parsed by Golang net.ParseCIDR
+ - mac: a MAC address as parsed by Golang net.ParseMAC
+ - uuid: an UUID that allows uppercase defined by
+ the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string like \"0321751043\"
+ or \"978-0321751041\" - isbn10: an ISBN10 number
+ string like \"0321751043\" - isbn13: an ISBN13 number
+ string like \"978-0321751041\" - creditcard: a credit
+ card number defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn: a
+ U.S. social security number following the regex
+ ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ - hexcolor:
+ an hexadecimal color code like \"#FFFFFF\" following
+ the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ -
+ rgbcolor: an RGB color code like rgb like \"rgb(255,255,255)\"
+ - byte: base64 encoded binary data - password: any
+ kind of string - date: a date string like \"2006-01-02\"
+ as defined by full-date in RFC3339 - duration: a
+ duration string like \"22 ns\" as parsed by Golang
+ time.ParseDuration or compatible with Scala duration
+ format - datetime: a date time string like \"2014-12-15T19:30:20.000Z\"
+ as defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended properties
+ that trigger a custom behavior in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ type: object
+ description: 'data specification types for the events consumed/produced
+ by the Kamelet Deprecated: In favor of using DataTypes'
+ type: object
+ type: object
+ status:
+ description: the actual status of the resource
+ properties:
+ conditions:
+ description: Conditions --
+ items:
+ description: KameletCondition describes the state of a resource
+ at a certain point.
+ properties:
+ lastTransitionTime:
+ description: Last time the condition transitioned from one status
+ to another.
+ format: date-time
+ type: string
+ lastUpdateTime:
+ description: The last time this condition was updated.
+ format: date-time
+ type: string
+ message:
+ description: A human-readable message indicating details about
+ the transition.
+ type: string
+ reason:
+ description: The reason for the condition's last transition.
+ type: string
+ status:
+ description: Status of the condition, one of True, False, Unknown.
+ type: string
+ type:
+ description: Type of kamelet condition.
+ type: string
+ required:
+ - status
+ - type
+ type: object
+ type: array
+ observedGeneration:
+ description: ObservedGeneration is the most recent generation observed
+ for this Kamelet.
+ format: int64
+ type: integer
+ phase:
+ description: Phase --
+ type: string
+ properties:
+ description: Properties --
+ items:
+ description: KameletProperty specify the behavior of a property
+ in a Kamelet
+ properties:
+ default:
+ description: the default value of the property (if any)
+ type: string
+ name:
+ description: the name of the property
+ type: string
+ type: object
+ type: array
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources:
+ status: {}
- additionalPrinterColumns:
- description: The Kamelet phase
jsonPath: .status.phase
@@ -730,6 +1437,6 @@ spec:
type: object
type: object
served: true
- storage: true
+ storage: false
subresources:
status: {}
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index c98fce367..097671dc4 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -5,6 +5,48 @@ Package v1 contains API Schema definitions for the camel v1 API group
== Resource Types
+[#_camel_apache_org_v1_Binding]
+=== Binding
+
+Binding is the Schema for the kamelets binding API
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`apiVersion` +
+string
+|`camel.apache.org/v1`
+
+|`kind` +
+string
+|`Binding`
+|`metadata` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
+|
+
+
+
+
+Refer to the Kubernetes API documentation for the fields of the `metadata` field.
+|`spec` +
+*xref:#_camel_apache_org_v1_BindingSpec[BindingSpec]*
+|
+
+
+the specification of a Binding
+
+|`status` +
+*xref:#_camel_apache_org_v1_BindingStatus[BindingStatus]*
+|
+
+
+the status of a Binding
+
+
+|===
+
[#_camel_apache_org_v1_Build]
=== Build
@@ -219,6 +261,48 @@ Refer to the Kubernetes API documentation for the fields of the `metadata` field
+|===
+
+[#_camel_apache_org_v1_Kamelet]
+=== Kamelet
+
+Kamelet is the Schema for the kamelets API
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`apiVersion` +
+string
+|`camel.apache.org/v1`
+
+|`kind` +
+string
+|`Kamelet`
+|`metadata` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
+|
+
+
+
+
+Refer to the Kubernetes API documentation for the fields of the `metadata` field.
+|`spec` +
+*xref:#_camel_apache_org_v1_KameletSpec[KameletSpec]*
+|
+
+
+the desired specification
+
+|`status` +
+*xref:#_camel_apache_org_v1_KameletStatus[KameletStatus]*
+|
+
+
+the actual status of the resource
+
+
|===
== Internal Types
@@ -320,6 +404,230 @@ string
name of the task
+|===
+
+[#_camel_apache_org_v1_BeanProperties]
+=== BeanProperties
+
+BeanProperties represent an unstructured object properties to be set on a bean
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
+
+
+
+
+
+|===
+
+[#_camel_apache_org_v1_BindingCondition]
+=== BindingCondition
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_BindingStatus, BindingStatus>>
+
+BindingCondition describes the state of a resource at a certain point.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1_BindingConditionType[BindingConditionType]*
+|
+
+
+Type of binding condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
+string
+|
+
+
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human readable message indicating details about the transition.
+
+|`pods` +
+*xref:#_camel_apache_org_v1_PodCondition[[\]PodCondition]*
+|
+
+
+Pods collect health and conditions information from the owned PODs
+
+
+|===
+
+[#_camel_apache_org_v1_BindingConditionType]
+=== BindingConditionType(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_BindingCondition, BindingCondition>>
+
+BindingConditionType --
+
+
+[#_camel_apache_org_v1_BindingPhase]
+=== BindingPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_BindingStatus, BindingStatus>>
+
+BindingPhase --
+
+
+[#_camel_apache_org_v1_BindingSpec]
+=== BindingSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Binding, Binding>>
+
+BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`integration` +
+*xref:#_camel_apache_org_v1_IntegrationSpec[IntegrationSpec]*
+|
+
+
+Integration is an optional integration used to specify custom parameters
+
+|`source` +
+*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
+|
+
+
+Source is the starting point of the integration defined by this binding
+
+|`sink` +
+*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
+|
+
+
+Sink is the destination of the integration defined by this binding
+
+|`errorHandler` +
+*xref:#_camel_apache_org_v1_ErrorHandlerSpec[ErrorHandlerSpec]*
+|
+
+
+ErrorHandler is an optional handler called upon an error occuring in the integration
+
+|`steps` +
+*xref:#_camel_apache_org_v1_Endpoint[[\]Endpoint]*
+|
+
+
+Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of desired replicas for the binding
+
+|`serviceAccountName` +
+string
+|
+
+
+Custom SA to use for the binding
+
+
+|===
+
+[#_camel_apache_org_v1_BindingStatus]
+=== BindingStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Binding, Binding>>
+
+BindingStatus specify the status of a binding
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this Binding.
+
+|`phase` +
+*xref:#_camel_apache_org_v1_BindingPhase[BindingPhase]*
+|
+
+
+Phase --
+
+|`conditions` +
+*xref:#_camel_apache_org_v1_BindingCondition[[\]BindingCondition]*
+|
+
+
+Conditions --
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of actual replicas of the binding
+
+|`selector` +
+string
+|
+
+
+Selector allows to identify pods belonging to the binding
+
+
|===
[#_camel_apache_org_v1_BuildCondition]
@@ -1239,707 +1547,663 @@ if the content is compressed (base64 encrypted)
|===
-[#_camel_apache_org_v1_Failure]
-=== Failure
+[#_camel_apache_org_v1_DataTypeReference]
+=== DataTypeReference
*Appears on:*
-* <<#_camel_apache_org_v1_BuildStatus, BuildStatus>>
-* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
+* <<#_camel_apache_org_v1_Endpoint, Endpoint>>
-Failure represent a message specifying the reason and the time of an event failure
+DataTypeReference references to the specification of a data type by its scheme and format name
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`reason` +
+|`scheme` +
string
|
-a short text specifying the reason
+the data type component scheme
-|`time` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|`format` +
+string
|
-the time when the failure has happened
-
-|`recovery` +
-*xref:#_camel_apache_org_v1_FailureRecovery[FailureRecovery]*
-|
-
-
-the recovery attempted for this failure
+the data type format name
|===
-[#_camel_apache_org_v1_FailureRecovery]
-=== FailureRecovery
+[#_camel_apache_org_v1_DataTypeSpec]
+=== DataTypeSpec
*Appears on:*
-* <<#_camel_apache_org_v1_Failure, Failure>>
+* <<#_camel_apache_org_v1_DataTypesSpec, DataTypesSpec>>
-FailureRecovery defines the attempts to recover a failure
+DataTypeSpec represents the specification for a data type
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`attempt` +
-int
+|`scheme` +
+string
|
-attempt number
+the data type component scheme
-|`attemptMax` +
-int
+|`format` +
+string
|
-maximum number of attempts
+the data type format name
-|`attemptTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|`description` +
+string
|
-*(Optional)*
-time of the attempt execution
+optional description
-|===
+|`mediaType` +
+string
+|
-[#_camel_apache_org_v1_Flow]
-=== Flow
-*Appears on:*
+media type as expected for HTTP media types (ie, application/json)
-* <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
+|`dependencies` +
+[]string
+|
-Flow is an unstructured object representing a Camel Flow in YAML/JSON DSL
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
+the list of Camel or Maven dependencies required by the data type
-|`RawMessage` +
-*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
-|(Members of `RawMessage` are embedded into this type.)
+|`headers` +
+*xref:#_camel_apache_org_v1_HeaderSpec[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.HeaderSpec]*
+|
+one to many header specifications
+
+|`schema` +
+*xref:#_camel_apache_org_v1_JSONSchemaProps[JSONSchemaProps]*
+|
+the expected schema for the data type
+
|===
-[#_camel_apache_org_v1_HealthCheck]
-=== HealthCheck
+[#_camel_apache_org_v1_DataTypesSpec]
+=== DataTypesSpec
+
+*Appears on:*
+* <<#_camel_apache_org_v1_KameletSpec, KameletSpec>>
+DataTypesSpec represents the specification for a set of data types
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`status` +
-*xref:#_camel_apache_org_v1_HealthCheckStatus[HealthCheckStatus]*
+|`default` +
+string
|
+the default data type for this Kamelet
-
-|`checks` +
-*xref:#_camel_apache_org_v1_HealthCheckResponse[[\]HealthCheckResponse]*
+|`types` +
+*xref:#_camel_apache_org_v1_DataTypeSpec[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.DataTypeSpec]*
|
+one to many data type specifications
+
+|`headers` +
+*xref:#_camel_apache_org_v1_HeaderSpec[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.HeaderSpec]*
+|
+
+one to many header specifications
|===
-[#_camel_apache_org_v1_HealthCheckResponse]
-=== HealthCheckResponse
+[#_camel_apache_org_v1_Endpoint]
+=== Endpoint
*Appears on:*
-* <<#_camel_apache_org_v1_HealthCheck, HealthCheck>>
-* <<#_camel_apache_org_v1_PodCondition, PodCondition>>
-
+* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
+* <<#_camel_apache_org_v1_ErrorHandlerSink, ErrorHandlerSink>>
+Endpoint represents a source/sink external entity (could be any Kubernetes resource or Camel URI)
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`name` +
-string
+|`ref` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
|
+Ref can be used to declare a Kubernetes resource as source/sink endpoint
-
-|`status` +
-*xref:#_camel_apache_org_v1_HealthCheckStatus[HealthCheckStatus]*
+|`uri` +
+string
|
+URI can be used to specify the (Camel) endpoint explicitly
-
-|`data` +
-*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|`properties` +
+*xref:#_camel_apache_org_v1_EndpointProperties[EndpointProperties]*
|
+Properties are a key value representation of endpoint properties
+|`types` +
+*xref:#_camel_apache_org_v1_EventTypeSpec[map[github.com/apache/camel-k/v2/pkg/apis/camel/v1.TypeSlot\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.EventTypeSpec]*
+|
-|===
-
-[#_camel_apache_org_v1_HealthCheckStatus]
-=== HealthCheckStatus(`string` alias)
+Types defines the data type of the data produced/consumed by the endpoint and references a given data type specification.
+Deprecated: In favor of using DataTypes
-*Appears on:*
+|`dataTypes` +
+*xref:#_camel_apache_org_v1_DataTypeReference[map[github.com/apache/camel-k/v2/pkg/apis/camel/v1.TypeSlot\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.DataTypeReference]*
+|
-* <<#_camel_apache_org_v1_HealthCheck, HealthCheck>>
-* <<#_camel_apache_org_v1_HealthCheckResponse, HealthCheckResponse>>
+DataTypes defines the data type of the data produced/consumed by the endpoint and references a given data type specification.
+|===
-[#_camel_apache_org_v1_IntegrationCondition]
-=== IntegrationCondition
+[#_camel_apache_org_v1_EndpointProperties]
+=== EndpointProperties
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
+* <<#_camel_apache_org_v1_Endpoint, Endpoint>>
-IntegrationCondition describes the state of a resource at a certain point.
+EndpointProperties is a key/value struct represented as JSON raw to allow numeric/boolean values
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`type` +
-*xref:#_camel_apache_org_v1_IntegrationConditionType[IntegrationConditionType]*
-|
-
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
-Type of integration condition.
-|`status` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
-|
-Status of the condition, one of True, False, Unknown.
-|`lastUpdateTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
+|===
+[#_camel_apache_org_v1_EndpointType]
+=== EndpointType(`string` alias)
-The last time this condition was updated.
+EndpointType represents the type (ie, source or sink)
-|`lastTransitionTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
+[#_camel_apache_org_v1_ErrorHandler]
+=== ErrorHandler
-Last time the condition transitioned from one status to another.
+ErrorHandler is a generic interface that represent any type of error handler specification
-|`firstTruthyTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
+[#_camel_apache_org_v1_ErrorHandlerLog]
+=== ErrorHandlerLog
-First time the condition status transitioned to True.
+*Appears on:*
-|`reason` +
-string
-|
+* <<#_camel_apache_org_v1_ErrorHandlerSink, ErrorHandlerSink>>
+ErrorHandlerLog represent a default (log) error handler type
-The reason for the condition's last transition.
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`message` +
-string
+|`ErrorHandlerNone` +
+*xref:#_camel_apache_org_v1_ErrorHandlerNone[ErrorHandlerNone]*
|
-A human-readable message indicating details about the transition.
-|`pods` +
-*xref:#_camel_apache_org_v1_PodCondition[[\]PodCondition]*
+
+|`parameters` +
+*xref:#_camel_apache_org_v1_ErrorHandlerParameters[ErrorHandlerParameters]*
|
-Pods collect health and conditions information from the owned PODs
+
|===
-[#_camel_apache_org_v1_IntegrationConditionType]
-=== IntegrationConditionType(`string` alias)
+[#_camel_apache_org_v1_ErrorHandlerNone]
+=== ErrorHandlerNone
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationCondition, IntegrationCondition>>
+* <<#_camel_apache_org_v1_ErrorHandlerLog, ErrorHandlerLog>>
-IntegrationConditionType --
+ErrorHandlerNone --
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-[#_camel_apache_org_v1_IntegrationKitCondition]
-=== IntegrationKitCondition
+
+|===
+
+[#_camel_apache_org_v1_ErrorHandlerParameters]
+=== ErrorHandlerParameters
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
+* <<#_camel_apache_org_v1_ErrorHandlerLog, ErrorHandlerLog>>
-IntegrationKitCondition describes the state of a resource at a certain point.
+ErrorHandlerParameters represent an unstructured object for error handler parameters
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`type` +
-*xref:#_camel_apache_org_v1_IntegrationKitConditionType[IntegrationKitConditionType]*
-|
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
-Type of integration condition.
-|`status` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
-|
-Status of the condition, one of True, False, Unknown.
+|===
-|`lastUpdateTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
+[#_camel_apache_org_v1_ErrorHandlerSink]
+=== ErrorHandlerSink
+ErrorHandlerSink represents a sink error handler type which behave like a dead letter channel
-The last time this condition was updated.
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`lastTransitionTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|`ErrorHandlerLog` +
+*xref:#_camel_apache_org_v1_ErrorHandlerLog[ErrorHandlerLog]*
|
-Last time the condition transitioned from one status to another.
-
-|`reason` +
-string
-|
-
-The reason for the condition's last transition.
-|`message` +
-string
+|`endpoint` +
+*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
|
-A human-readable message indicating details about the transition.
+
|===
-[#_camel_apache_org_v1_IntegrationKitConditionType]
-=== IntegrationKitConditionType(`string` alias)
+[#_camel_apache_org_v1_ErrorHandlerSpec]
+=== ErrorHandlerSpec
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKitCondition, IntegrationKitCondition>>
+* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
-IntegrationKitConditionType --
+ErrorHandlerSpec represents an unstructured object for an error handler
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-[#_camel_apache_org_v1_IntegrationKitPhase]
-=== IntegrationKitPhase(`string` alias)
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
-*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
-IntegrationKitPhase --
-[#_camel_apache_org_v1_IntegrationKitSpec]
-=== IntegrationKitSpec
+|===
+
+[#_camel_apache_org_v1_ErrorHandlerType]
+=== ErrorHandlerType(`string` alias)
+
+ErrorHandlerType a type of error handler (ie, sink)
+
+
+[#_camel_apache_org_v1_EventTypeSpec]
+=== EventTypeSpec
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKit, IntegrationKit>>
+* <<#_camel_apache_org_v1_Endpoint, Endpoint>>
+* <<#_camel_apache_org_v1_KameletSpec, KameletSpec>>
-IntegrationKitSpec defines a container image and additional configurations required to kick off an `Integration` with certain features
+EventTypeSpec represents a specification for an event type
+Deprecated: In favor of using DataTypeSpec
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`image` +
+|`mediaType` +
string
|
-the container image as identified in the container registry
+media type as expected for HTTP media types (ie, application/json)
-|`dependencies` +
-[]string
+|`schema` +
+*xref:#_camel_apache_org_v1_JSONSchemaProps[JSONSchemaProps]*
|
-a list of Camel dependecies used by this kit
-
-|`profile` +
-*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
-|
-
+the expected schema for the event
-the profile which is expected by this kit
-|`traits` +
-*xref:#_camel_apache_org_v1_IntegrationKitTraits[IntegrationKitTraits]*
-|
+|===
+[#_camel_apache_org_v1_ExternalDocumentation]
+=== ExternalDocumentation
-traits that the kit will execute
+*Appears on:*
-|`configuration` +
-*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
-|
+* <<#_camel_apache_org_v1_JSONSchemaProps, JSONSchemaProps>>
+ExternalDocumentation allows referencing an external resource for extended documentation.
-Deprecated:
-Use camel trait (camel.properties) to manage properties
-Use mount trait (mount.configs) to manage configs
-Use mount trait (mount.resources) to manage resources
-Use mount trait (mount.volumes) to manage volumes
-configuration used by the kit
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`repositories` +
-[]string
+|`description` +
+string
|
-Maven repositories that can be used by the kit
-|`sources` +
-*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
+
+|`url` +
+string
|
-the sources to add at build time
+
|===
-[#_camel_apache_org_v1_IntegrationKitStatus]
-=== IntegrationKitStatus
+[#_camel_apache_org_v1_Failure]
+=== Failure
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKit, IntegrationKit>>
+* <<#_camel_apache_org_v1_BuildStatus, BuildStatus>>
+* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
-IntegrationKitStatus defines the observed state of IntegrationKit
+Failure represent a message specifying the reason and the time of an event failure
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`observedGeneration` +
-int64
+|`reason` +
+string
|
-ObservedGeneration is the most recent generation observed for this IntegrationKit.
+a short text specifying the reason
-|`phase` +
-*xref:#_camel_apache_org_v1_IntegrationKitPhase[IntegrationKitPhase]*
+|`time` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
|
-phase of the kit
+the time when the failure has happened
-|`baseImage` +
-string
+|`recovery` +
+*xref:#_camel_apache_org_v1_FailureRecovery[FailureRecovery]*
|
-base image used by the kit
-
-|`image` +
-string
-|
-
+the recovery attempted for this failure
-actual image name of the kit
-|`digest` +
-string
-|
+|===
+[#_camel_apache_org_v1_FailureRecovery]
+=== FailureRecovery
-actual image digest of the kit
+*Appears on:*
-|`artifacts` +
-*xref:#_camel_apache_org_v1_Artifact[[\]Artifact]*
-|
+* <<#_camel_apache_org_v1_Failure, Failure>>
+FailureRecovery defines the attempts to recover a failure
-list of artifacts used by the kit
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`failure` +
-*xref:#_camel_apache_org_v1_Failure[Failure]*
+|`attempt` +
+int
|
-failure reason (if any)
+attempt number
-|`runtimeVersion` +
-string
+|`attemptMax` +
+int
|
-the runtime version for which this kit was configured
+maximum number of attempts
-|`runtimeProvider` +
-*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
+|`attemptTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
|
+*(Optional)*
+time of the attempt execution
-the runtime provider for which this kit was configured
-|`platform` +
-string
-|
+|===
+[#_camel_apache_org_v1_Flow]
+=== Flow
-the platform for which this kit was configured
+*Appears on:*
-|`version` +
-string
-|
+* <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
+Flow is an unstructured object representing a Camel Flow in YAML/JSON DSL
-the Camel K operator version for which this kit was configured
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
-|`conditions` +
-*xref:#_camel_apache_org_v1_IntegrationKitCondition[[\]IntegrationKitCondition]*
-|
-a list of conditions which happened for the events related the kit
|===
-[#_camel_apache_org_v1_IntegrationKitTraits]
-=== IntegrationKitTraits
+[#_camel_apache_org_v1_HeaderSpec]
+=== HeaderSpec
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationKitSpec, IntegrationKitSpec>>
+* <<#_camel_apache_org_v1_DataTypeSpec, DataTypeSpec>>
+* <<#_camel_apache_org_v1_DataTypesSpec, DataTypesSpec>>
-IntegrationKitTraits defines traits assigned to an `IntegrationKit`
+HeaderSpec represents the specification for a header used in the Kamelet
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`builder` +
-*xref:#_camel_apache_org_v1_trait_BuilderTrait[BuilderTrait]*
+|`type` +
+string
|
-The builder trait is internally used to determine the best strategy to build and configure IntegrationKits.
-
-|`camel` +
-*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
-|
-
-The Camel trait sets up Camel configuration.
-|`quarkus` +
-*xref:#_camel_apache_org_v1_trait_QuarkusTrait[QuarkusTrait]*
+|`title` +
+string
|
-The Quarkus trait configures the Quarkus runtime.
-It's enabled by default.
-NOTE: Compiling to a native executable, i.e. when using `package-type=native`, is only supported for kamelets, as well as YAML and XML integrations. It also requires at least 4GiB of memory, so the Pod running the native build, that is either the operator Pod, or the build Pod (depending on the build strategy configured for the platform), must have enough memory available.
-
-|`registry` +
-*xref:#_camel_apache_org_v1_trait_RegistryTrait[RegistryTrait]*
-|
-
-The Registry trait sets up Maven to use the Image registry as a Maven repository.
-|`addons` +
-*xref:#_camel_apache_org_v1_AddonTrait[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.AddonTrait]*
+|`description` +
+string
|
-The collection of addon trait configurations
-
-
-|===
-[#_camel_apache_org_v1_IntegrationPhase]
-=== IntegrationPhase(`string` alias)
-*Appears on:*
+|`required` +
+bool
+|
-* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
-IntegrationPhase --
-[#_camel_apache_org_v1_IntegrationPlatformBuildPublishStrategy]
-=== IntegrationPlatformBuildPublishStrategy(`string` alias)
+|`default` +
+string
+|
-*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformBuildSpec, IntegrationPlatformBuildSpec>>
-IntegrationPlatformBuildPublishStrategy defines the strategy used to package and publish an Integration base image
-[#_camel_apache_org_v1_IntegrationPlatformBuildSpec]
-=== IntegrationPlatformBuildSpec
+|===
-*Appears on:*
+[#_camel_apache_org_v1_HealthCheck]
+=== HealthCheck
-* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
-IntegrationPlatformBuildSpec contains platform related build information.
-This configuration can be used to tune the behavior of the Integration/IntegrationKit image builds.
-You can define the build strategy, the image registry to use and the Maven configuration to adopt.
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`buildStrategy` +
-*xref:#_camel_apache_org_v1_BuildStrategy[BuildStrategy]*
+|`status` +
+*xref:#_camel_apache_org_v1_HealthCheckStatus[HealthCheckStatus]*
|
-the strategy to adopt for building an Integration base image
-
-|`publishStrategy` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformBuildPublishStrategy[IntegrationPlatformBuildPublishStrategy]*
-|
-
-the strategy to adopt for publishing an Integration base image
-|`runtimeVersion` +
-string
+|`checks` +
+*xref:#_camel_apache_org_v1_HealthCheckResponse[[\]HealthCheckResponse]*
|
-the Camel K Runtime dependency version
-|`runtimeProvider` +
-*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
-|
-the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5)
+|===
-|`baseImage` +
-string
-|
+[#_camel_apache_org_v1_HealthCheckResponse]
+=== HealthCheckResponse
+*Appears on:*
-a base image that can be used as base layer for all images.
-It can be useful if you want to provide some custom base image with further utility softwares
+* <<#_camel_apache_org_v1_HealthCheck, HealthCheck>>
+* <<#_camel_apache_org_v1_PodCondition, PodCondition>>
-|`registry` +
-*xref:#_camel_apache_org_v1_RegistrySpec[RegistrySpec]*
-|
-the image registry used to push/pull Integration images
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`buildCatalogToolTimeout` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#duration-v1-meta[Kubernetes meta/v1.Duration]*
+|`name` +
+string
|
-the timeout (in seconds) to use when creating the build tools container image
-
-|`timeout` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#duration-v1-meta[Kubernetes meta/v1.Duration]*
-|
-
-how much time to wait before time out the build process
-|`maven` +
-*xref:#_camel_apache_org_v1_MavenSpec[MavenSpec]*
+|`status` +
+*xref:#_camel_apache_org_v1_HealthCheckStatus[HealthCheckStatus]*
|
-Maven configuration used to build the Camel/Camel-Quarkus applications
-
-|`PublishStrategyOptions` +
-map[string]string
-|
-
-Generic options that can used by each publish strategy
-|`maxRunningBuilds` +
-int32
+|`data` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
|
-the maximum amount of parallel running builds started by this operator instance
+
|===
-[#_camel_apache_org_v1_IntegrationPlatformCluster]
-=== IntegrationPlatformCluster(`string` alias)
+[#_camel_apache_org_v1_HealthCheckStatus]
+=== HealthCheckStatus(`string` alias)
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
+* <<#_camel_apache_org_v1_HealthCheck, HealthCheck>>
+* <<#_camel_apache_org_v1_HealthCheckResponse, HealthCheckResponse>>
-IntegrationPlatformCluster is the kind of orchestration cluster the platform is installed into
-[#_camel_apache_org_v1_IntegrationPlatformCondition]
-=== IntegrationPlatformCondition
+
+[#_camel_apache_org_v1_IntegrationCondition]
+=== IntegrationCondition
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
-IntegrationPlatformCondition describes the state of a resource at a certain point.
+IntegrationCondition describes the state of a resource at a certain point.
[cols="2,2a",options="header"]
|===
@@ -1947,7 +2211,7 @@ IntegrationPlatformCondition describes the state of a resource at a certain poin
|Description
|`type` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformConditionType[IntegrationPlatformConditionType]*
+*xref:#_camel_apache_org_v1_IntegrationConditionType[IntegrationConditionType]*
|
@@ -1974,6 +2238,13 @@ The last time this condition was updated.
Last time the condition transitioned from one status to another.
+|`firstTruthyTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+First time the condition status transitioned to True.
+
|`reason` +
string
|
@@ -1988,441 +2259,1493 @@ string
A human-readable message indicating details about the transition.
+|`pods` +
+*xref:#_camel_apache_org_v1_PodCondition[[\]PodCondition]*
+|
+
+
+Pods collect health and conditions information from the owned PODs
+
|===
-[#_camel_apache_org_v1_IntegrationPlatformConditionType]
-=== IntegrationPlatformConditionType(`string` alias)
+[#_camel_apache_org_v1_IntegrationConditionType]
+=== IntegrationConditionType(`string` alias)
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformCondition, IntegrationPlatformCondition>>
+* <<#_camel_apache_org_v1_IntegrationCondition, IntegrationCondition>>
-IntegrationPlatformConditionType defines the type of condition
+IntegrationConditionType --
-[#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec]
-=== IntegrationPlatformKameletRepositorySpec
+[#_camel_apache_org_v1_IntegrationKitCondition]
+=== IntegrationKitCondition
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformKameletSpec, IntegrationPlatformKameletSpec>>
+* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
-IntegrationPlatformKameletRepositorySpec defines the location of the Kamelet catalog to use
+IntegrationKitCondition describes the state of a resource at a certain point.
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`uri` +
+|`type` +
+*xref:#_camel_apache_org_v1_IntegrationKitConditionType[IntegrationKitConditionType]*
+|
+
+
+Type of integration condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
string
|
-the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human-readable message indicating details about the transition.
|===
-[#_camel_apache_org_v1_IntegrationPlatformKameletSpec]
-=== IntegrationPlatformKameletSpec
+[#_camel_apache_org_v1_IntegrationKitConditionType]
+=== IntegrationKitConditionType(`string` alias)
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
+* <<#_camel_apache_org_v1_IntegrationKitCondition, IntegrationKitCondition>>
+
+IntegrationKitConditionType --
+
+
+[#_camel_apache_org_v1_IntegrationKitPhase]
+=== IntegrationKitPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>>
+
+IntegrationKitPhase --
-IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform
+
+[#_camel_apache_org_v1_IntegrationKitSpec]
+=== IntegrationKitSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationKit, IntegrationKit>>
+
+IntegrationKitSpec defines a container image and additional configurations required to kick off an `Integration` with certain features
[cols="2,2a",options="header"]
|===
|Field
|Description
+|`image` +
+string
+|
+
+
+the container image as identified in the container registry
+
+|`dependencies` +
+[]string
+|
+
+
+a list of Camel dependecies used by this kit
+
+|`profile` +
+*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+|
+
+
+the profile which is expected by this kit
+
+|`traits` +
+*xref:#_camel_apache_org_v1_IntegrationKitTraits[IntegrationKitTraits]*
+|
+
+
+traits that the kit will execute
+
+|`configuration` +
+*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|
+
+
+Deprecated:
+Use camel trait (camel.properties) to manage properties
+Use mount trait (mount.configs) to manage configs
+Use mount trait (mount.resources) to manage resources
+Use mount trait (mount.volumes) to manage volumes
+configuration used by the kit
+
|`repositories` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec[[\]IntegrationPlatformKameletRepositorySpec]*
+[]string
|
-remote repository used to retrieve Kamelet catalog
+Maven repositories that can be used by the kit
+
+|`sources` +
+*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
+|
+
+
+the sources to add at build time
|===
-[#_camel_apache_org_v1_IntegrationPlatformPhase]
-=== IntegrationPlatformPhase(`string` alias)
+[#_camel_apache_org_v1_IntegrationKitStatus]
+=== IntegrationKitStatus
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+* <<#_camel_apache_org_v1_IntegrationKit, IntegrationKit>>
-IntegrationPlatformPhase is the phase of an IntegrationPlatform
+IntegrationKitStatus defines the observed state of IntegrationKit
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
-[#_camel_apache_org_v1_IntegrationPlatformSpec]
-=== IntegrationPlatformSpec
+ObservedGeneration is the most recent generation observed for this IntegrationKit.
+
+|`phase` +
+*xref:#_camel_apache_org_v1_IntegrationKitPhase[IntegrationKitPhase]*
+|
+
+
+phase of the kit
+
+|`baseImage` +
+string
+|
+
+
+base image used by the kit
+
+|`image` +
+string
+|
+
+
+actual image name of the kit
+
+|`digest` +
+string
+|
+
+
+actual image digest of the kit
+
+|`artifacts` +
+*xref:#_camel_apache_org_v1_Artifact[[\]Artifact]*
+|
+
+
+list of artifacts used by the kit
+
+|`failure` +
+*xref:#_camel_apache_org_v1_Failure[Failure]*
+|
+
+
+failure reason (if any)
+
+|`runtimeVersion` +
+string
+|
+
+
+the runtime version for which this kit was configured
+
+|`runtimeProvider` +
+*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
+|
+
+
+the runtime provider for which this kit was configured
+
+|`platform` +
+string
+|
+
+
+the platform for which this kit was configured
+
+|`version` +
+string
+|
+
+
+the Camel K operator version for which this kit was configured
+
+|`conditions` +
+*xref:#_camel_apache_org_v1_IntegrationKitCondition[[\]IntegrationKitCondition]*
+|
+
+
+a list of conditions which happened for the events related the kit
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationKitTraits]
+=== IntegrationKitTraits
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatform, IntegrationPlatform>>
-* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+* <<#_camel_apache_org_v1_IntegrationKitSpec, IntegrationKitSpec>>
-IntegrationPlatformSpec defines the desired state of IntegrationPlatform
+IntegrationKitTraits defines traits assigned to an `IntegrationKit`
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`cluster` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformCluster[IntegrationPlatformCluster]*
+|`builder` +
+*xref:#_camel_apache_org_v1_trait_BuilderTrait[BuilderTrait]*
|
-what kind of cluster you're running (ie, plain Kubernetes or OpenShift)
+The builder trait is internally used to determine the best strategy to build and configure IntegrationKits.
-|`profile` +
-*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+|`camel` +
+*xref:#_camel_apache_org_v1_trait_CamelTrait[CamelTrait]*
|
-the profile you wish to use. It will apply certain traits which are required by the specific profile chosen.
-It usually relates the Cluster with the optional definition of special profiles (ie, Knative)
+The Camel trait sets up Camel configuration.
-|`build` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformBuildSpec[IntegrationPlatformBuildSpec]*
+|`quarkus` +
+*xref:#_camel_apache_org_v1_trait_QuarkusTrait[QuarkusTrait]*
|
-specify how to build the Integration/IntegrationKits
+The Quarkus trait configures the Quarkus runtime.
+It's enabled by default.
+NOTE: Compiling to a native executable, i.e. when using `package-type=native`, is only supported for kamelets, as well as YAML and XML integrations. It also requires at least 4GiB of memory, so the Pod running the native build, that is either the operator Pod, or the build Pod (depending on the build strategy configured for the platform), must have enough memory available.
+
+|`registry` +
+*xref:#_camel_apache_org_v1_trait_RegistryTrait[RegistryTrait]*
+|
+
+
+The Registry trait sets up Maven to use the Image registry as a Maven repository.
+
+|`addons` +
+*xref:#_camel_apache_org_v1_AddonTrait[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.AddonTrait]*
+|
+
+
+The collection of addon trait configurations
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPhase]
+=== IntegrationPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
+
+IntegrationPhase --
+
+
+[#_camel_apache_org_v1_IntegrationPlatformBuildPublishStrategy]
+=== IntegrationPlatformBuildPublishStrategy(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformBuildSpec, IntegrationPlatformBuildSpec>>
+
+IntegrationPlatformBuildPublishStrategy defines the strategy used to package and publish an Integration base image
+
+
+[#_camel_apache_org_v1_IntegrationPlatformBuildSpec]
+=== IntegrationPlatformBuildSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
+
+IntegrationPlatformBuildSpec contains platform related build information.
+This configuration can be used to tune the behavior of the Integration/IntegrationKit image builds.
+You can define the build strategy, the image registry to use and the Maven configuration to adopt.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`buildStrategy` +
+*xref:#_camel_apache_org_v1_BuildStrategy[BuildStrategy]*
+|
+
+
+the strategy to adopt for building an Integration base image
+
+|`publishStrategy` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformBuildPublishStrategy[IntegrationPlatformBuildPublishStrategy]*
+|
+
+
+the strategy to adopt for publishing an Integration base image
+
+|`runtimeVersion` +
+string
+|
+
+
+the Camel K Runtime dependency version
+
+|`runtimeProvider` +
+*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
+|
+
+
+the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5)
+
+|`baseImage` +
+string
+|
+
+
+a base image that can be used as base layer for all images.
+It can be useful if you want to provide some custom base image with further utility softwares
+
+|`registry` +
+*xref:#_camel_apache_org_v1_RegistrySpec[RegistrySpec]*
+|
+
+
+the image registry used to push/pull Integration images
+
+|`buildCatalogToolTimeout` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#duration-v1-meta[Kubernetes meta/v1.Duration]*
+|
+
+
+the timeout (in seconds) to use when creating the build tools container image
+
+|`timeout` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#duration-v1-meta[Kubernetes meta/v1.Duration]*
+|
+
+
+how much time to wait before time out the build process
+
+|`maven` +
+*xref:#_camel_apache_org_v1_MavenSpec[MavenSpec]*
+|
+
+
+Maven configuration used to build the Camel/Camel-Quarkus applications
+
+|`PublishStrategyOptions` +
+map[string]string
+|
+
+
+Generic options that can used by each publish strategy
+
+|`maxRunningBuilds` +
+int32
+|
+
+
+the maximum amount of parallel running builds started by this operator instance
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPlatformCluster]
+=== IntegrationPlatformCluster(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
+
+IntegrationPlatformCluster is the kind of orchestration cluster the platform is installed into
+
+
+[#_camel_apache_org_v1_IntegrationPlatformCondition]
+=== IntegrationPlatformCondition
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+
+IntegrationPlatformCondition describes the state of a resource at a certain point.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformConditionType[IntegrationPlatformConditionType]*
+|
+
+
+Type of integration condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
+string
+|
+
+
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human-readable message indicating details about the transition.
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPlatformConditionType]
+=== IntegrationPlatformConditionType(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformCondition, IntegrationPlatformCondition>>
+
+IntegrationPlatformConditionType defines the type of condition
+
+
+[#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec]
+=== IntegrationPlatformKameletRepositorySpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformKameletSpec, IntegrationPlatformKameletSpec>>
+
+IntegrationPlatformKameletRepositorySpec defines the location of the Kamelet catalog to use
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`uri` +
+string
+|
+
+
+the remote repository in the format github:ORG/REPO/PATH_TO_KAMELETS_FOLDER
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPlatformKameletSpec]
+=== IntegrationPlatformKameletSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformSpec, IntegrationPlatformSpec>>
+
+IntegrationPlatformKameletSpec define the behavior for all the Kamelets controller by the IntegrationPlatform
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`repositories` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformKameletRepositorySpec[[\]IntegrationPlatformKameletRepositorySpec]*
+|
+
+
+remote repository used to retrieve Kamelet catalog
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPlatformPhase]
+=== IntegrationPlatformPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+
+IntegrationPlatformPhase is the phase of an IntegrationPlatform
+
+
+[#_camel_apache_org_v1_IntegrationPlatformSpec]
+=== IntegrationPlatformSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatform, IntegrationPlatform>>
+* <<#_camel_apache_org_v1_IntegrationPlatformStatus, IntegrationPlatformStatus>>
+
+IntegrationPlatformSpec defines the desired state of IntegrationPlatform
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`cluster` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformCluster[IntegrationPlatformCluster]*
+|
+
+
+what kind of cluster you're running (ie, plain Kubernetes or OpenShift)
+
+|`profile` +
+*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+|
+
+
+the profile you wish to use. It will apply certain traits which are required by the specific profile chosen.
+It usually relates the Cluster with the optional definition of special profiles (ie, Knative)
+
+|`build` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformBuildSpec[IntegrationPlatformBuildSpec]*
+|
+
+
+specify how to build the Integration/IntegrationKits
+
+|`traits` +
+*xref:#_camel_apache_org_v1_Traits[Traits]*
+|
+
+
+list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationPlatform
+
+|`configuration` +
+*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|
+
+
+Deprecated:
+Use camel trait (camel.properties) to manage properties
+Use mount trait (mount.configs) to manage configs
+Use mount trait (mount.resources) to manage resources
+Use mount trait (mount.volumes) to manage volumes
+list of configuration properties to be attached to all the Integration/IntegrationKits built from this IntegrationPlatform
+
+|`kamelet` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformKameletSpec[IntegrationPlatformKameletSpec]*
+|
+
+
+configuration to be executed to all Kamelets controlled by this IntegrationPlatform
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationPlatformStatus]
+=== IntegrationPlatformStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_IntegrationPlatform, IntegrationPlatform>>
+
+IntegrationPlatformStatus defines the observed state of IntegrationPlatform
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`IntegrationPlatformSpec` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformSpec[IntegrationPlatformSpec]*
+|(Members of `IntegrationPlatformSpec` are embedded into this type.)
+
+
+
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this IntegrationPlatform.
+
+|`phase` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformPhase[IntegrationPlatformPhase]*
+|
+
+
+defines in what phase the IntegrationPlatform is found
+
+|`conditions` +
+*xref:#_camel_apache_org_v1_IntegrationPlatformCondition[[\]IntegrationPlatformCondition]*
+|
+
+
+which are the conditions met (particularly useful when in ERROR phase)
+
+|`version` +
+string
+|
+
+
+the Camel K operator version controlling this IntegrationPlatform
+
+|`info` +
+map[string]string
+|
+
+
+generic information related to the build of Camel K operator software
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationSpec]
+=== IntegrationSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Integration, Integration>>
+* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
+
+IntegrationSpec specifies the configuration of an Integration.
+The Integration will be watched by the operator which will be in charge to run the related application, according to the configuration specified.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`replicas` +
+int32
+|
+
+
+the number of `Pods` needed for the running Integration
+
+|`sources` +
+*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
+|
+
+
+the sources which contain the Camel routes to run
+
+|`flows` +
+*xref:#_camel_apache_org_v1_Flow[[\]Flow]*
+|
+
+
+a source in YAML DSL language which contain the routes to run
+
+|`integrationKit` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
+|
+
+
+the reference of the `IntegrationKit` which is used for this Integration
+
+|`dependencies` +
+[]string
+|
+
+
+the list of Camel or Maven dependencies required by the Integration
+
+|`profile` +
+*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+|
+
+
+the profile needed to run this Integration
+
+|`traits` +
+*xref:#_camel_apache_org_v1_Traits[Traits]*
+|
+
+
+the traits needed to run this Integration
+
+|`template` +
+*xref:#_camel_apache_org_v1_PodSpecTemplate[PodSpecTemplate]*
+|
+
+
+Pod template customization
+
+|`configuration` +
+*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|
+
+
+Deprecated:
+Use camel trait (camel.properties) to manage properties
+Use mount trait (mount.configs) to manage configs
+Use mount trait (mount.resources) to manage resources
+Use mount trait (mount.volumes) to manage volumes
+
+|`repositories` +
+[]string
+|
+
+
+additional Maven repositories to be used
+
+|`serviceAccountName` +
+string
+|
+
+
+custom SA to use for the Integration
+
+
+|===
+
+[#_camel_apache_org_v1_IntegrationStatus]
+=== IntegrationStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Integration, Integration>>
+
+IntegrationStatus defines the observed state of Integration
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this Integration.
+
+|`phase` +
+*xref:#_camel_apache_org_v1_IntegrationPhase[IntegrationPhase]*
+|
+
+
+the actual phase
+
+|`digest` +
+string
+|
+
+
+the digest calculated for this Integration
+
+|`image` +
+string
+|
+
+
+the container image used
+
+|`dependencies` +
+[]string
+|
+
+
+a list of dependencies needed by the application
+
+|`profile` +
+*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+|
+
+
+the profile needed to run this Integration
+
+|`integrationKit` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
+|
+
+
+the reference of the `IntegrationKit` which is used for this Integration
+
+|`platform` +
+string
+|
+
+
+The IntegrationPlatform watching this Integration
+
+|`generatedSources` +
+*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
+|
+
+
+a list of sources generated for this Integration
+
+|`runtimeVersion` +
+string
+|
+
+
+the runtime version targeted for this Integration
+
+|`runtimeProvider` +
+*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
+|
+
+
+the runtime provider targeted for this Integration
+
+|`configuration` +
+*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|
+
+
+Deprecated:
+a list of configuration specification
+
+|`conditions` +
+*xref:#_camel_apache_org_v1_IntegrationCondition[[\]IntegrationCondition]*
+|
+
+
+a list of events happened for the Integration
+
+|`version` +
+string
+|
+
+
+the operator version
+
+|`replicas` +
+int32
+|
+
+
+the number of replicas
+
+|`selector` +
+string
+|
+
+
+label selector
+
+|`capabilities` +
+[]string
+|
+
+
+features offered by the Integration
+
+|`lastInitTimestamp` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+the timestamp representing the last time when this integration was initialized.
+
+
+|===
+
+[#_camel_apache_org_v1_JSON]
+=== JSON
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_JSONSchemaProp, JSONSchemaProp>>
+* <<#_camel_apache_org_v1_JSONSchemaProps, JSONSchemaProps>>
+
+JSON represents any valid JSON value.
+These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
+
+
+
+
+
+|===
+
+[#_camel_apache_org_v1_JSONSchemaProp]
+=== JSONSchemaProp
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_JSONSchemaProps, JSONSchemaProps>>
+
+
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`id` +
+string
+|
+
+
+
+
+|`deprecated` +
+bool
+|
+
+
+
+
+|`description` +
+string
+|
+
+
+
+
+|`type` +
+string
+|
+
+
+
+
+|`format` +
+string
+|
+
+
+format is an OpenAPI v3 format string. Unknown formats are ignored. The following formats are validated:
+
+- bsonobjectid: a bson object ID, i.e. a 24 characters hex string
+- uri: an URI as parsed by Golang net/url.ParseRequestURI
+- email: an email address as parsed by Golang net/mail.ParseAddress
+- hostname: a valid representation for an Internet host name, as defined by RFC 1034, section 3.1 [RFC1034].
+- ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+- ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+- cidr: a CIDR as parsed by Golang net.ParseCIDR
+- mac: a MAC address as parsed by Golang net.ParseMAC
+- uuid: an UUID that allows uppercase defined by the regex (?i)^[0-9a-f]\{8}-?[0-9a-f]\{4}-?[0-9a-f]\{4}-?[0-9a-f]\{4}-?[0-9a-f]\{12}$
+- uuid3: an UUID3 that allows uppercase defined by the regex (?i)^[0-9a-f]\{8}-?[0-9a-f]\{4}-?3[0-9a-f]\{3}-?[0-9a-f]\{4}-?[0-9a-f]\{12}$
+- uuid4: an UUID4 that allows uppercase defined by the regex (?i)^[0-9a-f]\{8}-?[0-9a-f]\{4}-?4[0-9a-f]\{3}-?[89ab][0-9a-f]\{3}-?[0-9a-f]\{12}$
+- uuid5: an UUID5 that allows uppercase defined by the regex (?i)^[0-9a-f]\{8}-?[0-9a-f]\{4}-?5[0-9a-f]\{3}-?[89ab][0-9a-f]\{3}-?[0-9a-f]\{12}$
+- isbn: an ISBN10 or ISBN13 number string like "0321751043" or "978-0321751041"
+- isbn10: an ISBN10 number string like "0321751043"
+- isbn13: an ISBN13 number string like "978-0321751041"
+- creditcard: a credit card number defined by the regex ^(?:4[0-9]\{12}(?:[0-9]\{3})?{vbar}5[1-5][0-9]\{14}{vbar}6(?:011{vbar}5[0-9][0-9])[0-9]\{12}{vbar}3[47][0-9]\{13}{vbar}3(?:0[0-5]{vbar}[68][0-9])[0-9]\{11}{vbar}(?:2131{vbar}1800{vbar}35\\d\{3})\\d\{11})$ with any non digit characters mixed in
+- ssn: a U.S. social security number following the regex ^\\d\{3}[- ]?\\d\{2}[- ]?\\d\{4}$
+- hexcolor: an hexadecimal color code like "\#FFFFFF" following the regex ^#?([0-9a-fA-F]\{3}{vbar}[0-9a-fA-F]\{6})$
+- rgbcolor: an RGB color code like rgb like "rgb(255,255,255)"
+- byte: base64 encoded binary data
+- password: any kind of string
+- date: a date string like "2006-01-02" as defined by full-date in RFC3339
+- duration: a duration string like "22 ns" as parsed by Golang time.ParseDuration or compatible with Scala duration format
+- datetime: a date time string like "2014-12-15T19:30:20.000Z" as defined by date-time in RFC3339.
+
+|`title` +
+string
+|
+
+
+
+
+|`default` +
+*xref:#_camel_apache_org_v1_JSON[JSON]*
+|
+
+
+default is a default value for undefined object fields.
+
+|`maximum` +
+encoding/json.Number
+|
+
+
+
+
+|`exclusiveMaximum` +
+bool
+|
+
+
+
+
+|`minimum` +
+encoding/json.Number
+|
+
+
+
+
+|`exclusiveMinimum` +
+bool
+|
+
+
+
+
+|`maxLength` +
+int64
+|
+
+
+
+
+|`minLength` +
+int64
+|
+
+
+
+
+|`pattern` +
+string
+|
+
+
+
+
+|`maxItems` +
+int64
+|
+
+
+
+
+|`minItems` +
+int64
+|
+
+
+
+
+|`uniqueItems` +
+bool
+|
+
+
+
+
+|`maxProperties` +
+int64
+|
+
+
+
+
+|`minProperties` +
+int64
+|
+
+
+
+
+|`multipleOf` +
+encoding/json.Number
+|
+
+
+
+
+|`enum` +
+*xref:#_camel_apache_org_v1_JSON[[\]JSON]*
+|
+
+
+
-|`traits` +
-*xref:#_camel_apache_org_v1_Traits[Traits]*
+|`example` +
+*xref:#_camel_apache_org_v1_JSON[JSON]*
|
-list of traits to be executed for all the Integration/IntegrationKits built from this IntegrationPlatform
-|`configuration` +
-*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+
+|`nullable` +
+bool
|
-Deprecated:
-Use camel trait (camel.properties) to manage properties
-Use mount trait (mount.configs) to manage configs
-Use mount trait (mount.resources) to manage resources
-Use mount trait (mount.volumes) to manage volumes
-list of configuration properties to be attached to all the Integration/IntegrationKits built from this IntegrationPlatform
-|`kamelet` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformKameletSpec[IntegrationPlatformKameletSpec]*
+
+|`x-descriptors` +
+[]string
|
-configuration to be executed to all Kamelets controlled by this IntegrationPlatform
+XDescriptors is a list of extended properties that trigger a custom behavior in external systems
|===
-[#_camel_apache_org_v1_IntegrationPlatformStatus]
-=== IntegrationPlatformStatus
+[#_camel_apache_org_v1_JSONSchemaProps]
+=== JSONSchemaProps
*Appears on:*
-* <<#_camel_apache_org_v1_IntegrationPlatform, IntegrationPlatform>>
+* <<#_camel_apache_org_v1_DataTypeSpec, DataTypeSpec>>
+* <<#_camel_apache_org_v1_EventTypeSpec, EventTypeSpec>>
+* <<#_camel_apache_org_v1_KameletSpec, KameletSpec>>
-IntegrationPlatformStatus defines the observed state of IntegrationPlatform
+JSONSchemaProps is a JSON-Schema following Specification Draft 4 (http://json-schema.org/).
[cols="2,2a",options="header"]
|===
|Field
|Description
-|`IntegrationPlatformSpec` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformSpec[IntegrationPlatformSpec]*
-|(Members of `IntegrationPlatformSpec` are embedded into this type.)
+|`id` +
+string
+|
-|`observedGeneration` +
-int64
+|`description` +
+string
|
-ObservedGeneration is the most recent generation observed for this IntegrationPlatform.
-|`phase` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformPhase[IntegrationPlatformPhase]*
+
+|`title` +
+string
|
-defines in what phase the IntegrationPlatform is found
-|`conditions` +
-*xref:#_camel_apache_org_v1_IntegrationPlatformCondition[[\]IntegrationPlatformCondition]*
+
+|`properties` +
+*xref:#_camel_apache_org_v1_JSONSchemaProp[map[string\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.JSONSchemaProp]*
|
-which are the conditions met (particularly useful when in ERROR phase)
-|`version` +
-string
+
+|`required` +
+[]string
|
-the Camel K operator version controlling this IntegrationPlatform
-|`info` +
-map[string]string
+
+|`example` +
+*xref:#_camel_apache_org_v1_JSON[JSON]*
|
-generic information related to the build of Camel K operator software
-|===
+|`externalDocs` +
+*xref:#_camel_apache_org_v1_ExternalDocumentation[ExternalDocumentation]*
+|
-[#_camel_apache_org_v1_IntegrationSpec]
-=== IntegrationSpec
-*Appears on:*
-* <<#_camel_apache_org_v1_Integration, Integration>>
-IntegrationSpec specifies the configuration of an Integration.
-The Integration will be watched by the operator which will be in charge to run the related application, according to the configuration specified.
+|`$schema` +
+*xref:#_camel_apache_org_v1_JSONSchemaURL[JSONSchemaURL]*
+|
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-|`replicas` +
-int32
+
+
+|`type` +
+string
|
-the number of `Pods` needed for the running Integration
-|`sources` +
-*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
-|
-the sources which contain the Camel routes to run
+|===
-|`flows` +
-*xref:#_camel_apache_org_v1_Flow[[\]Flow]*
-|
+[#_camel_apache_org_v1_JSONSchemaURL]
+=== JSONSchemaURL(`string` alias)
+*Appears on:*
-a source in YAML DSL language which contain the routes to run
+* <<#_camel_apache_org_v1_JSONSchemaProps, JSONSchemaProps>>
-|`integrationKit` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
-|
+JSONSchemaURL represents a schema url.
-the reference of the `IntegrationKit` which is used for this Integration
+[#_camel_apache_org_v1_KameletCondition]
+=== KameletCondition
-|`dependencies` +
-[]string
-|
+*Appears on:*
+* <<#_camel_apache_org_v1_KameletStatus, KameletStatus>>
-the list of Camel or Maven dependencies required by the Integration
+KameletCondition describes the state of a resource at a certain point.
-|`profile` +
-*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1_KameletConditionType[KameletConditionType]*
|
-the profile needed to run this Integration
+Type of kamelet condition.
-|`traits` +
-*xref:#_camel_apache_org_v1_Traits[Traits]*
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
|
-the traits needed to run this Integration
+Status of the condition, one of True, False, Unknown.
-|`template` +
-*xref:#_camel_apache_org_v1_PodSpecTemplate[PodSpecTemplate]*
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
|
-Pod template customization
+The last time this condition was updated.
-|`configuration` +
-*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
|
-Deprecated:
-Use camel trait (camel.properties) to manage properties
-Use mount trait (mount.configs) to manage configs
-Use mount trait (mount.resources) to manage resources
-Use mount trait (mount.volumes) to manage volumes
+Last time the condition transitioned from one status to another.
-|`repositories` +
-[]string
+|`reason` +
+string
|
-additional Maven repositories to be used
+The reason for the condition's last transition.
-|`serviceAccountName` +
+|`message` +
string
|
-custom SA to use for the Integration
+A human-readable message indicating details about the transition.
|===
-[#_camel_apache_org_v1_IntegrationStatus]
-=== IntegrationStatus
+[#_camel_apache_org_v1_KameletConditionType]
+=== KameletConditionType(`string` alias)
*Appears on:*
-* <<#_camel_apache_org_v1_Integration, Integration>>
+* <<#_camel_apache_org_v1_KameletCondition, KameletCondition>>
-IntegrationStatus defines the observed state of Integration
+KameletConditionType --
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-|`observedGeneration` +
-int64
-|
+[#_camel_apache_org_v1_KameletPhase]
+=== KameletPhase(`string` alias)
+
+*Appears on:*
+* <<#_camel_apache_org_v1_KameletStatus, KameletStatus>>
-ObservedGeneration is the most recent generation observed for this Integration.
+KameletPhase --
-|`phase` +
-*xref:#_camel_apache_org_v1_IntegrationPhase[IntegrationPhase]*
-|
+[#_camel_apache_org_v1_KameletProperty]
+=== KameletProperty
-the actual phase
+*Appears on:*
-|`digest` +
-string
-|
+* <<#_camel_apache_org_v1_KameletStatus, KameletStatus>>
+KameletProperty specify the behavior of a property in a Kamelet
-the digest calculated for this Integration
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
-|`image` +
+|`name` +
string
|
-the container image used
+the name of the property
-|`dependencies` +
-[]string
+|`default` +
+string
|
-a list of dependencies needed by the application
+the default value of the property (if any)
-|`profile` +
-*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
-|
+|===
-the profile needed to run this Integration
+[#_camel_apache_org_v1_KameletSpec]
+=== KameletSpec
-|`integrationKit` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectreference-v1-core[Kubernetes core/v1.ObjectReference]*
-|
+*Appears on:*
+* <<#_camel_apache_org_v1_Kamelet, Kamelet>>
-the reference of the `IntegrationKit` which is used for this Integration
+KameletSpec specifies the configuration required to execute a Kamelet
-|`platform` +
-string
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`definition` +
+*xref:#_camel_apache_org_v1_JSONSchemaProps[JSONSchemaProps]*
|
-The IntegrationPlatform watching this Integration
+defines the formal configuration of the Kamelet
-|`generatedSources` +
+|`sources` +
*xref:#_camel_apache_org_v1_SourceSpec[[\]SourceSpec]*
|
-a list of sources generated for this Integration
+sources in any Camel DSL supported
-|`runtimeVersion` +
-string
+|`template` +
+*xref:#_camel_apache_org_v1_Template[Template]*
|
-the runtime version targeted for this Integration
+the main source in YAML DSL
-|`runtimeProvider` +
-*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]*
+|`types` +
+*xref:#_camel_apache_org_v1_EventTypeSpec[map[github.com/apache/camel-k/v2/pkg/apis/camel/v1.TypeSlot\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.EventTypeSpec]*
|
-the runtime provider targeted for this Integration
+data specification types for the events consumed/produced by the Kamelet
+Deprecated: In favor of using DataTypes
-|`configuration` +
-*xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]*
+|`dataTypes` +
+*xref:#_camel_apache_org_v1_DataTypesSpec[map[github.com/apache/camel-k/v2/pkg/apis/camel/v1.TypeSlot\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.DataTypesSpec]*
|
-Deprecated:
-a list of configuration specification
+data specification types for the events consumed/produced by the Kamelet
-|`conditions` +
-*xref:#_camel_apache_org_v1_IntegrationCondition[[\]IntegrationCondition]*
+|`dependencies` +
+[]string
|
-a list of events happened for the Integration
+Camel dependencies needed by the Kamelet
-|`version` +
-string
-|
+|===
-the operator version
+[#_camel_apache_org_v1_KameletStatus]
+=== KameletStatus
-|`replicas` +
-int32
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Kamelet, Kamelet>>
+
+KameletStatus defines the observed state of Kamelet
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
|
-the number of replicas
+ObservedGeneration is the most recent generation observed for this Kamelet.
-|`selector` +
-string
+|`phase` +
+*xref:#_camel_apache_org_v1_KameletPhase[KameletPhase]*
|
-label selector
+Phase --
-|`capabilities` +
-[]string
+|`conditions` +
+*xref:#_camel_apache_org_v1_KameletCondition[[\]KameletCondition]*
|
-features offered by the Integration
+Conditions --
-|`lastInitTimestamp` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|`properties` +
+*xref:#_camel_apache_org_v1_KameletProperty[[\]KameletProperty]*
|
-the timestamp representing the last time when this integration was initialized.
+Properties --
|===
@@ -2688,6 +4011,7 @@ See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
*Appears on:*
+* <<#_camel_apache_org_v1_BindingCondition, BindingCondition>>
* <<#_camel_apache_org_v1_IntegrationCondition, IntegrationCondition>>
@@ -2903,8 +4227,14 @@ where to publish the final image
*Appears on:*
* <<#_camel_apache_org_v1_AddonTrait, AddonTrait>>
+* <<#_camel_apache_org_v1_BeanProperties, BeanProperties>>
+* <<#_camel_apache_org_v1_EndpointProperties, EndpointProperties>>
+* <<#_camel_apache_org_v1_ErrorHandlerParameters, ErrorHandlerParameters>>
+* <<#_camel_apache_org_v1_ErrorHandlerSpec, ErrorHandlerSpec>>
* <<#_camel_apache_org_v1_Flow, Flow>>
* <<#_camel_apache_org_v1_HealthCheckResponse, HealthCheckResponse>>
+* <<#_camel_apache_org_v1_JSON, JSON>>
+* <<#_camel_apache_org_v1_Template, Template>>
* <<#_camel_apache_org_v1_TraitConfiguration, TraitConfiguration>>
RawMessage is a raw encoded JSON value.
@@ -3281,6 +4611,7 @@ string
* <<#_camel_apache_org_v1_IntegrationKitSpec, IntegrationKitSpec>>
* <<#_camel_apache_org_v1_IntegrationSpec, IntegrationSpec>>
* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>>
+* <<#_camel_apache_org_v1_KameletSpec, KameletSpec>>
SourceSpec defines the configuration for one or more routes to be executed in a certain Camel DSL language
@@ -3454,6 +4785,30 @@ a SpectrumTask, for Spectrum strategy
a S2iTask, for S2I strategy
+|===
+
+[#_camel_apache_org_v1_Template]
+=== Template
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_KameletSpec, KameletSpec>>
+
+Template is an unstructured object representing a Kamelet template in YAML/JSON DSL
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`RawMessage` +
+*xref:#_camel_apache_org_v1_RawMessage[RawMessage]*
+|(Members of `RawMessage` are embedded into this type.)
+
+
+an unstructured raw message
+
+
|===
[#_camel_apache_org_v1_TraitConfiguration]
@@ -3817,6 +5172,12 @@ Deprecated: for backward compatibility.
|===
+[#_camel_apache_org_v1_TypeSlot]
+=== TypeSlot(`string` alias)
+
+TypeSlot represent a kind of data (ie, input, output, ...)
+
+
[#_camel_apache_org_v1_ValueSource]
=== ValueSource
diff --git a/docs/modules/ROOT/partials/apis/crds-html.adoc b/docs/modules/ROOT/partials/apis/crds-html.adoc
index d4d44ebe2..8ae089c6d 100644
--- a/docs/modules/ROOT/partials/apis/crds-html.adoc
+++ b/docs/modules/ROOT/partials/apis/crds-html.adoc
@@ -3083,7 +3083,7 @@ map[string]string
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1.Integration">Integration</a>,
-<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>IntegrationSpec defines the desired state of Integration</p>
@@ -4576,7 +4576,7 @@ string
<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>,
-<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
+<a href="#camel.apache.org/v1.KameletSpec">KameletSpec</a>)
</p>
<div>
<p>SourceSpec –</p>
@@ -4806,7 +4806,7 @@ S2iTask
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
+<a href="#camel.apache.org/v1.KameletSpec">KameletSpec</a>)
</p>
<div>
<p>Template is an unstructured object representing a Kamelet template in YAML/JSON DSL</p>
@@ -4966,11 +4966,11 @@ Kubernetes core/v1.SecretKeySelector
</div>
Resource Types:
<ul><li>
-<a href="#camel.apache.org/v1alpha1.Kamelet">Kamelet</a>
+<a href="#camel.apache.org/v1.Kamelet">Kamelet</a>
</li><li>
-<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>
+<a href="#camel.apache.org/v1.Binding">Binding</a>
</li></ul>
-<h3 id="camel.apache.org/v1alpha1.Kamelet">Kamelet
+<h3 id="camel.apache.org/v1.Kamelet">Kamelet
</h3>
<div>
<p>Kamelet is the Schema for the kamelets API</p>
@@ -5018,7 +5018,7 @@ Refer to the Kubernetes API documentation for the fields of the
<td>
<code>spec</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletSpec">
+<a href="#camel.apache.org/v1.KameletSpec">
KameletSpec
</a>
</em>
@@ -5104,7 +5104,7 @@ map[github.com/apache/camel-k/pkg/apis/camel/v1alpha1.EventSlot]github.com/apach
<td>
<code>status</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletStatus">
+<a href="#camel.apache.org/v1.KameletStatus">
KameletStatus
</a>
</em>
@@ -5114,7 +5114,7 @@ KameletStatus
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.Binding">Binding
+<h3 id="camel.apache.org/v1.Binding">Binding
</h3>
<div>
<p>Binding is the Schema for the kamelets binding API</p>
@@ -5162,7 +5162,7 @@ Refer to the Kubernetes API documentation for the fields of the
<td>
<code>spec</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.BindingSpec">
+<a href="#camel.apache.org/v1.BindingSpec">
BindingSpec
</a>
</em>
@@ -5254,7 +5254,7 @@ int32
<td>
<code>status</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.BindingStatus">
+<a href="#camel.apache.org/v1.BindingStatus">
BindingStatus
</a>
</em>
@@ -5268,7 +5268,7 @@ BindingStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
+<a href="#camel.apache.org/v1.KameletSpec">KameletSpec</a>)
</p>
<div>
<p>AuthorizationSpec is TODO (oauth information)</p>
@@ -5305,7 +5305,7 @@ RawMessage
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1alpha1.ErrorHandlerSink">ErrorHandlerSink</a>,
-<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>Endpoint represents a source/sink external entity</p>
@@ -5549,7 +5549,7 @@ Endpoint
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>ErrorHandlerSpec represents an unstructured object for an error handler</p>
@@ -5590,7 +5590,7 @@ RawMessage
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1alpha1.Endpoint">Endpoint</a>,
-<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
+<a href="#camel.apache.org/v1.KameletSpec">KameletSpec</a>)
</p>
<div>
</div>
@@ -5989,7 +5989,7 @@ bool
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1alpha1.EventTypeSpec">EventTypeSpec</a>,
-<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
+<a href="#camel.apache.org/v1.KameletSpec">KameletSpec</a>)
</p>
<div>
<p>JSONSchemaProps is a JSON-Schema following Specification Draft 4 (<a href="http://json-schema.org/">http://json-schema.org/</a>).</p>
@@ -6111,11 +6111,11 @@ string
<div>
<p>JSONSchemaURL represents a schema url.</p>
</div>
-<h3 id="camel.apache.org/v1alpha1.BindingCondition">BindingCondition
+<h3 id="camel.apache.org/v1.BindingCondition">BindingCondition
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.BindingStatus">BindingStatus</a>)
+<a href="#camel.apache.org/v1.BindingStatus">BindingStatus</a>)
</p>
<div>
<p>BindingCondition describes the state of a resource at a certain point.</p>
@@ -6132,7 +6132,7 @@ string
<td>
<code>type</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.BindingConditionType">
+<a href="#camel.apache.org/v1.BindingConditionType">
BindingConditionType
</a>
</em>
@@ -6204,27 +6204,27 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.BindingConditionType">BindingConditionType
+<h3 id="camel.apache.org/v1.BindingConditionType">BindingConditionType
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.BindingCondition">BindingCondition</a>)
+<a href="#camel.apache.org/v1.BindingCondition">BindingCondition</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.BindingPhase">BindingPhase
+<h3 id="camel.apache.org/v1.BindingPhase">BindingPhase
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.BindingStatus">BindingStatus</a>)
+<a href="#camel.apache.org/v1.BindingStatus">BindingStatus</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.BindingSpec">BindingSpec
+<h3 id="camel.apache.org/v1.BindingSpec">BindingSpec
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>)
+<a href="#camel.apache.org/v1.Binding">Binding</a>)
</p>
<div>
<p>BindingSpec –</p>
@@ -6315,11 +6315,11 @@ int32
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.BindingStatus">BindingStatus
+<h3 id="camel.apache.org/v1.BindingStatus">BindingStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>)
+<a href="#camel.apache.org/v1.Binding">Binding</a>)
</p>
<div>
<p>BindingStatus –</p>
@@ -6336,7 +6336,7 @@ int32
<td>
<code>phase</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.BindingPhase">
+<a href="#camel.apache.org/v1.BindingPhase">
BindingPhase
</a>
</em>
@@ -6349,7 +6349,7 @@ BindingPhase
<td>
<code>conditions</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.BindingCondition">
+<a href="#camel.apache.org/v1.BindingCondition">
[]BindingCondition
</a>
</em>
@@ -6382,11 +6382,11 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletCondition">KameletCondition
+<h3 id="camel.apache.org/v1.KameletCondition">KameletCondition
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletStatus">KameletStatus</a>)
+<a href="#camel.apache.org/v1.KameletStatus">KameletStatus</a>)
</p>
<div>
<p>KameletCondition describes the state of a resource at a certain point.</p>
@@ -6403,7 +6403,7 @@ string
<td>
<code>type</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletConditionType">
+<a href="#camel.apache.org/v1.KameletConditionType">
KameletConditionType
</a>
</em>
@@ -6475,27 +6475,27 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletConditionType">KameletConditionType
+<h3 id="camel.apache.org/v1.KameletConditionType">KameletConditionType
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletCondition">KameletCondition</a>)
+<a href="#camel.apache.org/v1.KameletCondition">KameletCondition</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.KameletPhase">KameletPhase
+<h3 id="camel.apache.org/v1.KameletPhase">KameletPhase
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletStatus">KameletStatus</a>)
+<a href="#camel.apache.org/v1.KameletStatus">KameletStatus</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.KameletProperty">KameletProperty
+<h3 id="camel.apache.org/v1.KameletProperty">KameletProperty
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletStatus">KameletStatus</a>)
+<a href="#camel.apache.org/v1.KameletStatus">KameletStatus</a>)
</p>
<div>
</div>
@@ -6529,11 +6529,11 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletSpec">KameletSpec
+<h3 id="camel.apache.org/v1.KameletSpec">KameletSpec
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.Kamelet">Kamelet</a>)
+<a href="#camel.apache.org/v1.Kamelet">Kamelet</a>)
</p>
<div>
<p>KameletSpec defines the desired state of Kamelet</p>
@@ -6618,11 +6618,11 @@ map[github.com/apache/camel-k/pkg/apis/camel/v1alpha1.EventSlot]github.com/apach
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletStatus">KameletStatus
+<h3 id="camel.apache.org/v1.KameletStatus">KameletStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.Kamelet">Kamelet</a>)
+<a href="#camel.apache.org/v1.Kamelet">Kamelet</a>)
</p>
<div>
<p>KameletStatus defines the observed state of Kamelet</p>
@@ -6639,7 +6639,7 @@ map[github.com/apache/camel-k/pkg/apis/camel/v1alpha1.EventSlot]github.com/apach
<td>
<code>phase</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletPhase">
+<a href="#camel.apache.org/v1.KameletPhase">
KameletPhase
</a>
</em>
@@ -6651,7 +6651,7 @@ KameletPhase
<td>
<code>conditions</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletCondition">
+<a href="#camel.apache.org/v1.KameletCondition">
[]KameletCondition
</a>
</em>
@@ -6663,7 +6663,7 @@ KameletPhase
<td>
<code>properties</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletProperty">
+<a href="#camel.apache.org/v1.KameletProperty">
[]KameletProperty
</a>
</em>
diff --git a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
index f0f444fab..36d7aea89 100644
--- a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
@@ -5,10 +5,10 @@ Package v1alpha1 contains API Schema definitions for the camel v1alpha1 API grou
== Resource Types
-[#_camel_apache_org_v1alpha1_Binding]
-=== Binding
+[#_camel_apache_org_v1alpha1_Kamelet]
+=== Kamelet
-Binding is the Schema for the kamelets binding API
+Kamelet is the Schema for the kamelets API
[cols="2,2a",options="header"]
|===
@@ -21,7 +21,7 @@ string
|`kind` +
string
-|`Binding`
+|`Kamelet`
|`metadata` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
|
@@ -31,26 +31,26 @@ string
Refer to the Kubernetes API documentation for the fields of the `metadata` field.
|`spec` +
-*xref:#_camel_apache_org_v1alpha1_BindingSpec[BindingSpec]*
+*xref:#_camel_apache_org_v1alpha1_KameletSpec[KameletSpec]*
|
-the specification of a Binding
+the desired specification
|`status` +
-*xref:#_camel_apache_org_v1alpha1_BindingStatus[BindingStatus]*
+*xref:#_camel_apache_org_v1alpha1_KameletStatus[KameletStatus]*
|
-the status of a Binding
+the actual status of the resource
|===
-[#_camel_apache_org_v1alpha1_Kamelet]
-=== Kamelet
+[#_camel_apache_org_v1alpha1_KameletBinding]
+=== KameletBinding
-Kamelet is the Schema for the kamelets API
+KameletBinding is the Schema for the kamelets binding API
[cols="2,2a",options="header"]
|===
@@ -63,7 +63,7 @@ string
|`kind` +
string
-|`Kamelet`
+|`KameletBinding`
|`metadata` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
|
@@ -73,18 +73,18 @@ string
Refer to the Kubernetes API documentation for the fields of the `metadata` field.
|`spec` +
-*xref:#_camel_apache_org_v1alpha1_KameletSpec[KameletSpec]*
+*xref:#_camel_apache_org_v1alpha1_KameletBindingSpec[KameletBindingSpec]*
|
-the desired specification
+the specification of a KameletBinding
|`status` +
-*xref:#_camel_apache_org_v1alpha1_KameletStatus[KameletStatus]*
+*xref:#_camel_apache_org_v1alpha1_KameletBindingStatus[KameletBindingStatus]*
|
-the actual status of the resource
+the status of a KameletBinding
|===
@@ -109,210 +109,6 @@ BeanProperties represent an unstructured object properties to be set on a bean
-|===
-
-[#_camel_apache_org_v1alpha1_BindingCondition]
-=== BindingCondition
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_BindingStatus, BindingStatus>>
-
-BindingCondition describes the state of a resource at a certain point.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`type` +
-*xref:#_camel_apache_org_v1alpha1_BindingConditionType[BindingConditionType]*
-|
-
-
-Type of binding condition.
-
-|`status` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
-|
-
-
-Status of the condition, one of True, False, Unknown.
-
-|`lastUpdateTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-The last time this condition was updated.
-
-|`lastTransitionTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-Last time the condition transitioned from one status to another.
-
-|`reason` +
-string
-|
-
-
-The reason for the condition's last transition.
-
-|`message` +
-string
-|
-
-
-A human readable message indicating details about the transition.
-
-|`pods` +
-[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition
-|
-
-
-Pods collect health and conditions information from the owned PODs
-
-
-|===
-
-[#_camel_apache_org_v1alpha1_BindingConditionType]
-=== BindingConditionType(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_BindingCondition, BindingCondition>>
-
-BindingConditionType --
-
-
-[#_camel_apache_org_v1alpha1_BindingPhase]
-=== BindingPhase(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_BindingStatus, BindingStatus>>
-
-BindingPhase --
-
-
-[#_camel_apache_org_v1alpha1_BindingSpec]
-=== BindingSpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_Binding, Binding>>
-
-BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`integration` +
-github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec
-|
-
-
-Integration is an optional integration used to specify custom parameters
-
-|`source` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
-|
-
-
-Source is the starting point of the integration defined by this binding
-
-|`sink` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
-|
-
-
-Sink is the destination of the integration defined by this binding
-
-|`errorHandler` +
-*xref:#_camel_apache_org_v1alpha1_ErrorHandlerSpec[ErrorHandlerSpec]*
-|
-
-
-ErrorHandler is an optional handler called upon an error occuring in the integration
-
-|`steps` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[[\]Endpoint]*
-|
-
-
-Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of desired replicas for the binding
-
-|`serviceAccountName` +
-string
-|
-
-
-Custom SA to use for the binding
-
-
-|===
-
-[#_camel_apache_org_v1alpha1_BindingStatus]
-=== BindingStatus
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_Binding, Binding>>
-
-BindingStatus specify the status of a binding
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`observedGeneration` +
-int64
-|
-
-
-ObservedGeneration is the most recent generation observed for this Binding.
-
-|`phase` +
-*xref:#_camel_apache_org_v1alpha1_BindingPhase[BindingPhase]*
-|
-
-
-Phase --
-
-|`conditions` +
-*xref:#_camel_apache_org_v1alpha1_BindingCondition[[\]BindingCondition]*
-|
-
-
-Conditions --
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of actual replicas of the binding
-
-|`selector` +
-string
-|
-
-
-Selector allows to identify pods belonging to the binding
-
-
|===
[#_camel_apache_org_v1alpha1_DataTypeReference]
@@ -455,8 +251,8 @@ one to many header specifications
*Appears on:*
-* <<#_camel_apache_org_v1alpha1_BindingSpec, BindingSpec>>
* <<#_camel_apache_org_v1alpha1_ErrorHandlerSink, ErrorHandlerSink>>
+* <<#_camel_apache_org_v1alpha1_KameletBindingSpec, KameletBindingSpec>>
Endpoint represents a source/sink external entity (could be any Kubernetes resource or Camel URI)
@@ -644,7 +440,7 @@ ErrorHandlerSink represents a sink error handler type which behave like a dead l
*Appears on:*
-* <<#_camel_apache_org_v1alpha1_BindingSpec, BindingSpec>>
+* <<#_camel_apache_org_v1alpha1_KameletBindingSpec, KameletBindingSpec>>
ErrorHandlerSpec represents an unstructured object for an error handler
@@ -1114,6 +910,210 @@ string
JSONSchemaURL represents a schema url.
+[#_camel_apache_org_v1alpha1_KameletBindingCondition]
+=== KameletBindingCondition
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_KameletBindingStatus, KameletBindingStatus>>
+
+KameletBindingCondition describes the state of a resource at a certain point.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1alpha1_KameletBindingConditionType[KameletBindingConditionType]*
+|
+
+
+Type of kameletBinding condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
+string
+|
+
+
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human readable message indicating details about the transition.
+
+|`pods` +
+[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition
+|
+
+
+Pods collect health and conditions information from the owned PODs
+
+
+|===
+
+[#_camel_apache_org_v1alpha1_KameletBindingConditionType]
+=== KameletBindingConditionType(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_KameletBindingCondition, KameletBindingCondition>>
+
+KameletBindingConditionType --
+
+
+[#_camel_apache_org_v1alpha1_KameletBindingPhase]
+=== KameletBindingPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_KameletBindingStatus, KameletBindingStatus>>
+
+KameletBindingPhase --
+
+
+[#_camel_apache_org_v1alpha1_KameletBindingSpec]
+=== KameletBindingSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_KameletBinding, KameletBinding>>
+
+KameletBindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`integration` +
+github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec
+|
+
+
+Integration is an optional integration used to specify custom parameters
+
+|`source` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
+|
+
+
+Source is the starting point of the integration defined by this binding
+
+|`sink` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
+|
+
+
+Sink is the destination of the integration defined by this binding
+
+|`errorHandler` +
+*xref:#_camel_apache_org_v1alpha1_ErrorHandlerSpec[ErrorHandlerSpec]*
+|
+
+
+ErrorHandler is an optional handler called upon an error occuring in the integration
+
+|`steps` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[[\]Endpoint]*
+|
+
+
+Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of desired replicas for the binding
+
+|`serviceAccountName` +
+string
+|
+
+
+Custom SA to use for the binding
+
+
+|===
+
+[#_camel_apache_org_v1alpha1_KameletBindingStatus]
+=== KameletBindingStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_KameletBinding, KameletBinding>>
+
+KameletBindingStatus specify the status of a binding
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this KameletBinding.
+
+|`phase` +
+*xref:#_camel_apache_org_v1alpha1_KameletBindingPhase[KameletBindingPhase]*
+|
+
+
+Phase --
+
+|`conditions` +
+*xref:#_camel_apache_org_v1alpha1_KameletBindingCondition[[\]KameletBindingCondition]*
+|
+
+
+Conditions --
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of actual replicas of the binding
+
+|`selector` +
+string
+|
+
+
+Selector allows to identify pods belonging to the binding
+
+
+|===
+
[#_camel_apache_org_v1alpha1_KameletCondition]
=== KameletCondition
diff --git a/e2e/common/misc/files/kamelets/timer-custom-source.kamelet.yaml b/e2e/common/misc/files/kamelets/timer-custom-source.kamelet.yaml
index a47e62e0d..f406c5aca 100644
--- a/e2e/common/misc/files/kamelets/timer-custom-source.kamelet.yaml
+++ b/e2e/common/misc/files/kamelets/timer-custom-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-custom-source
diff --git a/e2e/common/misc/files/my-timer-source.kamelet.yaml b/e2e/common/misc/files/my-timer-source.kamelet.yaml
index 7a91a2e20..cf2536500 100644
--- a/e2e/common/misc/files/my-timer-source.kamelet.yaml
+++ b/e2e/common/misc/files/my-timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: my-timer-source
diff --git a/e2e/common/misc/kamelet_binding_test.go b/e2e/common/misc/kamelet_binding_test.go
index dfe3fb502..a6dad0373 100644
--- a/e2e/common/misc/kamelet_binding_test.go
+++ b/e2e/common/misc/kamelet_binding_test.go
@@ -30,7 +30,7 @@ import (
corev1 "k8s.io/api/core/v1"
. "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/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
@@ -44,13 +44,13 @@ func TestBinding(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-error-producer-source",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
to := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-log-sink",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
errorHandler := map[string]interface{}{
@@ -58,7 +58,7 @@ func TestBinding(t *testing.T) {
"endpoint": map[string]interface{}{
"ref": map[string]string{
"kind": "Kamelet",
- "apiVersion": v1alpha1.SchemeGroupVersion.String(),
+ "apiVersion": v1.SchemeGroupVersion.String(),
"name": "my-own-log-sink",
},
"properties": map[string]string{
@@ -99,13 +99,13 @@ func TestBinding(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-timer-source",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
to := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-log-sink",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
Expect(BindKameletTo(ns, "kb-with-traits",
@@ -122,13 +122,13 @@ func TestBinding(t *testing.T) {
// Binding with wrong spec
t.Run("test Binding with wrong spec", func(t *testing.T) {
name := "bad-klb"
- kb := v1alpha1.NewBinding(ns, name)
- kb.Spec = v1alpha1.BindingSpec{}
+ kb := v1.NewBinding(ns, name)
+ kb.Spec = v1.BindingSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
Eventually(err).Should(BeNil())
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.BindingPhaseError))
- Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(BindingCondition(ns, name, v1alpha1.BindingIntegrationConditionError), TestTimeoutShort).Should(
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.BindingPhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(BindingCondition(ns, name, v1.BindingIntegrationConditionError), TestTimeoutShort).Should(
WithTransform(BindingConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
@@ -139,7 +139,7 @@ func TestBinding(t *testing.T) {
}
func createErrorProducerKamelet(ns string, name string) func() error {
- props := map[string]v1alpha1.JSONSchemaProp{
+ props := map[string]v1.JSONSchemaProp{
"message": {
Type: "string",
},
diff --git a/e2e/common/misc/kamelet_binding_with_image_test.go b/e2e/common/misc/kamelet_binding_with_image_test.go
index 133cc577b..beea78c97 100644
--- a/e2e/common/misc/kamelet_binding_with_image_test.go
+++ b/e2e/common/misc/kamelet_binding_with_image_test.go
@@ -31,7 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
. "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/apis/camel/v1"
)
func TestBindingWithImage(t *testing.T) {
@@ -40,13 +40,13 @@ func TestBindingWithImage(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-timer-source",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
to := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-log-sink",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
emptyMap := map[string]string{}
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 665a20d05..055863424 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -29,7 +29,7 @@ import (
. "github.com/onsi/gomega"
. "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/apis/camel/v1"
)
const customLabel = "custom-label"
@@ -56,8 +56,8 @@ func createBundleKamelet(ns string, name string) func() error {
}
labels := map[string]string{
- customLabel: "true",
- v1alpha1.KameletBundledLabel: "true",
+ customLabel: "true",
+ v1.KameletBundledLabel: "true",
}
return CreateKamelet(ns, name, flow, nil, labels)
}
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index bb5b62db7..55f552701 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -35,7 +35,6 @@ import (
. "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"
)
@@ -54,7 +53,7 @@ func TestBindingScale(t *testing.T) {
Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloBinding", "log-sink", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloBinding"))
t.Run("Update binding scale spec", func(t *testing.T) {
@@ -70,7 +69,7 @@ func TestBindingScale(t *testing.T) {
// Check the readiness condition becomes truthy back
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// Finally check the readiness condition becomes truthy back onBinding
- Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("ScaleBinding with polymorphic client", func(t *testing.T) {
@@ -79,11 +78,11 @@ func TestBindingScale(t *testing.T) {
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
- _, err = scaleClient.Scales(ns).Patch(TestContext, v1alpha1.SchemeGroupVersion.WithResource("bindings"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+ _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("bindings"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(BindingConditionStatus(ns, name, v1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
@@ -102,18 +101,18 @@ func TestBindingScale(t *testing.T) {
Expect(err).To(BeNil())
// Getter
- bindingScale, err := camel.CamelV1alpha1().Bindings(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ bindingScale, err := camel.CamelV1().Bindings(ns).GetScale(TestContext, name, metav1.GetOptions{})
Expect(err).To(BeNil())
Expect(bindingScale.Spec.Replicas).To(BeNumerically("==", 2))
Expect(bindingScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
bindingScale.Spec.Replicas = 1
- _, err = camel.CamelV1alpha1().Bindings(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
+ _, err = camel.CamelV1().Bindings(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling inBinding
- Expect(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(BindingConditionStatus(ns, name, v1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Binding scale subresource Spec field
Eventually(BindingSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 4ddf3c108..cf4b5f324 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -30,8 +30,7 @@ import (
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"
- "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
func TestErroredTrait(t *testing.T) {
@@ -58,9 +57,9 @@ func TestErroredTrait(t *testing.T) {
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
// Binding
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.BindingPhaseError))
- Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(BindingCondition(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.BindingPhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(BindingCondition(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(
WithTransform(BindingConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 918dc49ae..09d62548f 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/v2/pkg/apis/camel/v1alpha1"
+ camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"testing"
"time"
@@ -146,7 +146,7 @@ func TestHealthTrait(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-timer-source",
- APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: camelv1.SchemeGroupVersion.String(),
}
fromParams := map[string]string{
@@ -156,7 +156,7 @@ func TestHealthTrait(t *testing.T) {
to := corev1.ObjectReference{
Kind: "Kamelet",
Name: "my-own-log-sink",
- APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: camelv1.SchemeGroupVersion.String(),
}
toParams := map[string]string{
@@ -239,8 +239,8 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(BindingCondition(ns, name, camelv1alpha1.BindingConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *camelv1alpha1.BindingCondition) bool {
+ Eventually(BindingCondition(ns, name, camelv1.BindingConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *camelv1.BindingCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
}
diff --git a/e2e/install/kustomize/common.go b/e2e/install/kustomize/common.go
index c58655b1d..12b542b04 100644
--- a/e2e/install/kustomize/common.go
+++ b/e2e/install/kustomize/common.go
@@ -36,7 +36,7 @@ import (
const (
// v1.Build, v1.Integration
// v1.IntegrationKit, v1.IntegrationPlatform
- // v1alpha1.Kamelet, v1alpha1.Binding
+ // v1.Kamelet, v1.Binding
ExpectedCRDs = 6
// camel-k-operator, camel-k-operator-events,
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 541d3614f..4cf765052 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -34,7 +34,6 @@ import (
. "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 Binding can be changed and the changes are propagated to the Integration
@@ -49,7 +48,7 @@ func TestKameletChange(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
Name: timerSource,
}
@@ -72,7 +71,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(BindingCondition(ns, timerBinding, v1alpha1.BindingConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(BindingCondition(ns, timerBinding, v1.BindingConditionReady), TestTimeoutMedium).Should(And(
WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(BindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
@@ -85,7 +84,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(BindingCondition(ns, timerBinding, v1alpha1.BindingConditionReady), TestTimeoutMedium).
+ Eventually(BindingCondition(ns, timerBinding, v1.BindingConditionReady), TestTimeoutMedium).
Should(And(
WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index cd4a08ab3..1ac2f950f 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -25,14 +25,10 @@ package native
import (
"testing"
- "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/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ . "github.com/onsi/gomega"
+ corev1 "k8s.io/api/core/v1"
)
func TestNativeBinding(t *testing.T) {
@@ -48,12 +44,12 @@ func TestNativeBinding(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "timer-source",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
to := corev1.ObjectReference{
Kind: "Kamelet",
Name: "log-sink",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
}
message := "Magicstring!"
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index cf19f771e..a10a89cd5 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -73,7 +73,6 @@ import (
"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"
@@ -1068,9 +1067,9 @@ func ScaleIntegration(ns string, name string, replicas int32) error {
})
}
-func Binding(ns string, name string) func() *v1alpha1.Binding {
- return func() *v1alpha1.Binding {
- klb := v1alpha1.NewBinding(ns, name)
+func Binding(ns string, name string) func() *v1.Binding {
+ return func() *v1.Binding {
+ klb := v1.NewBinding(ns, name)
key := ctrl.ObjectKey{
Namespace: ns,
Name: name,
@@ -1084,8 +1083,8 @@ func Binding(ns string, name string) func() *v1alpha1.Binding {
}
}
-func BindingPhase(ns string, name string) func() v1alpha1.BindingPhase {
- return func() v1alpha1.BindingPhase {
+func BindingPhase(ns string, name string) func() v1.BindingPhase {
+ return func() v1.BindingPhase {
klb := Binding(ns, name)()
if klb == nil {
return ""
@@ -1114,8 +1113,8 @@ func BindingStatusReplicas(ns string, name string) func() *int32 {
}
}
-func BindingCondition(ns string, name string, conditionType v1alpha1.BindingConditionType) func() *v1alpha1.BindingCondition {
- return func() *v1alpha1.BindingCondition {
+func BindingCondition(ns string, name string, conditionType v1.BindingConditionType) func() *v1.BindingCondition {
+ return func() *v1.BindingCondition {
kb := Binding(ns, name)()
if kb == nil {
return nil
@@ -1128,28 +1127,28 @@ func BindingCondition(ns string, name string, conditionType v1alpha1.BindingCond
}
}
-func BindingConditionStatusExtract(c *v1alpha1.BindingCondition) corev1.ConditionStatus {
+func BindingConditionStatusExtract(c *v1.BindingCondition) corev1.ConditionStatus {
if c == nil {
return ""
}
return c.Status
}
-func BindingConditionReason(c *v1alpha1.BindingCondition) string {
+func BindingConditionReason(c *v1.BindingCondition) string {
if c == nil {
return ""
}
return c.Reason
}
-func BindingConditionMessage(c *v1alpha1.BindingCondition) string {
+func BindingConditionMessage(c *v1.BindingCondition) string {
if c == nil {
return ""
}
return c.Message
}
-func BindingConditionStatus(ns string, name string, conditionType v1alpha1.BindingConditionType) func() corev1.ConditionStatus {
+func BindingConditionStatus(ns string, name string, conditionType v1.BindingConditionType) func() corev1.ConditionStatus {
return func() corev1.ConditionStatus {
klb := Binding(ns, name)()
if klb == nil {
@@ -1163,7 +1162,7 @@ func BindingConditionStatus(ns string, name string, conditionType v1alpha1.Bindi
}
}
-func UpdateBinding(ns string, name string, upd func(it *v1alpha1.Binding)) error {
+func UpdateBinding(ns string, name string, upd func(it *v1.Binding)) error {
klb := Binding(ns, name)()
if klb == nil {
return fmt.Errorf("noBinding named %s found", name)
@@ -1181,7 +1180,7 @@ func UpdateBinding(ns string, name string, upd func(it *v1alpha1.Binding)) error
}
func ScaleBinding(ns string, name string, replicas int32) error {
- return UpdateBinding(ns, name, func(klb *v1alpha1.Binding) {
+ return UpdateBinding(ns, name, func(klb *v1.Binding) {
klb.Spec.Replicas = &replicas
})
}
@@ -1862,11 +1861,11 @@ func CRDs() func() []metav1.APIResource {
reflect.TypeOf(v1.Integration{}).Name(),
reflect.TypeOf(v1.IntegrationKit{}).Name(),
reflect.TypeOf(v1.IntegrationPlatform{}).Name(),
- reflect.TypeOf(v1alpha1.Kamelet{}).Name(),
- reflect.TypeOf(v1alpha1.Binding{}).Name(),
+ reflect.TypeOf(v1.Kamelet{}).Name(),
+ reflect.TypeOf(v1.Binding{}).Name(),
}
- versions := []string{"v1", "v1alpha1"}
+ versions := []string{"v1", "v1"}
present := []metav1.APIResource{}
for _, version := range versions {
@@ -2093,9 +2092,9 @@ func ServiceAccount(ns, name string) func() *corev1.ServiceAccount {
}
}
-func KameletList(ns string) func() []v1alpha1.Kamelet {
- return func() []v1alpha1.Kamelet {
- lst := v1alpha1.NewKameletList()
+func KameletList(ns string) func() []v1.Kamelet {
+ return func() []v1.Kamelet {
+ lst := v1.NewKameletList()
if err := TestClient().List(TestContext, &lst, ctrl.InNamespace(ns)); err != nil {
failTest(err)
}
@@ -2103,9 +2102,9 @@ func KameletList(ns string) func() []v1alpha1.Kamelet {
}
}
-func Kamelet(name string, ns string) func() *v1alpha1.Kamelet {
- return func() *v1alpha1.Kamelet {
- it := v1alpha1.NewKamelet(ns, name)
+func Kamelet(name string, ns string) func() *v1.Kamelet {
+ return func() *v1.Kamelet {
+ it := v1.NewKamelet(ns, name)
key := ctrl.ObjectKey{
Namespace: ns,
Name: name,
@@ -2119,7 +2118,7 @@ func Kamelet(name string, ns string) func() *v1alpha1.Kamelet {
}
}
-func KameletLabels(kamelet *v1alpha1.Kamelet) map[string]string {
+func KameletLabels(kamelet *v1.Kamelet) map[string]string {
if kamelet == nil {
return map[string]string{}
}
@@ -2251,16 +2250,16 @@ func CreateKnativeBroker(ns string, name string) func() error {
Kamelets
*/
-func CreateKamelet(ns string, name string, template map[string]interface{}, properties map[string]v1alpha1.JSONSchemaProp, labels map[string]string) func() error {
+func CreateKamelet(ns string, name string, template map[string]interface{}, properties map[string]v1.JSONSchemaProp, labels map[string]string) func() error {
return func() error {
- kamelet := v1alpha1.Kamelet{
+ kamelet := v1.Kamelet{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
Name: name,
Labels: labels,
},
- Spec: v1alpha1.KameletSpec{
- Definition: &v1alpha1.JSONSchemaProps{
+ Spec: v1.KameletSpec{
+ Definition: &v1.JSONSchemaProps{
Properties: properties,
},
Template: asTemplate(template),
@@ -2271,7 +2270,7 @@ func CreateKamelet(ns string, name string, template map[string]interface{}, prop
}
func CreateTimerKamelet(ns string, name string) func() error {
- props := map[string]v1alpha1.JSONSchemaProp{
+ props := map[string]v1.JSONSchemaProp{
"message": {
Type: "string",
},
@@ -2308,14 +2307,14 @@ func BindKameletTo(ns, name string, annotations map[string]string, from, to core
func BindKameletToWithErrorHandler(ns, name string, annotations map[string]string, from, to corev1.ObjectReference,
sourceProperties, sinkProperties map[string]string, errorHandler map[string]interface{}) func() error {
return func() error {
- kb := v1alpha1.NewBinding(ns, name)
+ kb := v1.NewBinding(ns, name)
kb.Annotations = annotations
- kb.Spec = v1alpha1.BindingSpec{
- Source: v1alpha1.Endpoint{
+ kb.Spec = v1.BindingSpec{
+ Source: v1.Endpoint{
Ref: &from,
Properties: asEndpointProperties(sourceProperties),
},
- Sink: v1alpha1.Endpoint{
+ Sink: v1.Endpoint{
Ref: &to,
Properties: asEndpointProperties(sinkProperties),
},
@@ -2330,40 +2329,40 @@ func BindKameletToWithErrorHandler(ns, name string, annotations map[string]strin
// Deprecated:
// Use KamelBind func instead
-func asTemplate(source map[string]interface{}) *v1alpha1.Template {
+func asTemplate(source map[string]interface{}) *v1.Template {
bytes, err := json.Marshal(source)
if err != nil {
failTest(err)
}
- return &v1alpha1.Template{
+ return &v1.Template{
RawMessage: bytes,
}
}
// Deprecated:
// Use KamelBind func instead
-func asErrorHandlerSpec(source map[string]interface{}) *v1alpha1.ErrorHandlerSpec {
+func asErrorHandlerSpec(source map[string]interface{}) *v1.ErrorHandlerSpec {
bytes, err := json.Marshal(source)
if err != nil {
failTest(err)
}
- return &v1alpha1.ErrorHandlerSpec{
+ return &v1.ErrorHandlerSpec{
RawMessage: bytes,
}
}
// Deprecated:
// Use KamelBind func instead
-func asEndpointProperties(props map[string]string) *v1alpha1.EndpointProperties {
+func asEndpointProperties(props map[string]string) *v1.EndpointProperties {
if props == nil {
- return &v1alpha1.EndpointProperties{}
+ return &v1.EndpointProperties{}
}
bytes, err := json.Marshal(props)
if err != nil {
failTest(err)
}
- return &v1alpha1.EndpointProperties{
+ return &v1.EndpointProperties{
RawMessage: bytes,
}
}
@@ -2704,7 +2703,7 @@ func CreateLogKamelet(ns string, name string) func() error {
},
}
- props := map[string]v1alpha1.JSONSchemaProp{
+ props := map[string]v1.JSONSchemaProp{
"loggerName": {
Type: "string",
},
diff --git a/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml b/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml
index 6a27d9b2b..2847d908d 100644
--- a/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: beans-source
diff --git a/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml
index a89ecb177..52bf905a8 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
index a3393a426..d34af676b 100644
--- a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: logger-sink-binding
@@ -30,5 +30,5 @@ spec:
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: logger-sink
diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml
index f9b58fedd..4107525fd 100644
--- a/e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: logger-sink
diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
index 45cc64084..00cbbfef4 100644
--- a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: timer-source-binding
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: Hello Custom Event from sample-broker
diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml
index df684a140..0b1adc007 100644
--- a/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
index b4efc7684..68d5ce441 100644
--- a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: timer-source-binding-display
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: Hello
diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml
index df684a140..0b1adc007 100644
--- a/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index 8a67c48df..cbdbaea61 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -16,13 +16,13 @@
# ---------------------------------------------------------------------------
kind: Binding
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
metadata:
name: properties-binding
spec:
source:
ref:
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
name: timer-source
properties:
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml
index 987a5b83a..1f2af14af 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index 34c9f8bf5..c29fe5051 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: logger-sink-binding
@@ -28,5 +28,5 @@ spec:
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: logger-sink
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
index f9b58fedd..4107525fd 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: logger-sink
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index eb7b7048b..eea5967c1 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: timer-source-binding
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: Hello Kamelets
diff --git a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
index df684a140..0b1adc007 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet-data-types/data-type-action.kamelet.yaml b/e2e/yaks/common/kamelet-data-types/data-type-action.kamelet.yaml
index 6aba41e8b..230a5e931 100644
--- a/e2e/yaks/common/kamelet-data-types/data-type-action.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-data-types/data-type-action.kamelet.yaml
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: data-type-action
diff --git a/e2e/yaks/common/kamelet-data-types/event-binding.yaml b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
index c08362f3c..880ffe8ed 100644
--- a/e2e/yaks/common/kamelet-data-types/event-binding.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: event-binding
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: event-source
dataTypes:
out:
@@ -31,12 +31,12 @@ spec:
steps:
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-action
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: event-sink
dataTypes:
in:
diff --git a/e2e/yaks/common/kamelet-data-types/event-sink.kamelet.yaml b/e2e/yaks/common/kamelet-data-types/event-sink.kamelet.yaml
index 60fd8028f..c6967ce51 100644
--- a/e2e/yaks/common/kamelet-data-types/event-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-sink.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: event-sink
diff --git a/e2e/yaks/common/kamelet-data-types/event-source.kamelet.yaml b/e2e/yaks/common/kamelet-data-types/event-source.kamelet.yaml
index eb4b5113a..547d2272d 100644
--- a/e2e/yaks/common/kamelet-data-types/event-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: event-source
diff --git a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
index cbff3417b..c145bb894 100644
--- a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
+++ b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: timer-to-log
@@ -23,14 +23,14 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: "Hello from Camel K!"
steps:
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-action
dataTypes:
in:
@@ -40,5 +40,5 @@ spec:
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-sink
diff --git a/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml b/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml
index f1dc779af..cb0e17959 100644
--- a/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: prefix-action
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
index 17d6d3903..ceb4e6b2b 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Binding
metadata:
name: steps-binding
@@ -23,20 +23,20 @@ spec:
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: "Camel"
steps:
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: prefix-action
properties:
prefix: "Apache"
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: prefix-action
properties:
prefix: "Hello"
diff --git a/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml
index df684a140..0b1adc007 100644
--- a/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
index ad49170b7..e92ea2dcc 100644
--- a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
+++ b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: echo-sink
diff --git a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
index df684a140..0b1adc007 100644
--- a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
+++ b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: timer-source
diff --git a/helm/camel-k/crds/crd-binding.yaml b/helm/camel-k/crds/crd-binding.yaml
index b1b019aa4..eecb595e9 100644
--- a/helm/camel-k/crds/crd-binding.yaml
+++ b/helm/camel-k/crds/crd-binding.yaml
@@ -47,7 +47,7 @@ spec:
jsonPath: .status.replicas
name: Replicas
type: integer
- name: v1alpha1
+ name: v1
schema:
openAPIV3Schema:
description: Binding is the Schema for the kamelets binding API
@@ -7777,6 +7777,7 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -7795,6 +7796,7 @@ spec:
default:
description: default is a default value for undefined
object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -7806,6 +7808,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -7813,6 +7816,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8012,6 +8016,7 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8030,6 +8035,7 @@ spec:
default:
description: default is a default value for undefined
object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8041,6 +8047,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8048,6 +8055,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8252,6 +8260,7 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8270,6 +8279,7 @@ spec:
default:
description: default is a default value for
undefined object fields.
+ type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8281,6 +8291,7 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8288,6 +8299,7 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
+ type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index 41dcba0e4..9eae88378 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -38,6 +38,713 @@ spec:
singular: kamelet
scope: Namespaced
versions:
+ - additionalPrinterColumns:
+ - description: The Kamelet phase
+ jsonPath: .status.phase
+ name: Phase
+ type: string
+ name: v1
+ schema:
+ openAPIV3Schema:
+ description: Kamelet is the Schema for the kamelets API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: the desired specification
+ properties:
+ dataTypes:
+ additionalProperties:
+ description: DataTypesSpec represents the specification for a set
+ of data types
+ properties:
+ default:
+ description: the default data type for this Kamelet
+ type: string
+ headers:
+ additionalProperties:
+ description: HeaderSpec represents the specification for a
+ header used in the Kamelet
+ properties:
+ default:
+ type: string
+ description:
+ type: string
+ required:
+ type: boolean
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ description: one to many header specifications
+ type: object
+ types:
+ additionalProperties:
+ description: DataTypeSpec represents the specification for
+ a data type
+ properties:
+ dependencies:
+ description: the list of Camel or Maven dependencies required
+ by the data type
+ items:
+ type: string
+ type: array
+ description:
+ description: optional description
+ type: string
+ format:
+ description: the data type format name
+ type: string
+ headers:
+ additionalProperties:
+ description: HeaderSpec represents the specification
+ for a header used in the Kamelet
+ properties:
+ default:
+ type: string
+ description:
+ type: string
+ required:
+ type: boolean
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ description: one to many header specifications
+ type: object
+ mediaType:
+ description: media type as expected for HTTP media types
+ (ie, application/json)
+ type: string
+ schema:
+ description: the expected schema for the data type
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{} and
+ nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing
+ an external resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for
+ undefined object fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON
+ value. These types are supported: bool,
+ int64, float64, string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON
+ value. These types are supported: bool, int64,
+ float64, string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format
+ string. Unknown formats are ignored. The following
+ formats are validated: \n - bsonobjectid:
+ a bson object ID, i.e. a 24 characters hex
+ string - uri: an URI as parsed by Golang net/url.ParseRequestURI
+ - email: an email address as parsed by Golang
+ net/mail.ParseAddress - hostname: a valid
+ representation for an Internet host name,
+ as defined by RFC 1034, section 3.1 [RFC1034].
+ - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+ - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+ - cidr: a CIDR as parsed by Golang net.ParseCIDR
+ - mac: a MAC address as parsed by Golang net.ParseMAC
+ - uuid: an UUID that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string
+ like \"0321751043\" or \"978-0321751041\"
+ - isbn10: an ISBN10 number string like \"0321751043\"
+ - isbn13: an ISBN13 number string like \"978-0321751041\"
+ - creditcard: a credit card number defined
+ by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn:
+ a U.S. social security number following the
+ regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$
+ - hexcolor: an hexadecimal color code like
+ \"#FFFFFF\" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+ - rgbcolor: an RGB color code like rgb like
+ \"rgb(255,255,255)\" - byte: base64 encoded
+ binary data - password: any kind of string
+ - date: a date string like \"2006-01-02\"
+ as defined by full-date in RFC3339 - duration:
+ a duration string like \"22 ns\" as parsed
+ by Golang time.ParseDuration or compatible
+ with Scala duration format - datetime: a date
+ time string like \"2014-12-15T19:30:20.000Z\"
+ as defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number
+ literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended
+ properties that trigger a custom behavior
+ in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ scheme:
+ description: the data type component scheme
+ type: string
+ type: object
+ description: one to many data type specifications
+ type: object
+ type: object
+ description: data specification types for the events consumed/produced
+ by the Kamelet
+ type: object
+ definition:
+ description: defines the formal configuration of the Kamelet
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value. These types
+ are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing an external
+ resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for undefined object
+ fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format string. Unknown
+ formats are ignored. The following formats are validated:
+ \n - bsonobjectid: a bson object ID, i.e. a 24 characters
+ hex string - uri: an URI as parsed by Golang net/url.ParseRequestURI
+ - email: an email address as parsed by Golang net/mail.ParseAddress
+ - hostname: a valid representation for an Internet host
+ name, as defined by RFC 1034, section 3.1 [RFC1034]. -
+ ipv4: an IPv4 IP as parsed by Golang net.ParseIP - ipv6:
+ an IPv6 IP as parsed by Golang net.ParseIP - cidr: a CIDR
+ as parsed by Golang net.ParseCIDR - mac: a MAC address
+ as parsed by Golang net.ParseMAC - uuid: an UUID that
+ allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined by the
+ regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string like \"0321751043\"
+ or \"978-0321751041\" - isbn10: an ISBN10 number string
+ like \"0321751043\" - isbn13: an ISBN13 number string
+ like \"978-0321751041\" - creditcard: a credit card number
+ defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn: a U.S. social
+ security number following the regex ^\\\\d{3}[- ]?\\\\d{2}[-
+ ]?\\\\d{4}$ - hexcolor: an hexadecimal color code like
+ \"#FFFFFF\" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+ - rgbcolor: an RGB color code like rgb like \"rgb(255,255,255)\"
+ - byte: base64 encoded binary data - password: any kind
+ of string - date: a date string like \"2006-01-02\" as
+ defined by full-date in RFC3339 - duration: a duration
+ string like \"22 ns\" as parsed by Golang time.ParseDuration
+ or compatible with Scala duration format - datetime: a
+ date time string like \"2014-12-15T19:30:20.000Z\" as
+ defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended properties
+ that trigger a custom behavior in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ dependencies:
+ description: Camel dependencies needed by the Kamelet
+ items:
+ type: string
+ type: array
+ sources:
+ description: sources in any Camel DSL supported
+ items:
+ description: SourceSpec defines the configuration for one or more
+ routes to be executed in a certain Camel DSL language
+ properties:
+ compression:
+ description: if the content is compressed (base64 encrypted)
+ type: boolean
+ content:
+ description: the source code (plain text)
+ type: string
+ contentKey:
+ description: the confimap key holding the source content
+ type: string
+ contentRef:
+ description: the confimap reference holding the source content
+ type: string
+ contentType:
+ description: the content type (tipically text or binary)
+ type: string
+ interceptors:
+ description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader
+ uses to pre/post process sources
+ items:
+ type: string
+ type: array
+ language:
+ description: specify which is the language (Camel DSL) used
+ to interpret this source code
+ type: string
+ loader:
+ description: Loader is an optional id of the org.apache.camel.k.RoutesLoader
+ that will interpret this source at runtime
+ type: string
+ name:
+ description: the name of the specification
+ type: string
+ path:
+ description: the path where the file is stored
+ type: string
+ property-names:
+ description: List of property names defined in the source (e.g.
+ if type is "template")
+ items:
+ type: string
+ type: array
+ rawContent:
+ description: the source code (binary)
+ format: byte
+ type: string
+ type:
+ description: Type defines the kind of source described by this
+ object
+ type: string
+ type: object
+ type: array
+ template:
+ description: the main source in YAML DSL
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ types:
+ additionalProperties:
+ description: 'EventTypeSpec represents a specification for an event
+ type Deprecated: In favor of using DataTypeSpec'
+ properties:
+ mediaType:
+ description: media type as expected for HTTP media types (ie,
+ application/json)
+ type: string
+ schema:
+ description: the expected schema for the event
+ properties:
+ $schema:
+ description: JSONSchemaURL represents a schema url.
+ type: string
+ description:
+ type: string
+ example:
+ description: 'JSON represents any valid JSON value. These
+ types are supported: bool, int64, float64, string, []interface{},
+ map[string]interface{} and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ externalDocs:
+ description: ExternalDocumentation allows referencing an
+ external resource for extended documentation.
+ properties:
+ description:
+ type: string
+ url:
+ type: string
+ type: object
+ id:
+ type: string
+ properties:
+ additionalProperties:
+ properties:
+ default:
+ description: default is a default value for undefined
+ object fields.
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ deprecated:
+ type: boolean
+ description:
+ type: string
+ enum:
+ items:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{}
+ and nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ type: array
+ example:
+ description: 'JSON represents any valid JSON value.
+ These types are supported: bool, int64, float64,
+ string, []interface{}, map[string]interface{} and
+ nil.'
+ type: object
+ x-kubernetes-preserve-unknown-fields: true
+ exclusiveMaximum:
+ type: boolean
+ exclusiveMinimum:
+ type: boolean
+ format:
+ description: "format is an OpenAPI v3 format string.
+ Unknown formats are ignored. The following formats
+ are validated: \n - bsonobjectid: a bson object
+ ID, i.e. a 24 characters hex string - uri: an URI
+ as parsed by Golang net/url.ParseRequestURI - email:
+ an email address as parsed by Golang net/mail.ParseAddress
+ - hostname: a valid representation for an Internet
+ host name, as defined by RFC 1034, section 3.1 [RFC1034].
+ - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+ - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+ - cidr: a CIDR as parsed by Golang net.ParseCIDR
+ - mac: a MAC address as parsed by Golang net.ParseMAC
+ - uuid: an UUID that allows uppercase defined by
+ the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid3: an UUID3 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ - uuid4: an UUID4 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - uuid5: an UUID5 that allows uppercase defined
+ by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ - isbn: an ISBN10 or ISBN13 number string like \"0321751043\"
+ or \"978-0321751041\" - isbn10: an ISBN10 number
+ string like \"0321751043\" - isbn13: an ISBN13 number
+ string like \"978-0321751041\" - creditcard: a credit
+ card number defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
+ with any non digit characters mixed in - ssn: a
+ U.S. social security number following the regex
+ ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ - hexcolor:
+ an hexadecimal color code like \"#FFFFFF\" following
+ the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$ -
+ rgbcolor: an RGB color code like rgb like \"rgb(255,255,255)\"
+ - byte: base64 encoded binary data - password: any
+ kind of string - date: a date string like \"2006-01-02\"
+ as defined by full-date in RFC3339 - duration: a
+ duration string like \"22 ns\" as parsed by Golang
+ time.ParseDuration or compatible with Scala duration
+ format - datetime: a date time string like \"2014-12-15T19:30:20.000Z\"
+ as defined by date-time in RFC3339."
+ type: string
+ id:
+ type: string
+ maxItems:
+ format: int64
+ type: integer
+ maxLength:
+ format: int64
+ type: integer
+ maxProperties:
+ format: int64
+ type: integer
+ maximum:
+ description: A Number represents a JSON number literal.
+ type: string
+ minItems:
+ format: int64
+ type: integer
+ minLength:
+ format: int64
+ type: integer
+ minProperties:
+ format: int64
+ type: integer
+ minimum:
+ description: A Number represents a JSON number literal.
+ type: string
+ multipleOf:
+ description: A Number represents a JSON number literal.
+ type: string
+ nullable:
+ type: boolean
+ pattern:
+ type: string
+ title:
+ type: string
+ type:
+ type: string
+ uniqueItems:
+ type: boolean
+ x-descriptors:
+ description: XDescriptors is a list of extended properties
+ that trigger a custom behavior in external systems
+ items:
+ type: string
+ type: array
+ type: object
+ type: object
+ required:
+ items:
+ type: string
+ type: array
+ title:
+ type: string
+ type:
+ type: string
+ type: object
+ type: object
+ description: 'data specification types for the events consumed/produced
+ by the Kamelet Deprecated: In favor of using DataTypes'
+ type: object
+ type: object
+ status:
+ description: the actual status of the resource
+ properties:
+ conditions:
+ description: Conditions --
+ items:
+ description: KameletCondition describes the state of a resource
+ at a certain point.
+ properties:
+ lastTransitionTime:
+ description: Last time the condition transitioned from one status
+ to another.
+ format: date-time
+ type: string
+ lastUpdateTime:
+ description: The last time this condition was updated.
+ format: date-time
+ type: string
+ message:
+ description: A human-readable message indicating details about
+ the transition.
+ type: string
+ reason:
+ description: The reason for the condition's last transition.
+ type: string
+ status:
+ description: Status of the condition, one of True, False, Unknown.
+ type: string
+ type:
+ description: Type of kamelet condition.
+ type: string
+ required:
+ - status
+ - type
+ type: object
+ type: array
+ observedGeneration:
+ description: ObservedGeneration is the most recent generation observed
+ for this Kamelet.
+ format: int64
+ type: integer
+ phase:
+ description: Phase --
+ type: string
+ properties:
+ description: Properties --
+ items:
+ description: KameletProperty specify the behavior of a property
+ in a Kamelet
+ properties:
+ default:
+ description: the default value of the property (if any)
+ type: string
+ name:
+ description: the name of the property
+ type: string
+ type: object
+ type: array
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources:
+ status: {}
- additionalPrinterColumns:
- description: The Kamelet phase
jsonPath: .status.phase
@@ -730,6 +1437,6 @@ spec:
type: object
type: object
served: true
- storage: true
+ storage: false
subresources:
status: {}
diff --git a/pkg/apis/addtoscheme_camel_v1alpha1.go b/pkg/apis/addtoscheme_camel_v1alpha1.go
index 448bf2aec..8d2b7ae5f 100644
--- a/pkg/apis/addtoscheme_camel_v1alpha1.go
+++ b/pkg/apis/addtoscheme_camel_v1alpha1.go
@@ -17,9 +17,7 @@ limitations under the License.
package apis
-import (
- "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
-)
+import v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
diff --git a/pkg/apis/camel/v1alpha1/binding_types.go b/pkg/apis/camel/v1/binding_types.go
similarity index 97%
copy from pkg/apis/camel/v1alpha1/binding_types.go
copy to pkg/apis/camel/v1/binding_types.go
index 8e2857df5..a72b62160 100644
--- a/pkg/apis/camel/v1alpha1/binding_types.go
+++ b/pkg/apis/camel/v1/binding_types.go
@@ -15,13 +15,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1alpha1
+package v1
import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// +genclient
@@ -48,7 +46,7 @@ type Binding struct {
// BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
type BindingSpec struct {
// Integration is an optional integration used to specify custom parameters
- Integration *v1.IntegrationSpec `json:"integration,omitempty"`
+ Integration *IntegrationSpec `json:"integration,omitempty"`
// Source is the starting point of the integration defined by this binding
Source Endpoint `json:"source,omitempty"`
// Sink is the destination of the integration defined by this binding
@@ -126,7 +124,7 @@ type BindingCondition struct {
// A human readable message indicating details about the transition.
Message string `json:"message,omitempty"`
// Pods collect health and conditions information from the owned PODs
- Pods []v1.PodCondition `json:"pods,omitempty"`
+ Pods []PodCondition `json:"pods,omitempty"`
}
// BindingConditionType --
diff --git a/pkg/apis/camel/v1alpha1/binding_types_support.go b/pkg/apis/camel/v1/binding_types_support.go
similarity index 95%
copy from pkg/apis/camel/v1alpha1/binding_types_support.go
copy to pkg/apis/camel/v1/binding_types_support.go
index c44b8a2d3..8bd6347e6 100644
--- a/pkg/apis/camel/v1alpha1/binding_types_support.go
+++ b/pkg/apis/camel/v1/binding_types_support.go
@@ -15,21 +15,20 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1alpha1
+package v1
import (
"bytes"
"encoding/json"
"fmt"
- 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"
)
// GetConditions --
-func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
- res := make([]v1.ResourceCondition, 0, len(in.Conditions))
+func (in *BindingStatus) GetConditions() []ResourceCondition {
+ res := make([]ResourceCondition, 0, len(in.Conditions))
for _, c := range in.Conditions {
res = append(res, c)
}
@@ -68,7 +67,7 @@ func (c BindingCondition) GetMessage() string {
// SetOperatorID sets the given operator id as an annotation
func (in *Binding) SetOperatorID(operatorID string) {
- v1.SetAnnotation(&in.ObjectMeta, v1.OperatorIDAnnotation, operatorID)
+ SetAnnotation(&in.ObjectMeta, OperatorIDAnnotation, operatorID)
}
// GetCondition returns the condition with the provided type.
diff --git a/pkg/apis/camel/v1alpha1/binding_types_support_test.go b/pkg/apis/camel/v1/binding_types_support_test.go
similarity index 98%
copy from pkg/apis/camel/v1alpha1/binding_types_support_test.go
copy to pkg/apis/camel/v1/binding_types_support_test.go
index ac77de187..334bd2d2a 100644
--- a/pkg/apis/camel/v1alpha1/binding_types_support_test.go
+++ b/pkg/apis/camel/v1/binding_types_support_test.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1alpha1
+package v1
import (
"encoding/json"
diff --git a/pkg/apis/camel/v1/common_types_support.go b/pkg/apis/camel/v1/common_types_support.go
index 1726b5c4b..d16aeaee1 100644
--- a/pkg/apis/camel/v1/common_types_support.go
+++ b/pkg/apis/camel/v1/common_types_support.go
@@ -116,6 +116,21 @@ func (m *RawMessage) UnmarshalJSON(data []byte) error {
return nil
}
+// String returns a string representation of RawMessage
+func (m *RawMessage) String() string {
+ if m == nil {
+ return ""
+ }
+ b, err := m.MarshalJSON()
+ if err != nil {
+ return ""
+ }
+ return string(b)
+}
+
+var _ json.Marshaler = (*RawMessage)(nil)
+var _ json.Unmarshaler = (*RawMessage)(nil)
+
// GetOperatorIDAnnotation to safely get the operator id annotation value.
func GetOperatorIDAnnotation(obj metav1.Object) string {
if obj == nil || obj.GetAnnotations() == nil {
diff --git a/pkg/apis/camel/v1/error_handler_types.go b/pkg/apis/camel/v1/error_handler_types.go
new file mode 100644
index 000000000..14a3721cd
--- /dev/null
+++ b/pkg/apis/camel/v1/error_handler_types.go
@@ -0,0 +1,55 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+const (
+ // ErrorHandlerRefName the reference name to use when looking for an error handler
+ ErrorHandlerRefName = "camel.k.errorHandler.ref"
+ // ErrorHandlerRefDefaultName the default name of the error handler
+ ErrorHandlerRefDefaultName = "defaultErrorHandler"
+ // ErrorHandlerAppPropertiesPrefix the prefix used for the error handler bean
+ ErrorHandlerAppPropertiesPrefix = "camel.beans.defaultErrorHandler"
+)
+
+// ErrorHandlerSpec represents an unstructured object for an error handler
+type ErrorHandlerSpec struct {
+ RawMessage `json:",inline,omitempty"`
+}
+
+// ErrorHandlerParameters represent an unstructured object for error handler parameters
+type ErrorHandlerParameters struct {
+ RawMessage `json:",inline,omitempty"`
+}
+
+// BeanProperties represent an unstructured object properties to be set on a bean
+type BeanProperties struct {
+ RawMessage `json:",inline,omitempty"`
+}
+
+// ErrorHandlerType a type of error handler (ie, sink)
+type ErrorHandlerType string
+
+const (
+ errorHandlerTypeBase ErrorHandlerType = ""
+ // ErrorHandlerTypeNone used to ignore any error event
+ ErrorHandlerTypeNone ErrorHandlerType = "none"
+ // ErrorHandlerTypeLog used to log the event producing the error
+ ErrorHandlerTypeLog ErrorHandlerType = "log"
+ // ErrorHandlerTypeSink used to send the event to a further sink (for future processing). This was previously known as dead-letter-channel.
+ ErrorHandlerTypeSink ErrorHandlerType = "sink"
+)
diff --git a/pkg/apis/camel/v1/error_handler_types_support.go b/pkg/apis/camel/v1/error_handler_types_support.go
new file mode 100644
index 000000000..a0aa93cd4
--- /dev/null
+++ b/pkg/apis/camel/v1/error_handler_types_support.go
@@ -0,0 +1,128 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+ "encoding/json"
+)
+
+// +kubebuilder:object:generate=false
+
+// ErrorHandler is a generic interface that represent any type of error handler specification
+type ErrorHandler interface {
+ Type() ErrorHandlerType
+ Endpoint() *Endpoint
+ Configuration() (map[string]interface{}, error)
+}
+
+// baseErrorHandler is the base used for the Error Handler hierarchy
+type baseErrorHandler struct {
+}
+
+// Type --
+func (e baseErrorHandler) Type() ErrorHandlerType {
+ return errorHandlerTypeBase
+}
+
+// Endpoint --
+func (e baseErrorHandler) Endpoint() *Endpoint {
+ return nil
+}
+
+// Configuration --
+func (e baseErrorHandler) Configuration() (map[string]interface{}, error) {
+ return nil, nil
+}
+
+// ErrorHandlerNone --
+type ErrorHandlerNone struct {
+ baseErrorHandler
+}
+
+// Type --
+func (e ErrorHandlerNone) Type() ErrorHandlerType {
+ return ErrorHandlerTypeNone
+}
+
+// Configuration --
+func (e ErrorHandlerNone) Configuration() (map[string]interface{}, error) {
+ return map[string]interface{}{
+ ErrorHandlerAppPropertiesPrefix: "#class:org.apache.camel.builder.NoErrorHandlerBuilder",
+ ErrorHandlerRefName: ErrorHandlerRefDefaultName,
+ }, nil
+}
+
+// ErrorHandlerLog represent a default (log) error handler type
+type ErrorHandlerLog struct {
+ ErrorHandlerNone
+ Parameters *ErrorHandlerParameters `json:"parameters,omitempty"`
+}
+
+// Type --
+func (e ErrorHandlerLog) Type() ErrorHandlerType {
+ return ErrorHandlerTypeLog
+}
+
+// Configuration --
+func (e ErrorHandlerLog) Configuration() (map[string]interface{}, error) {
+ properties, err := e.ErrorHandlerNone.Configuration()
+ if err != nil {
+ return nil, err
+ }
+ properties[ErrorHandlerAppPropertiesPrefix] = "#class:org.apache.camel.builder.DefaultErrorHandlerBuilder"
+
+ if e.Parameters != nil {
+ var parameters map[string]interface{}
+ err := json.Unmarshal(e.Parameters.RawMessage, ¶meters)
+ if err != nil {
+ return nil, err
+ }
+ for key, value := range parameters {
+ properties[ErrorHandlerAppPropertiesPrefix+"."+key] = value
+ }
+ }
+
+ return properties, nil
+}
+
+// ErrorHandlerSink represents a sink error handler type which behave like a dead letter channel
+type ErrorHandlerSink struct {
+ ErrorHandlerLog
+ DLCEndpoint *Endpoint `json:"endpoint,omitempty"`
+}
+
+// Type --
+func (e ErrorHandlerSink) Type() ErrorHandlerType {
+ return ErrorHandlerTypeSink
+}
+
+// Endpoint --
+func (e ErrorHandlerSink) Endpoint() *Endpoint {
+ return e.DLCEndpoint
+}
+
+// Configuration --
+func (e ErrorHandlerSink) Configuration() (map[string]interface{}, error) {
+ properties, err := e.ErrorHandlerLog.Configuration()
+ if err != nil {
+ return nil, err
+ }
+ properties[ErrorHandlerAppPropertiesPrefix] = "#class:org.apache.camel.builder.DeadLetterChannelBuilder"
+
+ return properties, err
+}
diff --git a/pkg/apis/camel/v1/jsonschema_types.go b/pkg/apis/camel/v1/jsonschema_types.go
new file mode 100644
index 000000000..41d70a70b
--- /dev/null
+++ b/pkg/apis/camel/v1/jsonschema_types.go
@@ -0,0 +1,108 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// NOTE: this file has been originally copied from https://github.com/kubernetes/apiextensions-apiserver/blob/33bb2d8b009bae408e40818a93877459efeb4cb1/pkg/apis/apiextensions/v1/types_jsonschema.go
+
+package v1
+
+import (
+ "encoding/json"
+)
+
+type JSONSchemaProp struct {
+ ID string `json:"id,omitempty"`
+ Deprecated bool `json:"deprecated,omitempty"`
+ Description string `json:"description,omitempty"`
+ Type string `json:"type,omitempty"`
+ // format is an OpenAPI v3 format string. Unknown formats are ignored. The following formats are validated:
+ //
+ // - bsonobjectid: a bson object ID, i.e. a 24 characters hex string
+ // - uri: an URI as parsed by Golang net/url.ParseRequestURI
+ // - email: an email address as parsed by Golang net/mail.ParseAddress
+ // - hostname: a valid representation for an Internet host name, as defined by RFC 1034, section 3.1 [RFC1034].
+ // - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
+ // - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
+ // - cidr: a CIDR as parsed by Golang net.ParseCIDR
+ // - mac: a MAC address as parsed by Golang net.ParseMAC
+ // - uuid: an UUID that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ // - uuid3: an UUID3 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
+ // - uuid4: an UUID4 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ // - uuid5: an UUID5 that allows uppercase defined by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
+ // - isbn: an ISBN10 or ISBN13 number string like "0321751043" or "978-0321751041"
+ // - isbn10: an ISBN10 number string like "0321751043"
+ // - isbn13: an ISBN13 number string like "978-0321751041"
+ // - creditcard: a credit card number defined by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\d{3})\\d{11})$ with any non digit characters mixed in
+ // - ssn: a U.S. social security number following the regex ^\\d{3}[- ]?\\d{2}[- ]?\\d{4}$
+ // - hexcolor: an hexadecimal color code like "#FFFFFF" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
+ // - rgbcolor: an RGB color code like rgb like "rgb(255,255,255)"
+ // - byte: base64 encoded binary data
+ // - password: any kind of string
+ // - date: a date string like "2006-01-02" as defined by full-date in RFC3339
+ // - duration: a duration string like "22 ns" as parsed by Golang time.ParseDuration or compatible with Scala duration format
+ // - datetime: a date time string like "2014-12-15T19:30:20.000Z" as defined by date-time in RFC3339.
+ Format string `json:"format,omitempty"`
+ Title string `json:"title,omitempty"`
+ // default is a default value for undefined object fields.
+ Default *JSON `json:"default,omitempty"`
+ Maximum *json.Number `json:"maximum,omitempty"`
+ ExclusiveMaximum bool `json:"exclusiveMaximum,omitempty"`
+ Minimum *json.Number `json:"minimum,omitempty"`
+ ExclusiveMinimum bool `json:"exclusiveMinimum,omitempty"`
+ MaxLength *int64 `json:"maxLength,omitempty"`
+ MinLength *int64 `json:"minLength,omitempty"`
+ Pattern string `json:"pattern,omitempty"`
+ MaxItems *int64 `json:"maxItems,omitempty"`
+ MinItems *int64 `json:"minItems,omitempty"`
+ UniqueItems bool `json:"uniqueItems,omitempty"`
+ MaxProperties *int64 `json:"maxProperties,omitempty"`
+ MinProperties *int64 `json:"minProperties,omitempty"`
+ MultipleOf *json.Number `json:"multipleOf,omitempty"`
+ Enum []JSON `json:"enum,omitempty"`
+ Example *JSON `json:"example,omitempty"`
+ Nullable bool `json:"nullable,omitempty"`
+ // XDescriptors is a list of extended properties that trigger a custom behavior in external systems
+ XDescriptors []string `json:"x-descriptors,omitempty"`
+}
+
+// JSONSchemaProps is a JSON-Schema following Specification Draft 4 (http://json-schema.org/).
+type JSONSchemaProps struct {
+ ID string `json:"id,omitempty"`
+ Description string `json:"description,omitempty"`
+ Title string `json:"title,omitempty"`
+ Properties map[string]JSONSchemaProp `json:"properties,omitempty"`
+ Required []string `json:"required,omitempty"`
+ Example *JSON `json:"example,omitempty"`
+ ExternalDocs *ExternalDocumentation `json:"externalDocs,omitempty"`
+ Schema JSONSchemaURL `json:"$schema,omitempty"`
+ Type string `json:"type,omitempty"`
+}
+
+// +kubebuilder:validation:Type=""
+// JSON represents any valid JSON value.
+// These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
+type JSON struct {
+ RawMessage `json:",inline"`
+}
+
+// JSONSchemaURL represents a schema url.
+type JSONSchemaURL string
+
+// ExternalDocumentation allows referencing an external resource for extended documentation.
+type ExternalDocumentation struct {
+ Description string `json:"description,omitempty"`
+ URL string `json:"url,omitempty"`
+}
diff --git a/pkg/apis/camel/v1/kamelet_types.go b/pkg/apis/camel/v1/kamelet_types.go
new file mode 100644
index 000000000..9d224b8fd
--- /dev/null
+++ b/pkg/apis/camel/v1/kamelet_types.go
@@ -0,0 +1,234 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+ corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+ // AnnotationIcon label used by icons
+ AnnotationIcon = "camel.apache.org/kamelet.icon"
+ // KameletBundledLabel label used by bundling
+ KameletBundledLabel = "camel.apache.org/kamelet.bundled"
+ // KameletReadOnlyLabel label used to identify readonly Kamelets
+ KameletReadOnlyLabel = "camel.apache.org/kamelet.readonly"
+ // KameletTypeLabel label used to identify Kamelet type
+ KameletTypeLabel = "camel.apache.org/kamelet.type"
+ // KameletGroupLabel label used to group Kamelets
+ KameletGroupLabel = "camel.apache.org/kamelet.group"
+
+ // KameletTypeSink type Sink
+ KameletTypeSink = "sink"
+ // KameletTypeSource type Source
+ KameletTypeSource = "source"
+ // KameletTypeAction type Action
+ KameletTypeAction = "action"
+)
+
+var (
+ // reservedKameletNames used to mark reserved names
+ reservedKameletNames = map[string]bool{"source": true, "sink": true}
+ // KameletIDProperty used to identify
+ KameletIDProperty = "id"
+)
+
+// +genclient
+// +kubebuilder:object:root=true
+// +kubebuilder:storageversion
+// +kubebuilder:resource:path=kamelets,scope=Namespaced,shortName=kl,categories=kamel;camel
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="The Kamelet phase"
+
+// Kamelet is the Schema for the kamelets API
+type Kamelet struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ObjectMeta `json:"metadata,omitempty"`
+
+ // the desired specification
+ Spec KameletSpec `json:"spec,omitempty"`
+ // the actual status of the resource
+ Status KameletStatus `json:"status,omitempty"`
+}
+
+// KameletSpec specifies the configuration required to execute a Kamelet
+type KameletSpec struct {
+ // defines the formal configuration of the Kamelet
+ Definition *JSONSchemaProps `json:"definition,omitempty"`
+ // sources in any Camel DSL supported
+ Sources []SourceSpec `json:"sources,omitempty"`
+ // the main source in YAML DSL
+ Template *Template `json:"template,omitempty"`
+ // data specification types for the events consumed/produced by the Kamelet
+ // Deprecated: In favor of using DataTypes
+ Types map[TypeSlot]EventTypeSpec `json:"types,omitempty"`
+ // data specification types for the events consumed/produced by the Kamelet
+ DataTypes map[TypeSlot]DataTypesSpec `json:"dataTypes,omitempty"`
+ // Camel dependencies needed by the Kamelet
+ Dependencies []string `json:"dependencies,omitempty"`
+}
+
+// Template is an unstructured object representing a Kamelet template in YAML/JSON DSL
+type Template struct {
+ // an unstructured raw message
+ RawMessage `json:",inline"`
+}
+
+// TypeSlot represent a kind of data (ie, input, output, ...)
+type TypeSlot string
+
+const (
+ // TypeSlotIn is used for the input events
+ TypeSlotIn TypeSlot = "in"
+ // TypeSlotOut is used for the output events
+ TypeSlotOut TypeSlot = "out"
+ // TypeSlotError is used for the error events
+ TypeSlotError TypeSlot = "error"
+)
+
+// EventTypeSpec represents a specification for an event type
+// Deprecated: In favor of using DataTypeSpec
+type EventTypeSpec struct {
+ // media type as expected for HTTP media types (ie, application/json)
+ MediaType string `json:"mediaType,omitempty"`
+ // the expected schema for the event
+ Schema *JSONSchemaProps `json:"schema,omitempty"`
+}
+
+// DataTypesSpec represents the specification for a set of data types
+type DataTypesSpec struct {
+ // the default data type for this Kamelet
+ Default string `json:"default,omitempty"`
+ // one to many data type specifications
+ Types map[string]DataTypeSpec `json:"types,omitempty"`
+ // one to many header specifications
+ Headers map[string]HeaderSpec `json:"headers,omitempty"`
+}
+
+// DataTypeSpec represents the specification for a data type
+type DataTypeSpec struct {
+ // the data type component scheme
+ Scheme string `json:"scheme,omitempty"`
+ // the data type format name
+ Format string `json:"format,omitempty"`
+ // optional description
+ Description string `json:"description,omitempty"`
+ // media type as expected for HTTP media types (ie, application/json)
+ MediaType string `json:"mediaType,omitempty"`
+ // the list of Camel or Maven dependencies required by the data type
+ Dependencies []string `json:"dependencies,omitempty"`
+ // one to many header specifications
+ Headers map[string]HeaderSpec `json:"headers,omitempty"`
+ // the expected schema for the data type
+ Schema *JSONSchemaProps `json:"schema,omitempty"`
+}
+
+// DataTypeReference references to the specification of a data type by its scheme and format name
+type DataTypeReference struct {
+ // the data type component scheme
+ Scheme string `json:"scheme,omitempty"`
+ // the data type format name
+ Format string `json:"format,omitempty"`
+}
+
+// HeaderSpec represents the specification for a header used in the Kamelet
+type HeaderSpec struct {
+ Type string `json:"type,omitempty"`
+ Title string `json:"title,omitempty"`
+ Description string `json:"description,omitempty"`
+ Required bool `json:"required,omitempty"`
+ Default string `json:"default,omitempty"`
+}
+
+// KameletStatus defines the observed state of Kamelet
+type KameletStatus struct {
+ // ObservedGeneration is the most recent generation observed for this Kamelet.
+ ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+ // Phase --
+ Phase KameletPhase `json:"phase,omitempty"`
+ // Conditions --
+ Conditions []KameletCondition `json:"conditions,omitempty"`
+ // Properties --
+ Properties []KameletProperty `json:"properties,omitempty"`
+}
+
+// KameletProperty specify the behavior of a property in a Kamelet
+type KameletProperty struct {
+ // the name of the property
+ Name string `json:"name,omitempty"`
+ // the default value of the property (if any)
+ Default string `json:"default,omitempty"`
+}
+
+// KameletCondition describes the state of a resource at a certain point.
+type KameletCondition struct {
+ // Type of kamelet condition.
+ Type KameletConditionType `json:"type"`
+ // Status of the condition, one of True, False, Unknown.
+ Status corev1.ConditionStatus `json:"status"`
+ // The last time this condition was updated.
+ LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
+ // Last time the condition transitioned from one status to another.
+ LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
+ // The reason for the condition's last transition.
+ Reason string `json:"reason,omitempty"`
+ // A human-readable message indicating details about the transition.
+ Message string `json:"message,omitempty"`
+}
+
+// KameletConditionType --
+type KameletConditionType string
+
+const (
+ // KameletConditionReady --
+ KameletConditionReady KameletConditionType = "Ready"
+)
+
+const (
+ // KameletConditionReasonInvalidName --
+ KameletConditionReasonInvalidName string = "InvalidName"
+ // KameletConditionReasonInvalidProperty --
+ KameletConditionReasonInvalidProperty string = "InvalidProperty"
+ // KameletConditionReasonInvalidTemplate --
+ KameletConditionReasonInvalidTemplate string = "InvalidTemplate"
+)
+
+// KameletPhase --
+type KameletPhase string
+
+const (
+ // KameletKind --
+ KameletKind string = "Kamelet"
+
+ // KameletPhaseNone --
+ KameletPhaseNone KameletPhase = ""
+ // KameletPhaseReady --
+ KameletPhaseReady KameletPhase = "Ready"
+ // KameletPhaseError --
+ KameletPhaseError KameletPhase = "Error"
+)
+
+// +kubebuilder:object:root=true
+
+// KameletList contains a list of Kamelet
+type KameletList struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ListMeta `json:"metadata,omitempty"`
+ Items []Kamelet `json:"items"`
+}
diff --git a/pkg/apis/camel/v1alpha1/binding_types_support.go b/pkg/apis/camel/v1/kamelet_types_support.go
similarity index 59%
copy from pkg/apis/camel/v1alpha1/binding_types_support.go
copy to pkg/apis/camel/v1/kamelet_types_support.go
index c44b8a2d3..c918a84eb 100644
--- a/pkg/apis/camel/v1alpha1/binding_types_support.go
+++ b/pkg/apis/camel/v1/kamelet_types_support.go
@@ -15,21 +15,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package v1alpha1
+package v1
import (
- "bytes"
- "encoding/json"
- "fmt"
+ "sort"
- 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"
)
// GetConditions --
-func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
- res := make([]v1.ResourceCondition, 0, len(in.Conditions))
+func (in *KameletStatus) GetConditions() []ResourceCondition {
+ res := make([]ResourceCondition, 0, len(in.Conditions))
for _, c := range in.Conditions {
res = append(res, c)
}
@@ -37,42 +34,37 @@ func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
}
// GetType --
-func (c BindingCondition) GetType() string {
+func (c KameletCondition) GetType() string {
return string(c.Type)
}
// GetStatus --
-func (c BindingCondition) GetStatus() corev1.ConditionStatus {
+func (c KameletCondition) GetStatus() corev1.ConditionStatus {
return c.Status
}
// GetLastUpdateTime --
-func (c BindingCondition) GetLastUpdateTime() metav1.Time {
+func (c KameletCondition) GetLastUpdateTime() metav1.Time {
return c.LastUpdateTime
}
// GetLastTransitionTime --
-func (c BindingCondition) GetLastTransitionTime() metav1.Time {
+func (c KameletCondition) GetLastTransitionTime() metav1.Time {
return c.LastTransitionTime
}
// GetReason --
-func (c BindingCondition) GetReason() string {
+func (c KameletCondition) GetReason() string {
return c.Reason
}
// GetMessage --
-func (c BindingCondition) GetMessage() string {
+func (c KameletCondition) GetMessage() string {
return c.Message
}
-// SetOperatorID sets the given operator id as an annotation
-func (in *Binding) SetOperatorID(operatorID string) {
- v1.SetAnnotation(&in.ObjectMeta, v1.OperatorIDAnnotation, operatorID)
-}
-
// GetCondition returns the condition with the provided type.
-func (in *BindingStatus) GetCondition(condType BindingConditionType) *BindingCondition {
+func (in *KameletStatus) GetCondition(condType KameletConditionType) *KameletCondition {
for i := range in.Conditions {
c := in.Conditions[i]
if c.Type == condType {
@@ -83,8 +75,8 @@ func (in *BindingStatus) GetCondition(condType BindingConditionType) *BindingCon
}
// SetCondition --
-func (in *BindingStatus) SetCondition(condType BindingConditionType, status corev1.ConditionStatus, reason string, message string) {
- in.SetConditions(BindingCondition{
+func (in *KameletStatus) SetCondition(condType KameletConditionType, status corev1.ConditionStatus, reason string, message string) {
+ in.SetConditions(KameletCondition{
Type: condType,
Status: status,
LastUpdateTime: metav1.Now(),
@@ -95,8 +87,8 @@ func (in *BindingStatus) SetCondition(condType BindingConditionType, status core
}
// SetErrorCondition --
-func (in *BindingStatus) SetErrorCondition(condType BindingConditionType, reason string, err error) {
- in.SetConditions(BindingCondition{
+func (in *KameletStatus) SetErrorCondition(condType KameletConditionType, reason string, err error) {
+ in.SetConditions(KameletCondition{
Type: condType,
Status: corev1.ConditionFalse,
LastUpdateTime: metav1.Now(),
@@ -110,7 +102,7 @@ func (in *BindingStatus) SetErrorCondition(condType BindingConditionType, reason
//
// If a condition that we are about to add already exists and has the same status and
// reason then we are not going to update.
-func (in *BindingStatus) SetConditions(conditions ...BindingCondition) {
+func (in *KameletStatus) SetConditions(conditions ...KameletCondition) {
for _, condition := range conditions {
if condition.LastUpdateTime.IsZero() {
condition.LastUpdateTime = metav1.Now()
@@ -135,7 +127,7 @@ func (in *BindingStatus) SetConditions(conditions ...BindingCondition) {
}
// RemoveCondition removes the resource condition with the provided type.
-func (in *BindingStatus) RemoveCondition(condType BindingConditionType) {
+func (in *KameletStatus) RemoveCondition(condType KameletConditionType) {
newConditions := in.Conditions[:0]
for _, c := range in.Conditions {
if c.Type != condType {
@@ -146,35 +138,65 @@ func (in *BindingStatus) RemoveCondition(condType BindingConditionType) {
in.Conditions = newConditions
}
-// GetPropertyMap returns the EndpointProperties as map
-func (p *EndpointProperties) GetPropertyMap() (map[string]string, error) {
- if p == nil {
- return nil, nil
+// SortedDefinitionPropertiesKeys returns the sorted keys of the Kamelet definition properties
+func (k *Kamelet) SortedDefinitionPropertiesKeys() []string {
+ if k.Spec.Definition == nil {
+ return []string{}
+ }
+ props := k.Spec.Definition.Properties
+ if len(props) == 0 {
+ return []string{}
+ }
+ res := make([]string, len(props))
+ i := 0
+ for key := range props {
+ res[i] = string(key)
+ i++
}
- if len(p.RawMessage) == 0 {
- return nil, nil
+ sort.Strings(res)
+ return res
+}
+
+// SortedTypesKeys returns the sorted keys of the Kamelet spec types
+func (k *Kamelet) SortedTypesKeys() []TypeSlot {
+ types := k.Spec.DataTypes
+ if len(types) == 0 {
+ return []TypeSlot{}
}
+ strs := make([]string, len(types))
+ i := 0
+ for key := range types {
+ strs[i] = string(key)
+ i++
+ }
+ sort.Strings(strs)
+ res := make([]TypeSlot, len(types))
+ for i, s := range strs {
+ res[i] = TypeSlot(s)
+ }
+ return res
+}
+
+func ValidKameletName(name string) bool {
+ return !reservedKameletNames[name]
+}
- // Convert json property values to objects before getting their string representation
- var props map[string]interface{}
- d := json.NewDecoder(bytes.NewReader(p.RawMessage))
- d.UseNumber()
- if err := d.Decode(&props); err != nil {
- return nil, err
+func ValidKameletProperties(kamelet *Kamelet) bool {
+ if kamelet == nil || kamelet.Spec.Definition == nil || kamelet.Spec.Definition.Properties == nil {
+ return true
}
- stringProps := make(map[string]string, len(props))
- for k, v := range props {
- stringProps[k] = fmt.Sprintf("%v", v)
+ if _, idPresent := kamelet.Spec.Definition.Properties[KameletIDProperty]; idPresent {
+ return false
}
- return stringProps, nil
+ return true
}
-// NewBinding --
-func NewBinding(namespace string, name string) Binding {
- return Binding{
+// NewKamelet creates a new kamelet
+func NewKamelet(namespace string, name string) Kamelet {
+ return Kamelet{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: BindingKind,
+ Kind: KameletKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
@@ -183,12 +205,12 @@ func NewBinding(namespace string, name string) Binding {
}
}
-// NewBindingList --
-func NewBindingList() BindingList {
- return BindingList{
+// NewKameletList creates a new list of kamelets
+func NewKameletList() KameletList {
+ return KameletList{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: BindingKind,
+ Kind: KameletKind,
},
}
}
diff --git a/pkg/apis/camel/v1/register.go b/pkg/apis/camel/v1/register.go
index 7f02c944b..205e4c58b 100644
--- a/pkg/apis/camel/v1/register.go
+++ b/pkg/apis/camel/v1/register.go
@@ -57,6 +57,10 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&CamelCatalogList{},
&Build{},
&BuildList{},
+ &Kamelet{},
+ &KameletList{},
+ &Binding{},
+ &BindingList{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index f7b543f17..2af39bb18 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -6,6 +6,7 @@
package v1
import (
+ "encoding/json"
"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"
@@ -62,6 +63,175 @@ func (in *BaseTask) DeepCopy() *BaseTask {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BeanProperties) DeepCopyInto(out *BeanProperties) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BeanProperties.
+func (in *BeanProperties) DeepCopy() *BeanProperties {
+ if in == nil {
+ return nil
+ }
+ out := new(BeanProperties)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Binding) DeepCopyInto(out *Binding) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+ in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Binding.
+func (in *Binding) DeepCopy() *Binding {
+ if in == nil {
+ return nil
+ }
+ out := new(Binding)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Binding) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingCondition) DeepCopyInto(out *BindingCondition) {
+ *out = *in
+ in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+ in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+ if in.Pods != nil {
+ in, out := &in.Pods, &out.Pods
+ *out = make([]PodCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingCondition.
+func (in *BindingCondition) DeepCopy() *BindingCondition {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingCondition)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingList) DeepCopyInto(out *BindingList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]Binding, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingList.
+func (in *BindingList) DeepCopy() *BindingList {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *BindingList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingSpec) DeepCopyInto(out *BindingSpec) {
+ *out = *in
+ if in.Integration != nil {
+ in, out := &in.Integration, &out.Integration
+ *out = new(IntegrationSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ in.Source.DeepCopyInto(&out.Source)
+ in.Sink.DeepCopyInto(&out.Sink)
+ if in.ErrorHandler != nil {
+ in, out := &in.ErrorHandler, &out.ErrorHandler
+ *out = new(ErrorHandlerSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Steps != nil {
+ in, out := &in.Steps, &out.Steps
+ *out = make([]Endpoint, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingSpec.
+func (in *BindingSpec) DeepCopy() *BindingSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingStatus) DeepCopyInto(out *BindingStatus) {
+ *out = *in
+ if in.Conditions != nil {
+ in, out := &in.Conditions, &out.Conditions
+ *out = make([]BindingCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingStatus.
+func (in *BindingStatus) DeepCopy() *BindingStatus {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingStatus)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Build) DeepCopyInto(out *Build) {
*out = *in
@@ -556,36 +726,309 @@ func (in *Capability) DeepCopy() *Capability {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ConfigurationSpec) DeepCopyInto(out *ConfigurationSpec) {
+func (in *ConfigurationSpec) DeepCopyInto(out *ConfigurationSpec) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigurationSpec.
+func (in *ConfigurationSpec) DeepCopy() *ConfigurationSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(ConfigurationSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataSpec) DeepCopyInto(out *DataSpec) {
+ *out = *in
+ if in.RawContent != nil {
+ in, out := &in.RawContent, &out.RawContent
+ *out = make([]byte, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSpec.
+func (in *DataSpec) DeepCopy() *DataSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(DataSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataTypeReference) DeepCopyInto(out *DataTypeReference) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataTypeReference.
+func (in *DataTypeReference) DeepCopy() *DataTypeReference {
+ if in == nil {
+ return nil
+ }
+ out := new(DataTypeReference)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataTypeSpec) DeepCopyInto(out *DataTypeSpec) {
+ *out = *in
+ if in.Dependencies != nil {
+ in, out := &in.Dependencies, &out.Dependencies
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+ if in.Headers != nil {
+ in, out := &in.Headers, &out.Headers
+ *out = make(map[string]HeaderSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+ if in.Schema != nil {
+ in, out := &in.Schema, &out.Schema
+ *out = new(JSONSchemaProps)
+ (*in).DeepCopyInto(*out)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataTypeSpec.
+func (in *DataTypeSpec) DeepCopy() *DataTypeSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(DataTypeSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *DataTypesSpec) DeepCopyInto(out *DataTypesSpec) {
+ *out = *in
+ if in.Types != nil {
+ in, out := &in.Types, &out.Types
+ *out = make(map[string]DataTypeSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
+ if in.Headers != nil {
+ in, out := &in.Headers, &out.Headers
+ *out = make(map[string]HeaderSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataTypesSpec.
+func (in *DataTypesSpec) DeepCopy() *DataTypesSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(DataTypesSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Endpoint) DeepCopyInto(out *Endpoint) {
+ *out = *in
+ if in.Ref != nil {
+ in, out := &in.Ref, &out.Ref
+ *out = new(corev1.ObjectReference)
+ **out = **in
+ }
+ if in.URI != nil {
+ in, out := &in.URI, &out.URI
+ *out = new(string)
+ **out = **in
+ }
+ if in.Properties != nil {
+ in, out := &in.Properties, &out.Properties
+ *out = new(EndpointProperties)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Types != nil {
+ in, out := &in.Types, &out.Types
+ *out = make(map[TypeSlot]EventTypeSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
+ if in.DataTypes != nil {
+ in, out := &in.DataTypes, &out.DataTypes
+ *out = make(map[TypeSlot]DataTypeReference, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Endpoint.
+func (in *Endpoint) DeepCopy() *Endpoint {
+ if in == nil {
+ return nil
+ }
+ out := new(Endpoint)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EndpointProperties) DeepCopyInto(out *EndpointProperties) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EndpointProperties.
+func (in *EndpointProperties) DeepCopy() *EndpointProperties {
+ if in == nil {
+ return nil
+ }
+ out := new(EndpointProperties)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ErrorHandlerLog) DeepCopyInto(out *ErrorHandlerLog) {
+ *out = *in
+ out.ErrorHandlerNone = in.ErrorHandlerNone
+ if in.Parameters != nil {
+ in, out := &in.Parameters, &out.Parameters
+ *out = new(ErrorHandlerParameters)
+ (*in).DeepCopyInto(*out)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ErrorHandlerLog.
+func (in *ErrorHandlerLog) DeepCopy() *ErrorHandlerLog {
+ if in == nil {
+ return nil
+ }
+ out := new(ErrorHandlerLog)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ErrorHandlerNone) DeepCopyInto(out *ErrorHandlerNone) {
+ *out = *in
+ out.baseErrorHandler = in.baseErrorHandler
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ErrorHandlerNone.
+func (in *ErrorHandlerNone) DeepCopy() *ErrorHandlerNone {
+ if in == nil {
+ return nil
+ }
+ out := new(ErrorHandlerNone)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ErrorHandlerParameters) DeepCopyInto(out *ErrorHandlerParameters) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ErrorHandlerParameters.
+func (in *ErrorHandlerParameters) DeepCopy() *ErrorHandlerParameters {
+ if in == nil {
+ return nil
+ }
+ out := new(ErrorHandlerParameters)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ErrorHandlerSink) DeepCopyInto(out *ErrorHandlerSink) {
+ *out = *in
+ in.ErrorHandlerLog.DeepCopyInto(&out.ErrorHandlerLog)
+ if in.DLCEndpoint != nil {
+ in, out := &in.DLCEndpoint, &out.DLCEndpoint
+ *out = new(Endpoint)
+ (*in).DeepCopyInto(*out)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ErrorHandlerSink.
+func (in *ErrorHandlerSink) DeepCopy() *ErrorHandlerSink {
+ if in == nil {
+ return nil
+ }
+ out := new(ErrorHandlerSink)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ErrorHandlerSpec) DeepCopyInto(out *ErrorHandlerSpec) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ErrorHandlerSpec.
+func (in *ErrorHandlerSpec) DeepCopy() *ErrorHandlerSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(ErrorHandlerSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EventTypeSpec) DeepCopyInto(out *EventTypeSpec) {
*out = *in
+ if in.Schema != nil {
+ in, out := &in.Schema, &out.Schema
+ *out = new(JSONSchemaProps)
+ (*in).DeepCopyInto(*out)
+ }
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigurationSpec.
-func (in *ConfigurationSpec) DeepCopy() *ConfigurationSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EventTypeSpec.
+func (in *EventTypeSpec) DeepCopy() *EventTypeSpec {
if in == nil {
return nil
}
- out := new(ConfigurationSpec)
+ out := new(EventTypeSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DataSpec) DeepCopyInto(out *DataSpec) {
+func (in *ExternalDocumentation) DeepCopyInto(out *ExternalDocumentation) {
*out = *in
- if in.RawContent != nil {
- in, out := &in.RawContent, &out.RawContent
- *out = make([]byte, len(*in))
- copy(*out, *in)
- }
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataSpec.
-func (in *DataSpec) DeepCopy() *DataSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalDocumentation.
+func (in *ExternalDocumentation) DeepCopy() *ExternalDocumentation {
if in == nil {
return nil
}
- out := new(DataSpec)
+ out := new(ExternalDocumentation)
in.DeepCopyInto(out)
return out
}
@@ -643,6 +1086,21 @@ func (in *Flow) DeepCopy() *Flow {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HeaderSpec) DeepCopyInto(out *HeaderSpec) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HeaderSpec.
+func (in *HeaderSpec) DeepCopy() *HeaderSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(HeaderSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *HealthCheck) DeepCopyInto(out *HealthCheck) {
*out = *in
@@ -1276,6 +1734,314 @@ func (in *IntegrationStatus) DeepCopy() *IntegrationStatus {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *JSON) DeepCopyInto(out *JSON) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JSON.
+func (in *JSON) DeepCopy() *JSON {
+ if in == nil {
+ return nil
+ }
+ out := new(JSON)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *JSONSchemaProp) DeepCopyInto(out *JSONSchemaProp) {
+ *out = *in
+ if in.Default != nil {
+ in, out := &in.Default, &out.Default
+ *out = new(JSON)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Maximum != nil {
+ in, out := &in.Maximum, &out.Maximum
+ *out = new(json.Number)
+ **out = **in
+ }
+ if in.Minimum != nil {
+ in, out := &in.Minimum, &out.Minimum
+ *out = new(json.Number)
+ **out = **in
+ }
+ if in.MaxLength != nil {
+ in, out := &in.MaxLength, &out.MaxLength
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MinLength != nil {
+ in, out := &in.MinLength, &out.MinLength
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MaxItems != nil {
+ in, out := &in.MaxItems, &out.MaxItems
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MinItems != nil {
+ in, out := &in.MinItems, &out.MinItems
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MaxProperties != nil {
+ in, out := &in.MaxProperties, &out.MaxProperties
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MinProperties != nil {
+ in, out := &in.MinProperties, &out.MinProperties
+ *out = new(int64)
+ **out = **in
+ }
+ if in.MultipleOf != nil {
+ in, out := &in.MultipleOf, &out.MultipleOf
+ *out = new(json.Number)
+ **out = **in
+ }
+ if in.Enum != nil {
+ in, out := &in.Enum, &out.Enum
+ *out = make([]JSON, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Example != nil {
+ in, out := &in.Example, &out.Example
+ *out = new(JSON)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.XDescriptors != nil {
+ in, out := &in.XDescriptors, &out.XDescriptors
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JSONSchemaProp.
+func (in *JSONSchemaProp) DeepCopy() *JSONSchemaProp {
+ if in == nil {
+ return nil
+ }
+ out := new(JSONSchemaProp)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *JSONSchemaProps) DeepCopyInto(out *JSONSchemaProps) {
+ *out = *in
+ if in.Properties != nil {
+ in, out := &in.Properties, &out.Properties
+ *out = make(map[string]JSONSchemaProp, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
+ if in.Required != nil {
+ in, out := &in.Required, &out.Required
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+ if in.Example != nil {
+ in, out := &in.Example, &out.Example
+ *out = new(JSON)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.ExternalDocs != nil {
+ in, out := &in.ExternalDocs, &out.ExternalDocs
+ *out = new(ExternalDocumentation)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JSONSchemaProps.
+func (in *JSONSchemaProps) DeepCopy() *JSONSchemaProps {
+ if in == nil {
+ return nil
+ }
+ out := new(JSONSchemaProps)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kamelet) DeepCopyInto(out *Kamelet) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+ in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kamelet.
+func (in *Kamelet) DeepCopy() *Kamelet {
+ if in == nil {
+ return nil
+ }
+ out := new(Kamelet)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Kamelet) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletCondition) DeepCopyInto(out *KameletCondition) {
+ *out = *in
+ in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+ in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletCondition.
+func (in *KameletCondition) DeepCopy() *KameletCondition {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletCondition)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletList) DeepCopyInto(out *KameletList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]Kamelet, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletList.
+func (in *KameletList) DeepCopy() *KameletList {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *KameletList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletProperty) DeepCopyInto(out *KameletProperty) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletProperty.
+func (in *KameletProperty) DeepCopy() *KameletProperty {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletProperty)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletSpec) DeepCopyInto(out *KameletSpec) {
+ *out = *in
+ if in.Definition != nil {
+ in, out := &in.Definition, &out.Definition
+ *out = new(JSONSchemaProps)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Sources != nil {
+ in, out := &in.Sources, &out.Sources
+ *out = make([]SourceSpec, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Template != nil {
+ in, out := &in.Template, &out.Template
+ *out = new(Template)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Types != nil {
+ in, out := &in.Types, &out.Types
+ *out = make(map[TypeSlot]EventTypeSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
+ if in.DataTypes != nil {
+ in, out := &in.DataTypes, &out.DataTypes
+ *out = make(map[TypeSlot]DataTypesSpec, len(*in))
+ for key, val := range *in {
+ (*out)[key] = *val.DeepCopy()
+ }
+ }
+ if in.Dependencies != nil {
+ in, out := &in.Dependencies, &out.Dependencies
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletSpec.
+func (in *KameletSpec) DeepCopy() *KameletSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletStatus) DeepCopyInto(out *KameletStatus) {
+ *out = *in
+ if in.Conditions != nil {
+ in, out := &in.Conditions, &out.Conditions
+ *out = make([]KameletCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Properties != nil {
+ in, out := &in.Properties, &out.Properties
+ *out = make([]KameletProperty, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletStatus.
+func (in *KameletStatus) DeepCopy() *KameletStatus {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletStatus)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *KanikoTask) DeepCopyInto(out *KanikoTask) {
*out = *in
@@ -1828,6 +2594,26 @@ func (in *Task) DeepCopy() *Task {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Template) DeepCopyInto(out *Template) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Template.
+func (in *Template) DeepCopy() *Template {
+ if in == nil {
+ return nil
+ }
+ out := new(Template)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *TraitConfiguration) DeepCopyInto(out *TraitConfiguration) {
*out = *in
diff --git a/pkg/apis/camel/v1alpha1/binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
similarity index 71%
rename from pkg/apis/camel/v1alpha1/binding_types.go
rename to pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index 8e2857df5..fb1e44bc4 100644
--- a/pkg/apis/camel/v1alpha1/binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -26,27 +26,27 @@ import (
// +genclient
// +kubebuilder:object:root=true
-// +kubebuilder:resource:path=bindings,scope=Namespaced,shortName=klb,categories=kamel;camel
+// +kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
-// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="TheBinding phase"
+// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="The Kamelet Binding phase"
// +kubebuilder:printcolumn:name="Replicas",type=integer,JSONPath=`.status.replicas`,description="The number of pods"
-// Binding is the Schema for the kamelets binding API
-type Binding struct {
+// KameletBinding is the Schema for the kamelets binding API
+type KameletBinding struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
- // the specification of a Binding
- Spec BindingSpec `json:"spec,omitempty"`
- // the status of a Binding
- Status BindingStatus `json:"status,omitempty"`
+ // the specification of a KameletBinding
+ Spec KameletBindingSpec `json:"spec,omitempty"`
+ // the status of a KameletBinding
+ Status KameletBindingStatus `json:"status,omitempty"`
}
-// BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
-type BindingSpec struct {
+// KameletBindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+type KameletBindingSpec struct {
// Integration is an optional integration used to specify custom parameters
Integration *v1.IntegrationSpec `json:"integration,omitempty"`
// Source is the starting point of the integration defined by this binding
@@ -97,24 +97,24 @@ type EndpointProperties struct {
RawMessage `json:",inline"`
}
-// BindingStatus specify the status of a binding
-type BindingStatus struct {
- // ObservedGeneration is the most recent generation observed for this Binding.
+// KameletBindingStatus specify the status of a binding
+type KameletBindingStatus struct {
+ // ObservedGeneration is the most recent generation observed for this KameletBinding.
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
// Phase --
- Phase BindingPhase `json:"phase,omitempty"`
+ Phase KameletBindingPhase `json:"phase,omitempty"`
// Conditions --
- Conditions []BindingCondition `json:"conditions,omitempty"`
+ Conditions []KameletBindingCondition `json:"conditions,omitempty"`
// Replicas is the number of actual replicas of the binding
Replicas *int32 `json:"replicas,omitempty"`
// Selector allows to identify pods belonging to the binding
Selector string `json:"selector,omitempty"`
}
-// BindingCondition describes the state of a resource at a certain point.
-type BindingCondition struct {
- // Type of binding condition.
- Type BindingConditionType `json:"type"`
+// KameletBindingCondition describes the state of a resource at a certain point.
+type KameletBindingCondition struct {
+ // Type of kameletBinding condition.
+ Type KameletBindingConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status corev1.ConditionStatus `json:"status"`
// The last time this condition was updated.
@@ -129,38 +129,38 @@ type BindingCondition struct {
Pods []v1.PodCondition `json:"pods,omitempty"`
}
-// BindingConditionType --
-type BindingConditionType string
+// KameletBindingConditionType --
+type KameletBindingConditionType string
const (
- // BindingConditionReady --
- BindingConditionReady BindingConditionType = "Ready"
- // BindingIntegrationConditionError is used to report the error on the generated Integration
- BindingIntegrationConditionError BindingConditionType = "IntegrationError"
+ // KameletBindingConditionReady --
+ KameletBindingConditionReady KameletBindingConditionType = "Ready"
+ // KameletBindingIntegrationConditionError is used to report the error on the generated Integration
+ KameletBindingIntegrationConditionError KameletBindingConditionType = "IntegrationError"
)
-// BindingPhase --
-type BindingPhase string
+// KameletBindingPhase --
+type KameletBindingPhase string
const (
- // BindingKind --
- BindingKind string = "Binding"
-
- // BindingPhaseNone --
- BindingPhaseNone BindingPhase = ""
- // BindingPhaseCreating --
- BindingPhaseCreating BindingPhase = "Creating"
- // BindingPhaseError --
- BindingPhaseError BindingPhase = "Error"
- // BindingPhaseReady --
- BindingPhaseReady BindingPhase = "Ready"
+ // KameletBindingKind --
+ KameletBindingKind string = "KameletBinding"
+
+ // KameletBindingPhaseNone --
+ KameletBindingPhaseNone KameletBindingPhase = ""
+ // KameletBindingPhaseCreating --
+ KameletBindingPhaseCreating KameletBindingPhase = "Creating"
+ // KameletBindingPhaseError --
+ KameletBindingPhaseError KameletBindingPhase = "Error"
+ // KameletBindingPhaseReady --
+ KameletBindingPhaseReady KameletBindingPhase = "Ready"
)
// +kubebuilder:object:root=true
-// BindingList contains a list of Binding
-type BindingList struct {
+// KameletBindingList contains a list of KameletBinding
+type KameletBindingList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []Binding `json:"items"`
+ Items []KameletBinding `json:"items"`
}
diff --git a/pkg/apis/camel/v1alpha1/binding_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
similarity index 74%
rename from pkg/apis/camel/v1alpha1/binding_types_support.go
rename to pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
index c44b8a2d3..20d55df1b 100644
--- a/pkg/apis/camel/v1alpha1/binding_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
@@ -28,7 +28,7 @@ import (
)
// GetConditions --
-func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
+func (in *KameletBindingStatus) GetConditions() []v1.ResourceCondition {
res := make([]v1.ResourceCondition, 0, len(in.Conditions))
for _, c := range in.Conditions {
res = append(res, c)
@@ -37,42 +37,42 @@ func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
}
// GetType --
-func (c BindingCondition) GetType() string {
+func (c KameletBindingCondition) GetType() string {
return string(c.Type)
}
// GetStatus --
-func (c BindingCondition) GetStatus() corev1.ConditionStatus {
+func (c KameletBindingCondition) GetStatus() corev1.ConditionStatus {
return c.Status
}
// GetLastUpdateTime --
-func (c BindingCondition) GetLastUpdateTime() metav1.Time {
+func (c KameletBindingCondition) GetLastUpdateTime() metav1.Time {
return c.LastUpdateTime
}
// GetLastTransitionTime --
-func (c BindingCondition) GetLastTransitionTime() metav1.Time {
+func (c KameletBindingCondition) GetLastTransitionTime() metav1.Time {
return c.LastTransitionTime
}
// GetReason --
-func (c BindingCondition) GetReason() string {
+func (c KameletBindingCondition) GetReason() string {
return c.Reason
}
// GetMessage --
-func (c BindingCondition) GetMessage() string {
+func (c KameletBindingCondition) GetMessage() string {
return c.Message
}
// SetOperatorID sets the given operator id as an annotation
-func (in *Binding) SetOperatorID(operatorID string) {
+func (in *KameletBinding) SetOperatorID(operatorID string) {
v1.SetAnnotation(&in.ObjectMeta, v1.OperatorIDAnnotation, operatorID)
}
// GetCondition returns the condition with the provided type.
-func (in *BindingStatus) GetCondition(condType BindingConditionType) *BindingCondition {
+func (in *KameletBindingStatus) GetCondition(condType KameletBindingConditionType) *KameletBindingCondition {
for i := range in.Conditions {
c := in.Conditions[i]
if c.Type == condType {
@@ -83,8 +83,8 @@ func (in *BindingStatus) GetCondition(condType BindingConditionType) *BindingCon
}
// SetCondition --
-func (in *BindingStatus) SetCondition(condType BindingConditionType, status corev1.ConditionStatus, reason string, message string) {
- in.SetConditions(BindingCondition{
+func (in *KameletBindingStatus) SetCondition(condType KameletBindingConditionType, status corev1.ConditionStatus, reason string, message string) {
+ in.SetConditions(KameletBindingCondition{
Type: condType,
Status: status,
LastUpdateTime: metav1.Now(),
@@ -95,8 +95,8 @@ func (in *BindingStatus) SetCondition(condType BindingConditionType, status core
}
// SetErrorCondition --
-func (in *BindingStatus) SetErrorCondition(condType BindingConditionType, reason string, err error) {
- in.SetConditions(BindingCondition{
+func (in *KameletBindingStatus) SetErrorCondition(condType KameletBindingConditionType, reason string, err error) {
+ in.SetConditions(KameletBindingCondition{
Type: condType,
Status: corev1.ConditionFalse,
LastUpdateTime: metav1.Now(),
@@ -110,7 +110,7 @@ func (in *BindingStatus) SetErrorCondition(condType BindingConditionType, reason
//
// If a condition that we are about to add already exists and has the same status and
// reason then we are not going to update.
-func (in *BindingStatus) SetConditions(conditions ...BindingCondition) {
+func (in *KameletBindingStatus) SetConditions(conditions ...KameletBindingCondition) {
for _, condition := range conditions {
if condition.LastUpdateTime.IsZero() {
condition.LastUpdateTime = metav1.Now()
@@ -135,7 +135,7 @@ func (in *BindingStatus) SetConditions(conditions ...BindingCondition) {
}
// RemoveCondition removes the resource condition with the provided type.
-func (in *BindingStatus) RemoveCondition(condType BindingConditionType) {
+func (in *KameletBindingStatus) RemoveCondition(condType KameletBindingConditionType) {
newConditions := in.Conditions[:0]
for _, c := range in.Conditions {
if c.Type != condType {
@@ -169,12 +169,12 @@ func (p *EndpointProperties) GetPropertyMap() (map[string]string, error) {
return stringProps, nil
}
-// NewBinding --
-func NewBinding(namespace string, name string) Binding {
- return Binding{
+// NewKameletBinding --
+func NewKameletBinding(namespace string, name string) KameletBinding {
+ return KameletBinding{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: BindingKind,
+ Kind: KameletBindingKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
@@ -183,12 +183,12 @@ func NewBinding(namespace string, name string) Binding {
}
}
-// NewBindingList --
-func NewBindingList() BindingList {
- return BindingList{
+// NewKameletBindingList --
+func NewKameletBindingList() KameletBindingList {
+ return KameletBindingList{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: BindingKind,
+ Kind: KameletBindingKind,
},
}
}
diff --git a/pkg/apis/camel/v1alpha1/binding_types_support_test.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
similarity index 100%
rename from pkg/apis/camel/v1alpha1/binding_types_support_test.go
rename to pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
diff --git a/pkg/apis/camel/v1alpha1/register.go b/pkg/apis/camel/v1alpha1/register.go
index 6676d3b1a..f472e4d78 100644
--- a/pkg/apis/camel/v1alpha1/register.go
+++ b/pkg/apis/camel/v1alpha1/register.go
@@ -47,8 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&Kamelet{},
&KameletList{},
- &Binding{},
- &BindingList{},
+ &KameletBinding{},
+ &KameletBindingList{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 5bd413b4a..ee2885294 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -32,155 +32,6 @@ func (in *BeanProperties) DeepCopy() *BeanProperties {
return out
}
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Binding) DeepCopyInto(out *Binding) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
- in.Spec.DeepCopyInto(&out.Spec)
- in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Binding.
-func (in *Binding) DeepCopy() *Binding {
- if in == nil {
- return nil
- }
- out := new(Binding)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Binding) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *BindingCondition) DeepCopyInto(out *BindingCondition) {
- *out = *in
- in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
- in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
- if in.Pods != nil {
- in, out := &in.Pods, &out.Pods
- *out = make([]v1.PodCondition, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingCondition.
-func (in *BindingCondition) DeepCopy() *BindingCondition {
- if in == nil {
- return nil
- }
- out := new(BindingCondition)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *BindingList) DeepCopyInto(out *BindingList) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ListMeta.DeepCopyInto(&out.ListMeta)
- if in.Items != nil {
- in, out := &in.Items, &out.Items
- *out = make([]Binding, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingList.
-func (in *BindingList) DeepCopy() *BindingList {
- if in == nil {
- return nil
- }
- out := new(BindingList)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *BindingList) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *BindingSpec) DeepCopyInto(out *BindingSpec) {
- *out = *in
- if in.Integration != nil {
- in, out := &in.Integration, &out.Integration
- *out = new(v1.IntegrationSpec)
- (*in).DeepCopyInto(*out)
- }
- in.Source.DeepCopyInto(&out.Source)
- in.Sink.DeepCopyInto(&out.Sink)
- if in.ErrorHandler != nil {
- in, out := &in.ErrorHandler, &out.ErrorHandler
- *out = new(ErrorHandlerSpec)
- (*in).DeepCopyInto(*out)
- }
- if in.Steps != nil {
- in, out := &in.Steps, &out.Steps
- *out = make([]Endpoint, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Replicas != nil {
- in, out := &in.Replicas, &out.Replicas
- *out = new(int32)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingSpec.
-func (in *BindingSpec) DeepCopy() *BindingSpec {
- if in == nil {
- return nil
- }
- out := new(BindingSpec)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *BindingStatus) DeepCopyInto(out *BindingStatus) {
- *out = *in
- if in.Conditions != nil {
- in, out := &in.Conditions, &out.Conditions
- *out = make([]BindingCondition, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Replicas != nil {
- in, out := &in.Replicas, &out.Replicas
- *out = new(int32)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingStatus.
-func (in *BindingStatus) DeepCopy() *BindingStatus {
- if in == nil {
- return nil
- }
- out := new(BindingStatus)
- in.DeepCopyInto(out)
- return out
-}
-
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DataTypeReference) DeepCopyInto(out *DataTypeReference) {
*out = *in
@@ -635,6 +486,155 @@ func (in *Kamelet) DeepCopyObject() runtime.Object {
return nil
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletBinding) DeepCopyInto(out *KameletBinding) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+ in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBinding.
+func (in *KameletBinding) DeepCopy() *KameletBinding {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletBinding)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *KameletBinding) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletBindingCondition) DeepCopyInto(out *KameletBindingCondition) {
+ *out = *in
+ in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+ in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+ if in.Pods != nil {
+ in, out := &in.Pods, &out.Pods
+ *out = make([]v1.PodCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingCondition.
+func (in *KameletBindingCondition) DeepCopy() *KameletBindingCondition {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletBindingCondition)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletBindingList) DeepCopyInto(out *KameletBindingList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]KameletBinding, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingList.
+func (in *KameletBindingList) DeepCopy() *KameletBindingList {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletBindingList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *KameletBindingList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletBindingSpec) DeepCopyInto(out *KameletBindingSpec) {
+ *out = *in
+ if in.Integration != nil {
+ in, out := &in.Integration, &out.Integration
+ *out = new(v1.IntegrationSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ in.Source.DeepCopyInto(&out.Source)
+ in.Sink.DeepCopyInto(&out.Sink)
+ if in.ErrorHandler != nil {
+ in, out := &in.ErrorHandler, &out.ErrorHandler
+ *out = new(ErrorHandlerSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Steps != nil {
+ in, out := &in.Steps, &out.Steps
+ *out = make([]Endpoint, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingSpec.
+func (in *KameletBindingSpec) DeepCopy() *KameletBindingSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletBindingSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KameletBindingStatus) DeepCopyInto(out *KameletBindingStatus) {
+ *out = *in
+ if in.Conditions != nil {
+ in, out := &in.Conditions, &out.Conditions
+ *out = make([]KameletBindingCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingStatus.
+func (in *KameletBindingStatus) DeepCopy() *KameletBindingStatus {
+ if in == nil {
+ return nil
+ }
+ out := new(KameletBindingStatus)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *KameletCondition) DeepCopyInto(out *KameletCondition) {
*out = *in
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go b/pkg/client/camel/applyconfiguration/camel/v1/binding.go
similarity index 99%
copy from pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go
copy to pkg/client/camel/applyconfiguration/camel/v1/binding.go
index 0c8e09fc7..6f9fb21a3 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/binding.go
@@ -17,7 +17,7 @@ limitations under the License.
// Code generated by applyconfiguration-gen. DO NOT EDIT.
-package v1alpha1
+package v1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -41,7 +41,7 @@ func Binding(name, namespace string) *BindingApplyConfiguration {
b.WithName(name)
b.WithNamespace(namespace)
b.WithKind("Binding")
- b.WithAPIVersion("camel.apache.org/v1alpha1")
+ b.WithAPIVersion("camel.apache.org/v1")
return b
}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go b/pkg/client/camel/applyconfiguration/camel/v1/bindingcondition.go
similarity index 78%
copy from pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go
copy to pkg/client/camel/applyconfiguration/camel/v1/bindingcondition.go
index 7ae16279d..30cb41a51 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/bindingcondition.go
@@ -17,25 +17,24 @@ limitations under the License.
// Code generated by applyconfiguration-gen. DO NOT EDIT.
-package v1alpha1
+package v1
import (
- 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"
+ 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"
)
// BindingConditionApplyConfiguration represents an declarative configuration of the BindingCondition type for use
// with apply.
type BindingConditionApplyConfiguration struct {
- Type *v1alpha1.BindingConditionType `json:"type,omitempty"`
- Status *v1.ConditionStatus `json:"status,omitempty"`
- LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"`
- LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
- Reason *string `json:"reason,omitempty"`
- Message *string `json:"message,omitempty"`
- Pods []camelv1.PodConditionApplyConfiguration `json:"pods,omitempty"`
+ Type *v1.BindingConditionType `json:"type,omitempty"`
+ Status *corev1.ConditionStatus `json:"status,omitempty"`
+ LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"`
+ LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
+ Reason *string `json:"reason,omitempty"`
+ Message *string `json:"message,omitempty"`
+ Pods []PodConditionApplyConfiguration `json:"pods,omitempty"`
}
// BindingConditionApplyConfiguration constructs an declarative configuration of the BindingCondition type for use with
@@ -47,7 +46,7 @@ func BindingCondition() *BindingConditionApplyConfiguration {
// WithType sets the Type field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Type field is set to the value of the last call.
-func (b *BindingConditionApplyConfiguration) WithType(value v1alpha1.BindingConditionType) *BindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithType(value v1.BindingConditionType) *BindingConditionApplyConfiguration {
b.Type = &value
return b
}
@@ -55,7 +54,7 @@ func (b *BindingConditionApplyConfiguration) WithType(value v1alpha1.BindingCond
// WithStatus sets the Status field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Status field is set to the value of the last call.
-func (b *BindingConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *BindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithStatus(value corev1.ConditionStatus) *BindingConditionApplyConfiguration {
b.Status = &value
return b
}
@@ -95,7 +94,7 @@ func (b *BindingConditionApplyConfiguration) WithMessage(value string) *BindingC
// WithPods adds the given value to the Pods field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the Pods field.
-func (b *BindingConditionApplyConfiguration) WithPods(values ...*camelv1.PodConditionApplyConfiguration) *BindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithPods(values ...*PodConditionApplyConfiguration) *BindingConditionApplyConfiguration {
for i := range values {
if values[i] == nil {
panic("nil value passed to WithPods")
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go b/pkg/client/camel/applyconfiguration/camel/v1/bindingspec.go
similarity index 83%
copy from pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go
copy to pkg/client/camel/applyconfiguration/camel/v1/bindingspec.go
index 885d67fb2..887c313e5 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/bindingspec.go
@@ -17,22 +17,18 @@ limitations under the License.
// Code generated by applyconfiguration-gen. DO NOT EDIT.
-package v1alpha1
-
-import (
- v1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
-)
+package v1
// BindingSpecApplyConfiguration represents an declarative configuration of the BindingSpec type for use
// with apply.
type BindingSpecApplyConfiguration struct {
- Integration *v1.IntegrationSpecApplyConfiguration `json:"integration,omitempty"`
- Source *EndpointApplyConfiguration `json:"source,omitempty"`
- Sink *EndpointApplyConfiguration `json:"sink,omitempty"`
- ErrorHandler *ErrorHandlerSpecApplyConfiguration `json:"errorHandler,omitempty"`
- Steps []EndpointApplyConfiguration `json:"steps,omitempty"`
- Replicas *int32 `json:"replicas,omitempty"`
- ServiceAccountName *string `json:"serviceAccountName,omitempty"`
+ Integration *IntegrationSpecApplyConfiguration `json:"integration,omitempty"`
+ Source *EndpointApplyConfiguration `json:"source,omitempty"`
+ Sink *EndpointApplyConfiguration `json:"sink,omitempty"`
+ ErrorHandler *ErrorHandlerSpecApplyConfiguration `json:"errorHandler,omitempty"`
+ Steps []EndpointApplyConfiguration `json:"steps,omitempty"`
+ Replicas *int32 `json:"replicas,omitempty"`
+ ServiceAccountName *string `json:"serviceAccountName,omitempty"`
}
// BindingSpecApplyConfiguration constructs an declarative configuration of the BindingSpec type for use with
@@ -44,7 +40,7 @@ func BindingSpec() *BindingSpecApplyConfiguration {
// WithIntegration sets the Integration field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Integration field is set to the value of the last call.
-func (b *BindingSpecApplyConfiguration) WithIntegration(value *v1.IntegrationSpecApplyConfiguration) *BindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithIntegration(value *IntegrationSpecApplyConfiguration) *BindingSpecApplyConfiguration {
b.Integration = value
return b
}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go b/pkg/client/camel/applyconfiguration/camel/v1/bindingstatus.go
similarity index 93%
copy from pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go
copy to pkg/client/camel/applyconfiguration/camel/v1/bindingstatus.go
index a832f87b0..1d5ae7691 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/bindingstatus.go
@@ -17,17 +17,17 @@ limitations under the License.
// Code generated by applyconfiguration-gen. DO NOT EDIT.
-package v1alpha1
+package v1
import (
- v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
// BindingStatusApplyConfiguration represents an declarative configuration of the BindingStatus type for use
// with apply.
type BindingStatusApplyConfiguration struct {
ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
- Phase *v1alpha1.BindingPhase `json:"phase,omitempty"`
+ Phase *v1.BindingPhase `json:"phase,omitempty"`
Conditions []BindingConditionApplyConfiguration `json:"conditions,omitempty"`
Replicas *int32 `json:"replicas,omitempty"`
Selector *string `json:"selector,omitempty"`
@@ -50,7 +50,7 @@ func (b *BindingStatusApplyConfiguration) WithObservedGeneration(value int64) *B
// WithPhase sets the Phase field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Phase field is set to the value of the last call.
-func (b *BindingStatusApplyConfiguration) WithPhase(value v1alpha1.BindingPhase) *BindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithPhase(value v1.BindingPhase) *BindingStatusApplyConfiguration {
b.Phase = &value
return b
}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go b/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go
new file mode 100644
index 000000000..6836e0956
--- /dev/null
+++ b/pkg/client/camel/applyconfiguration/camel/v1/datatypereference.go
@@ -0,0 +1,49 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v1
+
+// DataTypeReferenceApplyConfiguration represents an declarative configuration of the DataTypeReference type for use
+// with apply.
+type DataTypeReferenceApplyConfiguration struct {
+ Scheme *string `json:"scheme,omitempty"`
+ Format *string `json:"format,omitempty"`
+}
+
+// DataTypeReferenceApplyConfiguration constructs an declarative configuration of the DataTypeReference type for use with
+// apply.
+func DataTypeReference() *DataTypeReferenceApplyConfiguration {
+ return &DataTypeReferenceApplyConfiguration{}
+}
+
+// WithScheme sets the Scheme field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Scheme field is set to the value of the last call.
+func (b *DataTypeReferenceApplyConfiguration) WithScheme(value string) *DataTypeReferenceApplyConfiguration {
+ b.Scheme = &value
+ return b
+}
+
+// WithFormat sets the Format field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Format field is set to the value of the last call.
+func (b *DataTypeReferenceApplyConfiguration) WithFormat(value string) *DataTypeReferenceApplyConfiguration {
+ b.Format = &value
+ return b
+}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go b/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go
new file mode 100644
index 000000000..920d03bc8
--- /dev/null
+++ b/pkg/client/camel/applyconfiguration/camel/v1/datatypespec.go
@@ -0,0 +1,102 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by applyconfiguration-gen. DO NOT EDIT.
+
+package v1
+
+// DataTypeSpecApplyConfiguration represents an declarative configuration of the DataTypeSpec type for use
+// with apply.
+type DataTypeSpecApplyConfiguration struct {
+ Scheme *string `json:"scheme,omitempty"`
+ Format *string `json:"format,omitempty"`
+ Description *string `json:"description,omitempty"`
+ MediaType *string `json:"mediaType,omitempty"`
+ Dependencies []string `json:"dependencies,omitempty"`
+ Headers map[string]HeaderSpecApplyConfiguration `json:"headers,omitempty"`
+ Schema *JSONSchemaPropsApplyConfiguration `json:"schema,omitempty"`
+}
+
+// DataTypeSpecApplyConfiguration constructs an declarative configuration of the DataTypeSpec type for use with
+// apply.
+func DataTypeSpec() *DataTypeSpecApplyConfiguration {
+ return &DataTypeSpecApplyConfiguration{}
+}
+
+// WithScheme sets the Scheme field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Scheme field is set to the value of the last call.
+func (b *DataTypeSpecApplyConfiguration) WithScheme(value string) *DataTypeSpecApplyConfiguration {
+ b.Scheme = &value
+ return b
+}
+
+// WithFormat sets the Format field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Format field is set to the value of the last call.
+func (b *DataTypeSpecApplyConfiguration) WithFormat(value string) *DataTypeSpecApplyConfiguration {
+ b.Format = &value
+ return b
+}
+
+// WithDescription sets the Description field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the Description field is set to the value of the last call.
+func (b *DataTypeSpecApplyConfiguration) WithDescription(value string) *DataTypeSpecApplyConfiguration {
+ b.Description = &value
+ return b
+}
+
+// WithMediaType sets the MediaType field in the declarative configuration to the given value
+// and returns the receiver, so that objects can be built by chaining "With" function invocations.
+// If called multiple times, the MediaType field is set to the value of the last call.
+func (b *DataTypeSpecApplyConfiguration) WithMediaType(value string) *DataTypeSpecApplyConfiguration {
+ b.MediaType = &value
+ return b
+}
+
+// WithDependencies adds the given value to the Dependencies field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, values provided by each call will be appended to the Dependencies field.
+func (b *DataTypeSpecApplyConfiguration) WithDependencies(values ...string) *DataTypeSpecApplyConfiguration {
+ for i := range values {
+ b.Dependencies = append(b.Dependencies, values[i])
+ }
+ return b
+}
+
+// WithHeaders puts the entries into the Headers field in the declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With" function invocations.
+// If called multiple times, the entries provided by each call will be put on the Headers field,
... 7370 lines suppressed ...
[camel-k] 18/18: feat: error handler validation
Posted by pc...@apache.org.
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 2b7280f7fa79691048001e6a0437064db882f63e
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Apr 25 09:50:56 2023 +0200
feat: error handler validation
---
pkg/apis/camel/v1/error_handler_types_support.go | 15 +++++++++++++++
pkg/controller/kameletbinding/error_handler.go | 6 ++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pkg/apis/camel/v1/error_handler_types_support.go b/pkg/apis/camel/v1/error_handler_types_support.go
index a0aa93cd4..c7bd7d0b0 100644
--- a/pkg/apis/camel/v1/error_handler_types_support.go
+++ b/pkg/apis/camel/v1/error_handler_types_support.go
@@ -19,6 +19,7 @@ package v1
import (
"encoding/json"
+ "fmt"
)
// +kubebuilder:object:generate=false
@@ -28,6 +29,7 @@ type ErrorHandler interface {
Type() ErrorHandlerType
Endpoint() *Endpoint
Configuration() (map[string]interface{}, error)
+ Validate() error
}
// baseErrorHandler is the base used for the Error Handler hierarchy
@@ -49,6 +51,11 @@ func (e baseErrorHandler) Configuration() (map[string]interface{}, error) {
return nil, nil
}
+// Validate --
+func (e baseErrorHandler) Validate() error {
+ return nil
+}
+
// ErrorHandlerNone --
type ErrorHandlerNone struct {
baseErrorHandler
@@ -126,3 +133,11 @@ func (e ErrorHandlerSink) Configuration() (map[string]interface{}, error) {
return properties, err
}
+
+// Validate --
+func (e ErrorHandlerSink) Validate() error {
+ if e.DLCEndpoint == nil {
+ return fmt.Errorf("Missing endpoint in Error Handler Sink")
+ }
+ return nil
+}
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/kameletbinding/error_handler.go
index 571934a1a..2c1ee036a 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -79,8 +79,10 @@ func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler, e
return nil, errors.Errorf("Unknown error handler type %s", errHandlType)
}
- err := json.Unmarshal(errHandlValue, dst)
- if err != nil {
+ if err = json.Unmarshal(errHandlValue, dst); err != nil {
+ return nil, err
+ }
+ if err = dst.Validate(); err != nil {
return nil, err
}
[camel-k] 13/18: fix(lint): various
Posted by pc...@apache.org.
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 24fd12de9eb3249ab2e2768ed2c9aeb93045c18a
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Apr 4 09:59:27 2023 +0200
fix(lint): various
---
pkg/controller/kameletbinding/monitor.go | 32 --------------------------------
pkg/event/manager.go | 4 ++--
pkg/trait/util.go | 6 +++---
pkg/util/bindings/api_support.go | 2 +-
pkg/util/bindings/api_v1alpha1.go | 6 +++---
pkg/util/bindings/catalog.go | 10 +++++-----
pkg/util/bindings/v1alpha1_kamelet.go | 2 +-
pkg/util/log/log.go | 2 +-
8 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/kameletbinding/monitor.go
index 26cbea1f0..8c8656316 100644
--- a/pkg/controller/kameletbinding/monitor.go
+++ b/pkg/controller/kameletbinding/monitor.go
@@ -154,38 +154,6 @@ func (action *monitorAction) Handle(ctx context.Context, binding *v1alpha1.Kamel
return target, nil
}
-func setBindingReadyCondition(kb *v1.Binding, it *v1.Integration) {
- if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
- message := condition.Message
- if message == "" {
- message = fmt.Sprintf("Integration %q readiness condition is %q", it.GetName(), condition.Status)
- }
-
- c := v1.BindingCondition{
- Type: v1.BindingConditionReady,
- Status: condition.Status,
- Reason: condition.Reason,
- Message: message,
- }
-
- if condition.Pods != nil {
- c.Pods = make([]v1.PodCondition, 0, len(condition.Pods))
- c.Pods = append(c.Pods, condition.Pods...)
- }
-
- kb.Status.SetConditions(c)
-
- } else {
- kb.Status.SetCondition(
- v1.BindingConditionReady,
- corev1.ConditionUnknown,
- "",
- fmt.Sprintf("Integration %q does not have a readiness condition", it.GetName()),
- )
- }
-}
-
-// Deprecated
func setKameletBindingReadyCondition(kb *v1alpha1.KameletBinding, it *v1.Integration) {
if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
message := condition.Message
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 55c788589..849842936 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -256,7 +256,7 @@ func NotifyBindingError(ctx context.Context, c client.Client, recorder record.Ev
}
// NotifyKameletBindingUpdated automatically generates events when a KameletBinding changes.
-// Deprecated
+// Deprecated.
func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding) {
if newResource == nil {
return
@@ -274,7 +274,7 @@ func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder
}
// NotifyKameletBindingError automatically generates error events when the binding reconcile cycle phase has an error.
-// Deprecated
+// Deprecated.
func NotifyKameletBindingError(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding, err error) {
k := old
if newResource != nil {
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index fa7d03229..afd40e55c 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -389,7 +389,7 @@ func BindingsHaveSameTraits(i1 *v1.Binding, i2 *v1.Binding) (bool, error) {
}
// KameletBindingsHaveSameTraits return if traits are the same.
-// Deprecated
+// Deprecated.
func KameletBindingsHaveSameTraits(i1 *v1alpha1.KameletBinding, i2 *v1alpha1.KameletBinding) (bool, error) {
c1, err := NewTraitsOptionsForKameletBinding(i1)
if err != nil {
@@ -429,7 +429,7 @@ func IntegrationAndBindingSameTraits(i1 *v1.Integration, i2 *v1.Binding) (bool,
// IntegrationAndBindingSameTraits return if traits are the same.
// The comparison is done for the subset of traits defines on the binding as during the trait processing,
// some traits may be added to the Integration i.e. knative configuration in case of sink binding.
-// Deprecated
+// Deprecated.
func IntegrationAndKameletBindingSameTraits(i1 *v1.Integration, i2 *v1alpha1.KameletBinding) (bool, error) {
itOpts, err := NewTraitsOptionsForIntegration(i1)
if err != nil {
@@ -545,7 +545,7 @@ func NewTraitsOptionsForBinding(i *v1.Binding) (Options, error) {
return m1, nil
}
-// Deprecated
+// Deprecated.
func NewTraitsOptionsForKameletBinding(i *v1alpha1.KameletBinding) (Options, error) {
if i.Spec.Integration != nil {
m1, err := ToTraitMap(i.Spec.Integration.Traits)
diff --git a/pkg/util/bindings/api_support.go b/pkg/util/bindings/api_support.go
index c06b5a123..8ed0970cc 100644
--- a/pkg/util/bindings/api_support.go
+++ b/pkg/util/bindings/api_support.go
@@ -42,7 +42,7 @@ func (c EndpointContext) GenerateID() string {
}
// GenerateID generates an identifier based on the context type and its optional position.
-// Deprecated
+// Deprecated.
func (c V1alpha1EndpointContext) GenerateID() string {
id := string(c.Type)
if c.Position != nil {
diff --git a/pkg/util/bindings/api_v1alpha1.go b/pkg/util/bindings/api_v1alpha1.go
index 7639a2f91..8d97e8023 100644
--- a/pkg/util/bindings/api_v1alpha1.go
+++ b/pkg/util/bindings/api_v1alpha1.go
@@ -27,7 +27,7 @@ import (
)
// V1alpha1BindingProvider maps a Binding endpoint into Camel K resources.
-// Deprecated
+// Deprecated.
type V1alpha1BindingProvider interface {
// ID returns the name of the binding provider
ID() string
@@ -39,7 +39,7 @@ type V1alpha1BindingProvider interface {
// V1alpha1BindingContext --
// nolint: containedctx
-// Deprecated
+// Deprecated.
type V1alpha1BindingContext struct {
Ctx context.Context
Client client.Client
@@ -48,7 +48,7 @@ type V1alpha1BindingContext struct {
}
// V1alpha1EndpointContext --
-// Deprecated
+// Deprecated.
type V1alpha1EndpointContext struct {
Type v1alpha1.EndpointType
Position *int
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index ce3199fed..a2119bb4b 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -27,7 +27,7 @@ import (
var bindingProviders []BindingProvider
-// RegisterBindingProvider --
+// RegisterBindingProvider --.
func RegisterBindingProvider(bp BindingProvider) {
bindingProviders = append(bindingProviders, bp)
sort.Slice(bindingProviders, func(i, j int) bool {
@@ -38,11 +38,11 @@ func RegisterBindingProvider(bp BindingProvider) {
})
}
-// Deprecated
+// Deprecated.
var v1alpha1BindingProviders []V1alpha1BindingProvider
// V1alpha1RegisterBindingProvider --
-// Deprecated
+// Deprecated.
func V1alpha1RegisterBindingProvider(bp V1alpha1BindingProvider) {
v1alpha1BindingProviders = append(v1alpha1BindingProviders, bp)
sort.Slice(v1alpha1BindingProviders, func(i, j int) bool {
@@ -81,7 +81,7 @@ func validateEndpoint(ctx BindingContext, e v1.Endpoint) error {
}
// TranslateV1alpha1 execute all chained binding providers, returning the first success or the first error.
-// Deprecated
+// Deprecated.
func TranslateV1alpha1(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, endpoint v1alpha1.Endpoint) (*Binding, error) {
if err := validateEndpointV1alpha1(ctx, endpoint); err != nil {
return nil, err
@@ -96,7 +96,7 @@ func TranslateV1alpha1(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointC
return nil, nil
}
-// Deprecated
+// Deprecated.
func validateEndpointV1alpha1(ctx V1alpha1BindingContext, e v1alpha1.Endpoint) error {
if e.Ref == nil && e.URI == nil {
return errors.New("no ref or URI specified in endpoint")
diff --git a/pkg/util/bindings/v1alpha1_kamelet.go b/pkg/util/bindings/v1alpha1_kamelet.go
index 682db9317..30734fc7b 100644
--- a/pkg/util/bindings/v1alpha1_kamelet.go
+++ b/pkg/util/bindings/v1alpha1_kamelet.go
@@ -28,7 +28,7 @@ import (
)
// V1alpha1BindingConverter converts a reference to a Kamelet into a Camel URI.
-// Deprecated
+// Deprecated.
type V1alpha1BindingConverter struct{}
func (k V1alpha1BindingConverter) ID() string {
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index c3ef3ae11..398cd93bc 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -150,7 +150,7 @@ func (l Logger) ForBinding(target *v1.Binding) Logger {
}
// ForKameletBinding --.
-// Deprecated: use ForBinding instead
+// Deprecated: use ForBinding instead.
func (l Logger) ForKameletBinding(target *v1alpha1.KameletBinding) Logger {
return l.WithValues(
"api-version", target.APIVersion,
[camel-k] 16/18: chore: more replacements
Posted by pc...@apache.org.
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 f3815aac612feea0e07d9ebffc09cde307e6f687
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Apr 5 13:02:45 2023 +0200
chore: more replacements
---
.../kamel-cleanup/clean-orphan-resources.sh | 2 +-
addons/keda/keda.go | 2 +-
addons/keda/keda_test.go | 2 +-
config/crd/kustomization.yaml | 2 +-
.../bases/camel-k.clusterserviceversion.yaml | 10 ++---
config/rbac/openshift/operator-role-openshift.yaml | 3 +-
config/rbac/operator-role.yaml | 6 +--
config/rbac/user-cluster-role.yaml | 6 +--
.../bases/camel_v1_pipe.yaml} | 17 ++++++++
...ing.yaml => camel_v1alpha1_kameletbinding.yaml} | 2 +-
config/samples/kustomization.yaml | 3 +-
docs/modules/ROOT/nav.adoc | 4 +-
.../kamelets/kameletbindings-error-handler.adoc | 12 +++---
docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 26 +++++------
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 34 +++++++--------
docs/modules/ROOT/pages/kamelets/kamelets.adoc | 2 +-
docs/modules/ROOT/pages/running/knative-sink.adoc | 4 +-
docs/modules/ROOT/pages/scaling/binding.adoc | 24 +++++------
.../ROOT/pages/troubleshooting/debugging.adoc | 4 +-
e2e/common/misc/kamelet_binding_test.go | 18 ++++----
e2e/common/misc/kamelet_binding_with_image_test.go | 2 +-
e2e/common/misc/scale_binding_test.go | 50 +++++++++++-----------
e2e/common/traits/errored_trait_test.go | 12 +++---
e2e/common/traits/health_test.go | 2 +-
.../operator_id_filtering_test.go | 4 +-
e2e/knative/kamelet_test.go | 28 ++++++------
e2e/support/test_support.go | 46 ++++++++++----------
.../common/kamelet-binding-broker/yaks-config.yaml | 4 +-
.../common/kamelet-binding-http/yaks-config.yaml | 2 +-
e2e/yaks/common/kamelet-binding/yaks-config.yaml | 4 +-
e2e/yaks/common/kamelet-steps/yaks-config.yaml | 2 +-
pkg/install/cluster.go | 12 +++---
pkg/resources/resources.go | 20 +++------
pkg/resources/resources_test.go | 2 +-
script/prepare-operators.sh | 4 +-
35 files changed, 194 insertions(+), 183 deletions(-)
diff --git a/.github/actions/kamel-cleanup/clean-orphan-resources.sh b/.github/actions/kamel-cleanup/clean-orphan-resources.sh
index 2b1239990..f0d4bf732 100755
--- a/.github/actions/kamel-cleanup/clean-orphan-resources.sh
+++ b/.github/actions/kamel-cleanup/clean-orphan-resources.sh
@@ -2,7 +2,7 @@
set +e
-resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds bindings"
+resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds pipes kameletbindings"
#
# Loop through the resource types
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index f3b270305..b47ee4e89 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -280,7 +280,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
}
if ctrlRef.Kind == camelv1.PipeKind {
scale.ObjectMeta.Name = ctrlRef.Name
- _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
+ _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1.SchemeGroupVersion.WithResource("pipes").GroupResource(), &scale, metav1.UpdateOptions{})
if err != nil {
return err
}
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 15503862b..8a5f64c49 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -391,7 +391,7 @@ func TestHackKLBReplicas(t *testing.T) {
assert.NoError(t, keda.Apply(env))
scalesClient, err := env.Client.ScalesClient()
assert.NoError(t, err)
- sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1.SchemeGroupVersion.WithResource("bindings").GroupResource(), "my-klb", metav1.GetOptions{})
+ sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1.SchemeGroupVersion.WithResource("pipes").GroupResource(), "my-klb", metav1.GetOptions{})
assert.NoError(t, err)
assert.Equal(t, int32(1), sc.Spec.Replicas)
}
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 0b0099bb8..6941bdbad 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -25,4 +25,4 @@ resources:
- bases/camel.apache.org_integrations.yaml
- bases/camel.apache.org_kamelets.yaml
- bases/camel.apache.org_kameletbindings.yaml
-- bases/camel.apache.org_bindings.yaml
+- bases/camel.apache.org_pipes.yaml
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 236050ca2..5fe1df99c 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
- createdAt: 2023-03-30T11:22:34Z
+ createdAt: 2023-04-05T11:19:26Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -63,10 +63,10 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1
- - description: Binding is the Schema for the binding API
- displayName: Binding
- kind: Binding
- name: bindings.camel.apache.org
+ - description: Pipe is the Schema for the pipes API
+ displayName: Pipe
+ kind: BindPipe
+ name: pipes.camel.apache.org
version: v1alpha1
- description: Kamelet is the Schema for the kamelets API
displayName: Kamelet
diff --git a/config/rbac/openshift/operator-role-openshift.yaml b/config/rbac/openshift/operator-role-openshift.yaml
index bf99bf1ad..4eccaee70 100644
--- a/config/rbac/openshift/operator-role-openshift.yaml
+++ b/config/rbac/openshift/operator-role-openshift.yaml
@@ -29,7 +29,8 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- - bindings/finalizers
+ - pipes/finalizers
+ - kameletbindings/finalizers
verbs:
- update
- apiGroups:
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index 1a5904312..47ac7d44b 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -30,7 +30,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - bindings
+ - pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
@@ -56,8 +56,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - bindings/status
- - bindings/scale
+ - pipes/status
+ - pipes/scale
# Deprecated: kameletbindings CR
- kameletbindings/status
- kameletbindings/scale
diff --git a/config/rbac/user-cluster-role.yaml b/config/rbac/user-cluster-role.yaml
index 8942be225..aef6bee1c 100644
--- a/config/rbac/user-cluster-role.yaml
+++ b/config/rbac/user-cluster-role.yaml
@@ -33,7 +33,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - bindings
+ - pipes
# Deprecated: kameletbindings CR
- kameletbindings
- kamelets
@@ -55,8 +55,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - bindings/scale
- - bindings/status
+ - pipes/scale
+ - pipes/status
# Deprecated: kameletbindings CR
- kameletbindings/scale
- kameletbindings/status
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/samples/bases/camel_v1_pipe.yaml
similarity index 74%
rename from config/crd/bases/camel.apache.org_bindings.yaml
rename to config/samples/bases/camel_v1_pipe.yaml
index 658e8dc7e..da8949de6 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/samples/bases/camel_v1_pipe.yaml
@@ -15,3 +15,20 @@
# limitations under the License.
# ---------------------------------------------------------------------------
+apiVersion: camel.apache.org/v1
+kind: Pipe
+metadata:
+ name: example
+spec:
+ source:
+ ref:
+ apiVersion: camel.apache.org/v1alpha1
+ kind: Kamelet
+ name: example
+ properties:
+ message: Hello world
+ sink:
+ ref:
+ apiVersion: messaging.knative.dev/v1
+ kind: InMemoryChannel
+ name: example
diff --git a/config/samples/bases/camel_v1_binding.yaml b/config/samples/bases/camel_v1alpha1_kameletbinding.yaml
similarity index 98%
rename from config/samples/bases/camel_v1_binding.yaml
rename to config/samples/bases/camel_v1alpha1_kameletbinding.yaml
index 977bc5b4a..2d1424bca 100644
--- a/config/samples/bases/camel_v1_binding.yaml
+++ b/config/samples/bases/camel_v1alpha1_kameletbinding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: KameletBinding
metadata:
name: example
spec:
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index 707b358bf..85c8ee6a7 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -27,7 +27,8 @@ resources:
- bases/camel_v1_camelcatalog.yaml
- bases/camel_v1_build.yaml
- bases/camel_v1_kamelet.yaml
-- bases/camel_v1_binding.yaml
+- bases/camel_v1_pipe.yaml
+- bases/camel_v1alpha1_kameletbinding.yaml
patchesStrategicMerge:
- patch-integration-platform.yaml
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 7786bcdc9..e655589f2 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -51,8 +51,8 @@
*** xref:observability/monitoring/operator.adoc[Operator]
*** xref:observability/monitoring/integration.adoc[Integration]
* Scaling
-** xref:scaling/integration.adoc[Integration]
-** xref:scaling/binding.adoc[Binding]
+** xref:scaling/integration.adoc[Integrations]
+** xref:scaling/binding.adoc[Pipes]
* xref:traits:traits.adoc[Traits]
// Start of autogenerated code - DO NOT EDIT! (trait-nav)
** xref:traits:3scale.adoc[3Scale]
diff --git a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
index 48b827e08..4fc59f1bb 100644
--- a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
@@ -1,12 +1,12 @@
[[bindings-error-handler]]
-=Bindings Error Handler
+=Pipes Error Handler
-Bindings offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
+Pipes offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: my-kamelet-binding
spec:
@@ -33,7 +33,7 @@ There may be certain cases where you want to just ignore any failure happening o
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: my-kamelet-binding
spec:
@@ -54,7 +54,7 @@ Apache Camel offers a default behavior for handling any failure: log to standard
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: my-kamelet-binding
spec:
@@ -78,7 +78,7 @@ The `Sink` is probably the most interesting error handler type as it allows you
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: my-kamelet-binding
spec:
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
index d8d221e79..ba70e270b 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
@@ -273,7 +273,7 @@ spec:
- to: "kamelet:sink"
----
<1> An icon with an appropriate license, better using svg+base64 URL encoding. You can encode icons using services like https://dopiaza.org/tools/datauri/index.php[this one]
-<2> The dataTypes section indicates that the Kamelet is going to produce JSON data as a default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Binding when referencing the Kamelet.
+<2> The dataTypes section indicates that the Kamelet is going to produce JSON data as a default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Pipe when referencing the Kamelet.
<3> The previous YAML flow
The Kamelet can be shared on the Catalog and or created on a Kubernetes cluster to let users use it.
@@ -294,7 +294,7 @@ Then you can create a binding like the following one to try it out:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: twitter-search-source-binding
spec:
@@ -867,7 +867,7 @@ spec:
----
<1> Add an icon with an appropriate license, better using svg+base64 URL encoding. You can encode icons using services like https://dopiaza.org/tools/datauri/index.php[this one]
<2> This marks the Kamelet as dependant on Quarkus since we're specifying explicit dependencies on Quarkus artifacts in the `spec` -> `dependencies` section
-<3> The types section indicates that the Kamelet is going to produce JSON data by default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Binding when referencing the Kamelet.
+<3> The types section indicates that the Kamelet is going to produce JSON data by default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Pipe when referencing the Kamelet.
<4> Dependencies that we previously specified in the modeline options should be expressed now in the Kamelet spec
The Kamelet is now ready to be used!
@@ -893,7 +893,7 @@ To check if it works, you can create a simple binding:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: earthquake-source-binding
spec:
@@ -1217,7 +1217,7 @@ So, for example, to send a text message to a chat, we may create a binding like
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: telegram-text-binding
spec:
@@ -1261,7 +1261,7 @@ To check if we can also receive pictures using the above Kamelet, we can create
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: telegram-image-binding
spec:
@@ -1314,8 +1314,8 @@ Feature: Kamelet earthquake-source works
Scenario: Bind Kamelet to service
Given create Kubernetes service test-service with target port 8080
And bind Kamelet earthquake-source to uri http://test-service.${YAKS_NAMESPACE}.svc.cluster.local/test
- When create Binding earthquake-source-uri
- Then Binding earthquake-source-uri should be available
+ When create Pipe earthquake-source-uri
+ Then Pipe earthquake-source-uri should be available
And Camel K integration earthquake-source-uri should be running
Scenario: Verify binding
@@ -1323,7 +1323,7 @@ Feature: Kamelet earthquake-source works
And HTTP server timeout is 120000 ms
Then expect HTTP request header: Content-Type="application/json;charset=UTF-8"
And receive POST /test
- And delete Binding earthquake-source-uri
+ And delete Pipe earthquake-source-uri
----
As you see this is a declarative test that is materialized into something that actually checks that the service generates some data.
@@ -1356,7 +1356,7 @@ send data to it via HTTP. Let's create a parameterized binding like the followin
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: webhook-to-telegram
spec:
@@ -1406,8 +1406,8 @@ Feature: Kamelet telegram-sink works
Scenario: Bind webhook to Kamelet sink
Given load variables telegram-credentials.properties
- And load Binding webhook-to-telegram.yaml
- Then Binding webhook-to-telegram should be available
+ And load Pipe webhook-to-telegram.yaml
+ Then Pipe webhook-to-telegram should be available
And Camel K integration webhook-to-telegram should be running
@@ -1423,7 +1423,7 @@ Feature: Kamelet telegram-sink works
"""
When send POST /message
Then receive HTTP 200 OK
- And delete Binding webhook-to-telegram
+ And delete Pipe webhook-to-telegram
----
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
index b179fb29a..217e5b298 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
@@ -278,11 +278,11 @@ In some contexts (for example **"serverless"**) users often want to leverage the
doing additional processing (such as tranformations or other enterprise integration patterns).
A common use case is that of **Knative Sources**, for which the Apache Camel developers maintain the https://knative.dev/docs/eventing/samples/apache-camel-source/[Knative CamelSources].
-Kamelets represent an **evolution** of the model proposed in CamelSources, but they allow using the same declarative style of binding, via a resource named **Binding**.
+Kamelets represent an **evolution** of the model proposed in CamelSources, but they allow using the same declarative style of binding, via a resource named **Pipe**.
=== Binding to a Knative Destination
-A Binding allows to declaratively move data from a system described by a Kamelet towards a Knative destination (or other kind of destinations, in the future), or from
+A Pipe allows to declaratively move data from a system described by a Kamelet towards a Knative destination (or other kind of destinations, in the future), or from
a Knative channel/broker to another external system described by a Kamelet.
For example, here's an example of binding:
@@ -290,7 +290,7 @@ For example, here's an example of binding:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: telegram-text-source-to-channel
spec:
@@ -315,11 +315,11 @@ makes sure that messages produced by the Kamelet are forwarded to the Knative **
Note that source and sink are specified declaratively as standard **Kubernetes object references**.
-The example shows how we can reference the "telegram-text-source" resource in a Binding. It's contained in the `source` section
+The example shows how we can reference the "telegram-text-source" resource in a Pipe. It's contained in the `source` section
because it's a Kamelet of type "source".
-A Kamelet of type "sink", by contrast, can only be used in the `sink` section of a `Binding`.
+A Kamelet of type "sink", by contrast, can only be used in the `sink` section of a `Pipe`.
-**Under the covers, a Binding creates an Integration** resource that implements the binding, but this is transparent to the end user.
+**Under the covers, a Pipe creates an Integration** resource that implements the binding, but this is transparent to the end user.
=== Binding to a Kafka Topic
@@ -338,7 +338,7 @@ The following binding can be created to push data into the `my-topic` topic:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: telegram-text-source-to-kafka
spec:
@@ -361,13 +361,13 @@ After creating it, messages will flow from Telegram to Kafka.
=== Binding to an explicit URI
-An alternative way to use a Binding is to configure the source/sink to be an explicit Camel URI.
+An alternative way to use a Pipe is to configure the source/sink to be an explicit Camel URI.
For example, the following binding is allowed:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: telegram-text-source-to-channel
spec:
@@ -381,25 +381,25 @@ spec:
sink:
uri: https://mycompany.com/the-service # <1>
----
-<1> Binding with explicitly URI
+<1> Pipe with explicitly URI
-This Binding explicitly defines an URI where data is going to be pushed.
+This Pipe explicitly defines an URI where data is going to be pushed.
NOTE: the `uri` option is also conventionally used in Knative to specify a non-kubernetes destination.
To comply with the Knative specifications, in case an "http" or "https" URI is used, Camel will send https://cloudevents.io/[CloudEvents] to the destination.
=== Error Handling
-You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] for more detail.
+You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Pipes Error Handler User Guide] for more detail.
=== Trait via annotations
-You can easily tune your `Binding` with xref:traits:traits.adoc[traits] configuration adding `.metadata.annotations`. Let's have a look at the following example:
+You can easily tune your `Pipe` with xref:traits:traits.adoc[traits] configuration adding `.metadata.annotations`. Let's have a look at the following example:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: timer-2-log-annotation
annotations: # <1>
@@ -578,7 +578,7 @@ Data shapes contain the following information:
|E.g. `aws2-s3`
|`format`
-|The data shape name used to identify and reference the data type in a Binding when choosing from multiple data type options.
+|The data shape name used to identify and reference the data type in a Pipe when choosing from multiple data type options.
|`string`
|E.g. `json`
@@ -653,13 +653,13 @@ which is set to the name of a specific KEDA autoscaler.
A KEDA enabled Kamelet can be used in the same way as any other Kamelet, in a binding or in an integration.
KEDA autoscalers are not enabled by default: they need to be manually enabled by the user via the `keda` trait.
-In a Binding, the KEDA trait can be enabled using annotations:
+In a Pipe, the KEDA trait can be enabled using annotations:
.my-keda-binding.yaml
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: my-keda-binding
annotations:
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets.adoc b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
index 26f339389..e4ba888da 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
@@ -4,5 +4,5 @@
This section of the documentation contains information about Kamelets from both a user and a developer point of view:
- The xref:kamelets/kamelets-user.adoc[Kamelets User Guide] is for users that want to use Kamelets for connecting systems with their applications
-- The xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] explains how to configure an error handler on a `Binding`
+- The xref:kamelets/bindings-error-handler.adoc[Pipes Error Handler User Guide] explains how to configure an error handler on a `Pipe`
- The xref:kamelets/kamelets-dev.adoc[Kamelets Developer Guide] is a reference for developers that want to create new Kamelets and share them with users
diff --git a/docs/modules/ROOT/pages/running/knative-sink.adoc b/docs/modules/ROOT/pages/running/knative-sink.adoc
index 890de244f..55da49588 100644
--- a/docs/modules/ROOT/pages/running/knative-sink.adoc
+++ b/docs/modules/ROOT/pages/running/knative-sink.adoc
@@ -10,12 +10,12 @@ from('timer:tick')
.to('knative:event/broker')
----
-Or as the value of the `sink` field in a `Binding` resource, e.g.:
+Or as the value of the `sink` field in a `Pipe` resource, e.g.:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: timer-source-binding
spec:
diff --git a/docs/modules/ROOT/pages/scaling/binding.adoc b/docs/modules/ROOT/pages/scaling/binding.adoc
index 08d7a47bc..294de741a 100644
--- a/docs/modules/ROOT/pages/scaling/binding.adoc
+++ b/docs/modules/ROOT/pages/scaling/binding.adoc
@@ -1,23 +1,23 @@
[[binding-scaling]]
-= Camel K Binding Scaling
+= Camel K Pipe Scaling
== Manual Scaling
-A Binding can be scaled using the `kubectl scale` command, e.g.:
+A Pipe can be scaled using the `kubectl scale` command, e.g.:
[source,console]
----
$ kubectl scale klb <kamelet_binding_name> --replicas <number_of_replicas>
----
-This can also be achieved by editing the Binding resource directly, e.g.:
+This can also be achieved by editing the Pipe resource directly, e.g.:
[source,console]
----
$ kubectl patch klb <kamelet_binding_name> -p '{"spec":{"replicas":<number_of_replicas>}}'
----
-The Binding also reports its number of replicas in the `.status.replicas` field, e.g.:
+The Pipe also reports its number of replicas in the `.status.replicas` field, e.g.:
[source,console]
----
@@ -26,19 +26,19 @@ $ kubectl get klb <kamelet_binding_name> -o jsonpath='{.status.replicas}'
== Autoscaling with Knative
-A Binding that binds an HTTP-based source Kamelet can automatically scale based on _incoming_ traffic when installed on a cluster with _Knative_ enabled, including scaling to zero.
+A Pipe that binds an HTTP-based source Kamelet can automatically scale based on _incoming_ traffic when installed on a cluster with _Knative_ enabled, including scaling to zero.
The _incoming_ traffic measures either as:
* The number of simultaneous requests, that are processed by each replica at any given time;
* Or the number of requests that are processed per second, per replica.
-The `webhook-source` Kamelet is one of the sources that enables auto-scaling when used in a Binding:
+The `webhook-source` Kamelet is one of the sources that enables auto-scaling when used in a Pipe:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: webhook-binding
spec:
@@ -59,7 +59,7 @@ The Knative https://knative.dev/docs/serving/autoscaling/autoscaling-concepts/#s
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: Binding
+kind: Pipe
metadata:
name: webhook-binding
spec:
@@ -84,8 +84,8 @@ More information can be found in the Knative https://knative.dev/docs/serving/au
[NOTE]
====
-When <<Manual Scaling,manually scaling>> a Binding that deploys as a Knative Service, both https://knative.dev/docs/serving/autoscaling/scale-bounds/[scale bounds], i.e., `minScale` and `maxScale`, are set to the specified number of replicas.
-Scale bounds can be reset by removing the `.spec.replicas` field from the Binding, e.g., with:
+When <<Manual Scaling,manually scaling>> a Pipe that deploys as a Knative Service, both https://knative.dev/docs/serving/autoscaling/scale-bounds/[scale bounds], i.e., `minScale` and `maxScale`, are set to the specified number of replicas.
+Scale bounds can be reset by removing the `.spec.replicas` field from the Pipe, e.g., with:
[source,console]
----
@@ -95,9 +95,9 @@ $ kubectl patch klb <kamelet_binding_name> --type=json -p='[{"op": "remove", "pa
== Autoscaling with HPA
-A Binding can automatically scale based on its CPU utilization and custom metrics using https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[horizontal pod autoscaling (HPA)].
+A Pipe can automatically scale based on its CPU utilization and custom metrics using https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[horizontal pod autoscaling (HPA)].
-For example, executing the following command creates an _autoscaler_ for the Binding, with target CPU utilization set to 80%, and the number of replicas between 2 and 5:
+For example, executing the following command creates an _autoscaler_ for the Pipe, with target CPU utilization set to 80%, and the number of replicas between 2 and 5:
[source,console]
----
diff --git a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
index 255a7e747..26f0494b1 100644
--- a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
+++ b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
@@ -57,8 +57,8 @@ When the debugging session is done, hitting kbd:[Ctrl+c] on the terminal where t
[[debugging-kamelets]]
== Debugging Kamelets
-As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `Binding` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`.
+As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `Pipe` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`.
However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple `yaml` test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you in debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check.
-NOTE: the same idea applies for a `Binding` which translates to an `Integration` type under the hood. If you need to debug a `Binding` just apply the same troubleshooting technique that you would apply on an `Integration`.
+NOTE: the same idea applies for a `Pipe` which translates to an `Integration` type under the hood. If you need to debug a `Pipe` just apply the same troubleshooting technique that you would apply on an `Integration`.
diff --git a/e2e/common/misc/kamelet_binding_test.go b/e2e/common/misc/kamelet_binding_test.go
index 825e6a8ae..7c0e10847 100644
--- a/e2e/common/misc/kamelet_binding_test.go
+++ b/e2e/common/misc/kamelet_binding_test.go
@@ -34,7 +34,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
-func TestBinding(t *testing.T) {
+func TestPipe(t *testing.T) {
RegisterTestingT(t)
// Error Handler testing
@@ -91,8 +91,8 @@ func TestBinding(t *testing.T) {
})
})
- //Binding with traits testing
- t.Run("testBinding with trait", func(t *testing.T) {
+ //Pipe with traits testing
+ t.Run("test Pipe with trait", func(t *testing.T) {
Expect(CreateTimerKamelet(ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
@@ -119,17 +119,17 @@ func TestBinding(t *testing.T) {
Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
- // Binding with wrong spec
- t.Run("test Binding with wrong spec", func(t *testing.T) {
+ // Pipe with wrong spec
+ t.Run("test Pipe with wrong spec", func(t *testing.T) {
name := "bad-klb"
kb := v1.NewPipe(ns, name)
kb.Spec = v1.PipeSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
Eventually(err).Should(BeNil())
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(BindingCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
- WithTransform(BindingConditionMessage, And(
+ Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(PipeCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
+ WithTransform(PipeConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
)))
diff --git a/e2e/common/misc/kamelet_binding_with_image_test.go b/e2e/common/misc/kamelet_binding_with_image_test.go
index beea78c97..ab2ad549a 100644
--- a/e2e/common/misc/kamelet_binding_with_image_test.go
+++ b/e2e/common/misc/kamelet_binding_with_image_test.go
@@ -34,7 +34,7 @@ import (
"github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
-func TestBindingWithImage(t *testing.T) {
+func TestPipeWithImage(t *testing.T) {
RegisterTestingT(t)
from := corev1.ObjectReference{
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 663c3ee01..59557496b 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -39,7 +39,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/openshift"
)
-func TestBindingScale(t *testing.T) {
+func TestPipeScale(t *testing.T) {
RegisterTestingT(t)
ocp, err := openshift.IsOpenShift(TestClient())
@@ -50,39 +50,39 @@ func TestBindingScale(t *testing.T) {
}
name := "timer2log"
- Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloBinding", "log-sink", "--name", name).Execute()).To(Succeed())
+ Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloPipe", "log-sink", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloBinding"))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloPipe"))
- t.Run("Update binding scale spec", func(t *testing.T) {
- Expect(ScaleBinding(ns, name, 3)).To(Succeed())
+ t.Run("Update Pipe scale spec", func(t *testing.T) {
+ Expect(ScalePipe(ns, name, 3)).To(Succeed())
// Check the scale cascades into the Deployment scale
Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Check it also cascades into the Binding scale subresource Status field
- Eventually(BindingStatusReplicas(ns, name), TestTimeoutShort).
+ // Check it also cascades into the Pipe scale subresource Status field
+ Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check the readiness condition becomes truthy back
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- // Finally check the readiness condition becomes truthy back onBinding
- Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ // Finally check the readiness condition becomes truthy back onPipe
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
- t.Run("ScaleBinding with polymorphic client", func(t *testing.T) {
+ t.Run("ScalePipe with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient().ScalesClient()
Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
- _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("bindings"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+ _, err = scaleClient.Scales(ns).Patch(TestContext, v1.SchemeGroupVersion.WithResource("Pipes"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(BindingConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
@@ -91,30 +91,30 @@ func TestBindingScale(t *testing.T) {
// Check it cascades into the Integration scale subresource Status field
Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Finally check it cascades into the Binding scale subresource Status field
- Eventually(BindingStatusReplicas(ns, name), TestTimeoutShort).
+ // Finally check it cascades into the Pipe scale subresource Status field
+ Eventually(PipeStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
- t.Run("ScaleBinding with Camel K client", func(t *testing.T) {
+ t.Run("ScalePipe with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient().GetConfig())
Expect(err).To(BeNil())
// Getter
- bindingScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ PipeScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
Expect(err).To(BeNil())
- Expect(bindingScale.Spec.Replicas).To(BeNumerically("==", 2))
- Expect(bindingScale.Status.Replicas).To(BeNumerically("==", 2))
+ Expect(PipeScale.Spec.Replicas).To(BeNumerically("==", 2))
+ Expect(PipeScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
- bindingScale.Spec.Replicas = 1
- _, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
+ PipeScale.Spec.Replicas = 1
+ _, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, PipeScale, metav1.UpdateOptions{})
Expect(err).To(BeNil())
- // Check the readiness condition is still truthy as down-scaling inBinding
- Expect(BindingConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the Binding scale subresource Spec field
- Eventually(BindingSpecReplicas(ns, name), TestTimeoutShort).
+ // Check the readiness condition is still truthy as down-scaling inPipe
+ Expect(PipeConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Pipe scale subresource Spec field
+ Eventually(PipeSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Check the readiness condition is still truthy as down-scaling
Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 5c55ba56e..b74d0bccb 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -50,17 +50,17 @@ func TestErroredTrait(t *testing.T) {
))
})
- t.Run("Binding trait should fail", func(t *testing.T) {
+ t.Run("Pipe trait should fail", func(t *testing.T) {
name := "kb-errored"
Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
- // Binding
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
- Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(BindingCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
- WithTransform(BindingConditionMessage, And(
+ // Pipe
+ Eventually(PipePhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(PipeConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(PipeCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
+ WithTransform(PipeConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
)))
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 34147f9b2..4523f6989 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -239,7 +239,7 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(BindingCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ Eventually(PipeCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
Satisfy(func(c *camelv1.PipeCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
diff --git a/e2e/commonwithcustominstall/operator_id_filtering_test.go b/e2e/commonwithcustominstall/operator_id_filtering_test.go
index 0ac5b6231..373b2e37c 100644
--- a/e2e/commonwithcustominstall/operator_id_filtering_test.go
+++ b/e2e/commonwithcustominstall/operator_id_filtering_test.go
@@ -120,12 +120,12 @@ func TestOperatorIDFiltering(t *testing.T) {
Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
- t.Run("Operators can run scopedBindings", func(t *testing.T) {
+ t.Run("Operators can run scoped Pipes", func(t *testing.T) {
Expect(KamelBind(ns, "timer-source?message=Hello", "log-sink",
"--name", "klb", "--force").Execute()).To(Succeed())
Consistently(Integration(ns, "klb"), 10*time.Second).Should(BeNil())
- Expect(AssignBindingToOperator(ns, "klb", operator1)).To(Succeed())
+ Expect(AssignPipeToOperator(ns, "klb", operator1)).To(Succeed())
Eventually(Integration(ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
Eventually(IntegrationPhase(ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
Eventually(IntegrationPodPhase(ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 56d039751..e2598b8a3 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -36,7 +36,7 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
)
-// Test that a Binding can be changed and the changes are propagated to the Integration
+// Test that a Pipe can be changed and the changes are propagated to the Integration
func TestKameletChange(t *testing.T) {
RegisterTestingT(t)
@@ -58,37 +58,37 @@ func TestKameletChange(t *testing.T) {
APIVersion: messaging.SchemeGroupVersion.String(),
}
- timerBinding := "timer-binding"
+ timerPipe := "timer-binding"
annotations := map[string]string{
"trait.camel.apache.org/health.enabled": "true",
"trait.camel.apache.org/health.readiness-initial-delay": "10",
}
- // Create the Binding
- Expect(BindKameletTo(ns, timerBinding, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
+ // Create the Pipe
+ Expect(BindKameletTo(ns, timerPipe, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, timerBinding), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, timerPipe), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(BindingCondition(ns, timerBinding, v1.PipeConditionReady), TestTimeoutMedium).Should(And(
- WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
- WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
- WithTransform(BindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
+ Eventually(PipeCondition(ns, timerPipe, v1.PipeConditionReady), TestTimeoutMedium).Should(And(
+ WithTransform(PipeConditionStatusExtract, Equal(corev1.ConditionTrue)),
+ WithTransform(PipeConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
+ WithTransform(PipeConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
))
- // Update the Binding
+ // Update the Pipe
Expect(BindKameletTo(ns, "timer-binding", annotations, from, to, map[string]string{"message": "message is Hi"}, map[string]string{})()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "timer-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(BindingCondition(ns, timerBinding, v1.PipeConditionReady), TestTimeoutMedium).
+ Eventually(PipeCondition(ns, timerPipe, v1.PipeConditionReady), TestTimeoutMedium).
Should(And(
- WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
- WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
- WithTransform(BindingConditionMessage, Equal("1/1 ready replicas")),
+ WithTransform(PipeConditionStatusExtract, Equal(corev1.ConditionTrue)),
+ WithTransform(PipeConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
+ WithTransform(PipeConditionMessage, Equal("1/1 ready replicas")),
))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index b85605c59..57697449c 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1068,7 +1068,7 @@ func ScaleIntegration(ns string, name string, replicas int32) error {
})
}
-func Binding(ns string, name string) func() *v1.Pipe {
+func Pipe(ns string, name string) func() *v1.Pipe {
return func() *v1.Pipe {
klb := v1.NewPipe(ns, name)
key := ctrl.ObjectKey{
@@ -1084,9 +1084,9 @@ func Binding(ns string, name string) func() *v1.Pipe {
}
}
-func BindingPhase(ns string, name string) func() v1.PipePhase {
+func PipePhase(ns string, name string) func() v1.PipePhase {
return func() v1.PipePhase {
- klb := Binding(ns, name)()
+ klb := Pipe(ns, name)()
if klb == nil {
return ""
}
@@ -1094,9 +1094,9 @@ func BindingPhase(ns string, name string) func() v1.PipePhase {
}
}
-func BindingSpecReplicas(ns string, name string) func() *int32 {
+func PipeSpecReplicas(ns string, name string) func() *int32 {
return func() *int32 {
- klb := Binding(ns, name)()
+ klb := Pipe(ns, name)()
if klb == nil {
return nil
}
@@ -1104,9 +1104,9 @@ func BindingSpecReplicas(ns string, name string) func() *int32 {
}
}
-func BindingStatusReplicas(ns string, name string) func() *int32 {
+func PipeStatusReplicas(ns string, name string) func() *int32 {
return func() *int32 {
- klb := Binding(ns, name)()
+ klb := Pipe(ns, name)()
if klb == nil {
return nil
}
@@ -1114,9 +1114,9 @@ func BindingStatusReplicas(ns string, name string) func() *int32 {
}
}
-func BindingCondition(ns string, name string, conditionType v1.PipeConditionType) func() *v1.PipeCondition {
+func PipeCondition(ns string, name string, conditionType v1.PipeConditionType) func() *v1.PipeCondition {
return func() *v1.PipeCondition {
- kb := Binding(ns, name)()
+ kb := Pipe(ns, name)()
if kb == nil {
return nil
}
@@ -1128,32 +1128,32 @@ func BindingCondition(ns string, name string, conditionType v1.PipeConditionType
}
}
-func BindingConditionStatusExtract(c *v1.PipeCondition) corev1.ConditionStatus {
+func PipeConditionStatusExtract(c *v1.PipeCondition) corev1.ConditionStatus {
if c == nil {
return ""
}
return c.Status
}
-func BindingConditionReason(c *v1.PipeCondition) string {
+func PipeConditionReason(c *v1.PipeCondition) string {
if c == nil {
return ""
}
return c.Reason
}
-func BindingConditionMessage(c *v1.PipeCondition) string {
+func PipeConditionMessage(c *v1.PipeCondition) string {
if c == nil {
return ""
}
return c.Message
}
-func BindingConditionStatus(ns string, name string, conditionType v1.PipeConditionType) func() corev1.ConditionStatus {
+func PipeConditionStatus(ns string, name string, conditionType v1.PipeConditionType) func() corev1.ConditionStatus {
return func() corev1.ConditionStatus {
- klb := Binding(ns, name)()
+ klb := Pipe(ns, name)()
if klb == nil {
- return "BindingMissing"
+ return "PipeMissing"
}
c := klb.Status.GetCondition(conditionType)
if c == nil {
@@ -1163,10 +1163,10 @@ func BindingConditionStatus(ns string, name string, conditionType v1.PipeConditi
}
}
-func UpdateBinding(ns string, name string, upd func(it *v1.Pipe)) error {
- klb := Binding(ns, name)()
+func UpdatePipe(ns string, name string, upd func(it *v1.Pipe)) error {
+ klb := Pipe(ns, name)()
if klb == nil {
- return fmt.Errorf("noBinding named %s found", name)
+ return fmt.Errorf("no Pipe named %s found", name)
}
target := klb.DeepCopy()
upd(target)
@@ -1180,16 +1180,16 @@ func UpdateBinding(ns string, name string, upd func(it *v1.Pipe)) error {
return TestClient().Patch(TestContext, target, ctrl.RawPatch(types.MergePatchType, p))
}
-func ScaleBinding(ns string, name string, replicas int32) error {
- return UpdateBinding(ns, name, func(klb *v1.Pipe) {
+func ScalePipe(ns string, name string, replicas int32) error {
+ return UpdatePipe(ns, name, func(klb *v1.Pipe) {
klb.Spec.Replicas = &replicas
})
}
-func AssignBindingToOperator(ns, name, operator string) error {
- klb := Binding(ns, name)()
+func AssignPipeToOperator(ns, name, operator string) error {
+ klb := Pipe(ns, name)()
if klb == nil {
- return fmt.Errorf("cannot assignBinding %q to operator:Binding not found", name)
+ return fmt.Errorf("cannot assign Pipe %q to operator:Pipe not found", name)
}
klb.SetOperatorID(operator)
diff --git a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
index ff595de99..3369a0076 100644
--- a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
@@ -27,8 +27,8 @@ pre:
kubectl apply -f timer-source-binding.yaml -n $YAKS_NAMESPACE
kubectl apply -f logger-sink-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait binding timer-source-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
- kubectl wait binding logger-sink-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding timer-source-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding logger-sink-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
index c292a9a11..1922bf7bb 100644
--- a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
@@ -25,7 +25,7 @@ pre:
kamel run display.groovy -w -n $YAKS_NAMESPACE
cat timer-source-binding-display.yaml | sed 's/{namespace}/'"${YAKS_NAMESPACE}"'/' | kubectl apply -n $YAKS_NAMESPACE -f -
- kubectl wait binding timer-source-binding-display --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding timer-source-binding-display --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-binding/yaks-config.yaml b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
index 0c95cc4d0..b236c3435 100644
--- a/e2e/yaks/common/kamelet-binding/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
@@ -29,8 +29,8 @@ pre:
kubectl apply -f timer-source-binding.yaml -n $YAKS_NAMESPACE
kubectl apply -f logger-sink-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait binding timer-source-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
- kubectl wait binding logger-sink-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding timer-source-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding logger-sink-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-steps/yaks-config.yaml b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
index 1b4d1a6fa..2314a59fb 100644
--- a/e2e/yaks/common/kamelet-steps/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
@@ -25,7 +25,7 @@ pre:
kubectl apply -f prefix-action.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f steps-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait binding steps-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait kameletbinding steps-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index da4d44b57..2d2b3858d 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -206,8 +206,8 @@ func installCRDs(ctx context.Context, c client.Client, collection *kubernetes.Co
return err
}
- // Install CRD for Binding (if needed)
- if err := installCRD(ctx, c, "Binding", "v1", "camel.apache.org_bindings.yaml",
+ // Install CRD for Pipe (if needed)
+ if err := installCRD(ctx, c, "Pipe", "v1", "camel.apache.org_pipes.yaml",
v1beta1Customizer, collection, force); err != nil {
return err
}
@@ -217,7 +217,7 @@ func installCRDs(ctx context.Context, c client.Client, collection *kubernetes.Co
func downgradeToCRDv1beta1(isAPIExtensionsV1 bool) ResourceCustomizer {
return func(object ctrl.Object) ctrl.Object {
- // Remove default values in v1beta1 Integration and Binding CRDs,
+ // Remove default values in v1beta1 Integration and Pipe CRDs,
removeDefaultFromCrd := func(crd *apiextensionsv1beta1.CustomResourceDefinition, property string) {
defaultValue := apiextensionsv1beta1.JSONSchemaProps{
Default: nil,
@@ -227,7 +227,7 @@ func downgradeToCRDv1beta1(isAPIExtensionsV1 bool) ResourceCustomizer {
Properties["spec"].Properties["template"].Properties["spec"].Properties[property].Items.Schema.
Properties["ports"].Items.Schema.Properties["protocol"] = defaultValue
}
- if crd.Name == "bindings.camel.apache.org" {
+ if crd.Name == "pipes.camel.apache.org" {
crd.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties["integration"].Properties["template"].
Properties["spec"].Properties[property].Items.Schema.Properties["ports"].Items.Schema.
Properties["protocol"] = defaultValue
@@ -325,8 +325,8 @@ func areAllCrdInstalled(c client.Client) (int, error) {
} else if !ok {
return 7, nil
}
- if ok, err := isCrdInstalled(c, "Binding", "v1"); err != nil {
- return 8, pkgerr.Wrap(err, "Error installing Binding CRDs")
+ if ok, err := isCrdInstalled(c, "Pipe", "v1"); err != nil {
+ return 8, pkgerr.Wrap(err, "Error installing Pipe CRDs")
} else if !ok {
return 8, nil
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index edd5c11f9..87b3e101b 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -114,13 +114,6 @@ var assets = func() http.FileSystem {
name: "bases",
modTime: time.Time{},
},
- "/crd/bases/camel.apache.org_bindings.yaml": &vfsgenÛ°CompressedFileInfo{
- name: "camel.apache.org_bindings.yaml",
- modTime: time.Time{},
- uncompressedSize: 939,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\x9b\x40\x10\xbd\xf3\x2b\x9e\xbc\x97\x44\x72\xec\xaa\xc7\xf6\x44\x13\x5b\x45\x8d\xb0\x14\x9c\x46\x39\xae\x61\x80\x51\x61\x87\xce\x2e\x25\xfe\xf7\xd5\x62\xbb\x49\xd4\x6b\xe6\x86\x18\xde\xc7\xbc\x87\xc1\xcd\xc7\x4d\x62\x70\xcf\x25\x39\x4f\x15\x82\x20\xb4\x84\x74\xb0\x65\x4b\x28\xa4\x0e\x93\x55\xc2\x56\x46\x57\xd9\xc0\xe2\x70\x95\x16\xdb\x6b\x8c\xae\x22\x85\x38\x82\x28\x7a\x51\x4a\x0c\x4a\x71\x41\xf9\x30\x [...]
- },
"/crd/bases/camel.apache.org_builds.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
modTime: time.Time{},
@@ -327,9 +320,9 @@ var assets = func() http.FileSystem {
"/rbac/openshift/operator-role-openshift.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role-openshift.yaml",
modTime: time.Time{},
- uncompressedSize: 2183,
+ uncompressedSize: 2211,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\x41\x8f\xdb\x46\x0f\xbd\xeb\x57\x10\xd6\x25\x01\xd6\xd2\xf7\xf5\x54\xb8\x27\x77\xb3\xdb\x1a\x0d\x6c\x60\xe5\x34\xc8\x91\x1a\xd1\x12\xe1\xd1\x50\xe5\x8c\x56\xd9\xfc\xfa\x62\xc6\x76\xe2\x5d\xd7\x9b\x4b\x80\xe8\x22\x9a\x7c\x26\xdf\xe3\xa3\x72\x98\xff\xb8\x27\xcb\xe1\x3d\x1b\x72\x9e\x1a\x08\x02\xa1\x23\x58\x0e\x68\x3a\x82\x4a\x76\x61\x42\x25\xb8\x97\xd1\x35\x18\x58\x1c\xbc\x59\x56\xf7\x6f\x61\x74\x0d\x29\x88\x23\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\x41\x8f\xdb\x46\x0f\xbd\xeb\x57\x10\xd6\x25\x01\xd6\xf2\xf7\xf5\x54\xb8\x27\x37\xd9\x6d\x8d\x06\x36\xb0\x72\x1a\xe4\x48\x8d\x68\x89\xf0\x68\x38\xe5\x8c\x56\xd9\xfc\xfa\x62\xc6\x76\xe2\xac\xbb\x9b\x4b\x80\xf8\x22\x2e\xf9\x96\x7c\x8f\x8f\x53\xc2\xfc\xc7\xfd\x8a\x12\xde\xb1\x21\x17\xa8\x85\x28\x10\x7b\x82\x95\x47\xd3\x13\xd4\xb2\x8f\x13\x2a\xc1\x9d\x8c\xae\xc5\xc8\xe2\xe0\xd5\xaa\xbe\x7b\x0d\xa3\x6b\x49\x41\x1c\x [...]
},
"/rbac/operator-cluster-role-addressable-resolver.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-cluster-role-addressable-resolver.yaml",
@@ -467,9 +460,9 @@ var assets = func() http.FileSystem {
"/rbac/operator-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role.yaml",
modTime: time.Time{},
- uncompressedSize: 3164,
+ uncompressedSize: 3155,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x94\xf0\x65\x57\x1a\x20\xc9\x29\x22\x27\x32\x1f\x09\xca\x0a\xa4\x31\x9b\xd5\x1e\xcb\xed\xc2\x54\x68\x77\x75\xba\xdb\xc3\x90\x5f\x1f\xb5\xb1\x07\x0f\x86\x55\xb4\xbb\xd2\x84\x0b\xed\xaa\xa2\xea\xd5\x7b\xaf\x91\x53\x18\x7f\xbf\x4f\x92\xc2\x07\x56\x64\x3c\x15\x10\x04\xc2\x96\x60\x6e\x51\x6d\x09\x32\xd9\x84\x3d\x3a\x82\x07\xa9\x4d\x81\x81\xc5\xc0\xbb\x79\xf6\xf0\x1e\x6a\x53\x90\x03\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x51\x8f\xda\x46\x10\x7e\xf7\xaf\x18\xe1\x97\x44\x3a\xa0\xed\x53\x45\x9f\xe8\xe5\xae\x45\x8d\x40\x3a\x48\xa3\x3c\x8e\xd7\x83\x99\xb2\xde\xd9\xce\xae\x8f\xa3\xbf\xbe\x5a\x63\x02\x77\x86\xa8\x4a\x22\x5d\x79\x61\x3d\x33\xcc\x7c\xf3\x7d\xdf\x22\xe7\x30\xfc\x7e\x9f\x2c\x87\xf7\x6c\xc8\x05\x2a\x21\x0a\xc4\x0d\xc1\xd4\xa3\xd9\x10\x2c\x65\x1d\x77\xa8\x04\xf7\xd2\xb8\x12\x23\x8b\x83\x37\xd3\xe5\xfd\x5b\x68\x5c\x49\x0a\x [...]
},
"/rbac/patch-role-to-clusterrole.yaml": &vfsgenÛ°CompressedFileInfo{
name: "patch-role-to-clusterrole.yaml",
@@ -488,9 +481,9 @@ var assets = func() http.FileSystem {
"/rbac/user-cluster-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "user-cluster-role.yaml",
modTime: time.Time{},
- uncompressedSize: 1947,
+ uncompressedSize: 1938,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x8f\xdb\x36\x10\xbd\xeb\x57\x3c\x48\x97\x04\x58\xdb\x6d\x4f\x85\x7b\x72\xf7\xa3\x35\x1a\xd8\xc0\xca\x69\x90\xe3\x58\x1c\x4b\x84\x29\x52\x25\x47\xab\x6c\x7f\x7d\x41\xda\x5a\x6b\xe3\xec\xa1\x41\x7c\x31\xf5\x66\x34\xf3\xde\xbc\xa1\x0a\xcc\x7e\xdc\x2f\x2b\xf0\x41\x57\x6c\x03\x2b\x88\x83\x34\x8c\x55\x47\x55\xc3\x28\xdd\x41\x06\xf2\x8c\x07\xd7\x5b\x45\xa2\x9d\xc5\xbb\x55\xf9\xf0\x1e\xbd\x55\xec\xe1\x2c\xc3\x79\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x8f\x22\x47\x0c\xbd\xf7\xaf\x78\xea\xbe\xec\x4a\x03\x24\x39\x45\xe4\x44\xe6\x23\x41\x59\x81\x34\xcd\x66\xb5\x47\xd3\x65\x1a\x8b\xea\xaa\x4e\x95\x7b\xd8\xc9\xaf\x8f\xaa\x80\x81\x59\x76\x0e\x59\x2d\x17\x5c\xb6\xcb\x7e\xcf\xcf\xd5\x15\x46\x3f\xee\x57\x54\xf8\x20\x0d\xbb\xc8\x06\xea\xa1\x5b\xc6\xac\xa7\x66\xcb\xa8\xfd\x46\xf7\x14\x18\x0f\x7e\x70\x86\x54\xbc\xc3\xbb\x59\xfd\xf0\x1e\x83\x33\x1c\xe0\x1d\xc3\x07\x [...]
},
"/samples": &vfsgenÛ°DirInfo{
name: "samples",
@@ -688,7 +681,6 @@ var assets = func() http.FileSystem {
fs["/crd/bases"].(os.FileInfo),
}
fs["/crd/bases"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
- fs["/crd/bases/camel.apache.org_bindings.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_builds.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_camelcatalogs.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_integrationkits.yaml"].(os.FileInfo),
diff --git a/pkg/resources/resources_test.go b/pkg/resources/resources_test.go
index 9b4921895..869a36a23 100644
--- a/pkg/resources/resources_test.go
+++ b/pkg/resources/resources_test.go
@@ -171,5 +171,5 @@ func TestCRDResources(t *testing.T) {
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrations.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kamelets.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kameletbindings.yaml", Resource)
- NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_bindings.yaml", Resource)
+ NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_pipes.yaml", Resource)
}
diff --git a/script/prepare-operators.sh b/script/prepare-operators.sh
index 57ad22950..bfbd1cc4d 100755
--- a/script/prepare-operators.sh
+++ b/script/prepare-operators.sh
@@ -41,7 +41,7 @@ cp ./manifests/camel.apache.org_integrationplatforms.yaml k8s-operatorhub/$1/man
cp ./manifests/camel.apache.org_integrations.yaml k8s-operatorhub/$1/manifests/integrations.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml k8s-operatorhub/$1/manifests/kamelets.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kameletbindings.yaml k8s-operatorhub/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_bindings.yaml k8s-operatorhub/$1/manifests/bindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_pipes.yaml k8s-operatorhub/$1/manifests/pipes.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml k8s-operatorhub/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml k8s-operatorhub/$1/metadata/annotations.yaml
cp ./tests/scorecard/config.yaml k8s-operatorhub/$1/tests/scorecard/config.yaml
@@ -53,7 +53,7 @@ cp ./manifests/camel.apache.org_integrationplatforms.yaml openshift-ecosystem/$1
cp ./manifests/camel.apache.org_integrations.yaml openshift-ecosystem/$1/manifests/integrations.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml openshift-ecosystem/$1/manifests/kamelets.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kameletbindings.yaml openshift-ecosystem/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_bindings.yaml openshift-ecosystem/$1/manifests/bindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_pipes.yaml openshift-ecosystem/$1/manifests/pipes.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml openshift-ecosystem/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml openshift-ecosystem/$1/metadata/annotations.yaml
cp ./tests/scorecard/config.yaml openshift-ecosystem/$1/tests/scorecard/config.yaml
[camel-k] 05/18: chore(api): add a deprecation notice
Posted by pc...@apache.org.
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 46aad9b0c0182241250882fe0e25dd294b4ef9d1
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Mar 28 15:59:04 2023 +0200
chore(api): add a deprecation notice
---
.../bases/camel.apache.org_kameletbindings.yaml | 25 ++++++++++++++++------
helm/camel-k/crds/crd-kamelet-binding.yaml | 24 ++++++++++-----------
pkg/apis/camel/v1alpha1/error_handler_types.go | 2 ++
.../camel/v1alpha1/error_handler_types_support.go | 2 ++
pkg/apis/camel/v1alpha1/jsonschema_types.go | 2 ++
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 ++
.../v1alpha1/kamelet_binding_types_support.go | 2 ++
.../v1alpha1/kamelet_binding_types_support_test.go | 2 ++
pkg/apis/camel/v1alpha1/kamelet_types.go | 2 ++
pkg/apis/camel/v1alpha1/kamelet_types_support.go | 2 ++
pkg/apis/camel/v1alpha1/register.go | 2 ++
pkg/install/cluster.go | 4 ++--
pkg/util/reference/reference.go | 4 ++--
script/gen_crd.sh | 3 ++-
14 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 8269eee53..bbec3c111 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -1,11 +1,28 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
----
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
+ labels:
+ app: camel-k
name: kameletbindings.camel.apache.org
spec:
group: camel.apache.org
@@ -8513,9 +8530,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: []
- storedVersions: []
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index b1b019aa4..bbec3c111 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -23,23 +23,23 @@ metadata:
creationTimestamp: null
labels:
app: camel-k
- name: bindings.camel.apache.org
+ name: kameletbindings.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: Binding
- listKind: BindingList
- plural: bindings
+ kind: KameletBinding
+ listKind: KameletBindingList
+ plural: kameletbindings
shortNames:
- klb
- singular: binding
+ singular: kameletbinding
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: TheBinding phase
+ - description: The Kamelet Binding phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +50,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: Binding is the Schema for the kamelets binding API
+ description: KameletBinding is the Schema for the kamelets binding API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +65,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a Binding
+ description: the specification of a KameletBinding
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8410,12 @@ spec:
type: array
type: object
status:
- description: the status of a Binding
+ description: the status of a KameletBinding
properties:
conditions:
description: Conditions --
items:
- description: BindingCondition describes the state of a resource
+ description: KameletBindingCondition describes the state of a resource
at a certain point.
properties:
lastTransitionTime:
@@ -8498,7 +8498,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of binding condition.
+ description: Type of kameletBinding condition.
type: string
required:
- status
@@ -8507,7 +8507,7 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this Binding.
+ for this KameletBinding.
format: int64
type: integer
phase:
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go
index 52a32e60a..1d83d2081 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
const (
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types_support.go b/pkg/apis/camel/v1alpha1/error_handler_types_support.go
index 79f473a70..09cf74826 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types_support.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types_support.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/jsonschema_types.go b/pkg/apis/camel/v1alpha1/jsonschema_types.go
index c9cdc4362..c36a05bc5 100644
--- a/pkg/apis/camel/v1alpha1/jsonschema_types.go
+++ b/pkg/apis/camel/v1alpha1/jsonschema_types.go
@@ -17,6 +17,8 @@ limitations under the License.
// NOTE: this file has been originally copied from https://github.com/kubernetes/apiextensions-apiserver/blob/33bb2d8b009bae408e40818a93877459efeb4cb1/pkg/apis/apiextensions/v1/types_jsonschema.go
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index fb1e44bc4..4659505a4 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
index 20d55df1b..bfe3da8b3 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
index ac77de187..1f9b4d143 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index d9bd295d7..0dba0c9ab 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types_support.go b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
index c15e5dd4b..746d486f7 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types_support.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types_support.go
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
package v1alpha1
import (
diff --git a/pkg/apis/camel/v1alpha1/register.go b/pkg/apis/camel/v1alpha1/register.go
index f472e4d78..e90d44ad3 100644
--- a/pkg/apis/camel/v1alpha1/register.go
+++ b/pkg/apis/camel/v1alpha1/register.go
@@ -16,6 +16,8 @@ limitations under the License.
*/
// Package v1alpha1 contains Camel unstable API Schema definitions
+// Package v1alpha1 is deprecated: use the v1 API instead
+// Deprecated
// +kubebuilder:object:generate=true
// +groupName=camel.apache.org
package v1alpha1
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index 36ba39079..169fcf994 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -307,12 +307,12 @@ func areAllCrdInstalled(c client.Client) (bool, error) {
} else if !ok {
return false, nil
}
- if ok, err := isCrdInstalled(c, "Kamelet", "v1alpha1"); err != nil {
+ if ok, err := isCrdInstalled(c, "Kamelet", "v1"); err != nil {
return ok, err
} else if !ok {
return false, nil
}
- return isCrdInstalled(c, "Binding", "v1alpha1")
+ return isCrdInstalled(c, "Binding", "v1")
}
func isCrdInstalled(c client.Client, kind string, version string) (bool, error) {
diff --git a/pkg/util/reference/reference.go b/pkg/util/reference/reference.go
index 43dc1581a..d3f506f1e 100644
--- a/pkg/util/reference/reference.go
+++ b/pkg/util/reference/reference.go
@@ -24,7 +24,7 @@ import (
"strings"
"unicode"
- camelv1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1"
@@ -44,7 +44,7 @@ var (
templates = map[string]corev1.ObjectReference{
"kamelet": {
Kind: "Kamelet",
- APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: v1.SchemeGroupVersion.String(),
},
"channel": {
Kind: "Channel",
diff --git a/script/gen_crd.sh b/script/gen_crd.sh
index d4e20f71d..aa2c70787 100755
--- a/script/gen_crd.sh
+++ b/script/gen_crd.sh
@@ -68,4 +68,5 @@ deploy_crd integration integrations
deploy_crd integration-kit integrationkits
deploy_crd integration-platform integrationplatforms
deploy_crd kamelet kamelets
-deploy_crd binding bindings
+deploy_crd kamelet-binding kameletbindings
+deploy_crd binding bindings
\ No newline at end of file
[camel-k] 08/18: feat(api): promote kamelet to v1
Posted by pc...@apache.org.
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 6aa610979429cde12d949eb674842aba00f92092
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Mar 30 16:38:40 2023 +0200
feat(api): promote kamelet to v1
---
config/crd/bases/camel.apache.org_bindings.yaml | 15 ------
.../crd/bases/camel.apache.org_integrations.yaml | 1 -
.../bases/camel.apache.org_kameletbindings.yaml | 4 +-
config/crd/bases/camel.apache.org_kamelets.yaml | 14 +----
config/crd/kustomization.yaml | 3 +-
.../bases/camel-k.clusterserviceversion.yaml | 2 +-
helm/camel-k/crds/crd-binding.yaml | 15 ------
helm/camel-k/crds/crd-integration.yaml | 1 -
helm/camel-k/crds/crd-kamelet-binding.yaml | 4 +-
helm/camel-k/crds/crd-kamelet.yaml | 14 +----
pkg/apis/camel/v1/binding_types.go | 2 +-
pkg/apis/camel/v1/common_types.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_types.go | 2 +-
pkg/install/cluster.go | 62 ++++++++++++++--------
pkg/resources/resources.go | 16 +++---
pkg/resources/resources_test.go | 3 +-
script/prepare-operators.sh | 6 ++-
18 files changed, 67 insertions(+), 101 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/crd/bases/camel.apache.org_bindings.yaml
index eecb595e9..d2a6833c1 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/crd/bases/camel.apache.org_bindings.yaml
@@ -33,8 +33,6 @@ spec:
kind: Binding
listKind: BindingList
plural: bindings
- shortNames:
- - klb
singular: binding
scope: Namespaced
versions:
@@ -7777,7 +7775,6 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -7796,7 +7793,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -7808,7 +7804,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -7816,7 +7811,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8016,7 +8010,6 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8035,7 +8028,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8047,7 +8039,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8055,7 +8046,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8260,7 +8250,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8279,7 +8268,6 @@ spec:
default:
description: default is a default value for
undefined object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8291,7 +8279,6 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8299,7 +8286,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8489,7 +8475,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml
index 1c4bf2eba..a9d9b4624 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -7465,7 +7465,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index ede33f2ba..dce3df057 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -48,7 +48,8 @@ spec:
name: Replicas
type: integer
deprecated: true
- deprecationWarning: v1apha1 is deprecated, please, use v1 instead
+ deprecationWarning: v1apha1.KameletBinding is deprecated, please, use v1.Binding
+ instead
name: v1alpha1
schema:
openAPIV3Schema:
@@ -8479,7 +8480,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index 223b9b01d..3e2facd12 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -141,7 +141,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -160,7 +159,6 @@ spec:
default:
description: default is a default value for
undefined object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -172,7 +170,6 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -180,7 +177,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -312,7 +308,6 @@ spec:
description: 'JSON represents any valid JSON value. These types
are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing an external
@@ -331,7 +326,6 @@ spec:
default:
description: default is a default value for undefined object
fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -342,14 +336,12 @@ spec:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -535,7 +527,6 @@ spec:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing an
@@ -554,7 +545,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -566,7 +556,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -574,7 +563,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -751,7 +739,7 @@ spec:
name: Phase
type: string
deprecated: true
- deprecationWarning: v1apha1 is deprecated, please, use v1 instead
+ deprecationWarning: v1apha1.Kamelet is deprecated, please, use v1.Kamelet instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index be191a381..0b0099bb8 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -23,5 +23,6 @@ resources:
- bases/camel.apache.org_integrationkits.yaml
- bases/camel.apache.org_integrationplatforms.yaml
- bases/camel.apache.org_integrations.yaml
-- bases/camel.apache.org_bindings.yaml
- bases/camel.apache.org_kamelets.yaml
+- bases/camel.apache.org_kameletbindings.yaml
+- bases/camel.apache.org_bindings.yaml
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 560bb6bfc..236050ca2 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
- createdAt: 2023-03-24T15:48:09Z
+ createdAt: 2023-03-30T11:22:34Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
diff --git a/helm/camel-k/crds/crd-binding.yaml b/helm/camel-k/crds/crd-binding.yaml
index eecb595e9..d2a6833c1 100644
--- a/helm/camel-k/crds/crd-binding.yaml
+++ b/helm/camel-k/crds/crd-binding.yaml
@@ -33,8 +33,6 @@ spec:
kind: Binding
listKind: BindingList
plural: bindings
- shortNames:
- - klb
singular: binding
scope: Namespaced
versions:
@@ -7777,7 +7775,6 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -7796,7 +7793,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -7808,7 +7804,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -7816,7 +7811,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8016,7 +8010,6 @@ spec:
description: 'JSON represents any valid JSON value.
These types are supported: bool, int64, float64, string,
[]interface{}, map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8035,7 +8028,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8047,7 +8039,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8055,7 +8046,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8260,7 +8250,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -8279,7 +8268,6 @@ spec:
default:
description: default is a default value for
undefined object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -8291,7 +8279,6 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -8299,7 +8286,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -8489,7 +8475,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
index 1c4bf2eba..a9d9b4624 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -7465,7 +7465,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index ede33f2ba..dce3df057 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -48,7 +48,8 @@ spec:
name: Replicas
type: integer
deprecated: true
- deprecationWarning: v1apha1 is deprecated, please, use v1 instead
+ deprecationWarning: v1apha1.KameletBinding is deprecated, please, use v1.Binding
+ instead
name: v1alpha1
schema:
openAPIV3Schema:
@@ -8479,7 +8480,6 @@ spec:
It implements Marshaler and Unmarshaler and can
be used to delay JSON decoding or precompute a
JSON encoding.
- type: object
x-kubernetes-preserve-unknown-fields: true
name:
type: string
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index 223b9b01d..3e2facd12 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -141,7 +141,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing
@@ -160,7 +159,6 @@ spec:
default:
description: default is a default value for
undefined object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -172,7 +170,6 @@ spec:
value. These types are supported: bool,
int64, float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -180,7 +177,6 @@ spec:
value. These types are supported: bool, int64,
float64, string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -312,7 +308,6 @@ spec:
description: 'JSON represents any valid JSON value. These types
are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing an external
@@ -331,7 +326,6 @@ spec:
default:
description: default is a default value for undefined object
fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -342,14 +336,12 @@ spec:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -535,7 +527,6 @@ spec:
description: 'JSON represents any valid JSON value. These
types are supported: bool, int64, float64, string, []interface{},
map[string]interface{} and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
externalDocs:
description: ExternalDocumentation allows referencing an
@@ -554,7 +545,6 @@ spec:
default:
description: default is a default value for undefined
object fields.
- type: object
x-kubernetes-preserve-unknown-fields: true
deprecated:
type: boolean
@@ -566,7 +556,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{}
and nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
type: array
example:
@@ -574,7 +563,6 @@ spec:
These types are supported: bool, int64, float64,
string, []interface{}, map[string]interface{} and
nil.'
- type: object
x-kubernetes-preserve-unknown-fields: true
exclusiveMaximum:
type: boolean
@@ -751,7 +739,7 @@ spec:
name: Phase
type: string
deprecated: true
- deprecationWarning: v1apha1 is deprecated, please, use v1 instead
+ deprecationWarning: v1apha1.Kamelet is deprecated, please, use v1.Kamelet instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/pkg/apis/camel/v1/binding_types.go b/pkg/apis/camel/v1/binding_types.go
index a72b62160..550141542 100644
--- a/pkg/apis/camel/v1/binding_types.go
+++ b/pkg/apis/camel/v1/binding_types.go
@@ -24,7 +24,7 @@ import (
// +genclient
// +kubebuilder:object:root=true
-// +kubebuilder:resource:path=bindings,scope=Namespaced,shortName=klb,categories=kamel;camel
+// +kubebuilder:resource:path=bindings,scope=Namespaced,categories=kamel;camel
// +kubebuilder:subresource:status
// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index b8001c120..52978eb47 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -223,7 +223,7 @@ type TraitConfiguration struct {
// RawMessage is a raw encoded JSON value.
// It implements Marshaler and Unmarshaler and can
// be used to delay JSON decoding or precompute a JSON encoding.
-// +kubebuilder:validation:Type=object
+// +kubebuilder:validation:Type=""
// +kubebuilder:validation:Format=""
// +kubebuilder:pruning:PreserveUnknownFields
type RawMessage []byte
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index c529abf06..5dd12743a 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -27,7 +27,7 @@ import (
)
// +genclient
-// +kubebuilder:deprecatedversion:warning="v1apha1 is deprecated, please, use v1 instead"
+// +kubebuilder:deprecatedversion:warning="v1apha1.KameletBinding is deprecated, please, use v1.Binding instead"
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index ec4c0a6b7..c8b8ff673 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -54,7 +54,7 @@ var (
)
// +genclient
-// +kubebuilder:deprecatedversion:warning="v1apha1 is deprecated, please, use v1 instead"
+// +kubebuilder:deprecatedversion:warning="v1apha1.Kamelet is deprecated, please, use v1.Kamelet instead"
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=kamelets,scope=Namespaced,shortName=kl,categories=kamel;camel
// +kubebuilder:subresource:status
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index 169fcf994..da4d44b57 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -31,12 +31,12 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- ctrl "sigs.k8s.io/controller-runtime/pkg/client"
-
"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"
+ pkgerr "github.com/pkg/errors"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
)
func SetupClusterWideResourcesOrCollect(
@@ -200,8 +200,14 @@ func installCRDs(ctx context.Context, c client.Client, collection *kubernetes.Co
return err
}
+ // Install CRD for KameletBinding (if needed)
+ if err := installCRD(ctx, c, "KameletBinding", "v1alpha1", "camel.apache.org_kameletbindings.yaml",
+ v1beta1Customizer, collection, force); err != nil {
+ return err
+ }
+
// Install CRD for Binding (if needed)
- if err := installCRD(ctx, c, "Binding", "v1alpha1", "camel.apache.org_bindings.yaml",
+ if err := installCRD(ctx, c, "Binding", "v1", "camel.apache.org_bindings.yaml",
v1beta1Customizer, collection, force); err != nil {
return err
}
@@ -265,54 +271,66 @@ func WaitForAllCrdInstallation(ctx context.Context, clientProvider client.Provid
if c, err = clientProvider.Get(); err != nil {
return err
}
- var inst bool
- if inst, err = areAllCrdInstalled(c); err != nil {
+ var errno int
+ if errno, err = areAllCrdInstalled(c); err != nil {
return err
- } else if inst {
+ }
+ if errno == 0 {
return nil
}
// Check after 2 seconds if not expired
if time.Now().After(deadline) {
return fmt.Errorf(
- "cannot check CRD installation after %s seconds",
- strconv.FormatInt(timeout.Nanoseconds()/1000000000, 10))
+ "cannot check CRD installation after %s seconds (errno %d)",
+ strconv.FormatInt(timeout.Nanoseconds()/1000000000, 10),
+ errno)
}
time.Sleep(2 * time.Second)
}
}
-func areAllCrdInstalled(c client.Client) (bool, error) {
+func areAllCrdInstalled(c client.Client) (int, error) {
if ok, err := isCrdInstalled(c, "IntegrationPlatform", "v1"); err != nil {
- return ok, err
+ return 1, pkgerr.Wrap(err, "Error installing IntegrationPlatform CRDs")
} else if !ok {
- return false, nil
+ return 1, nil
}
if ok, err := isCrdInstalled(c, "IntegrationKit", "v1"); err != nil {
- return ok, err
+ return 2, pkgerr.Wrap(err, "Error installing IntegrationKit CRDs")
} else if !ok {
- return false, nil
+ return 2, nil
}
if ok, err := isCrdInstalled(c, "Integration", "v1"); err != nil {
- return ok, err
+ return 3, pkgerr.Wrap(err, "Error installing Integration CRDs")
} else if !ok {
- return false, nil
+ return 3, nil
}
if ok, err := isCrdInstalled(c, "CamelCatalog", "v1"); err != nil {
- return ok, err
+ return 4, pkgerr.Wrap(err, "Error installing CamelCatalog CRDs")
} else if !ok {
- return false, nil
+ return 4, nil
}
if ok, err := isCrdInstalled(c, "Build", "v1"); err != nil {
- return ok, err
+ return 5, pkgerr.Wrap(err, "Error installing Build CRDs")
} else if !ok {
- return false, nil
+ return 5, nil
}
if ok, err := isCrdInstalled(c, "Kamelet", "v1"); err != nil {
- return ok, err
+ return 6, pkgerr.Wrap(err, "Error installing Kamelet CRDs")
} else if !ok {
- return false, nil
+ return 6, nil
+ }
+ if ok, err := isCrdInstalled(c, "KameletBinding", "v1alpha1"); err != nil {
+ return 7, pkgerr.Wrap(err, "Error installing KameletBindings CRDs")
+ } else if !ok {
+ return 7, nil
+ }
+ if ok, err := isCrdInstalled(c, "Binding", "v1"); err != nil {
+ return 8, pkgerr.Wrap(err, "Error installing Binding CRDs")
+ } else if !ok {
+ return 8, nil
}
- return isCrdInstalled(c, "Binding", "v1")
+ return 0, nil
}
func isCrdInstalled(c client.Client, kind string, version string) (bool, error) {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 701371ab0..ce7e3ddd5 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -117,9 +117,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_bindings.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_bindings.yaml",
modTime: time.Time{},
- uncompressedSize: 573023,
+ uncompressedSize: 572366,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
},
"/crd/bases/camel.apache.org_builds.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
@@ -152,23 +152,23 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_integrations.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_integrations.yaml",
modTime: time.Time{},
- uncompressedSize: 492832,
+ uncompressedSize: 492785,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x30\x8c\xff\x9f\x4f\x81\x72\x52\x8f\xa4\x8d\x48\xd9\x99\xd9\xa9\x19\xff\xa6\x9e\x94\x56\x96\x13\xfd\x62\xcb\x2a\x4b\x49\x9e\x94\x93\x4d\xc0\x6e\x90\xc4\xa3\x6e\xa0\x17\x40\x53\xe2\xbc\x79\xbf\xfb\x5b\x38\x00\xfa\xc2\x5b\x1f\xb4\x48\xc7\xd9\x6d\x4c\x55\xc6\x14\xd9\xa7\x71\x39\x38\xf7\xcb\xe7\x64\xb4\xbf\xf1\xd9\xe7\xe4\x0d\x4f\x98\xd0\x2c\x25\x46\x12\x33\x67\xe4\xbc\xa0\xc9\x9c\x91\x5b\x39\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x30\x8c\xff\x9f\x4f\x81\x72\x52\x8f\xa4\x8d\x48\xd9\x99\xd9\xa9\x19\xff\xa6\x9e\x94\x56\x96\x13\xfd\x62\xcb\x2a\x4b\x49\x9e\x94\x93\x4d\xc0\x6e\x90\xc4\xa3\x6e\xa0\x17\x40\x53\xe2\xbc\x79\xbf\xfb\x5b\x38\x00\xfa\xc2\x5b\x1f\xb4\x48\xc7\xd9\x6d\x4c\x55\xc6\x14\xd9\xa7\x71\x39\x38\xf7\xcb\xe7\x64\xb4\xbf\xf1\xd9\xe7\xe4\x0d\x4f\x98\xd0\x2c\x25\x46\x12\x33\x67\xe4\xbc\xa0\xc9\x9c\x91\x5b\x39\x [...]
},
"/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 572531,
+ uncompressedSize: 572604,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x73\x1b\x37\xb6\x30\x0a\x7f\xf7\xaf\x40\xc9\xa9\x47\xd2\x8e\x48\xd9\x99\x99\xd4\x8c\xdf\xa9\x9d\xd2\xc8\x72\xa2\x37\xb6\xcc\xb2\x94\xe4\x49\x39\xd9\x09\xd8\x0d\x92\xd8\xea\x06\x7a\x00\x34\x25\xe6\xf8\xfc\xf7\x53\x58\x00\xfa\xc2\x9b\xb0\x9a\x92\x46\x9e\x69\x4c\x55\xc6\xa4\xd8\xab\x71\x5b\xf7\xdb\x73\x32\xb8\xbf\xf1\xec\x39\x79\xcb\x13\x26\x34\x4b\x89\x91\xc4\xcc\x18\x39\x29\x68\x32\x63\xe4\x52\x4e\xcc\x0d\x [...]
},
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 78374,
+ uncompressedSize: 77953,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7d\x6f\xdb\x3a\xb2\xf7\xff\xf9\x14\x83\xf4\x02\x4d\x81\xd8\x49\x9a\xb6\x7b\x36\xcf\x1f\x45\x36\x6d\x77\xf3\x9c\xbe\x04\x49\xba\xf7\xd9\xa7\x3d\x17\xa0\x25\xda\xe6\x46\xa6\x74\x49\x2a\x2f\x77\xdb\xef\x7e\x41\x52\x92\x25\x5b\x2f\x33\x8e\x94\xe4\x2c\x0e\x81\xa2\xb1\x2d\x0d\x87\xe4\x90\x1c\x92\xbf\xf9\xf1\x19\x8c\xfa\x4b\x5b\xcf\xe0\xa3\x08\xb8\xd4\x3c\x04\x13\x83\x99\x73\x38\x4e\x58\x30\xe7\x70\x11\x4f\xcd\x0d\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x6f\x1b\x39\xd2\xee\x77\xff\x8a\x82\xfd\x02\x71\x00\x4b\xb6\xe3\x24\x3b\xe3\xf3\x21\xf0\x3a\xc9\x8c\xcf\x38\x89\x61\x3b\xb3\x67\x4e\x32\x0b\x50\xdd\x94\xc4\x75\x8b\xdd\x4b\xb2\x7d\xd9\x4d\xfe\xfb\x0b\x92\xcd\xbe\x48\x7d\x29\xca\xdd\xb6\x67\x30\x04\x82\x58\x52\x77\xb1\x78\xad\x22\xf9\xd4\xc3\x2d\x18\xf5\x97\x36\xb6\xe0\x94\x05\x94\x4b\x1a\x82\x8a\x41\xcd\x29\x1c\x25\x24\x98\x53\xb8\x88\xa7\xea\x86\x08\x0a\x [...]
},
"/manager": &vfsgenÛ°DirInfo{
name: "manager",
diff --git a/pkg/resources/resources_test.go b/pkg/resources/resources_test.go
index 6dae89525..9b4921895 100644
--- a/pkg/resources/resources_test.go
+++ b/pkg/resources/resources_test.go
@@ -169,6 +169,7 @@ func TestCRDResources(t *testing.T) {
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrationkits.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrationplatforms.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrations.yaml", Resource)
- NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_bindings.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kamelets.yaml", Resource)
+ NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kameletbindings.yaml", Resource)
+ NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_bindings.yaml", Resource)
}
diff --git a/script/prepare-operators.sh b/script/prepare-operators.sh
index a8a27357a..57ad22950 100755
--- a/script/prepare-operators.sh
+++ b/script/prepare-operators.sh
@@ -39,8 +39,9 @@ cp ./manifests/camel.apache.org_camelcatalogs.yaml k8s-operatorhub/$1/manifests/
cp ./manifests/camel.apache.org_integrationkits.yaml k8s-operatorhub/$1/manifests/integrationkits.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrationplatforms.yaml k8s-operatorhub/$1/manifests/integrationplatforms.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrations.yaml k8s-operatorhub/$1/manifests/integrations.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_bindings.yaml k8s-operatorhub/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml k8s-operatorhub/$1/manifests/kamelets.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_kameletbindings.yaml k8s-operatorhub/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_bindings.yaml k8s-operatorhub/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml k8s-operatorhub/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml k8s-operatorhub/$1/metadata/annotations.yaml
cp ./tests/scorecard/config.yaml k8s-operatorhub/$1/tests/scorecard/config.yaml
@@ -50,8 +51,9 @@ cp ./manifests/camel.apache.org_camelcatalogs.yaml openshift-ecosystem/$1/manife
cp ./manifests/camel.apache.org_integrationkits.yaml openshift-ecosystem/$1/manifests/integrationkits.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrationplatforms.yaml openshift-ecosystem/$1/manifests/integrationplatforms.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrations.yaml openshift-ecosystem/$1/manifests/integrations.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_bindings.yaml openshift-ecosystem/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml openshift-ecosystem/$1/manifests/kamelets.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_kameletbindings.yaml openshift-ecosystem/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_bindings.yaml openshift-ecosystem/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml openshift-ecosystem/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml openshift-ecosystem/$1/metadata/annotations.yaml
cp ./tests/scorecard/config.yaml openshift-ecosystem/$1/tests/scorecard/config.yaml
[camel-k] 09/18: fix(install): add kameletbinding for kustomize
Posted by pc...@apache.org.
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 ae40de40085a03ef9945d694bc55c1be3c51e204
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 31 12:03:46 2023 +0200
fix(install): add kameletbinding for kustomize
---
PROJECT | 3 +++
1 file changed, 3 insertions(+)
diff --git a/PROJECT b/PROJECT
index fc4169d99..bea680d41 100644
--- a/PROJECT
+++ b/PROJECT
@@ -24,6 +24,9 @@ resources:
- group: camel
kind: Kamelet
version: v1
+- group: camel
+ kind: KameletBinding
+ version: v1alpha1
version: "3"
plugins:
go.sdk.operatorframework.io/v2-alpha: {}
[camel-k] 02/18: fix(olm): bundles
Posted by pc...@apache.org.
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 0c41d301f5c5b90f6f7f63f34925a7ef5aa09ce3
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 24 16:48:45 2023 +0100
fix(olm): bundles
---
.../manifests/bases/camel-k.clusterserviceversion.yaml | 4 ++--
...amel_v1_kameletbinding.yaml => camel_v1_binding.yaml} | 0
.../pages/kamelets/kameletbindings-error-handler.adoc | 2 +-
docs/modules/ROOT/pages/kamelets/kamelets-user.adoc | 2 +-
docs/modules/ROOT/pages/kamelets/kamelets.adoc | 2 +-
e2e/common/traits/service_binding_test.go | 2 +-
e2e/commonwithcustominstall/promote_test.go | 4 ++--
e2e/native/native_binding_test.go | 2 +-
pkg/cmd/bind.go | 4 ++--
pkg/cmd/reset.go | 2 +-
pkg/resources/resources.go | 16 ++++++++--------
pkg/util/bindings/api.go | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 603cfacb1..560bb6bfc 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
- createdAt: 2023-03-24T09:36:48Z
+ createdAt: 2023-03-24T15:48:09Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -63,7 +63,7 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1
- - description: Binding is the Schema for the kamelets binding API
+ - description: Binding is the Schema for the binding API
displayName: Binding
kind: Binding
name: bindings.camel.apache.org
diff --git a/config/samples/bases/camel_v1_kameletbinding.yaml b/config/samples/bases/camel_v1_binding.yaml
similarity index 100%
rename from config/samples/bases/camel_v1_kameletbinding.yaml
rename to config/samples/bases/camel_v1_binding.yaml
diff --git a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
index cbdcb7b52..48b827e08 100644
--- a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
@@ -1,7 +1,7 @@
[[bindings-error-handler]]
=Bindings Error Handler
-Kamelet Binding`s offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
+Bindings offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
[source,yaml]
----
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
index 5fe4f2d77..b179fb29a 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
@@ -390,7 +390,7 @@ To comply with the Knative specifications, in case an "http" or "https" URI is u
=== Error Handling
-You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] for more detail.
+You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] for more detail.
=== Trait via annotations
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets.adoc b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
index a4622c7c8..26f339389 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
@@ -4,5 +4,5 @@
This section of the documentation contains information about Kamelets from both a user and a developer point of view:
- The xref:kamelets/kamelets-user.adoc[Kamelets User Guide] is for users that want to use Kamelets for connecting systems with their applications
-- The xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] explains how to configure an error handler on a `Kamelet Binding`
+- The xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] explains how to configure an error handler on a `Binding`
- The xref:kamelets/kamelets-dev.adoc[Kamelets Developer Guide] is a reference for developers that want to create new Kamelets and share them with users
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 4d56157d7..bfbcc7726 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -74,7 +74,7 @@ func TestServiceBindingTrait(t *testing.T) {
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
})
- t.Run("Kamelet Binding Service Binding", func(t *testing.T) {
+ t.Run("Binding Service Binding", func(t *testing.T) {
// Create our mock service config
message := "hello"
service := &corev1.ConfigMap{
diff --git a/e2e/commonwithcustominstall/promote_test.go b/e2e/commonwithcustominstall/promote_test.go
index 942603bca..38489d37b 100644
--- a/e2e/commonwithcustominstall/promote_test.go
+++ b/e2e/commonwithcustominstall/promote_test.go
@@ -69,7 +69,7 @@ func TestKamelCLIPromote(t *testing.T) {
Eventually(IntegrationLogs(nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
- t.Run("kamelet binding dev", func(t *testing.T) {
+ t.Run("binding dev", func(t *testing.T) {
Expect(CreateTimerKamelet(nsDev, "kb-timer-source")()).To(Succeed())
Expect(KamelBindWithID(operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
@@ -152,7 +152,7 @@ func TestKamelCLIPromote(t *testing.T) {
Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
- t.Run("kamelet binding promotion", func(t *testing.T) {
+ t.Run("binding promotion", func(t *testing.T) {
Expect(CreateTimerKamelet(nsProd, "kb-timer-source")()).To(Succeed())
Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index d7f654bff..cd4a08ab3 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -57,7 +57,7 @@ func TestNativeBinding(t *testing.T) {
}
message := "Magicstring!"
- t.Run("kamelet binding with native build", func(t *testing.T) {
+ t.Run("binding with native build", func(t *testing.T) {
bindingName := "native-binding"
Expect(BindKameletTo(ns, bindingName,
map[string]string{"trait.camel.apache.org/quarkus.package-type": "native"},
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index a2cd8979c..9632bdd01 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -273,9 +273,9 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
}
if !replaced {
- fmt.Fprintln(cmd.OutOrStdout(), `kamelet binding "`+name+`" created`)
+ fmt.Fprintln(cmd.OutOrStdout(), `binding "`+name+`" created`)
} else {
- fmt.Fprintln(cmd.OutOrStdout(), `kamelet binding "`+name+`" updated`)
+ fmt.Fprintln(cmd.OutOrStdout(), `binding "`+name+`" updated`)
}
return nil
}
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index c91c5cf27..e24480b4e 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -67,7 +67,7 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
fmt.Fprint(cmd.ErrOrStderr(), err)
return
}
- fmt.Fprintln(cmd.OutOrStdout(), n, "kamelet bindings deleted from namespace", o.Namespace)
+ fmt.Fprintln(cmd.OutOrStdout(), n, "bindings deleted from namespace", o.Namespace)
}
if !o.SkipIntegrations {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index fca200371..384056d34 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -486,6 +486,13 @@ var assets = func() http.FileSystem {
name: "bases",
modTime: time.Time{},
},
+ "/samples/bases/camel_v1_binding.yaml": &vfsgenÛ°CompressedFileInfo{
+ name: "camel_v1_binding.yaml",
+ modTime: time.Time{},
+ uncompressedSize: 1277,
+
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\xae\xdb\x36\x10\xbc\xf3\x2b\x06\xd6\x25\x01\x1c\xb9\xe9\xd1\x3d\x39\x8e\x8d\x08\x49\x6d\xe0\xc9\x69\x90\xe3\x5a\x5a\x4b\x0b\x53\x24\x4b\x52\xd6\xf3\xdf\x17\x94\xec\xc6\x46\x8b\xa2\x87\xf0\x44\x51\xcb\x9d\x99\x9d\x61\x86\x77\x3f\x6f\xa9\x0c\x5f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe5\xa8\x6a\x19\xa5\x3d\xc5\x81\x3c\x63\x6b\x7b\x53\x53\x14\x6b\xf0\x66\x55\x6e\xdf\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\xac\x [...]
+ },
"/samples/bases/camel_v1_build.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel_v1_build.yaml",
modTime: time.Time{},
@@ -528,13 +535,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x6f\xe3\x46\x0c\xbd\xeb\x57\x3c\x58\x97\x5d\x20\x76\x92\x1e\xd5\x93\x9b\x75\x50\x63\xb7\xf6\x22\xf2\x76\xb1\x47\x5a\xa2\x65\xc2\xd2\xcc\x74\x86\x8a\xe2\x7f\x5f\x8c\x3e\x62\x27\x45\x6f\xd1\x6d\x38\x1c\xf2\x3d\xbe\x47\xa5\x98\x7f\xdc\x97\xa4\xf8\x26\x05\x9b\xc0\x25\xd4\x42\x8f\x8c\xa5\xa3\xe2\xc8\xc8\xed\x41\x3b\xf2\x8c\x47\xdb\x9a\x92\x54\xac\xc1\xa7\x65\xfe\xf8\x19\xad\x29\xd9\xc3\x1a\x86\xf5\x68\xac\xe7\x [...]
},
- "/samples/bases/camel_v1_kameletbinding.yaml": &vfsgenÛ°CompressedFileInfo{
- name: "camel_v1_kameletbinding.yaml",
- modTime: time.Time{},
- uncompressedSize: 1277,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\xae\xdb\x36\x10\xbc\xf3\x2b\x06\xd6\x25\x01\x1c\xb9\xe9\xd1\x3d\x39\x8e\x8d\x08\x49\x6d\xe0\xc9\x69\x90\xe3\x5a\x5a\x4b\x0b\x53\x24\x4b\x52\xd6\xf3\xdf\x17\x94\xec\xc6\x46\x8b\xa2\x87\xf0\x44\x51\xcb\x9d\x99\x9d\x61\x86\x77\x3f\x6f\xa9\x0c\x5f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe5\xa8\x6a\x19\xa5\x3d\xc5\x81\x3c\x63\x6b\x7b\x53\x53\x14\x6b\xf0\x66\x55\x6e\xdf\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\xac\x [...]
- },
"/samples/patch-integration-platform.yaml": &vfsgenÛ°CompressedFileInfo{
name: "patch-integration-platform.yaml",
modTime: time.Time{},
@@ -742,13 +742,13 @@ var assets = func() http.FileSystem {
fs["/samples/patch-integration-platform.yaml"].(os.FileInfo),
}
fs["/samples/bases"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
+ fs["/samples/bases/camel_v1_binding.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_build.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_camelcatalog.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integration.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integrationkit.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integrationplatform.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_kamelet.yaml"].(os.FileInfo),
- fs["/samples/bases/camel_v1_kameletbinding.yaml"].(os.FileInfo),
}
fs["/templates"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
fs["/templates/groovy.tmpl"].(os.FileInfo),
diff --git a/pkg/util/bindings/api.go b/pkg/util/bindings/api.go
index 6d6b5666f..4b05fae94 100644
--- a/pkg/util/bindings/api.go
+++ b/pkg/util/bindings/api.go
@@ -44,7 +44,7 @@ type Binding struct {
ApplicationProperties map[string]string
}
-// BindingProvider maps a KameletBinding endpoint into Camel K resources.
+// BindingProvider maps a Binding endpoint into Camel K resources.
type BindingProvider interface {
// ID returns the name of the binding provider
ID() string
[camel-k] 01/18: feat: change KameletBinding name to Binding
Posted by pc...@apache.org.
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 bff24b7603af2fd94d7fa779cc4daa99a44e554e
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Mar 23 18:02:28 2023 +0100
feat: change KameletBinding name to Binding
Closes #2625
---
.../kamel-cleanup/clean-orphan-resources.sh | 2 +-
PROJECT | 2 +-
addons/keda/keda.go | 6 +-
addons/keda/keda_test.go | 16 +-
addons/strimzi/strimzi.go | 2 +-
...indings.yaml => camel.apache.org_bindings.yaml} | 24 +-
config/crd/kustomization.yaml | 2 +-
.../bases/camel-k.clusterserviceversion.yaml | 10 +-
config/rbac/openshift/operator-role-openshift.yaml | 2 +-
config/rbac/operator-role.yaml | 6 +-
config/rbac/user-cluster-role.yaml | 6 +-
config/samples/bases/camel_v1_kameletbinding.yaml | 2 +-
config/samples/kustomization.yaml | 2 +-
.../kamelets/kameletbindings-error-handler.adoc | 36 +-
docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 26 +-
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 36 +-
docs/modules/ROOT/pages/kamelets/kamelets.adoc | 2 +-
docs/modules/ROOT/pages/running/knative-sink.adoc | 4 +-
docs/modules/ROOT/pages/scaling/binding.adoc | 24 +-
.../ROOT/pages/troubleshooting/debugging.adoc | 4 +-
docs/modules/ROOT/partials/apis/crds-html.adoc | 154 +++----
docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 444 ++++++++++-----------
e2e/common/misc/kamelet_binding_test.go | 22 +-
e2e/common/misc/scale_binding_test.go | 38 +-
e2e/common/traits/errored_trait_test.go | 12 +-
e2e/common/traits/health_test.go | 4 +-
.../operator_id_filtering_test.go | 4 +-
e2e/commonwithcustominstall/promote_test.go | 4 +-
e2e/install/kustomize/common.go | 2 +-
e2e/knative/kamelet_test.go | 22 +-
e2e/support/test_support.go | 60 +--
e2e/yaks/common/kamelet-beans/kamelet.feature | 4 +-
.../kamelet-autoload-specific.feature | 10 +-
.../kamelet-autoload.feature | 8 +-
.../common/kamelet-binding-broker/kamelet.feature | 2 +-
.../logger-sink-binding.yaml | 2 +-
.../timer-source-binding.yaml | 2 +-
.../common/kamelet-binding-broker/yaks-config.yaml | 4 +-
.../timer-source-binding-display.yaml | 2 +-
.../common/kamelet-binding-http/yaks-config.yaml | 2 +-
.../properties-binding.yaml | 2 +-
.../properties.feature | 2 +-
e2e/yaks/common/kamelet-binding/kamelet.feature | 2 +-
.../kamelet-binding/logger-sink-binding.yaml | 2 +-
.../kamelet-binding/timer-source-binding.yaml | 2 +-
e2e/yaks/common/kamelet-binding/yaks-config.yaml | 4 +-
.../common/kamelet-data-types/event-binding.yaml | 2 +-
.../kamelet-data-types/kamelet-data-types.feature | 4 +-
.../common/kamelet-data-types/timer-to-log.yaml | 2 +-
.../kamelet-no-properties/kamelet-no-props.feature | 4 +-
.../common/kamelet-steps/steps-binding.feature | 2 +-
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 2 +-
e2e/yaks/common/kamelet-steps/yaks-config.yaml | 2 +-
.../camel-k/crds/crd-binding.yaml | 24 +-
helm/camel-k/crds/crd-kamelet-binding.yaml | 24 +-
helm/camel-k/templates/operator-cluster-roles.yaml | 14 +-
helm/camel-k/templates/operator-role.yaml | 8 +-
.../{kamelet_binding_types.go => binding_types.go} | 82 ++--
...g_types_support.go => binding_types_support.go} | 46 +--
...pport_test.go => binding_types_support_test.go} | 0
pkg/apis/camel/v1alpha1/register.go | 4 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 298 +++++++-------
.../v1alpha1/{kameletbinding.go => binding.go} | 52 +--
...eletbindingcondition.go => bindingcondition.go} | 26 +-
.../{kameletbindingspec.go => bindingspec.go} | 24 +-
.../{kameletbindingstatus.go => bindingstatus.go} | 30 +-
pkg/client/camel/applyconfiguration/utils.go | 16 +-
.../versioned/typed/camel/v1alpha1/binding.go | 290 ++++++++++++++
.../versioned/typed/camel/v1alpha1/camel_client.go | 10 +-
.../typed/camel/v1alpha1/fake/fake_binding.go | 214 ++++++++++
.../typed/camel/v1alpha1/fake/fake_camel_client.go | 8 +-
.../camel/v1alpha1/fake/fake_kameletbinding.go | 214 ----------
.../typed/camel/v1alpha1/generated_expansion.go | 4 +-
.../typed/camel/v1alpha1/kameletbinding.go | 290 --------------
.../v1alpha1/{kameletbinding.go => binding.go} | 38 +-
.../externalversions/camel/v1alpha1/interface.go | 14 +-
.../camel/informers/externalversions/generic.go | 4 +-
pkg/client/camel/listers/camel/v1alpha1/binding.go | 100 +++++
.../listers/camel/v1alpha1/expansion_generated.go | 16 +-
.../camel/listers/camel/v1alpha1/kameletbinding.go | 100 -----
pkg/cmd/bind.go | 14 +-
pkg/cmd/bind_test.go | 14 +-
pkg/cmd/delete.go | 14 +-
pkg/cmd/promote.go | 38 +-
pkg/cmd/promote_test.go | 12 +-
pkg/cmd/reset.go | 18 +-
pkg/controller/add_kameletbinding.go | 4 +-
.../{kameletbinding => binding}/action.go | 8 +-
.../binding_controller.go} | 62 +--
.../{kameletbinding => binding}/error_handler.go | 2 +-
.../error_handler_test.go | 2 +-
.../{kameletbinding => binding}/initialize.go | 36 +-
.../{kameletbinding => binding}/integration.go | 50 +--
pkg/controller/{kameletbinding => binding}/log.go | 4 +-
.../{kameletbinding => binding}/monitor.go | 78 ++--
pkg/event/manager.go | 28 +-
pkg/install/cluster.go | 10 +-
pkg/resources/resources.go | 49 ++-
pkg/resources/resources_test.go | 2 +-
pkg/trait/util.go | 14 +-
pkg/trait/util_test.go | 58 +--
pkg/util/bindings/catalog.go | 2 +-
pkg/util/bindings/kamelet.go | 14 +-
pkg/util/bindings/kamelet_test.go | 8 +-
pkg/util/log/log.go | 4 +-
script/gen_crd.sh | 2 +-
script/prepare-operators.sh | 4 +-
107 files changed, 1783 insertions(+), 1766 deletions(-)
diff --git a/.github/actions/kamel-cleanup/clean-orphan-resources.sh b/.github/actions/kamel-cleanup/clean-orphan-resources.sh
index 13c82c5c1..2b1239990 100755
--- a/.github/actions/kamel-cleanup/clean-orphan-resources.sh
+++ b/.github/actions/kamel-cleanup/clean-orphan-resources.sh
@@ -2,7 +2,7 @@
set +e
-resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds kameletbindings"
+resourcetypes="integrations integrationkits integrationplatforms camelcatalogs kamelets builds bindings"
#
# Loop through the resource types
diff --git a/PROJECT b/PROJECT
index 349993f64..9173437e1 100644
--- a/PROJECT
+++ b/PROJECT
@@ -19,7 +19,7 @@ resources:
kind: Integration
version: v1
- group: camel
- kind: KameletBinding
+ kind: Binding
version: v1alpha1
- group: camel
kind: Kamelet
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index f85fb1359..e597ce0e0 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -279,9 +279,9 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
if err != nil {
return err
}
- if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
+ if ctrlRef.Kind == camelv1alpha1.BindingKind {
scale.ObjectMeta.Name = ctrlRef.Name
- _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("kameletbindings").GroupResource(), &scale, metav1.UpdateOptions{})
+ _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
if err != nil {
return err
}
@@ -297,7 +297,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectReference {
for _, o := range e.Integration.OwnerReferences {
- if o.Kind == camelv1alpha1.KameletBindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
+ if o.Kind == camelv1alpha1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
return &v1.ObjectReference{
APIVersion: o.APIVersion,
Kind: o.Kind,
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index fdfa721d9..9c64b3f1b 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -25,7 +25,7 @@ import (
"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/controller/binding"
"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"
@@ -203,16 +203,16 @@ func TestKameletAutoDetection(t *testing.T) {
assert.Contains(t, secret.StringData, "cc")
}
-func TestKameletBindingAutoDetection(t *testing.T) {
+func TestBindingAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
keda.Enabled = pointer.Bool(true)
logEndpoint := "log:info"
- klb := camelv1alpha1.KameletBinding{
+ klb := camelv1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-binding",
},
- Spec: camelv1alpha1.KameletBindingSpec{
+ Spec: camelv1alpha1.BindingSpec{
Source: camelv1alpha1.Endpoint{
Ref: &corev1.ObjectReference{
Kind: "Kamelet",
@@ -277,7 +277,7 @@ func TestKameletBindingAutoDetection(t *testing.T) {
},
})
- it, err := kameletbinding.CreateIntegrationFor(env.Ctx, env.Client, &klb)
+ it, err := binding.CreateIntegrationFor(env.Ctx, env.Client, &klb)
assert.NoError(t, err)
assert.NotNil(t, it)
env.Integration = it
@@ -362,7 +362,7 @@ func TestHackKLBReplicas(t *testing.T) {
})
keda.HackControllerReplicas = pointer.Bool(true)
env := createBasicTestEnvironment(
- &camelv1alpha1.KameletBinding{
+ &camelv1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-klb",
@@ -375,7 +375,7 @@ func TestHackKLBReplicas(t *testing.T) {
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
- Kind: "KameletBinding",
+ Kind: "Binding",
Name: "my-klb",
},
},
@@ -392,7 +392,7 @@ func TestHackKLBReplicas(t *testing.T) {
assert.NoError(t, keda.Apply(env))
scalesClient, err := env.Client.ScalesClient()
assert.NoError(t, err)
- sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("kameletbindings").GroupResource(), "my-klb", metav1.GetOptions{})
+ sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), "my-klb", metav1.GetOptions{})
assert.NoError(t, err)
assert.Equal(t, int32(1), sc.Spec.Replicas)
}
diff --git a/addons/strimzi/strimzi.go b/addons/strimzi/strimzi.go
index f414afa90..d10193f07 100644
--- a/addons/strimzi/strimzi.go
+++ b/addons/strimzi/strimzi.go
@@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
)
-// BindingProvider allows to connect to a Kafka topic via KameletBinding.
+// BindingProvider allows to connect to a Kafka topic via Binding.
type BindingProvider struct {
Client internalclientset.Interface
}
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_bindings.yaml
similarity index 99%
copy from config/crd/bases/camel.apache.org_kameletbindings.yaml
copy to config/crd/bases/camel.apache.org_bindings.yaml
index bbec3c111..b1b019aa4 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_bindings.yaml
@@ -23,23 +23,23 @@ metadata:
creationTimestamp: null
labels:
app: camel-k
- name: kameletbindings.camel.apache.org
+ name: bindings.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: KameletBinding
- listKind: KameletBindingList
- plural: kameletbindings
+ kind: Binding
+ listKind: BindingList
+ plural: bindings
shortNames:
- klb
- singular: kameletbinding
+ singular: binding
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: The Kamelet Binding phase
+ - description: TheBinding phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +50,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: KameletBinding is the Schema for the kamelets binding API
+ description: Binding is the Schema for the kamelets binding API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +65,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a KameletBinding
+ description: the specification of a Binding
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8410,12 @@ spec:
type: array
type: object
status:
- description: the status of a KameletBinding
+ description: the status of a Binding
properties:
conditions:
description: Conditions --
items:
- description: KameletBindingCondition describes the state of a resource
+ description: BindingCondition describes the state of a resource
at a certain point.
properties:
lastTransitionTime:
@@ -8498,7 +8498,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of kameletBinding condition.
+ description: Type of binding condition.
type: string
required:
- status
@@ -8507,7 +8507,7 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this KameletBinding.
+ for this Binding.
format: int64
type: integer
phase:
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index d26003e2a..be191a381 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -23,5 +23,5 @@ resources:
- bases/camel.apache.org_integrationkits.yaml
- bases/camel.apache.org_integrationplatforms.yaml
- bases/camel.apache.org_integrations.yaml
-- bases/camel.apache.org_kameletbindings.yaml
+- bases/camel.apache.org_bindings.yaml
- bases/camel.apache.org_kamelets.yaml
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 6d6cdaa0a..603cfacb1 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
- createdAt: 2023-04-03T16:32:08Z
+ createdAt: 2023-03-24T09:36:48Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -63,10 +63,10 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1
- - description: KameletBinding is the Schema for the kamelets binding API
- displayName: Kamelet Binding
- kind: KameletBinding
- name: kameletbindings.camel.apache.org
+ - description: Binding is the Schema for the kamelets binding API
+ displayName: Binding
+ kind: Binding
+ name: bindings.camel.apache.org
version: v1alpha1
- description: Kamelet is the Schema for the kamelets API
displayName: Kamelet
diff --git a/config/rbac/openshift/operator-role-openshift.yaml b/config/rbac/openshift/operator-role-openshift.yaml
index bebcb5900..bf99bf1ad 100644
--- a/config/rbac/openshift/operator-role-openshift.yaml
+++ b/config/rbac/openshift/operator-role-openshift.yaml
@@ -29,7 +29,7 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- - kameletbindings/finalizers
+ - bindings/finalizers
verbs:
- update
- apiGroups:
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index 43bfaf3bb..0c9dc702d 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -30,7 +30,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - kameletbindings
+ - bindings
- kamelets
verbs:
- create
@@ -54,8 +54,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - kameletbindings/status
- - kameletbindings/scale
+ - bindings/status
+ - bindings/scale
- kamelets/status
verbs:
- get
diff --git a/config/rbac/user-cluster-role.yaml b/config/rbac/user-cluster-role.yaml
index ed6a661a1..86e19096b 100644
--- a/config/rbac/user-cluster-role.yaml
+++ b/config/rbac/user-cluster-role.yaml
@@ -33,7 +33,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - kameletbindings
+ - bindings
- kamelets
verbs:
- create
@@ -53,8 +53,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - kameletbindings/scale
- - kameletbindings/status
+ - bindings/scale
+ - bindings/status
- kamelets/status
verbs:
- get
diff --git a/config/samples/bases/camel_v1_kameletbinding.yaml b/config/samples/bases/camel_v1_kameletbinding.yaml
index 2d1424bca..977bc5b4a 100644
--- a/config/samples/bases/camel_v1_kameletbinding.yaml
+++ b/config/samples/bases/camel_v1_kameletbinding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: example
spec:
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index e1bcc890a..707b358bf 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -27,7 +27,7 @@ resources:
- bases/camel_v1_camelcatalog.yaml
- bases/camel_v1_build.yaml
- bases/camel_v1_kamelet.yaml
-- bases/camel_v1_kameletbinding.yaml
+- bases/camel_v1_binding.yaml
patchesStrategicMerge:
- patch-integration-platform.yaml
diff --git a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
index 228e2726c..cbdcb7b52 100644
--- a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
@@ -1,12 +1,12 @@
-[[kameletbindings-error-handler]]
-= Kamelet Bindings Error Handler
+[[bindings-error-handler]]
+=Bindings Error Handler
Kamelet Binding`s offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: my-kamelet-binding
spec:
@@ -20,12 +20,12 @@ spec:
<2> Reference to the sink where data should be sent to
<3> Error Handler Configuration
-[[kameletbindings-error-handler-types]]
+[[bindings-error-handler-types]]
== Error Handler Types
We have different types of error handler: `none`, `log` and `sink`. The `errorHandler` parameter is optional.
-[[kameletbindings-error-handler-none]]
+[[bindings-error-handler-none]]
=== No error handler
There may be certain cases where you want to just ignore any failure happening on your integration. In this situation just use a `none` error handler.
@@ -33,20 +33,20 @@ There may be certain cases where you want to just ignore any failure happening o
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: my-kamelet-binding
spec:
source:
...
- sink:
+ sink:
...
- errorHandler:
+ errorHandler:
none: # <1>
----
<1> `none` error handler does not expect any configuration
-[[kameletbindings-error-handler-log]]
+[[bindings-error-handler-log]]
=== Log error handler
Apache Camel offers a default behavior for handling any failure: log to standard output. However you can use the `log` error handler to specify other behaviors such as redelivery or delay policy.
@@ -54,15 +54,15 @@ Apache Camel offers a default behavior for handling any failure: log to standard
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: my-kamelet-binding
spec:
source:
...
- sink:
+ sink:
...
- errorHandler:
+ errorHandler:
log:
parameters: # <1>
maximumRedeliveries: 3
@@ -70,7 +70,7 @@ spec:
----
<1> Parameters belonging to the `log` error handler type
-[[kameletbindings-error-handler-sink]]
+[[bindings-error-handler-sink]]
=== Sink error handler
The `Sink` is probably the most interesting error handler type as it allows you to redirect any failing event to any other component, such as a third party URI, a queue or even another `Kamelet` which will be performing certain logic with the failing event.
@@ -78,17 +78,17 @@ The `Sink` is probably the most interesting error handler type as it allows you
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: my-kamelet-binding
spec:
source:
...
- sink:
+ sink:
...
- errorHandler:
+ errorHandler:
sink:
- endpoint:
+ endpoint:
ref: # <1>
kind: Kamelet
apiVersion: camel.apache.org/v1alpha1
@@ -98,7 +98,7 @@ spec:
...
parameters:
maximumRedeliveries: 1 # <3>
- ...
+ ...
----
<1> You can use `ref` or `uri`. `ref` will be interpreted by the operator according the `kind`, `apiVersion` and `name`. You can use any `Kamelet`, `KafkaTopic` channel or `Knative` destination.
<2> Properties belonging to the endpoint (in this example, to the `Kamelet` named error handler)
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
index 6f675e55f..d8d221e79 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc
@@ -273,7 +273,7 @@ spec:
- to: "kamelet:sink"
----
<1> An icon with an appropriate license, better using svg+base64 URL encoding. You can encode icons using services like https://dopiaza.org/tools/datauri/index.php[this one]
-<2> The dataTypes section indicates that the Kamelet is going to produce JSON data as a default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a KameletBinding when referencing the Kamelet.
+<2> The dataTypes section indicates that the Kamelet is going to produce JSON data as a default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Binding when referencing the Kamelet.
<3> The previous YAML flow
The Kamelet can be shared on the Catalog and or created on a Kubernetes cluster to let users use it.
@@ -294,7 +294,7 @@ Then you can create a binding like the following one to try it out:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: twitter-search-source-binding
spec:
@@ -867,7 +867,7 @@ spec:
----
<1> Add an icon with an appropriate license, better using svg+base64 URL encoding. You can encode icons using services like https://dopiaza.org/tools/datauri/index.php[this one]
<2> This marks the Kamelet as dependant on Quarkus since we're specifying explicit dependencies on Quarkus artifacts in the `spec` -> `dependencies` section
-<3> The types section indicates that the Kamelet is going to produce JSON data by default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a KameletBinding when referencing the Kamelet.
+<3> The types section indicates that the Kamelet is going to produce JSON data by default. The Kamelet is able to define multiple data types for in/out/error. The user will then be able to choose on of the data types in a Binding when referencing the Kamelet.
<4> Dependencies that we previously specified in the modeline options should be expressed now in the Kamelet spec
The Kamelet is now ready to be used!
@@ -893,7 +893,7 @@ To check if it works, you can create a simple binding:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: earthquake-source-binding
spec:
@@ -1217,7 +1217,7 @@ So, for example, to send a text message to a chat, we may create a binding like
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: telegram-text-binding
spec:
@@ -1261,7 +1261,7 @@ To check if we can also receive pictures using the above Kamelet, we can create
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: telegram-image-binding
spec:
@@ -1314,8 +1314,8 @@ Feature: Kamelet earthquake-source works
Scenario: Bind Kamelet to service
Given create Kubernetes service test-service with target port 8080
And bind Kamelet earthquake-source to uri http://test-service.${YAKS_NAMESPACE}.svc.cluster.local/test
- When create KameletBinding earthquake-source-uri
- Then KameletBinding earthquake-source-uri should be available
+ When create Binding earthquake-source-uri
+ Then Binding earthquake-source-uri should be available
And Camel K integration earthquake-source-uri should be running
Scenario: Verify binding
@@ -1323,7 +1323,7 @@ Feature: Kamelet earthquake-source works
And HTTP server timeout is 120000 ms
Then expect HTTP request header: Content-Type="application/json;charset=UTF-8"
And receive POST /test
- And delete KameletBinding earthquake-source-uri
+ And delete Binding earthquake-source-uri
----
As you see this is a declarative test that is materialized into something that actually checks that the service generates some data.
@@ -1356,7 +1356,7 @@ send data to it via HTTP. Let's create a parameterized binding like the followin
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: webhook-to-telegram
spec:
@@ -1406,8 +1406,8 @@ Feature: Kamelet telegram-sink works
Scenario: Bind webhook to Kamelet sink
Given load variables telegram-credentials.properties
- And load KameletBinding webhook-to-telegram.yaml
- Then KameletBinding webhook-to-telegram should be available
+ And load Binding webhook-to-telegram.yaml
+ Then Binding webhook-to-telegram should be available
And Camel K integration webhook-to-telegram should be running
@@ -1423,7 +1423,7 @@ Feature: Kamelet telegram-sink works
"""
When send POST /message
Then receive HTTP 200 OK
- And delete KameletBinding webhook-to-telegram
+ And delete Binding webhook-to-telegram
----
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
index 64e6c6250..5fe4f2d77 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
@@ -256,7 +256,7 @@ These Kamelets are installed by default when you install Camel K operator. You w
[[kamelets-custom-catalog]]
=== Use a custom Catalog
-You can overwrite the default catalog by adding certain configuration to the `IntegrationPlatform`. In order to add a new repository, you must edit the `IntegrationPlatfom` and edit the `.spec.kamelet.repositories[].uri` field, which expects an array of repository URIs where you can host your catalog of Kamelets, ie:
+You can overwrite the default catalog by adding certain configuration to the `IntegrationPlatform`. In order to add a new repository, you must edit the `IntegrationPlatfom` and edit the `.spec.kamelet.repositories[].uri` field, which expects an array of repository URIs where you can host your catalog of Kamelets, ie:
[source,yaml]
----
spec:
@@ -278,11 +278,11 @@ In some contexts (for example **"serverless"**) users often want to leverage the
doing additional processing (such as tranformations or other enterprise integration patterns).
A common use case is that of **Knative Sources**, for which the Apache Camel developers maintain the https://knative.dev/docs/eventing/samples/apache-camel-source/[Knative CamelSources].
-Kamelets represent an **evolution** of the model proposed in CamelSources, but they allow using the same declarative style of binding, via a resource named **KameletBinding**.
+Kamelets represent an **evolution** of the model proposed in CamelSources, but they allow using the same declarative style of binding, via a resource named **Binding**.
=== Binding to a Knative Destination
-A KameletBinding allows to declaratively move data from a system described by a Kamelet towards a Knative destination (or other kind of destinations, in the future), or from
+A Binding allows to declaratively move data from a system described by a Kamelet towards a Knative destination (or other kind of destinations, in the future), or from
a Knative channel/broker to another external system described by a Kamelet.
For example, here's an example of binding:
@@ -290,7 +290,7 @@ For example, here's an example of binding:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: telegram-text-source-to-channel
spec:
@@ -315,11 +315,11 @@ makes sure that messages produced by the Kamelet are forwarded to the Knative **
Note that source and sink are specified declaratively as standard **Kubernetes object references**.
-The example shows how we can reference the "telegram-text-source" resource in a KameletBinding. It's contained in the `source` section
+The example shows how we can reference the "telegram-text-source" resource in a Binding. It's contained in the `source` section
because it's a Kamelet of type "source".
-A Kamelet of type "sink", by contrast, can only be used in the `sink` section of a `KameletBinding`.
+A Kamelet of type "sink", by contrast, can only be used in the `sink` section of a `Binding`.
-**Under the covers, a KameletBinding creates an Integration** resource that implements the binding, but this is transparent to the end user.
+**Under the covers, a Binding creates an Integration** resource that implements the binding, but this is transparent to the end user.
=== Binding to a Kafka Topic
@@ -338,7 +338,7 @@ The following binding can be created to push data into the `my-topic` topic:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: telegram-text-source-to-kafka
spec:
@@ -361,13 +361,13 @@ After creating it, messages will flow from Telegram to Kafka.
=== Binding to an explicit URI
-An alternative way to use a KameletBinding is to configure the source/sink to be an explicit Camel URI.
+An alternative way to use a Binding is to configure the source/sink to be an explicit Camel URI.
For example, the following binding is allowed:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: telegram-text-source-to-channel
spec:
@@ -381,25 +381,25 @@ spec:
sink:
uri: https://mycompany.com/the-service # <1>
----
-<1> KameletBinding with explicitly URI
+<1> Binding with explicitly URI
-This KameletBinding explicitly defines an URI where data is going to be pushed.
+This Binding explicitly defines an URI where data is going to be pushed.
NOTE: the `uri` option is also conventionally used in Knative to specify a non-kubernetes destination.
To comply with the Knative specifications, in case an "http" or "https" URI is used, Camel will send https://cloudevents.io/[CloudEvents] to the destination.
=== Error Handling
-You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/kameletbindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] for more detail.
+You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] for more detail.
=== Trait via annotations
-You can easily tune your `KameletBinding` with xref:traits:traits.adoc[traits] configuration adding `.metadata.annotations`. Let's have a look at the following example:
+You can easily tune your `Binding` with xref:traits:traits.adoc[traits] configuration adding `.metadata.annotations`. Let's have a look at the following example:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-2-log-annotation
annotations: # <1>
@@ -578,7 +578,7 @@ Data shapes contain the following information:
|E.g. `aws2-s3`
|`format`
-|The data shape name used to identify and reference the data type in a KameletBinding when choosing from multiple data type options.
+|The data shape name used to identify and reference the data type in a Binding when choosing from multiple data type options.
|`string`
|E.g. `json`
@@ -653,13 +653,13 @@ which is set to the name of a specific KEDA autoscaler.
A KEDA enabled Kamelet can be used in the same way as any other Kamelet, in a binding or in an integration.
KEDA autoscalers are not enabled by default: they need to be manually enabled by the user via the `keda` trait.
-In a KameletBinding, the KEDA trait can be enabled using annotations:
+In a Binding, the KEDA trait can be enabled using annotations:
.my-keda-binding.yaml
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: my-keda-binding
annotations:
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets.adoc b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
index c0d0327b7..a4622c7c8 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
@@ -4,5 +4,5 @@
This section of the documentation contains information about Kamelets from both a user and a developer point of view:
- The xref:kamelets/kamelets-user.adoc[Kamelets User Guide] is for users that want to use Kamelets for connecting systems with their applications
-- The xref:kamelets/kameletbindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] explains how to configure an error handler on a `Kamelet Binding`
+- The xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] explains how to configure an error handler on a `Kamelet Binding`
- The xref:kamelets/kamelets-dev.adoc[Kamelets Developer Guide] is a reference for developers that want to create new Kamelets and share them with users
diff --git a/docs/modules/ROOT/pages/running/knative-sink.adoc b/docs/modules/ROOT/pages/running/knative-sink.adoc
index a67d6ca6b..890de244f 100644
--- a/docs/modules/ROOT/pages/running/knative-sink.adoc
+++ b/docs/modules/ROOT/pages/running/knative-sink.adoc
@@ -10,12 +10,12 @@ from('timer:tick')
.to('knative:event/broker')
----
-Or as the value of the `sink` field in a `KameletBinding` resource, e.g.:
+Or as the value of the `sink` field in a `Binding` resource, e.g.:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-source-binding
spec:
diff --git a/docs/modules/ROOT/pages/scaling/binding.adoc b/docs/modules/ROOT/pages/scaling/binding.adoc
index 60d1b781b..08d7a47bc 100644
--- a/docs/modules/ROOT/pages/scaling/binding.adoc
+++ b/docs/modules/ROOT/pages/scaling/binding.adoc
@@ -1,23 +1,23 @@
[[binding-scaling]]
-= Camel K KameletBinding Scaling
+= Camel K Binding Scaling
== Manual Scaling
-A KameletBinding can be scaled using the `kubectl scale` command, e.g.:
+A Binding can be scaled using the `kubectl scale` command, e.g.:
[source,console]
----
$ kubectl scale klb <kamelet_binding_name> --replicas <number_of_replicas>
----
-This can also be achieved by editing the KameletBinding resource directly, e.g.:
+This can also be achieved by editing the Binding resource directly, e.g.:
[source,console]
----
$ kubectl patch klb <kamelet_binding_name> -p '{"spec":{"replicas":<number_of_replicas>}}'
----
-The KameletBinding also reports its number of replicas in the `.status.replicas` field, e.g.:
+The Binding also reports its number of replicas in the `.status.replicas` field, e.g.:
[source,console]
----
@@ -26,19 +26,19 @@ $ kubectl get klb <kamelet_binding_name> -o jsonpath='{.status.replicas}'
== Autoscaling with Knative
-A KameletBinding that binds an HTTP-based source Kamelet can automatically scale based on _incoming_ traffic when installed on a cluster with _Knative_ enabled, including scaling to zero.
+A Binding that binds an HTTP-based source Kamelet can automatically scale based on _incoming_ traffic when installed on a cluster with _Knative_ enabled, including scaling to zero.
The _incoming_ traffic measures either as:
* The number of simultaneous requests, that are processed by each replica at any given time;
* Or the number of requests that are processed per second, per replica.
-The `webhook-source` Kamelet is one of the sources that enables auto-scaling when used in a KameletBinding:
+The `webhook-source` Kamelet is one of the sources that enables auto-scaling when used in a Binding:
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: webhook-binding
spec:
@@ -59,7 +59,7 @@ The Knative https://knative.dev/docs/serving/autoscaling/autoscaling-concepts/#s
[source,yaml]
----
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: webhook-binding
spec:
@@ -84,8 +84,8 @@ More information can be found in the Knative https://knative.dev/docs/serving/au
[NOTE]
====
-When <<Manual Scaling,manually scaling>> a KameletBinding that deploys as a Knative Service, both https://knative.dev/docs/serving/autoscaling/scale-bounds/[scale bounds], i.e., `minScale` and `maxScale`, are set to the specified number of replicas.
-Scale bounds can be reset by removing the `.spec.replicas` field from the KameletBinding, e.g., with:
+When <<Manual Scaling,manually scaling>> a Binding that deploys as a Knative Service, both https://knative.dev/docs/serving/autoscaling/scale-bounds/[scale bounds], i.e., `minScale` and `maxScale`, are set to the specified number of replicas.
+Scale bounds can be reset by removing the `.spec.replicas` field from the Binding, e.g., with:
[source,console]
----
@@ -95,9 +95,9 @@ $ kubectl patch klb <kamelet_binding_name> --type=json -p='[{"op": "remove", "pa
== Autoscaling with HPA
-A KameletBinding can automatically scale based on its CPU utilization and custom metrics using https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[horizontal pod autoscaling (HPA)].
+A Binding can automatically scale based on its CPU utilization and custom metrics using https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/[horizontal pod autoscaling (HPA)].
-For example, executing the following command creates an _autoscaler_ for the KameletBinding, with target CPU utilization set to 80%, and the number of replicas between 2 and 5:
+For example, executing the following command creates an _autoscaler_ for the Binding, with target CPU utilization set to 80%, and the number of replicas between 2 and 5:
[source,console]
----
diff --git a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
index 51d0c7446..255a7e747 100644
--- a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
+++ b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc
@@ -57,8 +57,8 @@ When the debugging session is done, hitting kbd:[Ctrl+c] on the terminal where t
[[debugging-kamelets]]
== Debugging Kamelets
-As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `KameletBinding` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`.
+As we've seen in the previous section, all `Integration` created in Camel K are finally bundled as a Java application, hence, the possibility to debug via JVM debugger. Any `Kamelet` you will be using directly in your `Route` definition or in a `Binding` is automatically converted in a `yaml` route and injected in the Camel Context to be executed. That means that you cannot directly debug a `Kamelet` as you would do with a Java or any other JVM language `Route`.
However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification xref:kamelets/kamelets-user.adoc#_flow[`Flow`]. As an example, you can create a simple `yaml` test `Route` substituting the `kamelet:source` or `kamelet:sink` with any mock endpoint that can help you in debugging the single `Kamelet` flow. Even using a `timer` and a `log` component may be enough for a basic check.
-NOTE: the same idea applies for a `KameletBinding` which translates to an `Integration` type under the hood. If you need to debug a `KameletBinding` just apply the same troubleshooting technique that you would apply on an `Integration`.
+NOTE: the same idea applies for a `Binding` which translates to an `Integration` type under the hood. If you need to debug a `Binding` just apply the same troubleshooting technique that you would apply on an `Integration`.
diff --git a/docs/modules/ROOT/partials/apis/crds-html.adoc b/docs/modules/ROOT/partials/apis/crds-html.adoc
index 3a4dadc90..d4d44ebe2 100644
--- a/docs/modules/ROOT/partials/apis/crds-html.adoc
+++ b/docs/modules/ROOT/partials/apis/crds-html.adoc
@@ -769,7 +769,7 @@ IntegrationPlatformStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuildStatus">BuildStatus</a>,
+<a href="#camel.apache.org/v1.BuildStatus">BuildStatus</a>,
<a href="#camel.apache.org/v1.IntegrationKitStatus">IntegrationKitStatus</a>)
</p>
<div>
@@ -829,10 +829,10 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuildahTask">BuildahTask</a>,
-<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
-<a href="#camel.apache.org/v1.KanikoTask">KanikoTask</a>,
-<a href="#camel.apache.org/v1.S2iTask">S2iTask</a>,
+<a href="#camel.apache.org/v1.BuildahTask">BuildahTask</a>,
+<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
+<a href="#camel.apache.org/v1.KanikoTask">KanikoTask</a>,
+<a href="#camel.apache.org/v1.S2iTask">S2iTask</a>,
<a href="#camel.apache.org/v1.SpectrumTask">SpectrumTask</a>)
</p>
<div>
@@ -1165,7 +1165,7 @@ string
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuildSpec">BuildSpec</a>,
+<a href="#camel.apache.org/v1.BuildSpec">BuildSpec</a>,
<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>)
</p>
<div>
@@ -1444,7 +1444,7 @@ CamelArtifactDependency
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.CamelArtifact">CamelArtifact</a>,
+<a href="#camel.apache.org/v1.CamelArtifact">CamelArtifact</a>,
<a href="#camel.apache.org/v1.CamelSchemeScope">CamelSchemeScope</a>)
</p>
<div>
@@ -1800,9 +1800,9 @@ map[string]string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>)
</p>
<div>
@@ -1872,7 +1872,7 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.ResourceSpec">ResourceSpec</a>,
+<a href="#camel.apache.org/v1.ResourceSpec">ResourceSpec</a>,
<a href="#camel.apache.org/v1.SourceSpec">SourceSpec</a>)
</p>
<div>
@@ -1972,7 +1972,7 @@ bool
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuildStatus">BuildStatus</a>,
+<a href="#camel.apache.org/v1.BuildStatus">BuildStatus</a>,
<a href="#camel.apache.org/v1.IntegrationKitStatus">IntegrationKitStatus</a>)
</p>
<div>
@@ -2900,7 +2900,7 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationPlatform">IntegrationPlatform</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatform">IntegrationPlatform</a>,
<a href="#camel.apache.org/v1.IntegrationPlatformStatus">IntegrationPlatformStatus</a>)
</p>
<div>
@@ -3082,8 +3082,8 @@ map[string]string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.Integration">Integration</a>,
-<a href="#camel.apache.org/v1alpha1.KameletBindingSpec">KameletBindingSpec</a>)
+<a href="#camel.apache.org/v1.Integration">Integration</a>,
+<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>IntegrationSpec defines the desired state of Integration</p>
@@ -3583,10 +3583,10 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.CamelArtifactDependency">CamelArtifactDependency</a>,
-<a href="#camel.apache.org/v1.CamelLoader">CamelLoader</a>,
-<a href="#camel.apache.org/v1.Capability">Capability</a>,
-<a href="#camel.apache.org/v1.MavenSpec">MavenSpec</a>,
+<a href="#camel.apache.org/v1.CamelArtifactDependency">CamelArtifactDependency</a>,
+<a href="#camel.apache.org/v1.CamelLoader">CamelLoader</a>,
+<a href="#camel.apache.org/v1.Capability">Capability</a>,
+<a href="#camel.apache.org/v1.MavenSpec">MavenSpec</a>,
<a href="#camel.apache.org/v1.RuntimeSpec">RuntimeSpec</a>)
</p>
<div>
@@ -3683,7 +3683,7 @@ MavenSpec
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
<a href="#camel.apache.org/v1.MavenBuildSpec">MavenBuildSpec</a>)
</p>
<div>
@@ -4077,8 +4077,8 @@ map[string]string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuildahTask">BuildahTask</a>,
-<a href="#camel.apache.org/v1.KanikoTask">KanikoTask</a>,
+<a href="#camel.apache.org/v1.BuildahTask">BuildahTask</a>,
+<a href="#camel.apache.org/v1.KanikoTask">KanikoTask</a>,
<a href="#camel.apache.org/v1.SpectrumTask">SpectrumTask</a>)
</p>
<div>
@@ -4140,12 +4140,12 @@ RegistrySpec
(<code>[]byte</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.BeanProperties">BeanProperties</a>,
-<a href="#camel.apache.org/v1alpha1.EndpointProperties">EndpointProperties</a>,
-<a href="#camel.apache.org/v1alpha1.ErrorHandlerParameters">ErrorHandlerParameters</a>,
-<a href="#camel.apache.org/v1alpha1.ErrorHandlerSpec">ErrorHandlerSpec</a>,
-<a href="#camel.apache.org/v1.Flow">Flow</a>,
-<a href="#camel.apache.org/v1.Template">Template</a>,
+<a href="#camel.apache.org/v1alpha1.BeanProperties">BeanProperties</a>,
+<a href="#camel.apache.org/v1alpha1.EndpointProperties">EndpointProperties</a>,
+<a href="#camel.apache.org/v1alpha1.ErrorHandlerParameters">ErrorHandlerParameters</a>,
+<a href="#camel.apache.org/v1alpha1.ErrorHandlerSpec">ErrorHandlerSpec</a>,
+<a href="#camel.apache.org/v1.Flow">Flow</a>,
+<a href="#camel.apache.org/v1.Template">Template</a>,
<a href="#camel.apache.org/v1.TraitConfiguration">TraitConfiguration</a>)
</p>
<div>
@@ -4157,7 +4157,7 @@ be used to delay JSON decoding or precompute a JSON encoding.</p>
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
<a href="#camel.apache.org/v1.PublishTask">PublishTask</a>)
</p>
<div>
@@ -4354,8 +4354,8 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
-<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
+<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
+<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>)
</p>
<div>
@@ -4421,9 +4421,9 @@ string
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationKitStatus">IntegrationKitStatus</a>,
-<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>,
+<a href="#camel.apache.org/v1.IntegrationKitStatus">IntegrationKitStatus</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>,
<a href="#camel.apache.org/v1.RuntimeSpec">RuntimeSpec</a>)
</p>
<div>
@@ -4433,7 +4433,7 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
+<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
<a href="#camel.apache.org/v1.CamelCatalogSpec">CamelCatalogSpec</a>)
</p>
<div>
@@ -4573,9 +4573,9 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
-<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>,
+<a href="#camel.apache.org/v1.BuilderTask">BuilderTask</a>,
+<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>,
<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
</p>
<div>
@@ -4873,9 +4873,9 @@ RawMessage
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>,
<a href="#camel.apache.org/v1.IntegrationStatus">IntegrationStatus</a>)
</p>
<div>
@@ -4885,8 +4885,8 @@ RawMessage
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
-<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationKitSpec">IntegrationKitSpec</a>,
+<a href="#camel.apache.org/v1.IntegrationPlatformSpec">IntegrationPlatformSpec</a>,
<a href="#camel.apache.org/v1.IntegrationSpec">IntegrationSpec</a>)
</p>
<div>
@@ -4968,7 +4968,7 @@ Resource Types:
<ul><li>
<a href="#camel.apache.org/v1alpha1.Kamelet">Kamelet</a>
</li><li>
-<a href="#camel.apache.org/v1alpha1.KameletBinding">KameletBinding</a>
+<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>
</li></ul>
<h3 id="camel.apache.org/v1alpha1.Kamelet">Kamelet
</h3>
@@ -5114,10 +5114,10 @@ KameletStatus
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletBinding">KameletBinding
+<h3 id="camel.apache.org/v1alpha1.Binding">Binding
</h3>
<div>
-<p>KameletBinding is the Schema for the kamelets binding API</p>
+<p>Binding is the Schema for the kamelets binding API</p>
</div>
<table>
<thead>
@@ -5142,7 +5142,7 @@ camel.apache.org/v1alpha1
<code>kind</code></br>
string
</td>
-<td><code>KameletBinding</code></td>
+<td><code>Binding</code></td>
</tr>
<tr>
<td>
@@ -5162,8 +5162,8 @@ Refer to the Kubernetes API documentation for the fields of the
<td>
<code>spec</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingSpec">
-KameletBindingSpec
+<a href="#camel.apache.org/v1alpha1.BindingSpec">
+BindingSpec
</a>
</em>
</td>
@@ -5254,8 +5254,8 @@ int32
<td>
<code>status</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingStatus">
-KameletBindingStatus
+<a href="#camel.apache.org/v1alpha1.BindingStatus">
+BindingStatus
</a>
</em>
</td>
@@ -5304,8 +5304,8 @@ RawMessage
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.ErrorHandlerSink">ErrorHandlerSink</a>,
-<a href="#camel.apache.org/v1alpha1.KameletBindingSpec">KameletBindingSpec</a>)
+<a href="#camel.apache.org/v1alpha1.ErrorHandlerSink">ErrorHandlerSink</a>,
+<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>Endpoint represents a source/sink external entity</p>
@@ -5549,7 +5549,7 @@ Endpoint
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingSpec">KameletBindingSpec</a>)
+<a href="#camel.apache.org/v1alpha1.BindingSpec">BindingSpec</a>)
</p>
<div>
<p>ErrorHandlerSpec represents an unstructured object for an error handler</p>
@@ -5589,7 +5589,7 @@ RawMessage
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.Endpoint">Endpoint</a>,
+<a href="#camel.apache.org/v1alpha1.Endpoint">Endpoint</a>,
<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
</p>
<div>
@@ -5669,7 +5669,7 @@ string
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.JSONSchemaProp">JSONSchemaProp</a>,
+<a href="#camel.apache.org/v1alpha1.JSONSchemaProp">JSONSchemaProp</a>,
<a href="#camel.apache.org/v1alpha1.JSONSchemaProps">JSONSchemaProps</a>)
</p>
<div>
@@ -5988,7 +5988,7 @@ bool
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.EventTypeSpec">EventTypeSpec</a>,
+<a href="#camel.apache.org/v1alpha1.EventTypeSpec">EventTypeSpec</a>,
<a href="#camel.apache.org/v1alpha1.KameletSpec">KameletSpec</a>)
</p>
<div>
@@ -6111,14 +6111,14 @@ string
<div>
<p>JSONSchemaURL represents a schema url.</p>
</div>
-<h3 id="camel.apache.org/v1alpha1.KameletBindingCondition">KameletBindingCondition
+<h3 id="camel.apache.org/v1alpha1.BindingCondition">BindingCondition
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingStatus">KameletBindingStatus</a>)
+<a href="#camel.apache.org/v1alpha1.BindingStatus">BindingStatus</a>)
</p>
<div>
-<p>KameletBindingCondition describes the state of a resource at a certain point.</p>
+<p>BindingCondition describes the state of a resource at a certain point.</p>
</div>
<table>
<thead>
@@ -6132,13 +6132,13 @@ string
<td>
<code>type</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingConditionType">
-KameletBindingConditionType
+<a href="#camel.apache.org/v1alpha1.BindingConditionType">
+BindingConditionType
</a>
</em>
</td>
<td>
-<p>Type of kameletBinding condition.</p>
+<p>Type of binding condition.</p>
</td>
</tr>
<tr>
@@ -6204,30 +6204,30 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletBindingConditionType">KameletBindingConditionType
+<h3 id="camel.apache.org/v1alpha1.BindingConditionType">BindingConditionType
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingCondition">KameletBindingCondition</a>)
+<a href="#camel.apache.org/v1alpha1.BindingCondition">BindingCondition</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.KameletBindingPhase">KameletBindingPhase
+<h3 id="camel.apache.org/v1alpha1.BindingPhase">BindingPhase
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingStatus">KameletBindingStatus</a>)
+<a href="#camel.apache.org/v1alpha1.BindingStatus">BindingStatus</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1alpha1.KameletBindingSpec">KameletBindingSpec
+<h3 id="camel.apache.org/v1alpha1.BindingSpec">BindingSpec
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBinding">KameletBinding</a>)
+<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>)
</p>
<div>
-<p>KameletBindingSpec –</p>
+<p>BindingSpec –</p>
</div>
<table>
<thead>
@@ -6315,14 +6315,14 @@ int32
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1alpha1.KameletBindingStatus">KameletBindingStatus
+<h3 id="camel.apache.org/v1alpha1.BindingStatus">BindingStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1alpha1.KameletBinding">KameletBinding</a>)
+<a href="#camel.apache.org/v1alpha1.Binding">Binding</a>)
</p>
<div>
-<p>KameletBindingStatus –</p>
+<p>BindingStatus –</p>
</div>
<table>
<thead>
@@ -6336,8 +6336,8 @@ int32
<td>
<code>phase</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingPhase">
-KameletBindingPhase
+<a href="#camel.apache.org/v1alpha1.BindingPhase">
+BindingPhase
</a>
</em>
</td>
@@ -6349,8 +6349,8 @@ KameletBindingPhase
<td>
<code>conditions</code><br/>
<em>
-<a href="#camel.apache.org/v1alpha1.KameletBindingCondition">
-[]KameletBindingCondition
+<a href="#camel.apache.org/v1alpha1.BindingCondition">
+[]BindingCondition
</a>
</em>
</td>
diff --git a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
index 36d7aea89..f0f444fab 100644
--- a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc
@@ -5,10 +5,10 @@ Package v1alpha1 contains API Schema definitions for the camel v1alpha1 API grou
== Resource Types
-[#_camel_apache_org_v1alpha1_Kamelet]
-=== Kamelet
+[#_camel_apache_org_v1alpha1_Binding]
+=== Binding
-Kamelet is the Schema for the kamelets API
+Binding is the Schema for the kamelets binding API
[cols="2,2a",options="header"]
|===
@@ -21,7 +21,7 @@ string
|`kind` +
string
-|`Kamelet`
+|`Binding`
|`metadata` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
|
@@ -31,26 +31,26 @@ string
Refer to the Kubernetes API documentation for the fields of the `metadata` field.
|`spec` +
-*xref:#_camel_apache_org_v1alpha1_KameletSpec[KameletSpec]*
+*xref:#_camel_apache_org_v1alpha1_BindingSpec[BindingSpec]*
|
-the desired specification
+the specification of a Binding
|`status` +
-*xref:#_camel_apache_org_v1alpha1_KameletStatus[KameletStatus]*
+*xref:#_camel_apache_org_v1alpha1_BindingStatus[BindingStatus]*
|
-the actual status of the resource
+the status of a Binding
|===
-[#_camel_apache_org_v1alpha1_KameletBinding]
-=== KameletBinding
+[#_camel_apache_org_v1alpha1_Kamelet]
+=== Kamelet
-KameletBinding is the Schema for the kamelets binding API
+Kamelet is the Schema for the kamelets API
[cols="2,2a",options="header"]
|===
@@ -63,7 +63,7 @@ string
|`kind` +
string
-|`KameletBinding`
+|`Kamelet`
|`metadata` +
*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
|
@@ -73,18 +73,18 @@ string
Refer to the Kubernetes API documentation for the fields of the `metadata` field.
|`spec` +
-*xref:#_camel_apache_org_v1alpha1_KameletBindingSpec[KameletBindingSpec]*
+*xref:#_camel_apache_org_v1alpha1_KameletSpec[KameletSpec]*
|
-the specification of a KameletBinding
+the desired specification
|`status` +
-*xref:#_camel_apache_org_v1alpha1_KameletBindingStatus[KameletBindingStatus]*
+*xref:#_camel_apache_org_v1alpha1_KameletStatus[KameletStatus]*
|
-the status of a KameletBinding
+the actual status of the resource
|===
@@ -109,6 +109,210 @@ BeanProperties represent an unstructured object properties to be set on a bean
+|===
+
+[#_camel_apache_org_v1alpha1_BindingCondition]
+=== BindingCondition
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_BindingStatus, BindingStatus>>
+
+BindingCondition describes the state of a resource at a certain point.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1alpha1_BindingConditionType[BindingConditionType]*
+|
+
+
+Type of binding condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
+string
+|
+
+
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human readable message indicating details about the transition.
+
+|`pods` +
+[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition
+|
+
+
+Pods collect health and conditions information from the owned PODs
+
+
+|===
+
+[#_camel_apache_org_v1alpha1_BindingConditionType]
+=== BindingConditionType(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_BindingCondition, BindingCondition>>
+
+BindingConditionType --
+
+
+[#_camel_apache_org_v1alpha1_BindingPhase]
+=== BindingPhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_BindingStatus, BindingStatus>>
+
+BindingPhase --
+
+
+[#_camel_apache_org_v1alpha1_BindingSpec]
+=== BindingSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_Binding, Binding>>
+
+BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`integration` +
+github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec
+|
+
+
+Integration is an optional integration used to specify custom parameters
+
+|`source` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
+|
+
+
+Source is the starting point of the integration defined by this binding
+
+|`sink` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
+|
+
+
+Sink is the destination of the integration defined by this binding
+
+|`errorHandler` +
+*xref:#_camel_apache_org_v1alpha1_ErrorHandlerSpec[ErrorHandlerSpec]*
+|
+
+
+ErrorHandler is an optional handler called upon an error occuring in the integration
+
+|`steps` +
+*xref:#_camel_apache_org_v1alpha1_Endpoint[[\]Endpoint]*
+|
+
+
+Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of desired replicas for the binding
+
+|`serviceAccountName` +
+string
+|
+
+
+Custom SA to use for the binding
+
+
+|===
+
+[#_camel_apache_org_v1alpha1_BindingStatus]
+=== BindingStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1alpha1_Binding, Binding>>
+
+BindingStatus specify the status of a binding
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this Binding.
+
+|`phase` +
+*xref:#_camel_apache_org_v1alpha1_BindingPhase[BindingPhase]*
+|
+
+
+Phase --
+
+|`conditions` +
+*xref:#_camel_apache_org_v1alpha1_BindingCondition[[\]BindingCondition]*
+|
+
+
+Conditions --
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of actual replicas of the binding
+
+|`selector` +
+string
+|
+
+
+Selector allows to identify pods belonging to the binding
+
+
|===
[#_camel_apache_org_v1alpha1_DataTypeReference]
@@ -251,8 +455,8 @@ one to many header specifications
*Appears on:*
+* <<#_camel_apache_org_v1alpha1_BindingSpec, BindingSpec>>
* <<#_camel_apache_org_v1alpha1_ErrorHandlerSink, ErrorHandlerSink>>
-* <<#_camel_apache_org_v1alpha1_KameletBindingSpec, KameletBindingSpec>>
Endpoint represents a source/sink external entity (could be any Kubernetes resource or Camel URI)
@@ -440,7 +644,7 @@ ErrorHandlerSink represents a sink error handler type which behave like a dead l
*Appears on:*
-* <<#_camel_apache_org_v1alpha1_KameletBindingSpec, KameletBindingSpec>>
+* <<#_camel_apache_org_v1alpha1_BindingSpec, BindingSpec>>
ErrorHandlerSpec represents an unstructured object for an error handler
@@ -910,210 +1114,6 @@ string
JSONSchemaURL represents a schema url.
-[#_camel_apache_org_v1alpha1_KameletBindingCondition]
-=== KameletBindingCondition
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletBindingStatus, KameletBindingStatus>>
-
-KameletBindingCondition describes the state of a resource at a certain point.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`type` +
-*xref:#_camel_apache_org_v1alpha1_KameletBindingConditionType[KameletBindingConditionType]*
-|
-
-
-Type of kameletBinding condition.
-
-|`status` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
-|
-
-
-Status of the condition, one of True, False, Unknown.
-
-|`lastUpdateTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-The last time this condition was updated.
-
-|`lastTransitionTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-Last time the condition transitioned from one status to another.
-
-|`reason` +
-string
-|
-
-
-The reason for the condition's last transition.
-
-|`message` +
-string
-|
-
-
-A human readable message indicating details about the transition.
-
-|`pods` +
-[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition
-|
-
-
-Pods collect health and conditions information from the owned PODs
-
-
-|===
-
-[#_camel_apache_org_v1alpha1_KameletBindingConditionType]
-=== KameletBindingConditionType(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletBindingCondition, KameletBindingCondition>>
-
-KameletBindingConditionType --
-
-
-[#_camel_apache_org_v1alpha1_KameletBindingPhase]
-=== KameletBindingPhase(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletBindingStatus, KameletBindingStatus>>
-
-KameletBindingPhase --
-
-
-[#_camel_apache_org_v1alpha1_KameletBindingSpec]
-=== KameletBindingSpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletBinding, KameletBinding>>
-
-KameletBindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`integration` +
-github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec
-|
-
-
-Integration is an optional integration used to specify custom parameters
-
-|`source` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
-|
-
-
-Source is the starting point of the integration defined by this binding
-
-|`sink` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[Endpoint]*
-|
-
-
-Sink is the destination of the integration defined by this binding
-
-|`errorHandler` +
-*xref:#_camel_apache_org_v1alpha1_ErrorHandlerSpec[ErrorHandlerSpec]*
-|
-
-
-ErrorHandler is an optional handler called upon an error occuring in the integration
-
-|`steps` +
-*xref:#_camel_apache_org_v1alpha1_Endpoint[[\]Endpoint]*
-|
-
-
-Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of desired replicas for the binding
-
-|`serviceAccountName` +
-string
-|
-
-
-Custom SA to use for the binding
-
-
-|===
-
-[#_camel_apache_org_v1alpha1_KameletBindingStatus]
-=== KameletBindingStatus
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1alpha1_KameletBinding, KameletBinding>>
-
-KameletBindingStatus specify the status of a binding
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`observedGeneration` +
-int64
-|
-
-
-ObservedGeneration is the most recent generation observed for this KameletBinding.
-
-|`phase` +
-*xref:#_camel_apache_org_v1alpha1_KameletBindingPhase[KameletBindingPhase]*
-|
-
-
-Phase --
-
-|`conditions` +
-*xref:#_camel_apache_org_v1alpha1_KameletBindingCondition[[\]KameletBindingCondition]*
-|
-
-
-Conditions --
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of actual replicas of the binding
-
-|`selector` +
-string
-|
-
-
-Selector allows to identify pods belonging to the binding
-
-
-|===
-
[#_camel_apache_org_v1alpha1_KameletCondition]
=== KameletCondition
diff --git a/e2e/common/misc/kamelet_binding_test.go b/e2e/common/misc/kamelet_binding_test.go
index 79584263e..dfe3fb502 100644
--- a/e2e/common/misc/kamelet_binding_test.go
+++ b/e2e/common/misc/kamelet_binding_test.go
@@ -34,7 +34,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
)
-func TestKameletBinding(t *testing.T) {
+func TestBinding(t *testing.T) {
RegisterTestingT(t)
// Error Handler testing
@@ -91,8 +91,8 @@ func TestKameletBinding(t *testing.T) {
})
})
- // Kamelet binding with traits testing
- t.Run("test kamelet binding with trait", func(t *testing.T) {
+ //Binding with traits testing
+ t.Run("testBinding with trait", func(t *testing.T) {
Expect(CreateTimerKamelet(ns, "my-own-timer-source")()).To(Succeed())
// Log sink kamelet exists from previous test
@@ -119,17 +119,17 @@ func TestKameletBinding(t *testing.T) {
Eventually(IntegrationLogs(ns, "kb-with-traits"), TestTimeoutShort).Should(ContainSubstring("integrationLogger"))
})
- // KameletBinding with wrong spec
- t.Run("test KameletBinding with wrong spec", func(t *testing.T) {
+ // Binding with wrong spec
+ t.Run("test Binding with wrong spec", func(t *testing.T) {
name := "bad-klb"
- kb := v1alpha1.NewKameletBinding(ns, name)
- kb.Spec = v1alpha1.KameletBindingSpec{}
+ kb := v1alpha1.NewBinding(ns, name)
+ kb.Spec = v1alpha1.BindingSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
Eventually(err).Should(BeNil())
- Eventually(KameletBindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.KameletBindingPhaseError))
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingIntegrationConditionError), TestTimeoutShort).Should(
- WithTransform(KameletBindingConditionMessage, And(
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.BindingPhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(BindingCondition(ns, name, v1alpha1.BindingIntegrationConditionError), TestTimeoutShort).Should(
+ WithTransform(BindingConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
)))
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 0cc2b98cc..bb5b62db7 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -40,7 +40,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/openshift"
)
-func TestKameletBindingScale(t *testing.T) {
+func TestBindingScale(t *testing.T) {
RegisterTestingT(t)
ocp, err := openshift.IsOpenShift(TestClient())
@@ -54,36 +54,36 @@ func TestKameletBindingScale(t *testing.T) {
Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloBinding", "log-sink", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloBinding"))
t.Run("Update binding scale spec", func(t *testing.T) {
- Expect(ScaleKameletBinding(ns, name, 3)).To(Succeed())
+ Expect(ScaleBinding(ns, name, 3)).To(Succeed())
// Check the scale cascades into the Deployment scale
Eventually(IntegrationPods(ns, name), TestTimeoutShort).Should(HaveLen(3))
// Check it also cascades into the Integration scale subresource Status field
Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
- // Check it also cascades into the KameletBinding scale subresource Status field
- Eventually(KameletBindingStatusReplicas(ns, name), TestTimeoutShort).
+ // Check it also cascades into the Binding scale subresource Status field
+ Eventually(BindingStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 3)))
// Check the readiness condition becomes truthy back
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
- // Finally check the readiness condition becomes truthy back on kamelet binding
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ // Finally check the readiness condition becomes truthy back onBinding
+ Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
- t.Run("Scale kamelet binding with polymorphic client", func(t *testing.T) {
+ t.Run("ScaleBinding with polymorphic client", func(t *testing.T) {
scaleClient, err := TestClient().ScalesClient()
Expect(err).To(BeNil())
// Patch the integration scale subresource
patch := "{\"spec\":{\"replicas\":2}}"
- _, err = scaleClient.Scales(ns).Patch(TestContext, v1alpha1.SchemeGroupVersion.WithResource("kameletbindings"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+ _, err = scaleClient.Scales(ns).Patch(TestContext, v1alpha1.SchemeGroupVersion.WithResource("bindings"), name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
@@ -92,30 +92,30 @@ func TestKameletBindingScale(t *testing.T) {
// Check it cascades into the Integration scale subresource Status field
Eventually(IntegrationStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
- // Finally check it cascades into the KameletBinding scale subresource Status field
- Eventually(KameletBindingStatusReplicas(ns, name), TestTimeoutShort).
+ // Finally check it cascades into the Binding scale subresource Status field
+ Eventually(BindingStatusReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
})
- t.Run("Scale kamelet binding with Camel K client", func(t *testing.T) {
+ t.Run("ScaleBinding with Camel K client", func(t *testing.T) {
camel, err := versioned.NewForConfig(TestClient().GetConfig())
Expect(err).To(BeNil())
// Getter
- bindingScale, err := camel.CamelV1alpha1().KameletBindings(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ bindingScale, err := camel.CamelV1alpha1().Bindings(ns).GetScale(TestContext, name, metav1.GetOptions{})
Expect(err).To(BeNil())
Expect(bindingScale.Spec.Replicas).To(BeNumerically("==", 2))
Expect(bindingScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
bindingScale.Spec.Replicas = 1
- _, err = camel.CamelV1alpha1().KameletBindings(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
+ _, err = camel.CamelV1alpha1().Bindings(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
Expect(err).To(BeNil())
- // Check the readiness condition is still truthy as down-scaling in kamelet binding
- Expect(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady)()).To(Equal(corev1.ConditionTrue))
- // Check the KameletBinding scale subresource Spec field
- Eventually(KameletBindingSpecReplicas(ns, name), TestTimeoutShort).
+ // Check the readiness condition is still truthy as down-scaling inBinding
+ Expect(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ // Check the Binding scale subresource Spec field
+ Eventually(BindingSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
// Check the readiness condition is still truthy as down-scaling
Expect(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady)()).To(Equal(corev1.ConditionTrue))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index cffc8f8be..4ddf3c108 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -51,17 +51,17 @@ func TestErroredTrait(t *testing.T) {
))
})
- t.Run("KameletBinding trait should fail", func(t *testing.T) {
+ t.Run("Binding trait should fail", func(t *testing.T) {
name := "kb-errored"
Expect(KamelBindWithID(operatorID, ns, "timer:foo", "log:bar",
"--name", name,
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
- // KameletBinding
- Eventually(KameletBindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.KameletBindingPhaseError))
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(
- WithTransform(KameletBindingConditionMessage, And(
+ // Binding
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1alpha1.BindingPhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(BindingCondition(ns, name, v1alpha1.BindingConditionReady), TestTimeoutShort).Should(
+ WithTransform(BindingConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
)))
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 9577b3658..918dc49ae 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -239,8 +239,8 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(KameletBindingCondition(ns, name, camelv1alpha1.KameletBindingConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *camelv1alpha1.KameletBindingCondition) bool {
+ Eventually(BindingCondition(ns, name, camelv1alpha1.BindingConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *camelv1alpha1.BindingCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
}
diff --git a/e2e/commonwithcustominstall/operator_id_filtering_test.go b/e2e/commonwithcustominstall/operator_id_filtering_test.go
index 6a056e808..0ac5b6231 100644
--- a/e2e/commonwithcustominstall/operator_id_filtering_test.go
+++ b/e2e/commonwithcustominstall/operator_id_filtering_test.go
@@ -120,12 +120,12 @@ func TestOperatorIDFiltering(t *testing.T) {
Expect(Kamel("delete", "pre-built", "-n", ns).Execute()).To(Succeed())
})
- t.Run("Operators can run scoped kamelet bindings", func(t *testing.T) {
+ t.Run("Operators can run scopedBindings", func(t *testing.T) {
Expect(KamelBind(ns, "timer-source?message=Hello", "log-sink",
"--name", "klb", "--force").Execute()).To(Succeed())
Consistently(Integration(ns, "klb"), 10*time.Second).Should(BeNil())
- Expect(AssignKameletBindingToOperator(ns, "klb", operator1)).To(Succeed())
+ Expect(AssignBindingToOperator(ns, "klb", operator1)).To(Succeed())
Eventually(Integration(ns, "klb"), TestTimeoutShort).ShouldNot(BeNil())
Eventually(IntegrationPhase(ns, "klb"), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning))
Eventually(IntegrationPodPhase(ns, "klb"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/commonwithcustominstall/promote_test.go b/e2e/commonwithcustominstall/promote_test.go
index 7b2936702..942603bca 100644
--- a/e2e/commonwithcustominstall/promote_test.go
+++ b/e2e/commonwithcustominstall/promote_test.go
@@ -148,7 +148,7 @@ func TestKamelCLIPromote(t *testing.T) {
Expect(IntegrationPodImage(nsProd, "timer-kamelet-usage")()).Should(Equal(IntegrationPodImage(nsDev, "timer-kamelet-usage")()))
})
- t.Run("no kamelet for kameletbinding in destination", func(t *testing.T) {
+ t.Run("no kamelet for binding in destination", func(t *testing.T) {
Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
@@ -160,7 +160,7 @@ func TestKamelCLIPromote(t *testing.T) {
// They must use the same image
Expect(IntegrationPodImage(nsProd, "kb-timer-source-to-log")()).Should(Equal(IntegrationPodImage(nsDev, "kb-timer-source-to-log")()))
- // Kamelet Binding update
+ //Binding update
Expect(KamelBindWithID(operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks-again").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
Eventually(IntegrationLogs(nsDev, "kb-timer-source-to-log"), TestTimeoutShort).Should(ContainSubstring("my-kamelet-binding-rocks-again"))
diff --git a/e2e/install/kustomize/common.go b/e2e/install/kustomize/common.go
index 64f9d9992..c58655b1d 100644
--- a/e2e/install/kustomize/common.go
+++ b/e2e/install/kustomize/common.go
@@ -36,7 +36,7 @@ import (
const (
// v1.Build, v1.Integration
// v1.IntegrationKit, v1.IntegrationPlatform
- // v1alpha1.Kamelet, v1alpha1.KameletBinding
+ // v1alpha1.Kamelet, v1alpha1.Binding
ExpectedCRDs = 6
// camel-k-operator, camel-k-operator-events,
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 6f174a3ae..541d3614f 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -37,7 +37,7 @@ import (
"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
+// Test that a Binding can be changed and the changes are propagated to the Integration
func TestKameletChange(t *testing.T) {
RegisterTestingT(t)
@@ -65,31 +65,31 @@ func TestKameletChange(t *testing.T) {
"trait.camel.apache.org/health.readiness-initial-delay": "10",
}
- // Create the KameletBinding
+ // Create the Binding
Expect(BindKameletTo(ns, timerBinding, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
Eventually(IntegrationPodPhase(ns, timerBinding), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
- WithTransform(KameletBindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
- WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
- WithTransform(KameletBindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
+ Eventually(BindingCondition(ns, timerBinding, v1alpha1.BindingConditionReady), TestTimeoutMedium).Should(And(
+ WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
+ WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
+ WithTransform(BindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
))
- // Update the KameletBinding
+ // Update the Binding
Expect(BindKameletTo(ns, "timer-binding", annotations, from, to, map[string]string{"message": "message is Hi"}, map[string]string{})()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "timer-binding"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).
+ Eventually(BindingCondition(ns, timerBinding, v1alpha1.BindingConditionReady), TestTimeoutMedium).
Should(And(
- WithTransform(KameletBindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
- WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
- WithTransform(KameletBindingConditionMessage, Equal("1/1 ready replicas")),
+ WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
+ WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
+ WithTransform(BindingConditionMessage, Equal("1/1 ready replicas")),
))
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 438272cc4..cf19f771e 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1068,9 +1068,9 @@ func ScaleIntegration(ns string, name string, replicas int32) error {
})
}
-func KameletBinding(ns string, name string) func() *v1alpha1.KameletBinding {
- return func() *v1alpha1.KameletBinding {
- klb := v1alpha1.NewKameletBinding(ns, name)
+func Binding(ns string, name string) func() *v1alpha1.Binding {
+ return func() *v1alpha1.Binding {
+ klb := v1alpha1.NewBinding(ns, name)
key := ctrl.ObjectKey{
Namespace: ns,
Name: name,
@@ -1084,9 +1084,9 @@ func KameletBinding(ns string, name string) func() *v1alpha1.KameletBinding {
}
}
-func KameletBindingPhase(ns string, name string) func() v1alpha1.KameletBindingPhase {
- return func() v1alpha1.KameletBindingPhase {
- klb := KameletBinding(ns, name)()
+func BindingPhase(ns string, name string) func() v1alpha1.BindingPhase {
+ return func() v1alpha1.BindingPhase {
+ klb := Binding(ns, name)()
if klb == nil {
return ""
}
@@ -1094,9 +1094,9 @@ func KameletBindingPhase(ns string, name string) func() v1alpha1.KameletBindingP
}
}
-func KameletBindingSpecReplicas(ns string, name string) func() *int32 {
+func BindingSpecReplicas(ns string, name string) func() *int32 {
return func() *int32 {
- klb := KameletBinding(ns, name)()
+ klb := Binding(ns, name)()
if klb == nil {
return nil
}
@@ -1104,9 +1104,9 @@ func KameletBindingSpecReplicas(ns string, name string) func() *int32 {
}
}
-func KameletBindingStatusReplicas(ns string, name string) func() *int32 {
+func BindingStatusReplicas(ns string, name string) func() *int32 {
return func() *int32 {
- klb := KameletBinding(ns, name)()
+ klb := Binding(ns, name)()
if klb == nil {
return nil
}
@@ -1114,9 +1114,9 @@ func KameletBindingStatusReplicas(ns string, name string) func() *int32 {
}
}
-func KameletBindingCondition(ns string, name string, conditionType v1alpha1.KameletBindingConditionType) func() *v1alpha1.KameletBindingCondition {
- return func() *v1alpha1.KameletBindingCondition {
- kb := KameletBinding(ns, name)()
+func BindingCondition(ns string, name string, conditionType v1alpha1.BindingConditionType) func() *v1alpha1.BindingCondition {
+ return func() *v1alpha1.BindingCondition {
+ kb := Binding(ns, name)()
if kb == nil {
return nil
}
@@ -1128,32 +1128,32 @@ func KameletBindingCondition(ns string, name string, conditionType v1alpha1.Kame
}
}
-func KameletBindingConditionStatusExtract(c *v1alpha1.KameletBindingCondition) corev1.ConditionStatus {
+func BindingConditionStatusExtract(c *v1alpha1.BindingCondition) corev1.ConditionStatus {
if c == nil {
return ""
}
return c.Status
}
-func KameletBindingConditionReason(c *v1alpha1.KameletBindingCondition) string {
+func BindingConditionReason(c *v1alpha1.BindingCondition) string {
if c == nil {
return ""
}
return c.Reason
}
-func KameletBindingConditionMessage(c *v1alpha1.KameletBindingCondition) string {
+func BindingConditionMessage(c *v1alpha1.BindingCondition) string {
if c == nil {
return ""
}
return c.Message
}
-func KameletBindingConditionStatus(ns string, name string, conditionType v1alpha1.KameletBindingConditionType) func() corev1.ConditionStatus {
+func BindingConditionStatus(ns string, name string, conditionType v1alpha1.BindingConditionType) func() corev1.ConditionStatus {
return func() corev1.ConditionStatus {
- klb := KameletBinding(ns, name)()
+ klb := Binding(ns, name)()
if klb == nil {
- return "KameletBindingMissing"
+ return "BindingMissing"
}
c := klb.Status.GetCondition(conditionType)
if c == nil {
@@ -1163,10 +1163,10 @@ func KameletBindingConditionStatus(ns string, name string, conditionType v1alpha
}
}
-func UpdateKameletBinding(ns string, name string, upd func(it *v1alpha1.KameletBinding)) error {
- klb := KameletBinding(ns, name)()
+func UpdateBinding(ns string, name string, upd func(it *v1alpha1.Binding)) error {
+ klb := Binding(ns, name)()
if klb == nil {
- return fmt.Errorf("no kamelet binding named %s found", name)
+ return fmt.Errorf("noBinding named %s found", name)
}
target := klb.DeepCopy()
upd(target)
@@ -1180,16 +1180,16 @@ func UpdateKameletBinding(ns string, name string, upd func(it *v1alpha1.KameletB
return TestClient().Patch(TestContext, target, ctrl.RawPatch(types.MergePatchType, p))
}
-func ScaleKameletBinding(ns string, name string, replicas int32) error {
- return UpdateKameletBinding(ns, name, func(klb *v1alpha1.KameletBinding) {
+func ScaleBinding(ns string, name string, replicas int32) error {
+ return UpdateBinding(ns, name, func(klb *v1alpha1.Binding) {
klb.Spec.Replicas = &replicas
})
}
-func AssignKameletBindingToOperator(ns, name, operator string) error {
- klb := KameletBinding(ns, name)()
+func AssignBindingToOperator(ns, name, operator string) error {
+ klb := Binding(ns, name)()
if klb == nil {
- return fmt.Errorf("cannot assign kamelet binding %q to operator: kamelet binding not found", name)
+ return fmt.Errorf("cannot assignBinding %q to operator:Binding not found", name)
}
klb.SetOperatorID(operator)
@@ -1863,7 +1863,7 @@ func CRDs() func() []metav1.APIResource {
reflect.TypeOf(v1.IntegrationKit{}).Name(),
reflect.TypeOf(v1.IntegrationPlatform{}).Name(),
reflect.TypeOf(v1alpha1.Kamelet{}).Name(),
- reflect.TypeOf(v1alpha1.KameletBinding{}).Name(),
+ reflect.TypeOf(v1alpha1.Binding{}).Name(),
}
versions := []string{"v1", "v1alpha1"}
@@ -2308,9 +2308,9 @@ func BindKameletTo(ns, name string, annotations map[string]string, from, to core
func BindKameletToWithErrorHandler(ns, name string, annotations map[string]string, from, to corev1.ObjectReference,
sourceProperties, sinkProperties map[string]string, errorHandler map[string]interface{}) func() error {
return func() error {
- kb := v1alpha1.NewKameletBinding(ns, name)
+ kb := v1alpha1.NewBinding(ns, name)
kb.Annotations = annotations
- kb.Spec = v1alpha1.KameletBindingSpec{
+ kb.Spec = v1alpha1.BindingSpec{
Source: v1alpha1.Endpoint{
Ref: &from,
Properties: asEndpointProperties(sourceProperties),
diff --git a/e2e/yaks/common/kamelet-beans/kamelet.feature b/e2e/yaks/common/kamelet-beans/kamelet.feature
index 892f534ef..25fcb9e97 100644
--- a/e2e/yaks/common/kamelet-beans/kamelet.feature
+++ b/e2e/yaks/common/kamelet-beans/kamelet.feature
@@ -9,7 +9,7 @@ Feature: Kamelets can declare local beans
Scenario: Kamelets templates can use beans
Given bind Kamelet beans-source to uri log:info
- When create KameletBinding binding
- Then KameletBinding binding should be available
+ When create Binding binding
+ Then Binding binding should be available
Then Camel K integration binding should be running
Then Camel K integration binding should print Bean time is 0!
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
index 635bbee13..6cc3c633a 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
@@ -7,17 +7,17 @@ Feature: Camel K can load specific secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: KameletBinding can load specific settings for Kamelet
+ Scenario: Binding can load specific settings for Kamelet
Given create Kubernetes service stub-service-2 with target port 8080
And bind Kamelet timer-source to uri http://stub-service-2.${YAKS_NAMESPACE}.svc.cluster.local/specific
- And KameletBinding source properties
+ And Binding source properties
| id | specific |
- When create KameletBinding binding-specific
- Then KameletBinding binding-specific should be available
+ When create Binding binding-specific
+ Then Binding binding-specific should be available
Scenario: Verify specific binding
Given HTTP server "stub-service-2"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: specific
And receive POST /specific
- And delete KameletBinding binding-specific
+ And delete Binding binding-specific
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
index d5cc6ba81..0c567d1e6 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
@@ -7,15 +7,15 @@ Feature: Camel K can load default secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: KameletBinding can load default settings for Kamelet
+ Scenario: Binding can load default settings for Kamelet
Given create Kubernetes service stub-service with target port 8080
And bind Kamelet timer-source to uri http://stub-service.${YAKS_NAMESPACE}.svc.cluster.local/default
- When create KameletBinding binding
- Then KameletBinding binding should be available
+ When create Binding binding
+ Then Binding binding should be available
Scenario: Verify default binding
Given HTTP server "stub-service"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: default
And receive POST /default
- And delete KameletBinding binding
+ And delete Binding binding
diff --git a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
index c4d10c636..110cbd889 100644
--- a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets to the broker
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Sending event to the custom broker with KameletBinding
+ Scenario: Sending event to the custom broker with Binding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Custom Event from sample-broker
diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
index f155cb71a..a3393a426 100644
--- a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
index d14bd263c..45cc64084 100644
--- a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
index 3369a0076..ff595de99 100644
--- a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml
@@ -27,8 +27,8 @@ pre:
kubectl apply -f timer-source-binding.yaml -n $YAKS_NAMESPACE
kubectl apply -f logger-sink-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait kameletbinding timer-source-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
- kubectl wait kameletbinding logger-sink-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait binding timer-source-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait binding logger-sink-binding --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
index 91cbf376e..b4efc7684 100644
--- a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-source-binding-display
spec:
diff --git a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
index 1922bf7bb..c292a9a11 100644
--- a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml
@@ -25,7 +25,7 @@ pre:
kamel run display.groovy -w -n $YAKS_NAMESPACE
cat timer-source-binding-display.yaml | sed 's/{namespace}/'"${YAKS_NAMESPACE}"'/' | kubectl apply -n $YAKS_NAMESPACE -f -
- kubectl wait kameletbinding timer-source-binding-display --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
+ kubectl wait binding timer-source-binding-display --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index b4b39cb05..8a67c48df 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-kind: KameletBinding
+kind: Binding
apiVersion: camel.apache.org/v1alpha1
metadata:
name: properties-binding
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
index c3afc634f..7b1b961f8 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
@@ -23,4 +23,4 @@ Feature: Ensure that Kamelets support multiline configuration
"""
And expect HTTP request header: Content-Type="application/json;charset=UTF-8"
And receive POST /events
- And delete KameletBinding properties-binding
+ And delete Binding properties-binding
diff --git a/e2e/yaks/common/kamelet-binding/kamelet.feature b/e2e/yaks/common/kamelet-binding/kamelet.feature
index 107a80c92..c8e1c1402 100644
--- a/e2e/yaks/common/kamelet-binding/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Running integration using a simple Kamelet with KameletBinding
+ Scenario: Running integration using a simple Kamelet with Binding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Kamelets
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index 237f8ca01..34c9f8bf5 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index 536e63296..eb7b7048b 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding/yaks-config.yaml b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
index b236c3435..0c95cc4d0 100644
--- a/e2e/yaks/common/kamelet-binding/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-binding/yaks-config.yaml
@@ -29,8 +29,8 @@ pre:
kubectl apply -f timer-source-binding.yaml -n $YAKS_NAMESPACE
kubectl apply -f logger-sink-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait kameletbinding timer-source-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
- kubectl wait kameletbinding logger-sink-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait binding timer-source-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait binding logger-sink-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/e2e/yaks/common/kamelet-data-types/event-binding.yaml b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
index feb20a7c3..c08362f3c 100644
--- a/e2e/yaks/common/kamelet-data-types/event-binding.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: event-binding
spec:
diff --git a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
index 443366db0..2ea9c2ff9 100644
--- a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
+++ b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
@@ -6,13 +6,13 @@ Feature: Kamelets with data types
| delayBetweenAttempts | 4000 |
Scenario: Kamelet event data type conversion
- Given load KameletBinding event-binding.yaml
+ Given load Binding event-binding.yaml
Given Camel K integration event-binding is running
Then Camel K integration event-binding should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration event-binding should print BodyType: String, Body: Hello from Camel K!
Scenario: Kamelet timer-to-log conversion
- Given load KameletBinding timer-to-log.yaml
+ Given load Binding timer-to-log.yaml
Given Camel K integration timer-to-log is running
Then Camel K integration timer-to-log should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration timer-to-log should print BodyType: String, Body: Hello from Camel K!
diff --git a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
index 8e544ae81..cbff3417b 100644
--- a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
+++ b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: timer-to-log
spec:
diff --git a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
index 6f6b42afc..7815a17d3 100644
--- a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
+++ b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
@@ -22,7 +22,7 @@ from:
Scenario: Bind Kamelet to service
Given create Kubernetes service greeting-service with target port 8080
And bind Kamelet no-props-source to uri log:info
- When create KameletBinding no-props-source-uri
- Then KameletBinding no-props-source-uri should be available
+ When create Binding no-props-source-uri
+ Then Binding no-props-source-uri should be available
Then Camel K integration no-props-source-uri should be running
Then Camel K integration no-props-source-uri should print Hello World
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.feature b/e2e/yaks/common/kamelet-steps/steps-binding.feature
index a9980cfc3..35d71fced 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.feature
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.feature
@@ -1,4 +1,4 @@
-Feature: KameletBindings can have multiple processing steps
+Feature: Bindings can have multiple processing steps
Background:
Given Camel K resource polling configuration
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
index b2956bfbb..17d6d3903 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
name: steps-binding
spec:
diff --git a/e2e/yaks/common/kamelet-steps/yaks-config.yaml b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
index 2314a59fb..1b4d1a6fa 100644
--- a/e2e/yaks/common/kamelet-steps/yaks-config.yaml
+++ b/e2e/yaks/common/kamelet-steps/yaks-config.yaml
@@ -25,7 +25,7 @@ pre:
kubectl apply -f prefix-action.kamelet.yaml -n $YAKS_NAMESPACE
kubectl apply -f steps-binding.yaml -n $YAKS_NAMESPACE
- kubectl wait kameletbinding steps-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
+ kubectl wait binding steps-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE
post:
- name: print dump
if: env:CI=true && failure()
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/helm/camel-k/crds/crd-binding.yaml
similarity index 99%
rename from config/crd/bases/camel.apache.org_kameletbindings.yaml
rename to helm/camel-k/crds/crd-binding.yaml
index bbec3c111..b1b019aa4 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/helm/camel-k/crds/crd-binding.yaml
@@ -23,23 +23,23 @@ metadata:
creationTimestamp: null
labels:
app: camel-k
- name: kameletbindings.camel.apache.org
+ name: bindings.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: KameletBinding
- listKind: KameletBindingList
- plural: kameletbindings
+ kind: Binding
+ listKind: BindingList
+ plural: bindings
shortNames:
- klb
- singular: kameletbinding
+ singular: binding
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: The Kamelet Binding phase
+ - description: TheBinding phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +50,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: KameletBinding is the Schema for the kamelets binding API
+ description: Binding is the Schema for the kamelets binding API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +65,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a KameletBinding
+ description: the specification of a Binding
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8410,12 @@ spec:
type: array
type: object
status:
- description: the status of a KameletBinding
+ description: the status of a Binding
properties:
conditions:
description: Conditions --
items:
- description: KameletBindingCondition describes the state of a resource
+ description: BindingCondition describes the state of a resource
at a certain point.
properties:
lastTransitionTime:
@@ -8498,7 +8498,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of kameletBinding condition.
+ description: Type of binding condition.
type: string
required:
- status
@@ -8507,7 +8507,7 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this KameletBinding.
+ for this Binding.
format: int64
type: integer
phase:
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index bbec3c111..b1b019aa4 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -23,23 +23,23 @@ metadata:
creationTimestamp: null
labels:
app: camel-k
- name: kameletbindings.camel.apache.org
+ name: bindings.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: KameletBinding
- listKind: KameletBindingList
- plural: kameletbindings
+ kind: Binding
+ listKind: BindingList
+ plural: bindings
shortNames:
- klb
- singular: kameletbinding
+ singular: binding
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: The Kamelet Binding phase
+ - description: TheBinding phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +50,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: KameletBinding is the Schema for the kamelets binding API
+ description: Binding is the Schema for the kamelets binding API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +65,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a KameletBinding
+ description: the specification of a Binding
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -8410,12 +8410,12 @@ spec:
type: array
type: object
status:
- description: the status of a KameletBinding
+ description: the status of a Binding
properties:
conditions:
description: Conditions --
items:
- description: KameletBindingCondition describes the state of a resource
+ description: BindingCondition describes the state of a resource
at a certain point.
properties:
lastTransitionTime:
@@ -8498,7 +8498,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of kameletBinding condition.
+ description: Type of binding condition.
type: string
required:
- status
@@ -8507,7 +8507,7 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this KameletBinding.
+ for this Binding.
format: int64
type: integer
phase:
diff --git a/helm/camel-k/templates/operator-cluster-roles.yaml b/helm/camel-k/templates/operator-cluster-roles.yaml
index 46ca9c777..e1dccd478 100644
--- a/helm/camel-k/templates/operator-cluster-roles.yaml
+++ b/helm/camel-k/templates/operator-cluster-roles.yaml
@@ -35,7 +35,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - kameletbindings
+ - bindings
- kamelets
verbs:
- create
@@ -55,8 +55,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - kameletbindings/scale
- - kameletbindings/status
+ - bindings/scale
+ - bindings/status
- kamelets/status
verbs:
- get
@@ -81,7 +81,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - kameletbindings
+ - bindings
- kamelets
verbs:
- create
@@ -105,8 +105,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - kameletbindings/status
- - kameletbindings/scale
+ - bindings/status
+ - bindings/scale
- kamelets/status
verbs:
- get
@@ -403,7 +403,7 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- - kameletbindings/finalizers
+ - bindings/finalizers
verbs:
- update
- apiGroups:
diff --git a/helm/camel-k/templates/operator-role.yaml b/helm/camel-k/templates/operator-role.yaml
index 8b6badcda..0c52d01d0 100644
--- a/helm/camel-k/templates/operator-role.yaml
+++ b/helm/camel-k/templates/operator-role.yaml
@@ -32,7 +32,7 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - kameletbindings
+ - bindings
- kamelets
verbs:
- create
@@ -56,8 +56,8 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - kameletbindings/status
- - kameletbindings/scale
+ - bindings/status
+ - bindings/scale
- kamelets/status
verbs:
- get
@@ -256,7 +256,7 @@ rules:
- integrationkits/finalizers
- integrationplatforms/finalizers
- integrations/finalizers
- - kameletbindings/finalizers
+ - bindings/finalizers
verbs:
- update
- apiGroups:
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/binding_types.go
similarity index 71%
rename from pkg/apis/camel/v1alpha1/kamelet_binding_types.go
rename to pkg/apis/camel/v1alpha1/binding_types.go
index fb1e44bc4..8e2857df5 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/binding_types.go
@@ -26,27 +26,27 @@ import (
// +genclient
// +kubebuilder:object:root=true
-// +kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
+// +kubebuilder:resource:path=bindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
-// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="The Kamelet Binding phase"
+// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="TheBinding phase"
// +kubebuilder:printcolumn:name="Replicas",type=integer,JSONPath=`.status.replicas`,description="The number of pods"
-// KameletBinding is the Schema for the kamelets binding API
-type KameletBinding struct {
+// Binding is the Schema for the kamelets binding API
+type Binding struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
- // the specification of a KameletBinding
- Spec KameletBindingSpec `json:"spec,omitempty"`
- // the status of a KameletBinding
- Status KameletBindingStatus `json:"status,omitempty"`
+ // the specification of a Binding
+ Spec BindingSpec `json:"spec,omitempty"`
+ // the status of a Binding
+ Status BindingStatus `json:"status,omitempty"`
}
-// KameletBindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
-type KameletBindingSpec struct {
+// BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+type BindingSpec struct {
// Integration is an optional integration used to specify custom parameters
Integration *v1.IntegrationSpec `json:"integration,omitempty"`
// Source is the starting point of the integration defined by this binding
@@ -97,24 +97,24 @@ type EndpointProperties struct {
RawMessage `json:",inline"`
}
-// KameletBindingStatus specify the status of a binding
-type KameletBindingStatus struct {
- // ObservedGeneration is the most recent generation observed for this KameletBinding.
+// BindingStatus specify the status of a binding
+type BindingStatus struct {
+ // ObservedGeneration is the most recent generation observed for this Binding.
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
// Phase --
- Phase KameletBindingPhase `json:"phase,omitempty"`
+ Phase BindingPhase `json:"phase,omitempty"`
// Conditions --
- Conditions []KameletBindingCondition `json:"conditions,omitempty"`
+ Conditions []BindingCondition `json:"conditions,omitempty"`
// Replicas is the number of actual replicas of the binding
Replicas *int32 `json:"replicas,omitempty"`
// Selector allows to identify pods belonging to the binding
Selector string `json:"selector,omitempty"`
}
-// KameletBindingCondition describes the state of a resource at a certain point.
-type KameletBindingCondition struct {
- // Type of kameletBinding condition.
- Type KameletBindingConditionType `json:"type"`
+// BindingCondition describes the state of a resource at a certain point.
+type BindingCondition struct {
+ // Type of binding condition.
+ Type BindingConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status corev1.ConditionStatus `json:"status"`
// The last time this condition was updated.
@@ -129,38 +129,38 @@ type KameletBindingCondition struct {
Pods []v1.PodCondition `json:"pods,omitempty"`
}
-// KameletBindingConditionType --
-type KameletBindingConditionType string
+// BindingConditionType --
+type BindingConditionType string
const (
- // KameletBindingConditionReady --
- KameletBindingConditionReady KameletBindingConditionType = "Ready"
- // KameletBindingIntegrationConditionError is used to report the error on the generated Integration
- KameletBindingIntegrationConditionError KameletBindingConditionType = "IntegrationError"
+ // BindingConditionReady --
+ BindingConditionReady BindingConditionType = "Ready"
+ // BindingIntegrationConditionError is used to report the error on the generated Integration
+ BindingIntegrationConditionError BindingConditionType = "IntegrationError"
)
-// KameletBindingPhase --
-type KameletBindingPhase string
+// BindingPhase --
+type BindingPhase string
const (
- // KameletBindingKind --
- KameletBindingKind string = "KameletBinding"
-
- // KameletBindingPhaseNone --
- KameletBindingPhaseNone KameletBindingPhase = ""
- // KameletBindingPhaseCreating --
- KameletBindingPhaseCreating KameletBindingPhase = "Creating"
- // KameletBindingPhaseError --
- KameletBindingPhaseError KameletBindingPhase = "Error"
- // KameletBindingPhaseReady --
- KameletBindingPhaseReady KameletBindingPhase = "Ready"
+ // BindingKind --
+ BindingKind string = "Binding"
+
+ // BindingPhaseNone --
+ BindingPhaseNone BindingPhase = ""
+ // BindingPhaseCreating --
+ BindingPhaseCreating BindingPhase = "Creating"
+ // BindingPhaseError --
+ BindingPhaseError BindingPhase = "Error"
+ // BindingPhaseReady --
+ BindingPhaseReady BindingPhase = "Ready"
)
// +kubebuilder:object:root=true
-// KameletBindingList contains a list of KameletBinding
-type KameletBindingList struct {
+// BindingList contains a list of Binding
+type BindingList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []KameletBinding `json:"items"`
+ Items []Binding `json:"items"`
}
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go b/pkg/apis/camel/v1alpha1/binding_types_support.go
similarity index 74%
rename from pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
rename to pkg/apis/camel/v1alpha1/binding_types_support.go
index 20d55df1b..c44b8a2d3 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support.go
+++ b/pkg/apis/camel/v1alpha1/binding_types_support.go
@@ -28,7 +28,7 @@ import (
)
// GetConditions --
-func (in *KameletBindingStatus) GetConditions() []v1.ResourceCondition {
+func (in *BindingStatus) GetConditions() []v1.ResourceCondition {
res := make([]v1.ResourceCondition, 0, len(in.Conditions))
for _, c := range in.Conditions {
res = append(res, c)
@@ -37,42 +37,42 @@ func (in *KameletBindingStatus) GetConditions() []v1.ResourceCondition {
}
// GetType --
-func (c KameletBindingCondition) GetType() string {
+func (c BindingCondition) GetType() string {
return string(c.Type)
}
// GetStatus --
-func (c KameletBindingCondition) GetStatus() corev1.ConditionStatus {
+func (c BindingCondition) GetStatus() corev1.ConditionStatus {
return c.Status
}
// GetLastUpdateTime --
-func (c KameletBindingCondition) GetLastUpdateTime() metav1.Time {
+func (c BindingCondition) GetLastUpdateTime() metav1.Time {
return c.LastUpdateTime
}
// GetLastTransitionTime --
-func (c KameletBindingCondition) GetLastTransitionTime() metav1.Time {
+func (c BindingCondition) GetLastTransitionTime() metav1.Time {
return c.LastTransitionTime
}
// GetReason --
-func (c KameletBindingCondition) GetReason() string {
+func (c BindingCondition) GetReason() string {
return c.Reason
}
// GetMessage --
-func (c KameletBindingCondition) GetMessage() string {
+func (c BindingCondition) GetMessage() string {
return c.Message
}
// SetOperatorID sets the given operator id as an annotation
-func (in *KameletBinding) SetOperatorID(operatorID string) {
+func (in *Binding) SetOperatorID(operatorID string) {
v1.SetAnnotation(&in.ObjectMeta, v1.OperatorIDAnnotation, operatorID)
}
// GetCondition returns the condition with the provided type.
-func (in *KameletBindingStatus) GetCondition(condType KameletBindingConditionType) *KameletBindingCondition {
+func (in *BindingStatus) GetCondition(condType BindingConditionType) *BindingCondition {
for i := range in.Conditions {
c := in.Conditions[i]
if c.Type == condType {
@@ -83,8 +83,8 @@ func (in *KameletBindingStatus) GetCondition(condType KameletBindingConditionTyp
}
// SetCondition --
-func (in *KameletBindingStatus) SetCondition(condType KameletBindingConditionType, status corev1.ConditionStatus, reason string, message string) {
- in.SetConditions(KameletBindingCondition{
+func (in *BindingStatus) SetCondition(condType BindingConditionType, status corev1.ConditionStatus, reason string, message string) {
+ in.SetConditions(BindingCondition{
Type: condType,
Status: status,
LastUpdateTime: metav1.Now(),
@@ -95,8 +95,8 @@ func (in *KameletBindingStatus) SetCondition(condType KameletBindingConditionTyp
}
// SetErrorCondition --
-func (in *KameletBindingStatus) SetErrorCondition(condType KameletBindingConditionType, reason string, err error) {
- in.SetConditions(KameletBindingCondition{
+func (in *BindingStatus) SetErrorCondition(condType BindingConditionType, reason string, err error) {
+ in.SetConditions(BindingCondition{
Type: condType,
Status: corev1.ConditionFalse,
LastUpdateTime: metav1.Now(),
@@ -110,7 +110,7 @@ func (in *KameletBindingStatus) SetErrorCondition(condType KameletBindingConditi
//
// If a condition that we are about to add already exists and has the same status and
// reason then we are not going to update.
-func (in *KameletBindingStatus) SetConditions(conditions ...KameletBindingCondition) {
+func (in *BindingStatus) SetConditions(conditions ...BindingCondition) {
for _, condition := range conditions {
if condition.LastUpdateTime.IsZero() {
condition.LastUpdateTime = metav1.Now()
@@ -135,7 +135,7 @@ func (in *KameletBindingStatus) SetConditions(conditions ...KameletBindingCondit
}
// RemoveCondition removes the resource condition with the provided type.
-func (in *KameletBindingStatus) RemoveCondition(condType KameletBindingConditionType) {
+func (in *BindingStatus) RemoveCondition(condType BindingConditionType) {
newConditions := in.Conditions[:0]
for _, c := range in.Conditions {
if c.Type != condType {
@@ -169,12 +169,12 @@ func (p *EndpointProperties) GetPropertyMap() (map[string]string, error) {
return stringProps, nil
}
-// NewKameletBinding --
-func NewKameletBinding(namespace string, name string) KameletBinding {
- return KameletBinding{
+// NewBinding --
+func NewBinding(namespace string, name string) Binding {
+ return Binding{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: KameletBindingKind,
+ Kind: BindingKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
@@ -183,12 +183,12 @@ func NewKameletBinding(namespace string, name string) KameletBinding {
}
}
-// NewKameletBindingList --
-func NewKameletBindingList() KameletBindingList {
- return KameletBindingList{
+// NewBindingList --
+func NewBindingList() BindingList {
+ return BindingList{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: KameletBindingKind,
+ Kind: BindingKind,
},
}
}
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go b/pkg/apis/camel/v1alpha1/binding_types_support_test.go
similarity index 100%
rename from pkg/apis/camel/v1alpha1/kamelet_binding_types_support_test.go
rename to pkg/apis/camel/v1alpha1/binding_types_support_test.go
diff --git a/pkg/apis/camel/v1alpha1/register.go b/pkg/apis/camel/v1alpha1/register.go
index f472e4d78..6676d3b1a 100644
--- a/pkg/apis/camel/v1alpha1/register.go
+++ b/pkg/apis/camel/v1alpha1/register.go
@@ -47,8 +47,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&Kamelet{},
&KameletList{},
- &KameletBinding{},
- &KameletBindingList{},
+ &Binding{},
+ &BindingList{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index ee2885294..5bd413b4a 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -32,6 +32,155 @@ func (in *BeanProperties) DeepCopy() *BeanProperties {
return out
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Binding) DeepCopyInto(out *Binding) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+ in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Binding.
+func (in *Binding) DeepCopy() *Binding {
+ if in == nil {
+ return nil
+ }
+ out := new(Binding)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Binding) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingCondition) DeepCopyInto(out *BindingCondition) {
+ *out = *in
+ in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+ in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+ if in.Pods != nil {
+ in, out := &in.Pods, &out.Pods
+ *out = make([]v1.PodCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingCondition.
+func (in *BindingCondition) DeepCopy() *BindingCondition {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingCondition)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingList) DeepCopyInto(out *BindingList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]Binding, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingList.
+func (in *BindingList) DeepCopy() *BindingList {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *BindingList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingSpec) DeepCopyInto(out *BindingSpec) {
+ *out = *in
+ if in.Integration != nil {
+ in, out := &in.Integration, &out.Integration
+ *out = new(v1.IntegrationSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ in.Source.DeepCopyInto(&out.Source)
+ in.Sink.DeepCopyInto(&out.Sink)
+ if in.ErrorHandler != nil {
+ in, out := &in.ErrorHandler, &out.ErrorHandler
+ *out = new(ErrorHandlerSpec)
+ (*in).DeepCopyInto(*out)
+ }
+ if in.Steps != nil {
+ in, out := &in.Steps, &out.Steps
+ *out = make([]Endpoint, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingSpec.
+func (in *BindingSpec) DeepCopy() *BindingSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *BindingStatus) DeepCopyInto(out *BindingStatus) {
+ *out = *in
+ if in.Conditions != nil {
+ in, out := &in.Conditions, &out.Conditions
+ *out = make([]BindingCondition, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.Replicas != nil {
+ in, out := &in.Replicas, &out.Replicas
+ *out = new(int32)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BindingStatus.
+func (in *BindingStatus) DeepCopy() *BindingStatus {
+ if in == nil {
+ return nil
+ }
+ out := new(BindingStatus)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DataTypeReference) DeepCopyInto(out *DataTypeReference) {
*out = *in
@@ -486,155 +635,6 @@ func (in *Kamelet) DeepCopyObject() runtime.Object {
return nil
}
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KameletBinding) DeepCopyInto(out *KameletBinding) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
- in.Spec.DeepCopyInto(&out.Spec)
- in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBinding.
-func (in *KameletBinding) DeepCopy() *KameletBinding {
- if in == nil {
- return nil
- }
- out := new(KameletBinding)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *KameletBinding) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KameletBindingCondition) DeepCopyInto(out *KameletBindingCondition) {
- *out = *in
- in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
- in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
- if in.Pods != nil {
- in, out := &in.Pods, &out.Pods
- *out = make([]v1.PodCondition, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingCondition.
-func (in *KameletBindingCondition) DeepCopy() *KameletBindingCondition {
- if in == nil {
- return nil
- }
- out := new(KameletBindingCondition)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KameletBindingList) DeepCopyInto(out *KameletBindingList) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ListMeta.DeepCopyInto(&out.ListMeta)
- if in.Items != nil {
- in, out := &in.Items, &out.Items
- *out = make([]KameletBinding, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingList.
-func (in *KameletBindingList) DeepCopy() *KameletBindingList {
- if in == nil {
- return nil
- }
- out := new(KameletBindingList)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *KameletBindingList) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KameletBindingSpec) DeepCopyInto(out *KameletBindingSpec) {
- *out = *in
- if in.Integration != nil {
- in, out := &in.Integration, &out.Integration
- *out = new(v1.IntegrationSpec)
- (*in).DeepCopyInto(*out)
- }
- in.Source.DeepCopyInto(&out.Source)
- in.Sink.DeepCopyInto(&out.Sink)
- if in.ErrorHandler != nil {
- in, out := &in.ErrorHandler, &out.ErrorHandler
- *out = new(ErrorHandlerSpec)
- (*in).DeepCopyInto(*out)
- }
- if in.Steps != nil {
- in, out := &in.Steps, &out.Steps
- *out = make([]Endpoint, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Replicas != nil {
- in, out := &in.Replicas, &out.Replicas
- *out = new(int32)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingSpec.
-func (in *KameletBindingSpec) DeepCopy() *KameletBindingSpec {
- if in == nil {
- return nil
- }
- out := new(KameletBindingSpec)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *KameletBindingStatus) DeepCopyInto(out *KameletBindingStatus) {
- *out = *in
- if in.Conditions != nil {
- in, out := &in.Conditions, &out.Conditions
- *out = make([]KameletBindingCondition, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Replicas != nil {
- in, out := &in.Replicas, &out.Replicas
- *out = new(int32)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KameletBindingStatus.
-func (in *KameletBindingStatus) DeepCopy() *KameletBindingStatus {
- if in == nil {
- return nil
- }
- out := new(KameletBindingStatus)
- in.DeepCopyInto(out)
- return out
-}
-
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *KameletCondition) DeepCopyInto(out *KameletCondition) {
*out = *in
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go
similarity index 75%
rename from pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbinding.go
rename to pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go
index 794bed9d5..0c8e09fc7 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbinding.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/binding.go
@@ -25,22 +25,22 @@ import (
v1 "k8s.io/client-go/applyconfigurations/meta/v1"
)
-// KameletBindingApplyConfiguration represents an declarative configuration of the KameletBinding type for use
+// BindingApplyConfiguration represents an declarative configuration of the Binding type for use
// with apply.
-type KameletBindingApplyConfiguration struct {
+type BindingApplyConfiguration struct {
v1.TypeMetaApplyConfiguration `json:",inline"`
*v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"`
- Spec *KameletBindingSpecApplyConfiguration `json:"spec,omitempty"`
- Status *KameletBindingStatusApplyConfiguration `json:"status,omitempty"`
+ Spec *BindingSpecApplyConfiguration `json:"spec,omitempty"`
+ Status *BindingStatusApplyConfiguration `json:"status,omitempty"`
}
-// KameletBinding constructs an declarative configuration of the KameletBinding type for use with
+// Binding constructs an declarative configuration of the Binding type for use with
// apply.
-func KameletBinding(name, namespace string) *KameletBindingApplyConfiguration {
- b := &KameletBindingApplyConfiguration{}
+func Binding(name, namespace string) *BindingApplyConfiguration {
+ b := &BindingApplyConfiguration{}
b.WithName(name)
b.WithNamespace(namespace)
- b.WithKind("KameletBinding")
+ b.WithKind("Binding")
b.WithAPIVersion("camel.apache.org/v1alpha1")
return b
}
@@ -48,7 +48,7 @@ func KameletBinding(name, namespace string) *KameletBindingApplyConfiguration {
// WithKind sets the Kind field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Kind field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithKind(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithKind(value string) *BindingApplyConfiguration {
b.Kind = &value
return b
}
@@ -56,7 +56,7 @@ func (b *KameletBindingApplyConfiguration) WithKind(value string) *KameletBindin
// WithAPIVersion sets the APIVersion field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the APIVersion field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithAPIVersion(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithAPIVersion(value string) *BindingApplyConfiguration {
b.APIVersion = &value
return b
}
@@ -64,7 +64,7 @@ func (b *KameletBindingApplyConfiguration) WithAPIVersion(value string) *Kamelet
// WithName sets the Name field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Name field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithName(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithName(value string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.Name = &value
return b
@@ -73,7 +73,7 @@ func (b *KameletBindingApplyConfiguration) WithName(value string) *KameletBindin
// WithGenerateName sets the GenerateName field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the GenerateName field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithGenerateName(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithGenerateName(value string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.GenerateName = &value
return b
@@ -82,7 +82,7 @@ func (b *KameletBindingApplyConfiguration) WithGenerateName(value string) *Kamel
// WithNamespace sets the Namespace field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Namespace field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithNamespace(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithNamespace(value string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.Namespace = &value
return b
@@ -91,7 +91,7 @@ func (b *KameletBindingApplyConfiguration) WithNamespace(value string) *KameletB
// WithUID sets the UID field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the UID field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithUID(value types.UID) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithUID(value types.UID) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.UID = &value
return b
@@ -100,7 +100,7 @@ func (b *KameletBindingApplyConfiguration) WithUID(value types.UID) *KameletBind
// WithResourceVersion sets the ResourceVersion field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the ResourceVersion field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithResourceVersion(value string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithResourceVersion(value string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.ResourceVersion = &value
return b
@@ -109,7 +109,7 @@ func (b *KameletBindingApplyConfiguration) WithResourceVersion(value string) *Ka
// WithGeneration sets the Generation field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Generation field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithGeneration(value int64) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithGeneration(value int64) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.Generation = &value
return b
@@ -118,7 +118,7 @@ func (b *KameletBindingApplyConfiguration) WithGeneration(value int64) *KameletB
// WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the CreationTimestamp field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithCreationTimestamp(value metav1.Time) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithCreationTimestamp(value metav1.Time) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.CreationTimestamp = &value
return b
@@ -127,7 +127,7 @@ func (b *KameletBindingApplyConfiguration) WithCreationTimestamp(value metav1.Ti
// WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the DeletionTimestamp field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.DeletionTimestamp = &value
return b
@@ -136,7 +136,7 @@ func (b *KameletBindingApplyConfiguration) WithDeletionTimestamp(value metav1.Ti
// WithDeletionGracePeriodSeconds sets the DeletionGracePeriodSeconds field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
b.DeletionGracePeriodSeconds = &value
return b
@@ -146,7 +146,7 @@ func (b *KameletBindingApplyConfiguration) WithDeletionGracePeriodSeconds(value
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, the entries provided by each call will be put on the Labels field,
// overwriting an existing map entries in Labels field with the same key.
-func (b *KameletBindingApplyConfiguration) WithLabels(entries map[string]string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithLabels(entries map[string]string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
if b.Labels == nil && len(entries) > 0 {
b.Labels = make(map[string]string, len(entries))
@@ -161,7 +161,7 @@ func (b *KameletBindingApplyConfiguration) WithLabels(entries map[string]string)
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, the entries provided by each call will be put on the Annotations field,
// overwriting an existing map entries in Annotations field with the same key.
-func (b *KameletBindingApplyConfiguration) WithAnnotations(entries map[string]string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithAnnotations(entries map[string]string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
if b.Annotations == nil && len(entries) > 0 {
b.Annotations = make(map[string]string, len(entries))
@@ -175,7 +175,7 @@ func (b *KameletBindingApplyConfiguration) WithAnnotations(entries map[string]st
// WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the OwnerReferences field.
-func (b *KameletBindingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
for i := range values {
if values[i] == nil {
@@ -189,7 +189,7 @@ func (b *KameletBindingApplyConfiguration) WithOwnerReferences(values ...*v1.Own
// WithFinalizers adds the given value to the Finalizers field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the Finalizers field.
-func (b *KameletBindingApplyConfiguration) WithFinalizers(values ...string) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithFinalizers(values ...string) *BindingApplyConfiguration {
b.ensureObjectMetaApplyConfigurationExists()
for i := range values {
b.Finalizers = append(b.Finalizers, values[i])
@@ -197,7 +197,7 @@ func (b *KameletBindingApplyConfiguration) WithFinalizers(values ...string) *Kam
return b
}
-func (b *KameletBindingApplyConfiguration) ensureObjectMetaApplyConfigurationExists() {
+func (b *BindingApplyConfiguration) ensureObjectMetaApplyConfigurationExists() {
if b.ObjectMetaApplyConfiguration == nil {
b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{}
}
@@ -206,7 +206,7 @@ func (b *KameletBindingApplyConfiguration) ensureObjectMetaApplyConfigurationExi
// WithSpec sets the Spec field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Spec field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithSpec(value *KameletBindingSpecApplyConfiguration) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithSpec(value *BindingSpecApplyConfiguration) *BindingApplyConfiguration {
b.Spec = value
return b
}
@@ -214,7 +214,7 @@ func (b *KameletBindingApplyConfiguration) WithSpec(value *KameletBindingSpecApp
// WithStatus sets the Status field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Status field is set to the value of the last call.
-func (b *KameletBindingApplyConfiguration) WithStatus(value *KameletBindingStatusApplyConfiguration) *KameletBindingApplyConfiguration {
+func (b *BindingApplyConfiguration) WithStatus(value *BindingStatusApplyConfiguration) *BindingApplyConfiguration {
b.Status = value
return b
}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go
similarity index 73%
rename from pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go
rename to pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go
index 68fb4e89e..7ae16279d 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingcondition.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingcondition.go
@@ -26,10 +26,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
-// KameletBindingConditionApplyConfiguration represents an declarative configuration of the KameletBindingCondition type for use
+// BindingConditionApplyConfiguration represents an declarative configuration of the BindingCondition type for use
// with apply.
-type KameletBindingConditionApplyConfiguration struct {
- Type *v1alpha1.KameletBindingConditionType `json:"type,omitempty"`
+type BindingConditionApplyConfiguration struct {
+ Type *v1alpha1.BindingConditionType `json:"type,omitempty"`
Status *v1.ConditionStatus `json:"status,omitempty"`
LastUpdateTime *metav1.Time `json:"lastUpdateTime,omitempty"`
LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"`
@@ -38,16 +38,16 @@ type KameletBindingConditionApplyConfiguration struct {
Pods []camelv1.PodConditionApplyConfiguration `json:"pods,omitempty"`
}
-// KameletBindingConditionApplyConfiguration constructs an declarative configuration of the KameletBindingCondition type for use with
+// BindingConditionApplyConfiguration constructs an declarative configuration of the BindingCondition type for use with
// apply.
-func KameletBindingCondition() *KameletBindingConditionApplyConfiguration {
- return &KameletBindingConditionApplyConfiguration{}
+func BindingCondition() *BindingConditionApplyConfiguration {
+ return &BindingConditionApplyConfiguration{}
}
// WithType sets the Type field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Type field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithType(value v1alpha1.KameletBindingConditionType) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithType(value v1alpha1.BindingConditionType) *BindingConditionApplyConfiguration {
b.Type = &value
return b
}
@@ -55,7 +55,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithType(value v1alpha1.Kame
// WithStatus sets the Status field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Status field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *BindingConditionApplyConfiguration {
b.Status = &value
return b
}
@@ -63,7 +63,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithStatus(value v1.Conditio
// WithLastUpdateTime sets the LastUpdateTime field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the LastUpdateTime field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithLastUpdateTime(value metav1.Time) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithLastUpdateTime(value metav1.Time) *BindingConditionApplyConfiguration {
b.LastUpdateTime = &value
return b
}
@@ -71,7 +71,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithLastUpdateTime(value met
// WithLastTransitionTime sets the LastTransitionTime field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the LastTransitionTime field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithLastTransitionTime(value metav1.Time) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithLastTransitionTime(value metav1.Time) *BindingConditionApplyConfiguration {
b.LastTransitionTime = &value
return b
}
@@ -79,7 +79,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithLastTransitionTime(value
// WithReason sets the Reason field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Reason field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithReason(value string) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithReason(value string) *BindingConditionApplyConfiguration {
b.Reason = &value
return b
}
@@ -87,7 +87,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithReason(value string) *Ka
// WithMessage sets the Message field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Message field is set to the value of the last call.
-func (b *KameletBindingConditionApplyConfiguration) WithMessage(value string) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithMessage(value string) *BindingConditionApplyConfiguration {
b.Message = &value
return b
}
@@ -95,7 +95,7 @@ func (b *KameletBindingConditionApplyConfiguration) WithMessage(value string) *K
// WithPods adds the given value to the Pods field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the Pods field.
-func (b *KameletBindingConditionApplyConfiguration) WithPods(values ...*camelv1.PodConditionApplyConfiguration) *KameletBindingConditionApplyConfiguration {
+func (b *BindingConditionApplyConfiguration) WithPods(values ...*camelv1.PodConditionApplyConfiguration) *BindingConditionApplyConfiguration {
for i := range values {
if values[i] == nil {
panic("nil value passed to WithPods")
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go
similarity index 74%
rename from pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go
rename to pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go
index 69f067698..885d67fb2 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingspec.go
@@ -23,9 +23,9 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/client/camel/applyconfiguration/camel/v1"
)
-// KameletBindingSpecApplyConfiguration represents an declarative configuration of the KameletBindingSpec type for use
+// BindingSpecApplyConfiguration represents an declarative configuration of the BindingSpec type for use
// with apply.
-type KameletBindingSpecApplyConfiguration struct {
+type BindingSpecApplyConfiguration struct {
Integration *v1.IntegrationSpecApplyConfiguration `json:"integration,omitempty"`
Source *EndpointApplyConfiguration `json:"source,omitempty"`
Sink *EndpointApplyConfiguration `json:"sink,omitempty"`
@@ -35,16 +35,16 @@ type KameletBindingSpecApplyConfiguration struct {
ServiceAccountName *string `json:"serviceAccountName,omitempty"`
}
-// KameletBindingSpecApplyConfiguration constructs an declarative configuration of the KameletBindingSpec type for use with
+// BindingSpecApplyConfiguration constructs an declarative configuration of the BindingSpec type for use with
// apply.
-func KameletBindingSpec() *KameletBindingSpecApplyConfiguration {
- return &KameletBindingSpecApplyConfiguration{}
+func BindingSpec() *BindingSpecApplyConfiguration {
+ return &BindingSpecApplyConfiguration{}
}
// WithIntegration sets the Integration field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Integration field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithIntegration(value *v1.IntegrationSpecApplyConfiguration) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithIntegration(value *v1.IntegrationSpecApplyConfiguration) *BindingSpecApplyConfiguration {
b.Integration = value
return b
}
@@ -52,7 +52,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithIntegration(value *v1.Integra
// WithSource sets the Source field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Source field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithSource(value *EndpointApplyConfiguration) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithSource(value *EndpointApplyConfiguration) *BindingSpecApplyConfiguration {
b.Source = value
return b
}
@@ -60,7 +60,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithSource(value *EndpointApplyCo
// WithSink sets the Sink field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Sink field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithSink(value *EndpointApplyConfiguration) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithSink(value *EndpointApplyConfiguration) *BindingSpecApplyConfiguration {
b.Sink = value
return b
}
@@ -68,7 +68,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithSink(value *EndpointApplyConf
// WithErrorHandler sets the ErrorHandler field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the ErrorHandler field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithErrorHandler(value *ErrorHandlerSpecApplyConfiguration) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithErrorHandler(value *ErrorHandlerSpecApplyConfiguration) *BindingSpecApplyConfiguration {
b.ErrorHandler = value
return b
}
@@ -76,7 +76,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithErrorHandler(value *ErrorHand
// WithSteps adds the given value to the Steps field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the Steps field.
-func (b *KameletBindingSpecApplyConfiguration) WithSteps(values ...*EndpointApplyConfiguration) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithSteps(values ...*EndpointApplyConfiguration) *BindingSpecApplyConfiguration {
for i := range values {
if values[i] == nil {
panic("nil value passed to WithSteps")
@@ -89,7 +89,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithSteps(values ...*EndpointAppl
// WithReplicas sets the Replicas field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Replicas field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithReplicas(value int32) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithReplicas(value int32) *BindingSpecApplyConfiguration {
b.Replicas = &value
return b
}
@@ -97,7 +97,7 @@ func (b *KameletBindingSpecApplyConfiguration) WithReplicas(value int32) *Kamele
// WithServiceAccountName sets the ServiceAccountName field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the ServiceAccountName field is set to the value of the last call.
-func (b *KameletBindingSpecApplyConfiguration) WithServiceAccountName(value string) *KameletBindingSpecApplyConfiguration {
+func (b *BindingSpecApplyConfiguration) WithServiceAccountName(value string) *BindingSpecApplyConfiguration {
b.ServiceAccountName = &value
return b
}
diff --git a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go
similarity index 63%
rename from pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go
rename to pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go
index e21665453..a832f87b0 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1alpha1/kameletbindingstatus.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1alpha1/bindingstatus.go
@@ -23,26 +23,26 @@ import (
v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
-// KameletBindingStatusApplyConfiguration represents an declarative configuration of the KameletBindingStatus type for use
+// BindingStatusApplyConfiguration represents an declarative configuration of the BindingStatus type for use
// with apply.
-type KameletBindingStatusApplyConfiguration struct {
- ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
- Phase *v1alpha1.KameletBindingPhase `json:"phase,omitempty"`
- Conditions []KameletBindingConditionApplyConfiguration `json:"conditions,omitempty"`
- Replicas *int32 `json:"replicas,omitempty"`
- Selector *string `json:"selector,omitempty"`
+type BindingStatusApplyConfiguration struct {
+ ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
+ Phase *v1alpha1.BindingPhase `json:"phase,omitempty"`
+ Conditions []BindingConditionApplyConfiguration `json:"conditions,omitempty"`
+ Replicas *int32 `json:"replicas,omitempty"`
+ Selector *string `json:"selector,omitempty"`
}
-// KameletBindingStatusApplyConfiguration constructs an declarative configuration of the KameletBindingStatus type for use with
+// BindingStatusApplyConfiguration constructs an declarative configuration of the BindingStatus type for use with
// apply.
-func KameletBindingStatus() *KameletBindingStatusApplyConfiguration {
- return &KameletBindingStatusApplyConfiguration{}
+func BindingStatus() *BindingStatusApplyConfiguration {
+ return &BindingStatusApplyConfiguration{}
}
// WithObservedGeneration sets the ObservedGeneration field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the ObservedGeneration field is set to the value of the last call.
-func (b *KameletBindingStatusApplyConfiguration) WithObservedGeneration(value int64) *KameletBindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithObservedGeneration(value int64) *BindingStatusApplyConfiguration {
b.ObservedGeneration = &value
return b
}
@@ -50,7 +50,7 @@ func (b *KameletBindingStatusApplyConfiguration) WithObservedGeneration(value in
// WithPhase sets the Phase field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Phase field is set to the value of the last call.
-func (b *KameletBindingStatusApplyConfiguration) WithPhase(value v1alpha1.KameletBindingPhase) *KameletBindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithPhase(value v1alpha1.BindingPhase) *BindingStatusApplyConfiguration {
b.Phase = &value
return b
}
@@ -58,7 +58,7 @@ func (b *KameletBindingStatusApplyConfiguration) WithPhase(value v1alpha1.Kamele
// WithConditions adds the given value to the Conditions field in the declarative configuration
// and returns the receiver, so that objects can be build by chaining "With" function invocations.
// If called multiple times, values provided by each call will be appended to the Conditions field.
-func (b *KameletBindingStatusApplyConfiguration) WithConditions(values ...*KameletBindingConditionApplyConfiguration) *KameletBindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithConditions(values ...*BindingConditionApplyConfiguration) *BindingStatusApplyConfiguration {
for i := range values {
if values[i] == nil {
panic("nil value passed to WithConditions")
@@ -71,7 +71,7 @@ func (b *KameletBindingStatusApplyConfiguration) WithConditions(values ...*Kamel
// WithReplicas sets the Replicas field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Replicas field is set to the value of the last call.
-func (b *KameletBindingStatusApplyConfiguration) WithReplicas(value int32) *KameletBindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithReplicas(value int32) *BindingStatusApplyConfiguration {
b.Replicas = &value
return b
}
@@ -79,7 +79,7 @@ func (b *KameletBindingStatusApplyConfiguration) WithReplicas(value int32) *Kame
// WithSelector sets the Selector field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the Selector field is set to the value of the last call.
-func (b *KameletBindingStatusApplyConfiguration) WithSelector(value string) *KameletBindingStatusApplyConfiguration {
+func (b *BindingStatusApplyConfiguration) WithSelector(value string) *BindingStatusApplyConfiguration {
b.Selector = &value
return b
}
diff --git a/pkg/client/camel/applyconfiguration/utils.go b/pkg/client/camel/applyconfiguration/utils.go
index 215b8caa7..5bad5763f 100644
--- a/pkg/client/camel/applyconfiguration/utils.go
+++ b/pkg/client/camel/applyconfiguration/utils.go
@@ -162,6 +162,14 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
return &camelv1.ValueSourceApplyConfiguration{}
// Group=camel.apache.org, Version=v1alpha1
+ case v1alpha1.SchemeGroupVersion.WithKind("Binding"):
+ return &camelv1alpha1.BindingApplyConfiguration{}
+ case v1alpha1.SchemeGroupVersion.WithKind("BindingCondition"):
+ return &camelv1alpha1.BindingConditionApplyConfiguration{}
+ case v1alpha1.SchemeGroupVersion.WithKind("BindingSpec"):
+ return &camelv1alpha1.BindingSpecApplyConfiguration{}
+ case v1alpha1.SchemeGroupVersion.WithKind("BindingStatus"):
+ return &camelv1alpha1.BindingStatusApplyConfiguration{}
case v1alpha1.SchemeGroupVersion.WithKind("DataTypeReference"):
return &camelv1alpha1.DataTypeReferenceApplyConfiguration{}
case v1alpha1.SchemeGroupVersion.WithKind("DataTypeSpec"):
@@ -188,14 +196,6 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
return &camelv1alpha1.JSONSchemaPropsApplyConfiguration{}
case v1alpha1.SchemeGroupVersion.WithKind("Kamelet"):
return &camelv1alpha1.KameletApplyConfiguration{}
- case v1alpha1.SchemeGroupVersion.WithKind("KameletBinding"):
- return &camelv1alpha1.KameletBindingApplyConfiguration{}
- case v1alpha1.SchemeGroupVersion.WithKind("KameletBindingCondition"):
- return &camelv1alpha1.KameletBindingConditionApplyConfiguration{}
- case v1alpha1.SchemeGroupVersion.WithKind("KameletBindingSpec"):
- return &camelv1alpha1.KameletBindingSpecApplyConfiguration{}
- case v1alpha1.SchemeGroupVersion.WithKind("KameletBindingStatus"):
- return &camelv1alpha1.KameletBindingStatusApplyConfiguration{}
case v1alpha1.SchemeGroupVersion.WithKind("KameletCondition"):
return &camelv1alpha1.KameletConditionApplyConfiguration{}
case v1alpha1.SchemeGroupVersion.WithKind("KameletProperty"):
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/binding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/binding.go
new file mode 100644
index 000000000..febe279a7
--- /dev/null
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/binding.go
@@ -0,0 +1,290 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+ "context"
+ json "encoding/json"
+ "fmt"
+ "time"
+
+ 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"
+ watch "k8s.io/apimachinery/pkg/watch"
+ rest "k8s.io/client-go/rest"
+)
+
+// BindingsGetter has a method to return a BindingInterface.
+// A group's client should implement this interface.
+type BindingsGetter interface {
+ Bindings(namespace string) BindingInterface
+}
+
+// BindingInterface has methods to work with Binding resources.
+type BindingInterface interface {
+ Create(ctx context.Context, binding *v1alpha1.Binding, opts v1.CreateOptions) (*v1alpha1.Binding, error)
+ Update(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (*v1alpha1.Binding, error)
+ UpdateStatus(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (*v1alpha1.Binding, error)
+ Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
+ DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
+ Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Binding, error)
+ List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.BindingList, error)
+ Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
+ Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Binding, err error)
+ Apply(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error)
+ ApplyStatus(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error)
+ GetScale(ctx context.Context, bindingName string, options v1.GetOptions) (*autoscalingv1.Scale, error)
+ UpdateScale(ctx context.Context, bindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (*autoscalingv1.Scale, error)
+
+ BindingExpansion
+}
+
+// bindings implements BindingInterface
+type bindings struct {
+ client rest.Interface
+ ns string
+}
+
+// newBindings returns a Bindings
+func newBindings(c *CamelV1alpha1Client, namespace string) *bindings {
+ return &bindings{
+ client: c.RESTClient(),
+ ns: namespace,
+ }
+}
+
+// Get takes name of the binding, and returns the corresponding binding object, and an error if there is any.
+func (c *bindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Binding, err error) {
+ result = &v1alpha1.Binding{}
+ err = c.client.Get().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(name).
+ VersionedParams(&options, scheme.ParameterCodec).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// List takes label and field selectors, and returns the list of Bindings that match those selectors.
+func (c *bindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.BindingList, err error) {
+ var timeout time.Duration
+ if opts.TimeoutSeconds != nil {
+ timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+ }
+ result = &v1alpha1.BindingList{}
+ err = c.client.Get().
+ Namespace(c.ns).
+ Resource("bindings").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Timeout(timeout).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// Watch returns a watch.Interface that watches the requested bindings.
+func (c *bindings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
+ var timeout time.Duration
+ if opts.TimeoutSeconds != nil {
+ timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+ }
+ opts.Watch = true
+ return c.client.Get().
+ Namespace(c.ns).
+ Resource("bindings").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Timeout(timeout).
+ Watch(ctx)
+}
+
+// Create takes the representation of a binding and creates it. Returns the server's representation of the binding, and an error, if there is any.
+func (c *bindings) Create(ctx context.Context, binding *v1alpha1.Binding, opts v1.CreateOptions) (result *v1alpha1.Binding, err error) {
+ result = &v1alpha1.Binding{}
+ err = c.client.Post().
+ Namespace(c.ns).
+ Resource("bindings").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Body(binding).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// Update takes the representation of a binding and updates it. Returns the server's representation of the binding, and an error, if there is any.
+func (c *bindings) Update(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (result *v1alpha1.Binding, err error) {
+ result = &v1alpha1.Binding{}
+ err = c.client.Put().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(binding.Name).
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Body(binding).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *bindings) UpdateStatus(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (result *v1alpha1.Binding, err error) {
+ result = &v1alpha1.Binding{}
+ err = c.client.Put().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(binding.Name).
+ SubResource("status").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Body(binding).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// Delete takes name of the binding and deletes it. Returns an error if one occurs.
+func (c *bindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
+ return c.client.Delete().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(name).
+ Body(&opts).
+ Do(ctx).
+ Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *bindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
+ var timeout time.Duration
+ if listOpts.TimeoutSeconds != nil {
+ timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
+ }
+ return c.client.Delete().
+ Namespace(c.ns).
+ Resource("bindings").
+ VersionedParams(&listOpts, scheme.ParameterCodec).
+ Timeout(timeout).
+ Body(&opts).
+ Do(ctx).
+ Error()
+}
+
+// Patch applies the patch and returns the patched binding.
+func (c *bindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Binding, err error) {
+ result = &v1alpha1.Binding{}
+ err = c.client.Patch(pt).
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(name).
+ SubResource(subresources...).
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Body(data).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// Apply takes the given apply declarative configuration, applies it and returns the applied binding.
+func (c *bindings) Apply(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error) {
+ if binding == nil {
+ return nil, fmt.Errorf("binding provided to Apply must not be nil")
+ }
+ patchOpts := opts.ToPatchOptions()
+ data, err := json.Marshal(binding)
+ if err != nil {
+ return nil, err
+ }
+ name := binding.Name
+ if name == nil {
+ return nil, fmt.Errorf("binding.Name must be provided to Apply")
+ }
+ result = &v1alpha1.Binding{}
+ err = c.client.Patch(types.ApplyPatchType).
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(*name).
+ VersionedParams(&patchOpts, scheme.ParameterCodec).
+ Body(data).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// ApplyStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
+func (c *bindings) ApplyStatus(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error) {
+ if binding == nil {
+ return nil, fmt.Errorf("binding provided to Apply must not be nil")
+ }
+ patchOpts := opts.ToPatchOptions()
+ data, err := json.Marshal(binding)
+ if err != nil {
+ return nil, err
+ }
+
+ name := binding.Name
+ if name == nil {
+ return nil, fmt.Errorf("binding.Name must be provided to Apply")
+ }
+
+ result = &v1alpha1.Binding{}
+ err = c.client.Patch(types.ApplyPatchType).
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(*name).
+ SubResource("status").
+ VersionedParams(&patchOpts, scheme.ParameterCodec).
+ Body(data).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// GetScale takes name of the binding, and returns the corresponding autoscalingv1.Scale object, and an error if there is any.
+func (c *bindings) GetScale(ctx context.Context, bindingName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) {
+ result = &autoscalingv1.Scale{}
+ err = c.client.Get().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(bindingName).
+ SubResource("scale").
+ VersionedParams(&options, scheme.ParameterCodec).
+ Do(ctx).
+ Into(result)
+ return
+}
+
+// UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
+func (c *bindings) UpdateScale(ctx context.Context, bindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (result *autoscalingv1.Scale, err error) {
+ result = &autoscalingv1.Scale{}
+ err = c.client.Put().
+ Namespace(c.ns).
+ Resource("bindings").
+ Name(bindingName).
+ SubResource("scale").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Body(scale).
+ Do(ctx).
+ Into(result)
+ return
+}
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 a7728be45..21ab303f0 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
@@ -29,8 +29,8 @@ import (
type CamelV1alpha1Interface interface {
RESTClient() rest.Interface
+ BindingsGetter
KameletsGetter
- KameletBindingsGetter
}
// CamelV1alpha1Client is used to interact with features provided by the camel.apache.org group.
@@ -38,12 +38,12 @@ type CamelV1alpha1Client struct {
restClient rest.Interface
}
-func (c *CamelV1alpha1Client) Kamelets(namespace string) KameletInterface {
- return newKamelets(c, namespace)
+func (c *CamelV1alpha1Client) Bindings(namespace string) BindingInterface {
+ return newBindings(c, namespace)
}
-func (c *CamelV1alpha1Client) KameletBindings(namespace string) KameletBindingInterface {
- return newKameletBindings(c, namespace)
+func (c *CamelV1alpha1Client) Kamelets(namespace string) KameletInterface {
+ return newKamelets(c, namespace)
}
// NewForConfig creates a new CamelV1alpha1Client for the given config.
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_binding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_binding.go
new file mode 100644
index 000000000..e729f2e42
--- /dev/null
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_binding.go
@@ -0,0 +1,214 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+ "context"
+ json "encoding/json"
+ "fmt"
+
+ 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"
+ schema "k8s.io/apimachinery/pkg/runtime/schema"
+ types "k8s.io/apimachinery/pkg/types"
+ watch "k8s.io/apimachinery/pkg/watch"
+ testing "k8s.io/client-go/testing"
+)
+
+// FakeBindings implements BindingInterface
+type FakeBindings struct {
+ Fake *FakeCamelV1alpha1
+ ns string
+}
+
+var bindingsResource = schema.GroupVersionResource{Group: "camel.apache.org", Version: "v1alpha1", Resource: "bindings"}
+
+var bindingsKind = schema.GroupVersionKind{Group: "camel.apache.org", Version: "v1alpha1", Kind: "Binding"}
+
+// Get takes name of the binding, and returns the corresponding binding object, and an error if there is any.
+func (c *FakeBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Binding, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewGetAction(bindingsResource, c.ns, name), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// List takes label and field selectors, and returns the list of Bindings that match those selectors.
+func (c *FakeBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.BindingList, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewListAction(bindingsResource, bindingsKind, c.ns, opts), &v1alpha1.BindingList{})
+
+ if obj == nil {
+ return nil, err
+ }
+
+ label, _, _ := testing.ExtractFromListOptions(opts)
+ if label == nil {
+ label = labels.Everything()
+ }
+ list := &v1alpha1.BindingList{ListMeta: obj.(*v1alpha1.BindingList).ListMeta}
+ for _, item := range obj.(*v1alpha1.BindingList).Items {
+ if label.Matches(labels.Set(item.Labels)) {
+ list.Items = append(list.Items, item)
+ }
+ }
+ return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested bindings.
+func (c *FakeBindings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
+ return c.Fake.
+ InvokesWatch(testing.NewWatchAction(bindingsResource, c.ns, opts))
+
+}
+
+// Create takes the representation of a binding and creates it. Returns the server's representation of the binding, and an error, if there is any.
+func (c *FakeBindings) Create(ctx context.Context, binding *v1alpha1.Binding, opts v1.CreateOptions) (result *v1alpha1.Binding, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewCreateAction(bindingsResource, c.ns, binding), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// Update takes the representation of a binding and updates it. Returns the server's representation of the binding, and an error, if there is any.
+func (c *FakeBindings) Update(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (result *v1alpha1.Binding, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewUpdateAction(bindingsResource, c.ns, binding), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *FakeBindings) UpdateStatus(ctx context.Context, binding *v1alpha1.Binding, opts v1.UpdateOptions) (*v1alpha1.Binding, error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewUpdateSubresourceAction(bindingsResource, "status", c.ns, binding), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// Delete takes name of the binding and deletes it. Returns an error if one occurs.
+func (c *FakeBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
+ _, err := c.Fake.
+ Invokes(testing.NewDeleteActionWithOptions(bindingsResource, c.ns, name, opts), &v1alpha1.Binding{})
+
+ return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
+ action := testing.NewDeleteCollectionAction(bindingsResource, c.ns, listOpts)
+
+ _, err := c.Fake.Invokes(action, &v1alpha1.BindingList{})
+ return err
+}
+
+// Patch applies the patch and returns the patched binding.
+func (c *FakeBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Binding, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewPatchSubresourceAction(bindingsResource, c.ns, name, pt, data, subresources...), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// Apply takes the given apply declarative configuration, applies it and returns the applied binding.
+func (c *FakeBindings) Apply(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error) {
+ if binding == nil {
+ return nil, fmt.Errorf("binding provided to Apply must not be nil")
+ }
+ data, err := json.Marshal(binding)
+ if err != nil {
+ return nil, err
+ }
+ name := binding.Name
+ if name == nil {
+ return nil, fmt.Errorf("binding.Name must be provided to Apply")
+ }
+ obj, err := c.Fake.
+ Invokes(testing.NewPatchSubresourceAction(bindingsResource, c.ns, *name, types.ApplyPatchType, data), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// ApplyStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
+func (c *FakeBindings) ApplyStatus(ctx context.Context, binding *camelv1alpha1.BindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Binding, err error) {
+ if binding == nil {
+ return nil, fmt.Errorf("binding provided to Apply must not be nil")
+ }
+ data, err := json.Marshal(binding)
+ if err != nil {
+ return nil, err
+ }
+ name := binding.Name
+ if name == nil {
+ return nil, fmt.Errorf("binding.Name must be provided to Apply")
+ }
+ obj, err := c.Fake.
+ Invokes(testing.NewPatchSubresourceAction(bindingsResource, c.ns, *name, types.ApplyPatchType, data, "status"), &v1alpha1.Binding{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*v1alpha1.Binding), err
+}
+
+// GetScale takes name of the binding, and returns the corresponding scale object, and an error if there is any.
+func (c *FakeBindings) GetScale(ctx context.Context, bindingName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewGetSubresourceAction(bindingsResource, c.ns, "scale", bindingName), &autoscalingv1.Scale{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*autoscalingv1.Scale), err
+}
+
+// UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
+func (c *FakeBindings) UpdateScale(ctx context.Context, bindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (result *autoscalingv1.Scale, err error) {
+ obj, err := c.Fake.
+ Invokes(testing.NewUpdateSubresourceAction(bindingsResource, "scale", c.ns, scale), &autoscalingv1.Scale{})
+
+ if obj == nil {
+ return nil, err
+ }
+ return obj.(*autoscalingv1.Scale), err
+}
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 840321205..4c002621f 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
@@ -29,12 +29,12 @@ type FakeCamelV1alpha1 struct {
*testing.Fake
}
-func (c *FakeCamelV1alpha1) Kamelets(namespace string) v1alpha1.KameletInterface {
- return &FakeKamelets{c, namespace}
+func (c *FakeCamelV1alpha1) Bindings(namespace string) v1alpha1.BindingInterface {
+ return &FakeBindings{c, namespace}
}
-func (c *FakeCamelV1alpha1) KameletBindings(namespace string) v1alpha1.KameletBindingInterface {
- return &FakeKameletBindings{c, namespace}
+func (c *FakeCamelV1alpha1) Kamelets(namespace string) v1alpha1.KameletInterface {
+ return &FakeKamelets{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate
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
deleted file mode 100644
index 3023497b7..000000000
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/fake/fake_kameletbinding.go
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-import (
- "context"
- json "encoding/json"
- "fmt"
-
- 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"
- schema "k8s.io/apimachinery/pkg/runtime/schema"
- types "k8s.io/apimachinery/pkg/types"
- watch "k8s.io/apimachinery/pkg/watch"
- testing "k8s.io/client-go/testing"
-)
-
-// FakeKameletBindings implements KameletBindingInterface
-type FakeKameletBindings struct {
- Fake *FakeCamelV1alpha1
- ns string
-}
-
-var kameletbindingsResource = schema.GroupVersionResource{Group: "camel.apache.org", Version: "v1alpha1", Resource: "kameletbindings"}
-
-var kameletbindingsKind = schema.GroupVersionKind{Group: "camel.apache.org", Version: "v1alpha1", Kind: "KameletBinding"}
-
-// Get takes name of the kameletBinding, and returns the corresponding kameletBinding object, and an error if there is any.
-func (c *FakeKameletBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.KameletBinding, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewGetAction(kameletbindingsResource, c.ns, name), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// List takes label and field selectors, and returns the list of KameletBindings that match those selectors.
-func (c *FakeKameletBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.KameletBindingList, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewListAction(kameletbindingsResource, kameletbindingsKind, c.ns, opts), &v1alpha1.KameletBindingList{})
-
- if obj == nil {
- return nil, err
- }
-
- label, _, _ := testing.ExtractFromListOptions(opts)
- if label == nil {
- label = labels.Everything()
- }
- list := &v1alpha1.KameletBindingList{ListMeta: obj.(*v1alpha1.KameletBindingList).ListMeta}
- for _, item := range obj.(*v1alpha1.KameletBindingList).Items {
- if label.Matches(labels.Set(item.Labels)) {
- list.Items = append(list.Items, item)
- }
- }
- return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested kameletBindings.
-func (c *FakeKameletBindings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
- return c.Fake.
- InvokesWatch(testing.NewWatchAction(kameletbindingsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a kameletBinding and creates it. Returns the server's representation of the kameletBinding, and an error, if there is any.
-func (c *FakeKameletBindings) Create(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.CreateOptions) (result *v1alpha1.KameletBinding, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewCreateAction(kameletbindingsResource, c.ns, kameletBinding), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// Update takes the representation of a kameletBinding and updates it. Returns the server's representation of the kameletBinding, and an error, if there is any.
-func (c *FakeKameletBindings) Update(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (result *v1alpha1.KameletBinding, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewUpdateAction(kameletbindingsResource, c.ns, kameletBinding), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeKameletBindings) UpdateStatus(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (*v1alpha1.KameletBinding, error) {
- obj, err := c.Fake.
- Invokes(testing.NewUpdateSubresourceAction(kameletbindingsResource, "status", c.ns, kameletBinding), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// Delete takes name of the kameletBinding and deletes it. Returns an error if one occurs.
-func (c *FakeKameletBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
- _, err := c.Fake.
- Invokes(testing.NewDeleteActionWithOptions(kameletbindingsResource, c.ns, name, opts), &v1alpha1.KameletBinding{})
-
- return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeKameletBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
- action := testing.NewDeleteCollectionAction(kameletbindingsResource, c.ns, listOpts)
-
- _, err := c.Fake.Invokes(action, &v1alpha1.KameletBindingList{})
- return err
-}
-
-// Patch applies the patch and returns the patched kameletBinding.
-func (c *FakeKameletBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.KameletBinding, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(kameletbindingsResource, c.ns, name, pt, data, subresources...), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied kameletBinding.
-func (c *FakeKameletBindings) Apply(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error) {
- if kameletBinding == nil {
- return nil, fmt.Errorf("kameletBinding provided to Apply must not be nil")
- }
- data, err := json.Marshal(kameletBinding)
- if err != nil {
- return nil, err
- }
- name := kameletBinding.Name
- if name == nil {
- return nil, fmt.Errorf("kameletBinding.Name must be provided to Apply")
- }
- obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(kameletbindingsResource, c.ns, *name, types.ApplyPatchType, data), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *FakeKameletBindings) ApplyStatus(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error) {
- if kameletBinding == nil {
- return nil, fmt.Errorf("kameletBinding provided to Apply must not be nil")
- }
- data, err := json.Marshal(kameletBinding)
- if err != nil {
- return nil, err
- }
- name := kameletBinding.Name
- if name == nil {
- return nil, fmt.Errorf("kameletBinding.Name must be provided to Apply")
- }
- obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(kameletbindingsResource, c.ns, *name, types.ApplyPatchType, data, "status"), &v1alpha1.KameletBinding{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha1.KameletBinding), err
-}
-
-// GetScale takes name of the kameletBinding, and returns the corresponding scale object, and an error if there is any.
-func (c *FakeKameletBindings) GetScale(ctx context.Context, kameletBindingName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewGetSubresourceAction(kameletbindingsResource, c.ns, "scale", kameletBindingName), &autoscalingv1.Scale{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*autoscalingv1.Scale), err
-}
-
-// UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
-func (c *FakeKameletBindings) UpdateScale(ctx context.Context, kameletBindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (result *autoscalingv1.Scale, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewUpdateSubresourceAction(kameletbindingsResource, "scale", c.ns, scale), &autoscalingv1.Scale{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*autoscalingv1.Scale), err
-}
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/generated_expansion.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/generated_expansion.go
index b53910b3b..a3c3af86d 100644
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/generated_expansion.go
+++ b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/generated_expansion.go
@@ -19,6 +19,6 @@ limitations under the License.
package v1alpha1
-type KameletExpansion interface{}
+type BindingExpansion interface{}
-type KameletBindingExpansion interface{}
+type KameletExpansion interface{}
diff --git a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go
deleted file mode 100644
index 04d4008ee..000000000
--- a/pkg/client/camel/clientset/versioned/typed/camel/v1alpha1/kameletbinding.go
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
- "context"
- json "encoding/json"
- "fmt"
- "time"
-
- 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"
- watch "k8s.io/apimachinery/pkg/watch"
- rest "k8s.io/client-go/rest"
-)
-
-// KameletBindingsGetter has a method to return a KameletBindingInterface.
-// A group's client should implement this interface.
-type KameletBindingsGetter interface {
- KameletBindings(namespace string) KameletBindingInterface
-}
-
-// KameletBindingInterface has methods to work with KameletBinding resources.
-type KameletBindingInterface interface {
- Create(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.CreateOptions) (*v1alpha1.KameletBinding, error)
- Update(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (*v1alpha1.KameletBinding, error)
- UpdateStatus(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (*v1alpha1.KameletBinding, error)
- Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
- DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
- Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.KameletBinding, error)
- List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.KameletBindingList, error)
- Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
- Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.KameletBinding, err error)
- Apply(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error)
- ApplyStatus(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error)
- GetScale(ctx context.Context, kameletBindingName string, options v1.GetOptions) (*autoscalingv1.Scale, error)
- UpdateScale(ctx context.Context, kameletBindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (*autoscalingv1.Scale, error)
-
- KameletBindingExpansion
-}
-
-// kameletBindings implements KameletBindingInterface
-type kameletBindings struct {
- client rest.Interface
- ns string
-}
-
-// newKameletBindings returns a KameletBindings
-func newKameletBindings(c *CamelV1alpha1Client, namespace string) *kameletBindings {
- return &kameletBindings{
- client: c.RESTClient(),
- ns: namespace,
- }
-}
-
-// Get takes name of the kameletBinding, and returns the corresponding kameletBinding object, and an error if there is any.
-func (c *kameletBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.KameletBinding, err error) {
- result = &v1alpha1.KameletBinding{}
- err = c.client.Get().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(name).
- VersionedParams(&options, scheme.ParameterCodec).
- Do(ctx).
- Into(result)
- return
-}
-
-// List takes label and field selectors, and returns the list of KameletBindings that match those selectors.
-func (c *kameletBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.KameletBindingList, err error) {
- var timeout time.Duration
- if opts.TimeoutSeconds != nil {
- timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
- }
- result = &v1alpha1.KameletBindingList{}
- err = c.client.Get().
- Namespace(c.ns).
- Resource("kameletbindings").
- VersionedParams(&opts, scheme.ParameterCodec).
- Timeout(timeout).
- Do(ctx).
- Into(result)
- return
-}
-
-// Watch returns a watch.Interface that watches the requested kameletBindings.
-func (c *kameletBindings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
- var timeout time.Duration
- if opts.TimeoutSeconds != nil {
- timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
- }
- opts.Watch = true
- return c.client.Get().
- Namespace(c.ns).
- Resource("kameletbindings").
- VersionedParams(&opts, scheme.ParameterCodec).
- Timeout(timeout).
- Watch(ctx)
-}
-
-// Create takes the representation of a kameletBinding and creates it. Returns the server's representation of the kameletBinding, and an error, if there is any.
-func (c *kameletBindings) Create(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.CreateOptions) (result *v1alpha1.KameletBinding, err error) {
- result = &v1alpha1.KameletBinding{}
- err = c.client.Post().
- Namespace(c.ns).
- Resource("kameletbindings").
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(kameletBinding).
- Do(ctx).
- Into(result)
- return
-}
-
-// Update takes the representation of a kameletBinding and updates it. Returns the server's representation of the kameletBinding, and an error, if there is any.
-func (c *kameletBindings) Update(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (result *v1alpha1.KameletBinding, err error) {
- result = &v1alpha1.KameletBinding{}
- err = c.client.Put().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(kameletBinding.Name).
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(kameletBinding).
- Do(ctx).
- Into(result)
- return
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *kameletBindings) UpdateStatus(ctx context.Context, kameletBinding *v1alpha1.KameletBinding, opts v1.UpdateOptions) (result *v1alpha1.KameletBinding, err error) {
- result = &v1alpha1.KameletBinding{}
- err = c.client.Put().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(kameletBinding.Name).
- SubResource("status").
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(kameletBinding).
- Do(ctx).
- Into(result)
- return
-}
-
-// Delete takes name of the kameletBinding and deletes it. Returns an error if one occurs.
-func (c *kameletBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
- return c.client.Delete().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(name).
- Body(&opts).
- Do(ctx).
- Error()
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *kameletBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
- var timeout time.Duration
- if listOpts.TimeoutSeconds != nil {
- timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
- }
- return c.client.Delete().
- Namespace(c.ns).
- Resource("kameletbindings").
- VersionedParams(&listOpts, scheme.ParameterCodec).
- Timeout(timeout).
- Body(&opts).
- Do(ctx).
- Error()
-}
-
-// Patch applies the patch and returns the patched kameletBinding.
-func (c *kameletBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.KameletBinding, err error) {
- result = &v1alpha1.KameletBinding{}
- err = c.client.Patch(pt).
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(name).
- SubResource(subresources...).
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(data).
- Do(ctx).
- Into(result)
- return
-}
-
-// Apply takes the given apply declarative configuration, applies it and returns the applied kameletBinding.
-func (c *kameletBindings) Apply(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error) {
- if kameletBinding == nil {
- return nil, fmt.Errorf("kameletBinding provided to Apply must not be nil")
- }
- patchOpts := opts.ToPatchOptions()
- data, err := json.Marshal(kameletBinding)
- if err != nil {
- return nil, err
- }
- name := kameletBinding.Name
- if name == nil {
- return nil, fmt.Errorf("kameletBinding.Name must be provided to Apply")
- }
- result = &v1alpha1.KameletBinding{}
- err = c.client.Patch(types.ApplyPatchType).
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(*name).
- VersionedParams(&patchOpts, scheme.ParameterCodec).
- Body(data).
- Do(ctx).
- Into(result)
- return
-}
-
-// ApplyStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus().
-func (c *kameletBindings) ApplyStatus(ctx context.Context, kameletBinding *camelv1alpha1.KameletBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.KameletBinding, err error) {
- if kameletBinding == nil {
- return nil, fmt.Errorf("kameletBinding provided to Apply must not be nil")
- }
- patchOpts := opts.ToPatchOptions()
- data, err := json.Marshal(kameletBinding)
- if err != nil {
- return nil, err
- }
-
- name := kameletBinding.Name
- if name == nil {
- return nil, fmt.Errorf("kameletBinding.Name must be provided to Apply")
- }
-
- result = &v1alpha1.KameletBinding{}
- err = c.client.Patch(types.ApplyPatchType).
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(*name).
- SubResource("status").
- VersionedParams(&patchOpts, scheme.ParameterCodec).
- Body(data).
- Do(ctx).
- Into(result)
- return
-}
-
-// GetScale takes name of the kameletBinding, and returns the corresponding autoscalingv1.Scale object, and an error if there is any.
-func (c *kameletBindings) GetScale(ctx context.Context, kameletBindingName string, options v1.GetOptions) (result *autoscalingv1.Scale, err error) {
- result = &autoscalingv1.Scale{}
- err = c.client.Get().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(kameletBindingName).
- SubResource("scale").
- VersionedParams(&options, scheme.ParameterCodec).
- Do(ctx).
- Into(result)
- return
-}
-
-// UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
-func (c *kameletBindings) UpdateScale(ctx context.Context, kameletBindingName string, scale *autoscalingv1.Scale, opts v1.UpdateOptions) (result *autoscalingv1.Scale, err error) {
- result = &autoscalingv1.Scale{}
- err = c.client.Put().
- Namespace(c.ns).
- Resource("kameletbindings").
- Name(kameletBindingName).
- SubResource("scale").
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(scale).
- Do(ctx).
- Into(result)
- return
-}
diff --git a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/informers/externalversions/camel/v1alpha1/binding.go
similarity index 58%
rename from pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go
rename to pkg/client/camel/informers/externalversions/camel/v1alpha1/binding.go
index 7dc014bae..8e7804fbd 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1alpha1/kameletbinding.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1alpha1/binding.go
@@ -33,59 +33,59 @@ import (
cache "k8s.io/client-go/tools/cache"
)
-// KameletBindingInformer provides access to a shared informer and lister for
-// KameletBindings.
-type KameletBindingInformer interface {
+// BindingInformer provides access to a shared informer and lister for
+// Bindings.
+type BindingInformer interface {
Informer() cache.SharedIndexInformer
- Lister() v1alpha1.KameletBindingLister
+ Lister() v1alpha1.BindingLister
}
-type kameletBindingInformer struct {
+type bindingInformer struct {
factory internalinterfaces.SharedInformerFactory
tweakListOptions internalinterfaces.TweakListOptionsFunc
namespace string
}
-// NewKameletBindingInformer constructs a new informer for KameletBinding type.
+// NewBindingInformer constructs a new informer for Binding type.
// Always prefer using an informer factory to get a shared informer instead of getting an independent
// one. This reduces memory footprint and number of connections to the server.
-func NewKameletBindingInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
- return NewFilteredKameletBindingInformer(client, namespace, resyncPeriod, indexers, nil)
+func NewBindingInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+ return NewFilteredBindingInformer(client, namespace, resyncPeriod, indexers, nil)
}
-// NewFilteredKameletBindingInformer constructs a new informer for KameletBinding type.
+// NewFilteredBindingInformer constructs a new informer for Binding type.
// Always prefer using an informer factory to get a shared informer instead of getting an independent
// one. This reduces memory footprint and number of connections to the server.
-func NewFilteredKameletBindingInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+func NewFilteredBindingInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer(
&cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
- return client.CamelV1alpha1().KameletBindings(namespace).List(context.TODO(), options)
+ return client.CamelV1alpha1().Bindings(namespace).List(context.TODO(), options)
},
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
- return client.CamelV1alpha1().KameletBindings(namespace).Watch(context.TODO(), options)
+ return client.CamelV1alpha1().Bindings(namespace).Watch(context.TODO(), options)
},
},
- &camelv1alpha1.KameletBinding{},
+ &camelv1alpha1.Binding{},
resyncPeriod,
indexers,
)
}
-func (f *kameletBindingInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
- return NewFilteredKameletBindingInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+func (f *bindingInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+ return NewFilteredBindingInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
}
-func (f *kameletBindingInformer) Informer() cache.SharedIndexInformer {
- return f.factory.InformerFor(&camelv1alpha1.KameletBinding{}, f.defaultInformer)
+func (f *bindingInformer) Informer() cache.SharedIndexInformer {
+ return f.factory.InformerFor(&camelv1alpha1.Binding{}, f.defaultInformer)
}
-func (f *kameletBindingInformer) Lister() v1alpha1.KameletBindingLister {
- return v1alpha1.NewKameletBindingLister(f.Informer().GetIndexer())
+func (f *bindingInformer) Lister() v1alpha1.BindingLister {
+ return v1alpha1.NewBindingLister(f.Informer().GetIndexer())
}
diff --git a/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go b/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
index ef032869e..20496d8f5 100644
--- a/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
+++ b/pkg/client/camel/informers/externalversions/camel/v1alpha1/interface.go
@@ -25,10 +25,10 @@ import (
// Interface provides access to all the informers in this group version.
type Interface interface {
+ // Bindings returns a BindingInformer.
+ Bindings() BindingInformer
// Kamelets returns a KameletInformer.
Kamelets() KameletInformer
- // KameletBindings returns a KameletBindingInformer.
- KameletBindings() KameletBindingInformer
}
type version struct {
@@ -42,12 +42,12 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions}
}
+// Bindings returns a BindingInformer.
+func (v *version) Bindings() BindingInformer {
+ return &bindingInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
+}
+
// Kamelets returns a KameletInformer.
func (v *version) Kamelets() KameletInformer {
return &kameletInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
}
-
-// KameletBindings returns a KameletBindingInformer.
-func (v *version) KameletBindings() KameletBindingInformer {
- return &kameletBindingInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
-}
diff --git a/pkg/client/camel/informers/externalversions/generic.go b/pkg/client/camel/informers/externalversions/generic.go
index d89c46e4a..9a6b9561c 100644
--- a/pkg/client/camel/informers/externalversions/generic.go
+++ b/pkg/client/camel/informers/externalversions/generic.go
@@ -67,10 +67,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
return &genericInformer{resource: resource.GroupResource(), informer: f.Camel().V1().IntegrationPlatforms().Informer()}, nil
// Group=camel.apache.org, Version=v1alpha1
+ case v1alpha1.SchemeGroupVersion.WithResource("bindings"):
+ return &genericInformer{resource: resource.GroupResource(), informer: f.Camel().V1alpha1().Bindings().Informer()}, nil
case v1alpha1.SchemeGroupVersion.WithResource("kamelets"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Camel().V1alpha1().Kamelets().Informer()}, nil
- case v1alpha1.SchemeGroupVersion.WithResource("kameletbindings"):
- return &genericInformer{resource: resource.GroupResource(), informer: f.Camel().V1alpha1().KameletBindings().Informer()}, nil
}
diff --git a/pkg/client/camel/listers/camel/v1alpha1/binding.go b/pkg/client/camel/listers/camel/v1alpha1/binding.go
new file mode 100644
index 000000000..eaf56d29f
--- /dev/null
+++ b/pkg/client/camel/listers/camel/v1alpha1/binding.go
@@ -0,0 +1,100 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+ 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"
+)
+
+// BindingLister helps list Bindings.
+// All objects returned here must be treated as read-only.
+type BindingLister interface {
+ // List lists all Bindings in the indexer.
+ // Objects returned here must be treated as read-only.
+ List(selector labels.Selector) (ret []*v1alpha1.Binding, err error)
+ // Bindings returns an object that can list and get Bindings.
+ Bindings(namespace string) BindingNamespaceLister
+ BindingListerExpansion
+}
+
+// bindingLister implements the BindingLister interface.
+type bindingLister struct {
+ indexer cache.Indexer
+}
+
+// NewBindingLister returns a new BindingLister.
+func NewBindingLister(indexer cache.Indexer) BindingLister {
+ return &bindingLister{indexer: indexer}
+}
+
+// List lists all Bindings in the indexer.
+func (s *bindingLister) List(selector labels.Selector) (ret []*v1alpha1.Binding, err error) {
+ err = cache.ListAll(s.indexer, selector, func(m interface{}) {
+ ret = append(ret, m.(*v1alpha1.Binding))
+ })
+ return ret, err
+}
+
+// Bindings returns an object that can list and get Bindings.
+func (s *bindingLister) Bindings(namespace string) BindingNamespaceLister {
+ return bindingNamespaceLister{indexer: s.indexer, namespace: namespace}
+}
+
+// BindingNamespaceLister helps list and get Bindings.
+// All objects returned here must be treated as read-only.
+type BindingNamespaceLister interface {
+ // List lists all Bindings in the indexer for a given namespace.
+ // Objects returned here must be treated as read-only.
+ List(selector labels.Selector) (ret []*v1alpha1.Binding, err error)
+ // Get retrieves the Binding from the indexer for a given namespace and name.
+ // Objects returned here must be treated as read-only.
+ Get(name string) (*v1alpha1.Binding, error)
+ BindingNamespaceListerExpansion
+}
+
+// bindingNamespaceLister implements the BindingNamespaceLister
+// interface.
+type bindingNamespaceLister struct {
+ indexer cache.Indexer
+ namespace string
+}
+
+// List lists all Bindings in the indexer for a given namespace.
+func (s bindingNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.Binding, err error) {
+ err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
+ ret = append(ret, m.(*v1alpha1.Binding))
+ })
+ return ret, err
+}
+
+// Get retrieves the Binding from the indexer for a given namespace and name.
+func (s bindingNamespaceLister) Get(name string) (*v1alpha1.Binding, error) {
+ obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+ if err != nil {
+ return nil, err
+ }
+ if !exists {
+ return nil, errors.NewNotFound(v1alpha1.Resource("binding"), name)
+ }
+ return obj.(*v1alpha1.Binding), nil
+}
diff --git a/pkg/client/camel/listers/camel/v1alpha1/expansion_generated.go b/pkg/client/camel/listers/camel/v1alpha1/expansion_generated.go
index df951a562..825b05f1e 100644
--- a/pkg/client/camel/listers/camel/v1alpha1/expansion_generated.go
+++ b/pkg/client/camel/listers/camel/v1alpha1/expansion_generated.go
@@ -19,6 +19,14 @@ limitations under the License.
package v1alpha1
+// BindingListerExpansion allows custom methods to be added to
+// BindingLister.
+type BindingListerExpansion interface{}
+
+// BindingNamespaceListerExpansion allows custom methods to be added to
+// BindingNamespaceLister.
+type BindingNamespaceListerExpansion interface{}
+
// KameletListerExpansion allows custom methods to be added to
// KameletLister.
type KameletListerExpansion interface{}
@@ -26,11 +34,3 @@ type KameletListerExpansion interface{}
// KameletNamespaceListerExpansion allows custom methods to be added to
// KameletNamespaceLister.
type KameletNamespaceListerExpansion interface{}
-
-// KameletBindingListerExpansion allows custom methods to be added to
-// KameletBindingLister.
-type KameletBindingListerExpansion interface{}
-
-// KameletBindingNamespaceListerExpansion allows custom methods to be added to
-// KameletBindingNamespaceLister.
-type KameletBindingNamespaceListerExpansion interface{}
diff --git a/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go b/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go
deleted file mode 100644
index aa53b58de..000000000
--- a/pkg/client/camel/listers/camel/v1alpha1/kameletbinding.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by lister-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
- 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"
-)
-
-// KameletBindingLister helps list KameletBindings.
-// All objects returned here must be treated as read-only.
-type KameletBindingLister interface {
- // List lists all KameletBindings in the indexer.
- // Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1alpha1.KameletBinding, err error)
- // KameletBindings returns an object that can list and get KameletBindings.
- KameletBindings(namespace string) KameletBindingNamespaceLister
- KameletBindingListerExpansion
-}
-
-// kameletBindingLister implements the KameletBindingLister interface.
-type kameletBindingLister struct {
- indexer cache.Indexer
-}
-
-// NewKameletBindingLister returns a new KameletBindingLister.
-func NewKameletBindingLister(indexer cache.Indexer) KameletBindingLister {
- return &kameletBindingLister{indexer: indexer}
-}
-
-// List lists all KameletBindings in the indexer.
-func (s *kameletBindingLister) List(selector labels.Selector) (ret []*v1alpha1.KameletBinding, err error) {
- err = cache.ListAll(s.indexer, selector, func(m interface{}) {
- ret = append(ret, m.(*v1alpha1.KameletBinding))
- })
- return ret, err
-}
-
-// KameletBindings returns an object that can list and get KameletBindings.
-func (s *kameletBindingLister) KameletBindings(namespace string) KameletBindingNamespaceLister {
- return kameletBindingNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// KameletBindingNamespaceLister helps list and get KameletBindings.
-// All objects returned here must be treated as read-only.
-type KameletBindingNamespaceLister interface {
- // List lists all KameletBindings in the indexer for a given namespace.
- // Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1alpha1.KameletBinding, err error)
- // Get retrieves the KameletBinding from the indexer for a given namespace and name.
- // Objects returned here must be treated as read-only.
- Get(name string) (*v1alpha1.KameletBinding, error)
- KameletBindingNamespaceListerExpansion
-}
-
-// kameletBindingNamespaceLister implements the KameletBindingNamespaceLister
-// interface.
-type kameletBindingNamespaceLister struct {
- indexer cache.Indexer
- namespace string
-}
-
-// List lists all KameletBindings in the indexer for a given namespace.
-func (s kameletBindingNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.KameletBinding, err error) {
- err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
- ret = append(ret, m.(*v1alpha1.KameletBinding))
- })
- return ret, err
-}
-
-// Get retrieves the KameletBinding from the indexer for a given namespace and name.
-func (s kameletBindingNamespaceLister) Get(name string) (*v1alpha1.KameletBinding, error) {
- obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
- if err != nil {
- return nil, err
- }
- if !exists {
- return nil, errors.NewNotFound(v1alpha1.Resource("kameletbinding"), name)
- }
- return obj.(*v1alpha1.KameletBinding), nil
-}
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index 8c013c9d6..a2cd8979c 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -60,9 +60,9 @@ func newCmdBind(rootCmdOptions *RootCmdOptions) (*cobra.Command, *bindCmdOptions
cmd.Flags().Bool("skip-checks", false, "Do not verify the binding for compliance with Kamelets and other Kubernetes resources")
cmd.Flags().StringArray("step", nil, `Add binding steps as Kubernetes resources. Endpoints are expected in the format "[[apigroup/]version:]kind:[namespace/]name", plain Camel URIs or Kamelet name.`)
cmd.Flags().StringArrayP("trait", "t", nil, `Add a trait to the corresponding Integration.`)
- cmd.Flags().StringP("operator-id", "x", "camel-k", "Operator id selected to manage this Kamelet binding.")
- cmd.Flags().StringArray("annotation", nil, "Add an annotation to the Kamelet binding. E.g. \"--annotation my.company=hello\"")
- cmd.Flags().Bool("force", false, "Force creation of Kamelet binding regardless of potential misconfiguration.")
+ cmd.Flags().StringP("operator-id", "x", "camel-k", "Operator id selected to manage thisBinding.")
+ cmd.Flags().StringArray("annotation", nil, "Add an annotation to theBinding. E.g. \"--annotation my.company=hello\"")
+ cmd.Flags().Bool("force", false, "Force creation ofBinding regardless of potential misconfiguration.")
cmd.Flags().String("service-account", "", "The SA to use to run this binding")
return &cmd, &options
@@ -190,12 +190,12 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
name := o.nameFor(source, sink)
- binding := v1alpha1.KameletBinding{
+ binding := v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Namespace: o.Namespace,
Name: name,
},
- Spec: v1alpha1.KameletBindingSpec{
+ Spec: v1alpha1.BindingSpec{
Source: source,
Sink: sink,
},
@@ -264,7 +264,7 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
}
if o.OutputFormat != "" {
- return showKameletBindingOutput(cmd, &binding, o.OutputFormat, client.GetScheme())
+ return showBindingOutput(cmd, &binding, o.OutputFormat, client.GetScheme())
}
replaced, err := kubernetes.ReplaceResource(o.Context, client, &binding)
@@ -280,7 +280,7 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
return nil
}
-func showKameletBindingOutput(cmd *cobra.Command, binding *v1alpha1.KameletBinding, outputFormat string, scheme runtime.ObjectTyper) error {
+func showBindingOutput(cmd *cobra.Command, binding *v1alpha1.Binding, outputFormat string, scheme runtime.ObjectTyper) error {
printer := printers.NewTypeSetter(scheme)
printer.Delegate = &kubernetes.CLIPrinter{
Format: outputFormat,
diff --git a/pkg/cmd/bind_test.go b/pkg/cmd/bind_test.go
index 03b1247e6..050875908 100644
--- a/pkg/cmd/bind_test.go
+++ b/pkg/cmd/bind_test.go
@@ -57,7 +57,7 @@ func TestBindOutputJSON(t *testing.T) {
assert.Equal(t, "json", buildCmdOptions.OutputFormat)
assert.Nil(t, err)
- assert.Equal(t, `{"kind":"KameletBinding","apiVersion":"camel.apache.org/v1alpha1","metadata":{"name":"my-to-my","creationTimestamp":null,"annotations":{"camel.apache.org/operator.id":"camel-k"}},"spec":{"source":{"uri":"my:src"},"sink":{"uri":"my:dst"}},"status":{}}`, output)
+ assert.Equal(t, `{"kind":"Binding","apiVersion":"camel.apache.org/v1alpha1","metadata":{"name":"my-to-my","creationTimestamp":null,"annotations":{"camel.apache.org/operator.id":"camel-k"}},"spec":{"source":{"uri":"my:src"},"sink":{"uri":"my:dst"}},"status":{}}`, output)
}
func TestBindOutputYAML(t *testing.T) {
@@ -67,7 +67,7 @@ func TestBindOutputYAML(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
@@ -98,7 +98,7 @@ func TestBindErrorHandlerDLCKamelet(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
@@ -130,7 +130,7 @@ func TestBindErrorHandlerNone(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
@@ -155,7 +155,7 @@ func TestBindErrorHandlerLog(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
@@ -179,7 +179,7 @@ func TestBindTraits(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
@@ -212,7 +212,7 @@ func TestBindSteps(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
annotations:
camel.apache.org/operator.id: camel-k
diff --git a/pkg/cmd/delete.go b/pkg/cmd/delete.go
index 554a39b04..e2707f07d 100644
--- a/pkg/cmd/delete.go
+++ b/pkg/cmd/delete.go
@@ -136,25 +136,25 @@ func getIntegration(ctx context.Context, c client.Client, name string, namespace
}
func deleteIntegration(ctx context.Context, cmd *cobra.Command, c client.Client, integration *v1.Integration) error {
- deleted, binding, err := deleteKameletBindingIfExists(ctx, c, integration)
+ deleted, binding, err := deleteBindingIfExists(ctx, c, integration)
if err != nil {
return err
}
if deleted {
- // Deleting KameletBinding will automatically clean up the integration
- fmt.Fprintln(cmd.OutOrStdout(), "KameletBinding "+binding+" deleted")
+ // Deleting Binding will automatically clean up the integration
+ fmt.Fprintln(cmd.OutOrStdout(), "Binding "+binding+" deleted")
return nil
}
return c.Delete(ctx, integration)
}
-func deleteKameletBindingIfExists(ctx context.Context, c client.Client, integration *v1.Integration) (bool, string, error) {
+func deleteBindingIfExists(ctx context.Context, c client.Client, integration *v1.Integration) (bool, string, error) {
kind, name := findCreator(integration)
- if kind != v1alpha1.KameletBindingKind || name == "" {
+ if kind != v1alpha1.BindingKind || name == "" {
return false, "", nil
}
- binding := v1alpha1.KameletBinding{
+ binding := v1alpha1.Binding{
TypeMeta: metav1.TypeMeta{
Kind: kind,
APIVersion: v1alpha1.SchemeGroupVersion.String(),
@@ -178,7 +178,7 @@ func findCreator(integration *v1.Integration) (string, string) {
if kind == "" && name == "" {
// Look up in OwnerReferences in case creator labels are absent
for _, owner := range integration.GetOwnerReferences() {
- if owner.Kind == v1alpha1.KameletBindingKind {
+ if owner.Kind == v1alpha1.BindingKind {
return owner.Kind, owner.Name
}
}
diff --git a/pkg/cmd/promote.go b/pkg/cmd/promote.go
index b83bcd2f0..fc05b8de8 100644
--- a/pkg/cmd/promote.go
+++ b/pkg/cmd/promote.go
@@ -52,8 +52,8 @@ func newCmdPromote(rootCmdOptions *RootCmdOptions) (*cobra.Command, *promoteCmdO
}
cmd := cobra.Command{
Use: "promote my-it --to [namespace]",
- Short: "Promote an Integration/KameletBinding from an environment to another",
- Long: "Promote an Integration/KameletBinding from an environment to another, for example from a Development environment to a Production environment",
+ Short: "Promote an Integration/Binding from an environment to another",
+ Long: "Promote an Integration/Binding from an environment to another, for example from a Development environment to a Production environment",
PreRunE: decode(&options),
RunE: options.run,
}
@@ -72,7 +72,7 @@ type promoteCmdOptions struct {
func (o *promoteCmdOptions) validate(_ *cobra.Command, args []string) error {
if len(args) != 1 {
- return errors.New("promote expects an Integration/KameletBinding name argument")
+ return errors.New("promote expects an Integration/Binding name argument")
}
if o.To == "" {
return errors.New("promote expects a destination namespace as --to argument")
@@ -103,15 +103,15 @@ func (o *promoteCmdOptions) run(cmd *cobra.Command, args []string) error {
if err != nil {
return errors.Wrap(err, "could not verify operators compatibility")
}
- promoteKameletBinding := false
+ promoteBinding := false
var sourceIntegration *v1.Integration
- // We first look if a KameletBinding with the name exists
- sourceKameletBinding, err := o.getKameletBinding(c, name)
+ // We first look if a Binding with the name exists
+ sourceBinding, err := o.getBinding(c, name)
if err != nil && !k8serrors.IsNotFound(err) {
- return errors.Wrap(err, "problems looking for KameletBinding "+name)
+ return errors.Wrap(err, "problems looking for Binding "+name)
}
- if sourceKameletBinding != nil {
- promoteKameletBinding = true
+ if sourceBinding != nil {
+ promoteBinding = true
}
sourceIntegration, err = o.getIntegration(c, name)
if err != nil {
@@ -125,17 +125,17 @@ func (o *promoteCmdOptions) run(cmd *cobra.Command, args []string) error {
return errors.Wrap(err, "could not validate destination resources")
}
- // KameletBinding promotion
- if promoteKameletBinding {
- destKameletBinding := o.editKameletBinding(sourceKameletBinding, sourceIntegration)
+ // Binding promotion
+ if promoteBinding {
+ destBinding := o.editBinding(sourceBinding, sourceIntegration)
// Ensure the destination namespace has access to the source namespace images
- err = addSystemPullerRoleBinding(o.Context, c, sourceIntegration.Namespace, destKameletBinding.Namespace)
+ err = addSystemPullerRoleBinding(o.Context, c, sourceIntegration.Namespace, destBinding.Namespace)
if err != nil {
return err
}
- replaced, err := o.replaceResource(destKameletBinding)
+ replaced, err := o.replaceResource(destBinding)
if o.OutputFormat != "" {
- return showKameletBindingOutput(cmd, destKameletBinding, o.OutputFormat, c.GetScheme())
+ return showBindingOutput(cmd, destBinding, o.OutputFormat, c.GetScheme())
}
if !replaced {
fmt.Fprintln(cmd.OutOrStdout(), `Promoted Integration "`+name+`" created`)
@@ -178,8 +178,8 @@ func checkOpsCompatibility(cmd *cobra.Command, source, dest map[string]string) e
return nil
}
-func (o *promoteCmdOptions) getKameletBinding(c client.Client, name string) (*v1alpha1.KameletBinding, error) {
- it := v1alpha1.NewKameletBinding(o.Namespace, name)
+func (o *promoteCmdOptions) getBinding(c client.Client, name string) (*v1alpha1.Binding, error) {
+ it := v1alpha1.NewBinding(o.Namespace, name)
key := k8sclient.ObjectKey{
Name: name,
Namespace: o.Namespace,
@@ -446,8 +446,8 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
return &dst
}
-func (o *promoteCmdOptions) editKameletBinding(kb *v1alpha1.KameletBinding, it *v1.Integration) *v1alpha1.KameletBinding {
- dst := v1alpha1.NewKameletBinding(o.To, kb.Name)
+func (o *promoteCmdOptions) editBinding(kb *v1alpha1.Binding, it *v1.Integration) *v1alpha1.Binding {
+ dst := v1alpha1.NewBinding(o.To, kb.Name)
dst.Spec = *kb.Spec.DeepCopy()
contImage := it.Status.Image
if dst.Spec.Integration == nil {
diff --git a/pkg/cmd/promote_test.go b/pkg/cmd/promote_test.go
index 8fd74064e..1fab665d0 100644
--- a/pkg/cmd/promote_test.go
+++ b/pkg/cmd/promote_test.go
@@ -114,7 +114,7 @@ func nominalIntegration(name string) v1.Integration {
return it
}
-func TestKameletBindingDryRun(t *testing.T) {
+func TestBindingDryRun(t *testing.T) {
srcPlatform := v1.NewIntegrationPlatform("default", platform.DefaultPlatformName)
srcPlatform.Status.Version = defaults.Version
srcPlatform.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion
@@ -123,7 +123,7 @@ func TestKameletBindingDryRun(t *testing.T) {
dstPlatform.Status.Version = defaults.Version
dstPlatform.Status.Build.RuntimeVersion = defaults.DefaultRuntimeVersion
dstPlatform.Status.Phase = v1.IntegrationPlatformPhaseReady
- defaultKB := nominalKameletBinding("my-kb-test")
+ defaultKB := nominalBinding("my-kb-test")
defaultIntegration := nominalIntegration("my-kb-test")
srcCatalog := createCamelCatalog(srcPlatform)
dstCatalog := createCamelCatalog(dstPlatform)
@@ -133,7 +133,7 @@ func TestKameletBindingDryRun(t *testing.T) {
assert.Equal(t, "yaml", promoteCmdOptions.OutputFormat)
assert.Nil(t, err)
assert.Equal(t, `apiVersion: camel.apache.org/v1alpha1
-kind: KameletBinding
+kind: Binding
metadata:
creationTimestamp: null
name: my-kb-test
@@ -150,9 +150,9 @@ status: {}
`, output)
}
-func nominalKameletBinding(name string) v1alpha1.KameletBinding {
- kb := v1alpha1.NewKameletBinding("default", name)
- kb.Status.Phase = v1alpha1.KameletBindingPhaseReady
+func nominalBinding(name string) v1alpha1.Binding {
+ kb := v1alpha1.NewBinding("default", name)
+ kb.Status.Phase = v1alpha1.BindingPhaseReady
return kb
}
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index f3eb15d3e..c91c5cf27 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -49,9 +49,9 @@ func newCmdReset(rootCmdOptions *RootCmdOptions) (*cobra.Command, *resetCmdOptio
type resetCmdOptions struct {
*RootCmdOptions
- SkipKits bool `mapstructure:"skip-kits"`
- SkipIntegrations bool `mapstructure:"skip-integrations"`
- SkipKameletBindings bool `mapstructure:"skip-kamelet-bindings"`
+ SkipKits bool `mapstructure:"skip-kits"`
+ SkipIntegrations bool `mapstructure:"skip-integrations"`
+ SkipBindings bool `mapstructure:"skip-kamelet-bindings"`
}
func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
@@ -62,8 +62,8 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
}
var n int
- if !o.SkipKameletBindings {
- if n, err = o.deleteAllKameletBindings(c); err != nil {
+ if !o.SkipBindings {
+ if n, err = o.deleteAllBindings(c); err != nil {
fmt.Fprint(cmd.ErrOrStderr(), err)
return
}
@@ -126,15 +126,15 @@ func (o *resetCmdOptions) deleteAllIntegrationKits(c client.Client) (int, error)
return len(list.Items), nil
}
-func (o *resetCmdOptions) deleteAllKameletBindings(c client.Client) (int, error) {
- list := v1alpha1.NewKameletBindingList()
+func (o *resetCmdOptions) deleteAllBindings(c client.Client) (int, error) {
+ list := v1alpha1.NewBindingList()
if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
- return 0, errors.Wrap(err, fmt.Sprintf("could not retrieve kamelet bindings from namespace %s", o.Namespace))
+ return 0, errors.Wrap(err, fmt.Sprintf("could not retrieveBindings from namespace %s", o.Namespace))
}
for _, i := range list.Items {
klb := i
if err := c.Delete(o.Context, &klb); err != nil {
- return 0, errors.Wrap(err, fmt.Sprintf("could not delete kamelet binding %s from namespace %s", klb.Name, klb.Namespace))
+ return 0, errors.Wrap(err, fmt.Sprintf("could not deleteBinding %s from namespace %s", klb.Name, klb.Namespace))
}
}
return len(list.Items), nil
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/add_kameletbinding.go
index c517b61b0..9e977f7a1 100644
--- a/pkg/controller/add_kameletbinding.go
+++ b/pkg/controller/add_kameletbinding.go
@@ -18,9 +18,9 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
+ "github.com/apache/camel-k/v2/pkg/controller/binding"
)
func init() {
- addToManager = append(addToManager, kameletbinding.Add)
+ addToManager = append(addToManager, binding.Add)
}
diff --git a/pkg/controller/kameletbinding/action.go b/pkg/controller/binding/action.go
similarity index 85%
rename from pkg/controller/kameletbinding/action.go
rename to pkg/controller/binding/action.go
index f24970a86..a61bfccad 100644
--- a/pkg/controller/kameletbinding/action.go
+++ b/pkg/controller/binding/action.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"context"
@@ -33,11 +33,11 @@ type Action interface {
// a user friendly name for the action
Name() string
- // returns true if the action can handle the kameletBinding
- CanHandle(kamelet *v1alpha1.KameletBinding) bool
+ // returns true if the action can handle the binding
+ CanHandle(kamelet *v1alpha1.Binding) bool
// executes the handling function
- Handle(ctx context.Context, kamelet *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error)
+ Handle(ctx context.Context, kamelet *v1alpha1.Binding) (*v1alpha1.Binding, error)
}
type baseAction struct {
diff --git a/pkg/controller/kameletbinding/kamelet_binding_controller.go b/pkg/controller/binding/binding_controller.go
similarity index 73%
rename from pkg/controller/kameletbinding/kamelet_binding_controller.go
rename to pkg/controller/binding/binding_controller.go
index a8dfda3f0..4a138cc2b 100644
--- a/pkg/controller/kameletbinding/kamelet_binding_controller.go
+++ b/pkg/controller/binding/binding_controller.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"context"
@@ -44,7 +44,7 @@ import (
"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
+// Add creates a new Binding Controller and adds it to the Manager. The Manager will set fields on the Controller
// and Start it when the Manager is Started.
func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
return add(mgr, newReconciler(mgr, c))
@@ -52,7 +52,7 @@ func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
return monitoring.NewInstrumentedReconciler(
- &ReconcileKameletBinding{
+ &ReconcileBinding{
client: c,
scheme: mgr.GetScheme(),
recorder: mgr.GetEventRecorderFor("camel-k-kamelet-binding-controller"),
@@ -60,7 +60,7 @@ func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
schema.GroupVersionKind{
Group: v1alpha1.SchemeGroupVersion.Group,
Version: v1alpha1.SchemeGroupVersion.Version,
- Kind: v1alpha1.KameletBindingKind,
+ Kind: v1alpha1.BindingKind,
},
)
}
@@ -71,25 +71,25 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return err
}
- // Watch for changes to primary resource KameletBinding
- err = c.Watch(&source.Kind{Type: &v1alpha1.KameletBinding{}},
+ // Watch for changes to primary resource Binding
+ err = c.Watch(&source.Kind{Type: &v1alpha1.Binding{}},
&handler.EnqueueRequestForObject{},
platform.FilteringFuncs{
UpdateFunc: func(e event.UpdateEvent) bool {
- oldKameletBinding, ok := e.ObjectOld.(*v1alpha1.KameletBinding)
+ oldBinding, ok := e.ObjectOld.(*v1alpha1.Binding)
if !ok {
return false
}
- newKameletBinding, ok := e.ObjectNew.(*v1alpha1.KameletBinding)
+ newBinding, ok := e.ObjectNew.(*v1alpha1.Binding)
if !ok {
return false
}
// If traits have changed, the reconciliation loop must kick in as
// traits may have impact
- sameTraits, err := trait.KameletBindingsHaveSameTraits(oldKameletBinding, newKameletBinding)
+ sameTraits, err := trait.BindingsHaveSameTraits(oldBinding, newBinding)
if err != nil {
- Log.ForKameletBinding(newKameletBinding).Error(
+ Log.ForBinding(newBinding).Error(
err,
"unable to determine if old and new resource have the same traits")
}
@@ -97,11 +97,11 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return true
}
- // Ignore updates to the kameletBinding status in which case metadata.Generation
- // does not change, or except when the kameletBinding phase changes as it's used
+ // Ignore updates to the binding status in which case metadata.Generation
+ // does not change, or except when the binding phase changes as it's used
// to transition from one phase to another
- return oldKameletBinding.Generation != newKameletBinding.Generation ||
- oldKameletBinding.Status.Phase != newKameletBinding.Status.Phase
+ return oldBinding.Generation != newBinding.Generation ||
+ oldBinding.Status.Phase != newBinding.Status.Phase
},
DeleteFunc: func(e event.DeleteEvent) bool {
// Evaluates to false if the object has been confirmed deleted
@@ -115,7 +115,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
// Watch Integration to propagate changes downstream
err = c.Watch(&source.Kind{Type: &v1.Integration{}}, &handler.EnqueueRequestForOwner{
- OwnerType: &v1alpha1.KameletBinding{},
+ OwnerType: &v1alpha1.Binding{},
IsController: false,
})
if err != nil {
@@ -125,10 +125,10 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return nil
}
-var _ reconcile.Reconciler = &ReconcileKameletBinding{}
+var _ reconcile.Reconciler = &ReconcileBinding{}
-// ReconcileKameletBinding reconciles a KameletBinding object.
-type ReconcileKameletBinding struct {
+// ReconcileBinding reconciles a Binding object.
+type ReconcileBinding struct {
// This client, initialized using mgr.Client() above, is a split client
// that reads objects from the cache and writes to the API server
client client.Client
@@ -136,14 +136,14 @@ type ReconcileKameletBinding struct {
recorder record.EventRecorder
}
-// Reconcile reads that state of the cluster for a KameletBinding object and makes changes based
-// on the state read and what is in the KameletBinding.Spec
+// Reconcile reads that state of the cluster for a Binding object and makes changes based
+// on the state read and what is in the Binding.Spec
// Note:
// The Controller will requeue the Request to be processed again if the returned error is non-nil or
// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
-func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
+func (r *ReconcileBinding) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
rlog := Log.WithValues("request-namespace", request.Namespace, "request-name", request.Name)
- rlog.Info("Reconciling KameletBinding")
+ rlog.Info("Reconciling Binding")
// Make sure the operator is allowed to act on namespace
if ok, err := platform.IsOperatorAllowedOnNamespace(ctx, r.client, request.Namespace); err != nil {
@@ -153,8 +153,8 @@ func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconci
return reconcile.Result{}, nil
}
- // Fetch the KameletBinding instance
- var instance v1alpha1.KameletBinding
+ // Fetch the Binding instance
+ var instance v1alpha1.Binding
if err := r.client.Get(ctx, request.NamespacedName, &instance); err != nil {
if errors.IsNotFound(err) {
@@ -183,7 +183,7 @@ func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconci
var err error
target := instance.DeepCopy()
- targetLog := rlog.ForKameletBinding(target)
+ targetLog := rlog.ForBinding(target)
for _, a := range actions {
a.InjectClient(r.client)
@@ -194,8 +194,8 @@ func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconci
target, err = a.Handle(ctx, target)
if err != nil {
- camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, &instance, target, err)
- // Update the kameletbinding (mostly just to update its phase) if the new instance is returned
+ camelevent.NotifyBindingError(ctx, r.client, r.recorder, &instance, target, err)
+ // Update the binding (mostly just to update its phase) if the new instance is returned
if target != nil {
_ = r.update(ctx, &instance, target, &targetLog)
}
@@ -204,14 +204,14 @@ func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconci
if target != nil {
if err := r.update(ctx, &instance, target, &targetLog); err != nil {
- camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, &instance, target, err)
+ camelevent.NotifyBindingError(ctx, r.client, r.recorder, &instance, target, err)
return reconcile.Result{}, err
}
}
// handle one action at time so the resource
// is always at its latest state
- camelevent.NotifyKameletBindingUpdated(ctx, r.client, r.recorder, &instance, target)
+ camelevent.NotifyBindingUpdated(ctx, r.client, r.recorder, &instance, target)
break
}
}
@@ -219,11 +219,11 @@ func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconci
return reconcile.Result{}, nil
}
-func (r *ReconcileKameletBinding) update(ctx context.Context, base *v1alpha1.KameletBinding, target *v1alpha1.KameletBinding, log *log.Logger) error {
+func (r *ReconcileBinding) update(ctx context.Context, base *v1alpha1.Binding, target *v1alpha1.Binding, log *log.Logger) error {
target.Status.ObservedGeneration = base.Generation
if err := r.client.Status().Patch(ctx, target, ctrl.MergeFrom(base)); err != nil {
- camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, base, target, err)
+ camelevent.NotifyBindingError(ctx, r.client, r.recorder, base, target, err)
return err
}
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/binding/error_handler.go
similarity index 99%
rename from pkg/controller/kameletbinding/error_handler.go
rename to pkg/controller/binding/error_handler.go
index 231c5b49a..f1cb50014 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/binding/error_handler.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"encoding/json"
diff --git a/pkg/controller/kameletbinding/error_handler_test.go b/pkg/controller/binding/error_handler_test.go
similarity index 99%
rename from pkg/controller/kameletbinding/error_handler_test.go
rename to pkg/controller/binding/error_handler_test.go
index 02607dda4..205f66037 100644
--- a/pkg/controller/kameletbinding/error_handler_test.go
+++ b/pkg/controller/binding/error_handler_test.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"testing"
diff --git a/pkg/controller/kameletbinding/initialize.go b/pkg/controller/binding/initialize.go
similarity index 73%
rename from pkg/controller/kameletbinding/initialize.go
rename to pkg/controller/binding/initialize.go
index 3a64e8440..8e631e9ff 100644
--- a/pkg/controller/kameletbinding/initialize.go
+++ b/pkg/controller/binding/initialize.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"context"
@@ -32,7 +32,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)
-// NewInitializeAction returns a action that initializes the kamelet binding configuration when not provided by the user.
+// NewInitializeAction returns a action that initializes theBinding configuration when not provided by the user.
func NewInitializeAction() Action {
return &initializeAction{}
}
@@ -45,35 +45,35 @@ func (action *initializeAction) Name() string {
return "initialize"
}
-func (action *initializeAction) CanHandle(kameletbinding *v1alpha1.KameletBinding) bool {
- return kameletbinding.Status.Phase == v1alpha1.KameletBindingPhaseNone
+func (action *initializeAction) CanHandle(binding *v1alpha1.Binding) bool {
+ return binding.Status.Phase == v1alpha1.BindingPhaseNone
}
-func (action *initializeAction) Handle(ctx context.Context, kameletbinding *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error) {
- it, err := CreateIntegrationFor(ctx, action.client, kameletbinding)
+func (action *initializeAction) Handle(ctx context.Context, binding *v1alpha1.Binding) (*v1alpha1.Binding, error) {
+ it, err := CreateIntegrationFor(ctx, action.client, binding)
if err != nil {
- kameletbinding.Status.Phase = v1alpha1.KameletBindingPhaseError
- kameletbinding.Status.SetErrorCondition(v1alpha1.KameletBindingIntegrationConditionError,
+ binding.Status.Phase = v1alpha1.BindingPhaseError
+ binding.Status.SetErrorCondition(v1alpha1.BindingIntegrationConditionError,
"Couldn't create an Integration custom resource", err)
- return kameletbinding, err
+ return binding, err
}
if _, err := kubernetes.ReplaceResource(ctx, action.client, it); err != nil {
- return nil, errors.Wrap(err, "could not create integration for kamelet binding")
+ return nil, errors.Wrap(err, "could not create integration forBinding")
}
// propagate Kamelet icon (best effort)
- action.propagateIcon(ctx, kameletbinding)
+ action.propagateIcon(ctx, binding)
- target := kameletbinding.DeepCopy()
- target.Status.Phase = v1alpha1.KameletBindingPhaseCreating
+ target := binding.DeepCopy()
+ target.Status.Phase = v1alpha1.BindingPhaseCreating
return target, nil
}
-func (action *initializeAction) propagateIcon(ctx context.Context, binding *v1alpha1.KameletBinding) {
+func (action *initializeAction) propagateIcon(ctx context.Context, binding *v1alpha1.Binding) {
icon, err := action.findIcon(ctx, binding)
if err != nil {
- action.L.Errorf(err, "cannot find icon for kamelet binding %q", binding.Name)
+ action.L.Errorf(err, "cannot find icon forBinding %q", binding.Name)
return
}
if icon == "" {
@@ -90,18 +90,18 @@ func (action *initializeAction) propagateIcon(ctx context.Context, binding *v1al
}
p, err := patch.MergePatch(binding, clone)
if err != nil {
- action.L.Errorf(err, "cannot compute patch to update icon for kamelet binding %q", binding.Name)
+ action.L.Errorf(err, "cannot compute patch to update icon forBinding %q", binding.Name)
return
}
if len(p) > 0 {
if err := action.client.Patch(ctx, clone, client.RawPatch(types.MergePatchType, p)); err != nil {
- action.L.Errorf(err, "cannot apply merge patch to update icon for kamelet binding %q", binding.Name)
+ action.L.Errorf(err, "cannot apply merge patch to update icon forBinding %q", binding.Name)
return
}
}
}
-func (action *initializeAction) findIcon(ctx context.Context, binding *v1alpha1.KameletBinding) (string, error) {
+func (action *initializeAction) findIcon(ctx context.Context, binding *v1alpha1.Binding) (string, error) {
var kameletRef *corev1.ObjectReference
if binding.Spec.Source.Ref != nil && binding.Spec.Source.Ref.Kind == "Kamelet" && strings.HasPrefix(binding.Spec.Source.Ref.APIVersion, "camel.apache.org/") {
kameletRef = binding.Spec.Source.Ref
diff --git a/pkg/controller/kameletbinding/integration.go b/pkg/controller/binding/integration.go
similarity index 82%
rename from pkg/controller/kameletbinding/integration.go
rename to pkg/controller/binding/integration.go
index a9d4296cf..1558c0359 100644
--- a/pkg/controller/kameletbinding/integration.go
+++ b/pkg/controller/binding/integration.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"context"
@@ -43,25 +43,25 @@ var (
endpointTypeSinkContext = bindings.EndpointContext{Type: v1alpha1.EndpointTypeSink}
)
-func CreateIntegrationFor(ctx context.Context, c client.Client, kameletbinding *v1alpha1.KameletBinding) (*v1.Integration, error) {
+func CreateIntegrationFor(ctx context.Context, c client.Client, binding *v1alpha1.Binding) (*v1.Integration, error) {
controller := true
blockOwnerDeletion := true
- annotations := util.CopyMap(kameletbinding.Annotations)
+ annotations := util.CopyMap(binding.Annotations)
// avoid propagating the icon to the integration as it's heavyweight and not needed
delete(annotations, v1alpha1.AnnotationIcon)
it := v1.Integration{
ObjectMeta: metav1.ObjectMeta{
- Namespace: kameletbinding.Namespace,
- Name: kameletbinding.Name,
+ Namespace: binding.Namespace,
+ Name: binding.Name,
Annotations: annotations,
- Labels: util.CopyMap(kameletbinding.Labels),
+ Labels: util.CopyMap(binding.Labels),
OwnerReferences: []metav1.OwnerReference{
{
- APIVersion: kameletbinding.APIVersion,
- Kind: kameletbinding.Kind,
- Name: kameletbinding.Name,
- UID: kameletbinding.UID,
+ APIVersion: binding.APIVersion,
+ Kind: binding.Kind,
+ Name: binding.Name,
+ UID: binding.UID,
Controller: &controller,
BlockOwnerDeletion: &blockOwnerDeletion,
},
@@ -73,28 +73,28 @@ func CreateIntegrationFor(ctx context.Context, c client.Client, kameletbinding *
if it.GetLabels() == nil {
it.SetLabels(make(map[string]string))
}
- it.GetLabels()[kubernetes.CamelCreatorLabelKind] = kameletbinding.Kind
- it.GetLabels()[kubernetes.CamelCreatorLabelName] = kameletbinding.Name
+ it.GetLabels()[kubernetes.CamelCreatorLabelKind] = binding.Kind
+ it.GetLabels()[kubernetes.CamelCreatorLabelName] = binding.Name
// start from the integration spec defined in the binding
- if kameletbinding.Spec.Integration != nil {
- it.Spec = *kameletbinding.Spec.Integration.DeepCopy()
+ if binding.Spec.Integration != nil {
+ it.Spec = *binding.Spec.Integration.DeepCopy()
}
// Set replicas (or override podspecable value) if present
- if kameletbinding.Spec.Replicas != nil {
- replicas := *kameletbinding.Spec.Replicas
+ if binding.Spec.Replicas != nil {
+ replicas := *binding.Spec.Replicas
it.Spec.Replicas = &replicas
}
- profile, err := determineProfile(ctx, c, kameletbinding)
+ profile, err := determineProfile(ctx, c, binding)
if err != nil {
return nil, err
}
it.Spec.Profile = profile
- if kameletbinding.Spec.ServiceAccountName != "" {
- it.Spec.ServiceAccountName = kameletbinding.Spec.ServiceAccountName
+ if binding.Spec.ServiceAccountName != "" {
+ it.Spec.ServiceAccountName = binding.Spec.ServiceAccountName
}
bindingContext := bindings.BindingContext{
@@ -104,22 +104,22 @@ func CreateIntegrationFor(ctx context.Context, c client.Client, kameletbinding *
Profile: profile,
}
- from, err := bindings.Translate(bindingContext, endpointTypeSourceContext, kameletbinding.Spec.Source)
+ from, err := bindings.Translate(bindingContext, endpointTypeSourceContext, binding.Spec.Source)
if err != nil {
return nil, errors.Wrap(err, "could not determine source URI")
}
- to, err := bindings.Translate(bindingContext, endpointTypeSinkContext, kameletbinding.Spec.Sink)
+ to, err := bindings.Translate(bindingContext, endpointTypeSinkContext, binding.Spec.Sink)
if err != nil {
return nil, errors.Wrap(err, "could not determine sink URI")
}
// error handler is optional
- errorHandler, err := maybeErrorHandler(kameletbinding.Spec.ErrorHandler, bindingContext)
+ errorHandler, err := maybeErrorHandler(binding.Spec.ErrorHandler, bindingContext)
if err != nil {
return nil, errors.Wrap(err, "could not determine error handler")
}
- steps := make([]*bindings.Binding, 0, len(kameletbinding.Spec.Steps))
- for idx, step := range kameletbinding.Spec.Steps {
+ steps := make([]*bindings.Binding, 0, len(binding.Spec.Steps))
+ for idx, step := range binding.Spec.Steps {
position := idx
stepBinding, err := bindings.Translate(bindingContext, bindings.EndpointContext{
Type: v1alpha1.EndpointTypeAction,
@@ -233,7 +233,7 @@ func configureBinding(integration *v1.Integration, bindings ...*bindings.Binding
return nil
}
-func determineProfile(ctx context.Context, c client.Client, binding *v1alpha1.KameletBinding) (v1.TraitProfile, error) {
+func determineProfile(ctx context.Context, c client.Client, binding *v1alpha1.Binding) (v1.TraitProfile, error) {
if binding.Spec.Integration != nil && binding.Spec.Integration.Profile != "" {
return binding.Spec.Integration.Profile, nil
}
diff --git a/pkg/controller/kameletbinding/log.go b/pkg/controller/binding/log.go
similarity index 90%
rename from pkg/controller/kameletbinding/log.go
rename to pkg/controller/binding/log.go
index a7a70a117..81305fb5a 100644
--- a/pkg/controller/kameletbinding/log.go
+++ b/pkg/controller/binding/log.go
@@ -15,9 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import "github.com/apache/camel-k/v2/pkg/util/log"
// Log --.
-var Log = log.Log.WithName("controller").WithName("kameletbinding")
+var Log = log.Log.WithName("controller").WithName("binding")
diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/binding/monitor.go
similarity index 60%
rename from pkg/controller/kameletbinding/monitor.go
rename to pkg/controller/binding/monitor.go
index efef9afc2..2e24bf7c2 100644
--- a/pkg/controller/kameletbinding/monitor.go
+++ b/pkg/controller/binding/monitor.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package kameletbinding
+package binding
import (
"context"
@@ -34,7 +34,7 @@ import (
"github.com/apache/camel-k/v2/pkg/trait"
)
-// NewMonitorAction returns an action that monitors the KameletBinding after it's fully initialized.
+// NewMonitorAction returns an action that monitors the Binding after it's fully initialized.
func NewMonitorAction() Action {
return &monitorAction{}
}
@@ -47,66 +47,66 @@ func (action *monitorAction) Name() string {
return "monitor"
}
-func (action *monitorAction) CanHandle(kameletbinding *v1alpha1.KameletBinding) bool {
- return kameletbinding.Status.Phase == v1alpha1.KameletBindingPhaseCreating ||
- (kameletbinding.Status.Phase == v1alpha1.KameletBindingPhaseError &&
- kameletbinding.Status.GetCondition(v1alpha1.KameletBindingIntegrationConditionError) == nil) ||
- kameletbinding.Status.Phase == v1alpha1.KameletBindingPhaseReady
+func (action *monitorAction) CanHandle(binding *v1alpha1.Binding) bool {
+ return binding.Status.Phase == v1alpha1.BindingPhaseCreating ||
+ (binding.Status.Phase == v1alpha1.BindingPhaseError &&
+ binding.Status.GetCondition(v1alpha1.BindingIntegrationConditionError) == nil) ||
+ binding.Status.Phase == v1alpha1.BindingPhaseReady
}
-func (action *monitorAction) Handle(ctx context.Context, kameletbinding *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error) {
+func (action *monitorAction) Handle(ctx context.Context, binding *v1alpha1.Binding) (*v1alpha1.Binding, error) {
key := client.ObjectKey{
- Namespace: kameletbinding.Namespace,
- Name: kameletbinding.Name,
+ Namespace: binding.Namespace,
+ Name: binding.Name,
}
it := v1.Integration{}
if err := action.client.Get(ctx, key, &it); err != nil && k8serrors.IsNotFound(err) {
- target := kameletbinding.DeepCopy()
+ target := binding.DeepCopy()
// Rebuild the integration
- target.Status.Phase = v1alpha1.KameletBindingPhaseNone
+ target.Status.Phase = v1alpha1.BindingPhaseNone
target.Status.SetCondition(
- v1alpha1.KameletBindingConditionReady,
+ v1alpha1.BindingConditionReady,
corev1.ConditionFalse,
"",
"",
)
return target, nil
} else if err != nil {
- return nil, errors.Wrapf(err, "could not load integration for KameletBinding %q", kameletbinding.Name)
+ return nil, errors.Wrapf(err, "could not load integration for Binding %q", binding.Name)
}
- operatorIDChanged := v1.GetOperatorIDAnnotation(kameletbinding) != "" &&
- (v1.GetOperatorIDAnnotation(kameletbinding) != v1.GetOperatorIDAnnotation(&it))
+ operatorIDChanged := v1.GetOperatorIDAnnotation(binding) != "" &&
+ (v1.GetOperatorIDAnnotation(binding) != v1.GetOperatorIDAnnotation(&it))
- sameTraits, err := trait.IntegrationAndBindingSameTraits(&it, kameletbinding)
+ sameTraits, err := trait.IntegrationAndBindingSameTraits(&it, binding)
if err != nil {
return nil, err
}
// Check if the integration needs to be changed
- expected, err := CreateIntegrationFor(ctx, action.client, kameletbinding)
+ expected, err := CreateIntegrationFor(ctx, action.client, binding)
if err != nil {
- kameletbinding.Status.Phase = v1alpha1.KameletBindingPhaseError
- kameletbinding.Status.SetErrorCondition(v1alpha1.KameletBindingIntegrationConditionError,
+ binding.Status.Phase = v1alpha1.BindingPhaseError
+ binding.Status.SetErrorCondition(v1alpha1.BindingIntegrationConditionError,
"Couldn't create an Integration custom resource", err)
- return kameletbinding, err
+ return binding, err
}
semanticEquality := equality.Semantic.DeepDerivative(expected.Spec, it.Spec)
if !semanticEquality || operatorIDChanged || !sameTraits {
action.L.Info(
- "KameletBinding needs a rebuild",
+ "Binding needs a rebuild",
"semantic-equality", !semanticEquality,
"operatorid-changed", operatorIDChanged,
"traits-changed", !sameTraits)
- // KameletBinding has changed and needs rebuild
- target := kameletbinding.DeepCopy()
+ // Binding has changed and needs rebuild
+ target := binding.DeepCopy()
// Rebuild the integration
- target.Status.Phase = v1alpha1.KameletBindingPhaseNone
+ target.Status.Phase = v1alpha1.BindingPhaseNone
target.Status.SetCondition(
- v1alpha1.KameletBindingConditionReady,
+ v1alpha1.BindingConditionReady,
corev1.ConditionFalse,
"",
"",
@@ -114,24 +114,24 @@ func (action *monitorAction) Handle(ctx context.Context, kameletbinding *v1alpha
return target, nil
}
- // Map integration phase and conditions to KameletBinding
- target := kameletbinding.DeepCopy()
+ // Map integration phase and conditions to Binding
+ target := binding.DeepCopy()
switch it.Status.Phase {
case v1.IntegrationPhaseRunning:
- target.Status.Phase = v1alpha1.KameletBindingPhaseReady
- setKameletBindingReadyCondition(target, &it)
+ target.Status.Phase = v1alpha1.BindingPhaseReady
+ setBindingReadyCondition(target, &it)
case v1.IntegrationPhaseError:
- target.Status.Phase = v1alpha1.KameletBindingPhaseError
- setKameletBindingReadyCondition(target, &it)
+ target.Status.Phase = v1alpha1.BindingPhaseError
+ setBindingReadyCondition(target, &it)
default:
- target.Status.Phase = v1alpha1.KameletBindingPhaseCreating
+ target.Status.Phase = v1alpha1.BindingPhaseCreating
- c := v1alpha1.KameletBindingCondition{
- Type: v1alpha1.KameletBindingConditionReady,
+ c := v1alpha1.BindingCondition{
+ Type: v1alpha1.BindingConditionReady,
Status: corev1.ConditionFalse,
Reason: string(target.Status.Phase),
Message: fmt.Sprintf("Integration %q is in %q phase", it.GetName(), target.Status.Phase),
@@ -154,15 +154,15 @@ func (action *monitorAction) Handle(ctx context.Context, kameletbinding *v1alpha
return target, nil
}
-func setKameletBindingReadyCondition(kb *v1alpha1.KameletBinding, it *v1.Integration) {
+func setBindingReadyCondition(kb *v1alpha1.Binding, it *v1.Integration) {
if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
message := condition.Message
if message == "" {
message = fmt.Sprintf("Integration %q readiness condition is %q", it.GetName(), condition.Status)
}
- c := v1alpha1.KameletBindingCondition{
- Type: v1alpha1.KameletBindingConditionReady,
+ c := v1alpha1.BindingCondition{
+ Type: v1alpha1.BindingConditionReady,
Status: condition.Status,
Reason: condition.Reason,
Message: message,
@@ -177,7 +177,7 @@ func setKameletBindingReadyCondition(kb *v1alpha1.KameletBinding, it *v1.Integra
} else {
kb.Status.SetCondition(
- v1alpha1.KameletBindingConditionReady,
+ v1alpha1.BindingConditionReady,
corev1.ConditionUnknown,
"",
fmt.Sprintf("Integration %q does not have a readiness condition", it.GetName()),
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 053db3069..ac6b64fc6 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -70,12 +70,12 @@ const (
// ReasonKameletPhaseUpdated --.
ReasonKameletPhaseUpdated = "KameletPhaseUpdated"
- // ReasonKameletBindingError --.
- ReasonKameletBindingError = "KameletBindingError"
- // ReasonKameletBindingConditionChanged --.
- ReasonKameletBindingConditionChanged = "KameletBindingConditionChanged"
- // ReasonKameletBindingPhaseUpdated --.
- ReasonKameletBindingPhaseUpdated = "KameletBindingPhaseUpdated"
+ // ReasonBindingError --.
+ ReasonBindingError = "BindingError"
+ // ReasonBindingConditionChanged --.
+ ReasonBindingConditionChanged = "BindingConditionChanged"
+ // ReasonBindingPhaseUpdated --.
+ ReasonBindingPhaseUpdated = "BindingPhaseUpdated"
// ReasonRelatedObjectChanged --.
ReasonRelatedObjectChanged = "ReasonRelatedObjectChanged"
@@ -226,8 +226,8 @@ func NotifyCamelCatalogError(ctx context.Context, c client.Client, recorder reco
recorder.Eventf(k, corev1.EventTypeWarning, ReasonKameletError, "Cannot reconcile CamelCatalog %s: %v", k.Name, err)
}
-// NotifyKameletBindingUpdated automatically generates events when a KameletBinding changes.
-func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding) {
+// NotifyBindingUpdated automatically generates events when a Binding changes.
+func NotifyBindingUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.Binding) {
if newResource == nil {
return
}
@@ -237,14 +237,14 @@ func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder
oldPhase = string(old.Status.Phase)
oldConditions = old.Status.GetConditions()
}
- if newResource.Status.Phase != v1alpha1.KameletBindingPhaseNone {
- notifyIfConditionUpdated(recorder, newResource, oldConditions, newResource.Status.GetConditions(), "KameletBinding", newResource.Name, ReasonKameletBindingConditionChanged)
+ if newResource.Status.Phase != v1alpha1.BindingPhaseNone {
+ notifyIfConditionUpdated(recorder, newResource, oldConditions, newResource.Status.GetConditions(), "Binding", newResource.Name, ReasonBindingConditionChanged)
}
- notifyIfPhaseUpdated(ctx, c, recorder, newResource, oldPhase, string(newResource.Status.Phase), "KameletBinding", newResource.Name, ReasonKameletBindingPhaseUpdated, "")
+ notifyIfPhaseUpdated(ctx, c, recorder, newResource, oldPhase, string(newResource.Status.Phase), "Binding", newResource.Name, ReasonBindingPhaseUpdated, "")
}
-// NotifyKameletBindingError automatically generates error events when the kameletBinding reconcile cycle phase has an error.
-func NotifyKameletBindingError(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding, err error) {
+// NotifyBindingError automatically generates error events when the binding reconcile cycle phase has an error.
+func NotifyBindingError(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.Binding, err error) {
k := old
if newResource != nil {
k = newResource
@@ -252,7 +252,7 @@ func NotifyKameletBindingError(ctx context.Context, c client.Client, recorder re
if k == nil {
return
}
- recorder.Eventf(k, corev1.EventTypeWarning, ReasonKameletError, "Cannot reconcile KameletBinding %s: %v", k.Name, err)
+ recorder.Eventf(k, corev1.EventTypeWarning, ReasonKameletError, "Cannot reconcile Binding %s: %v", k.Name, err)
}
// NotifyBuildUpdated automatically generates events when a build changes.
diff --git a/pkg/install/cluster.go b/pkg/install/cluster.go
index 036049510..36ba39079 100644
--- a/pkg/install/cluster.go
+++ b/pkg/install/cluster.go
@@ -200,8 +200,8 @@ func installCRDs(ctx context.Context, c client.Client, collection *kubernetes.Co
return err
}
- // Install CRD for KameletBinding (if needed)
- if err := installCRD(ctx, c, "KameletBinding", "v1alpha1", "camel.apache.org_kameletbindings.yaml",
+ // Install CRD for Binding (if needed)
+ if err := installCRD(ctx, c, "Binding", "v1alpha1", "camel.apache.org_bindings.yaml",
v1beta1Customizer, collection, force); err != nil {
return err
}
@@ -211,7 +211,7 @@ func installCRDs(ctx context.Context, c client.Client, collection *kubernetes.Co
func downgradeToCRDv1beta1(isAPIExtensionsV1 bool) ResourceCustomizer {
return func(object ctrl.Object) ctrl.Object {
- // Remove default values in v1beta1 Integration and KameletBinding CRDs,
+ // Remove default values in v1beta1 Integration and Binding CRDs,
removeDefaultFromCrd := func(crd *apiextensionsv1beta1.CustomResourceDefinition, property string) {
defaultValue := apiextensionsv1beta1.JSONSchemaProps{
Default: nil,
@@ -221,7 +221,7 @@ func downgradeToCRDv1beta1(isAPIExtensionsV1 bool) ResourceCustomizer {
Properties["spec"].Properties["template"].Properties["spec"].Properties[property].Items.Schema.
Properties["ports"].Items.Schema.Properties["protocol"] = defaultValue
}
- if crd.Name == "kameletbindings.camel.apache.org" {
+ if crd.Name == "bindings.camel.apache.org" {
crd.Spec.Validation.OpenAPIV3Schema.Properties["spec"].Properties["integration"].Properties["template"].
Properties["spec"].Properties[property].Items.Schema.Properties["ports"].Items.Schema.
Properties["protocol"] = defaultValue
@@ -312,7 +312,7 @@ func areAllCrdInstalled(c client.Client) (bool, error) {
} else if !ok {
return false, nil
}
- return isCrdInstalled(c, "KameletBinding", "v1alpha1")
+ return isCrdInstalled(c, "Binding", "v1alpha1")
}
func isCrdInstalled(c client.Client, kind string, version string) (bool, error) {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 3149ebade..fca200371 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -114,6 +114,13 @@ var assets = func() http.FileSystem {
name: "bases",
modTime: time.Time{},
},
+ "/crd/bases/camel.apache.org_bindings.yaml": &vfsgenÛ°CompressedFileInfo{
+ name: "camel.apache.org_bindings.yaml",
+ modTime: time.Time{},
+ uncompressedSize: 572445,
+
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
+ },
"/crd/bases/camel.apache.org_builds.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
modTime: time.Time{},
@@ -149,13 +156,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x30\x8c\xff\x9f\x4f\x81\x72\x52\x8f\xa4\x8d\x48\xd9\x99\xd9\xa9\x19\xff\xa6\x9e\x94\x56\x96\x13\xfd\x62\xcb\x2a\x4b\x49\x9e\x94\x93\x4d\xc0\x6e\x90\xc4\xa3\x6e\xa0\x17\x40\x53\xe2\xbc\x79\xbf\xfb\x5b\x38\x00\xfa\xc2\x5b\x1f\xb4\x48\xc7\xd9\x6d\x4c\x55\xc6\x14\xd9\xa7\x71\x39\x38\xf7\xcb\xe7\x64\xb4\xbf\xf1\xd9\xe7\xe4\x0d\x4f\x98\xd0\x2c\x25\x46\x12\x33\x67\xe4\xbc\xa0\xc9\x9c\x91\x5b\x39\x [...]
},
- "/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgenÛ°CompressedFileInfo{
- name: "camel.apache.org_kameletbindings.yaml",
- modTime: time.Time{},
- uncompressedSize: 572531,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
- },
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
@@ -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{},
@@ -301,9 +313,9 @@ var assets = func() http.FileSystem {
"/rbac/openshift/operator-role-openshift.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role-openshift.yaml",
modTime: time.Time{},
- uncompressedSize: 2190,
+ uncompressedSize: 2183,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\xc1\x8e\xdb\x46\x0c\xbd\xeb\x2b\x08\xeb\x92\x00\x6b\xa9\xed\xa9\x70\x4f\xee\x66\xb7\x35\x1a\xd8\xc0\xca\x69\x90\x23\x35\xa2\x25\xc2\xa3\xa1\xca\x19\xad\xb2\xf9\xfa\x62\xc6\x76\xe2\xac\xe3\xcd\x25\x40\x74\x11\x4d\x3e\x93\xef\xf1\x51\x39\xcc\x7f\xdc\x93\xe5\xf0\x96\x0d\x39\x4f\x0d\x04\x81\xd0\x11\x2c\x07\x34\x1d\x41\x25\xbb\x30\xa1\x12\xdc\xcb\xe8\x1a\x0c\x2c\x0e\x5e\x2d\xab\xfb\xd7\x30\xba\x86\x14\xc4\x11\x88\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x53\x41\x8f\xdb\x46\x0f\xbd\xeb\x57\x10\xd6\x25\x01\xd6\xd2\xf7\xf5\x54\xb8\x27\x77\xb3\xdb\x1a\x0d\x6c\x60\xe5\x34\xc8\x91\x1a\xd1\x12\xe1\xd1\x50\xe5\x8c\x56\xd9\xfc\xfa\x62\xc6\x76\xe2\x5d\xd7\x9b\x4b\x80\xe8\x22\x9a\x7c\x26\xdf\xe3\xa3\x72\x98\xff\xb8\x27\xcb\xe1\x3d\x1b\x72\x9e\x1a\x08\x02\xa1\x23\x58\x0e\x68\x3a\x82\x4a\x76\x61\x42\x25\xb8\x97\xd1\x35\x18\x58\x1c\xbc\x59\x56\xf7\x6f\x61\x74\x0d\x29\x88\x23\x [...]
},
"/rbac/operator-cluster-role-addressable-resolver.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-cluster-role-addressable-resolver.yaml",
@@ -441,9 +453,9 @@ var assets = func() http.FileSystem {
"/rbac/operator-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role.yaml",
modTime: time.Time{},
- uncompressedSize: 3042,
+ uncompressedSize: 3021,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x6f\xe3\x36\x13\xbd\xeb\x57\x0c\xac\xcb\x2e\x10\xdb\xdf\xd7\x53\xe1\x9e\xdc\xdd\xa4\x35\xba\xb0\x81\xd8\xdb\xc5\x1e\x47\xd4\x58\x9e\x9a\xe2\xb0\x43\x2a\x8e\xfb\xeb\x0b\xca\x72\x6c\x47\x71\x50\x74\x17\x48\x7d\x09\x45\x4e\xde\xbc\x79\xef\x51\x50\x0e\xc3\xef\xf7\xcb\x72\xf8\xc4\x86\x5c\xa0\x12\xa2\x40\xdc\x10\x4c\x3d\x9a\x0d\xc1\x52\xd6\x71\x87\x4a\x70\x27\x8d\x2b\x31\xb2\x38\x78\x37\x5d\xde\xbd\x87\xc6\x95\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x8f\xdb\x36\x13\xbd\xeb\x57\x0c\xac\x4b\x02\xec\xda\xdf\xd7\x53\xe1\x9e\xdc\x64\xb7\x35\x1a\xd8\xc0\xda\x69\x90\xe3\x88\x1a\xcb\x53\x53\x1c\x76\x48\xad\xd7\xfd\xf5\x05\x65\x29\xf6\xae\xec\xa0\x68\x02\x6c\x7d\x31\x35\x1c\xbd\x79\xf3\xe6\x51\x60\x0e\xb7\xdf\xef\x97\xe5\xf0\x81\x0d\xb9\x40\x25\x44\x81\xb8\x25\x98\x79\x34\x5b\x82\x95\x6c\xe2\x1e\x95\xe0\x5e\x1a\x57\x62\x64\x71\xf0\x66\xb6\xba\x7f\x0b\x8d\x2b\x [...]
},
"/rbac/patch-role-to-clusterrole.yaml": &vfsgenÛ°CompressedFileInfo{
name: "patch-role-to-clusterrole.yaml",
@@ -462,9 +474,9 @@ var assets = func() http.FileSystem {
"/rbac/user-cluster-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "user-cluster-role.yaml",
modTime: time.Time{},
- uncompressedSize: 1825,
+ uncompressedSize: 1804,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4f\x6f\xdb\xc6\x13\xbd\xf3\x53\x3c\x90\x97\x04\xb0\xa4\xdf\xaf\xa7\x42\x3d\xa9\x8e\xdd\x0a\x0d\x24\xc0\x54\x1a\xe4\x38\xe2\x8e\xa8\x81\x96\xbb\xec\xee\xd0\x8c\xfb\xe9\x8b\x5d\x49\xb6\x1c\xc5\x87\x16\xe1\x85\xcb\xf9\xf3\xe6\xcd\x9b\x59\x56\x98\xfc\xb8\xa7\xa8\xf0\x51\x1a\x76\x91\x0d\xd4\x43\xf7\x8c\x45\x4f\xcd\x9e\x51\xfb\x9d\x8e\x14\x18\xf7\x7e\x70\x86\x54\xbc\xc3\xbb\x45\x7d\xff\x1e\x83\x33\x1c\xe0\x1d\xc3\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xa4\xcb\x2e\x10\xcb\x6d\x4f\x85\x7b\x72\xb3\x49\x6b\x74\x61\x03\x91\xb7\x8b\x3d\x8e\xc5\xb1\x34\x30\x45\xaa\x24\x15\x6d\xfa\xf5\x05\x29\x2b\x76\x9a\xcd\xa1\xc5\xfa\x62\x6a\x66\xf4\xe6\xbd\x37\x43\x15\x58\x7c\xbf\x5f\x56\xe0\xa3\xd4\x6c\x3c\x2b\x04\x8b\xd0\x32\xd6\x3d\xd5\x2d\xa3\xb2\xc7\x30\x92\x63\xdc\xdb\xc1\x28\x0a\x62\x0d\xde\xad\xab\xfb\xf7\x18\x8c\x62\x07\x6b\x18\xd6\x [...]
},
"/samples": &vfsgenÛ°DirInfo{
name: "samples",
@@ -519,9 +531,9 @@ var assets = func() http.FileSystem {
"/samples/bases/camel_v1_kameletbinding.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel_v1_kameletbinding.yaml",
modTime: time.Time{},
- uncompressedSize: 1284,
+ uncompressedSize: 1277,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x10\xbd\xf3\x2b\x1e\xac\x4b\x02\x38\x72\xd3\xa3\x7b\x72\x1c\x1b\x11\x92\xda\xc0\xca\xe9\x62\x8f\x63\x69\x2c\x0d\x4c\x91\x2c\x49\x59\xeb\xbf\x2f\x28\xdb\x5d\x1b\x2d\x8a\x1e\x56\x27\x8a\x1c\xce\x7b\x6f\xde\x63\x86\x4f\xef\xf7\xa9\x0c\x3f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe1\xa8\x6a\x19\xa5\x3d\xc4\x81\x3c\x63\x6d\x7b\x53\x53\x14\x6b\xf0\x61\x51\xae\x3f\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\xae\xdb\x36\x10\xbc\xf3\x2b\x06\xd6\x25\x01\x1c\xb9\xe9\xd1\x3d\x39\x8e\x8d\x08\x49\x6d\xe0\xc9\x69\x90\xe3\x5a\x5a\x4b\x0b\x53\x24\x4b\x52\xd6\xf3\xdf\x17\x94\xec\xc6\x46\x8b\xa2\x87\xf0\x44\x51\xcb\x9d\x99\x9d\x61\x86\x77\x3f\x6f\xa9\x0c\x5f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe5\xa8\x6a\x19\xa5\x3d\xc5\x81\x3c\x63\x6b\x7b\x53\x53\x14\x6b\xf0\x66\x55\x6e\xdf\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\xac\x [...]
},
"/samples/patch-integration-platform.yaml": &vfsgenÛ°CompressedFileInfo{
name: "patch-integration-platform.yaml",
@@ -662,15 +674,16 @@ var assets = func() http.FileSystem {
fs["/crd/bases"].(os.FileInfo),
}
fs["/crd/bases"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
+ fs["/crd/bases/camel.apache.org_bindings.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_builds.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_camelcatalogs.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_integrationkits.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_integrationplatforms.yaml"].(os.FileInfo),
fs["/crd/bases/camel.apache.org_integrations.yaml"].(os.FileInfo),
- fs["/crd/bases/camel.apache.org_kameletbindings.yaml"].(os.FileInfo),
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_test.go b/pkg/resources/resources_test.go
index 3f2a544ff..6dae89525 100644
--- a/pkg/resources/resources_test.go
+++ b/pkg/resources/resources_test.go
@@ -169,6 +169,6 @@ func TestCRDResources(t *testing.T) {
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrationkits.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrationplatforms.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_integrations.yaml", Resource)
- NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kameletbindings.yaml", Resource)
+ NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_bindings.yaml", Resource)
NoErrorAndNotEmptyBytes(t, "/crd/bases/camel.apache.org_kamelets.yaml", Resource)
}
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index c6114f9fb..7100ea4c8 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -374,13 +374,13 @@ func IntegrationKitsHaveSameTraits(i1 *v1.IntegrationKit, i2 *v1.IntegrationKit)
return Equals(c1, c2), nil
}
-// KameletBindingsHaveSameTraits return if traits are the same.
-func KameletBindingsHaveSameTraits(i1 *v1alpha1.KameletBinding, i2 *v1alpha1.KameletBinding) (bool, error) {
- c1, err := NewTraitsOptionsForKameletBinding(i1)
+// BindingsHaveSameTraits return if traits are the same.
+func BindingsHaveSameTraits(i1 *v1alpha1.Binding, i2 *v1alpha1.Binding) (bool, error) {
+ c1, err := NewTraitsOptionsForBinding(i1)
if err != nil {
return false, err
}
- c2, err := NewTraitsOptionsForKameletBinding(i2)
+ c2, err := NewTraitsOptionsForBinding(i2)
if err != nil {
return false, err
}
@@ -391,12 +391,12 @@ func KameletBindingsHaveSameTraits(i1 *v1alpha1.KameletBinding, i2 *v1alpha1.Kam
// IntegrationAndBindingSameTraits return if traits are the same.
// The comparison is done for the subset of traits defines on the binding as during the trait processing,
// some traits may be added to the Integration i.e. knative configuration in case of sink binding.
-func IntegrationAndBindingSameTraits(i1 *v1.Integration, i2 *v1alpha1.KameletBinding) (bool, error) {
+func IntegrationAndBindingSameTraits(i1 *v1.Integration, i2 *v1alpha1.Binding) (bool, error) {
itOpts, err := NewTraitsOptionsForIntegration(i1)
if err != nil {
return false, err
}
- klbOpts, err := NewTraitsOptionsForKameletBinding(i2)
+ klbOpts, err := NewTraitsOptionsForBinding(i2)
if err != nil {
return false, err
}
@@ -479,7 +479,7 @@ func NewTraitsOptionsForIntegrationPlatform(i *v1.IntegrationPlatform) (Options,
return m1, nil
}
-func NewTraitsOptionsForKameletBinding(i *v1alpha1.KameletBinding) (Options, error) {
+func NewTraitsOptionsForBinding(i *v1alpha1.Binding) (Options, error) {
if i.Spec.Integration != nil {
m1, err := ToTraitMap(i.Spec.Integration.Traits)
if err != nil {
diff --git a/pkg/trait/util_test.go b/pkg/trait/util_test.go
index 4f669faf7..963da619a 100644
--- a/pkg/trait/util_test.go
+++ b/pkg/trait/util_test.go
@@ -206,29 +206,29 @@ func TestToTrait(t *testing.T) {
func TestSameTraits(t *testing.T) {
t.Run("empty traits", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ oldKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{},
},
},
}
- newKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ newKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{},
},
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.True(t, ok)
})
t.Run("same traits", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ oldKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Container: &traitv1.ContainerTrait{
@@ -238,8 +238,8 @@ func TestSameTraits(t *testing.T) {
},
},
}
- newKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ newKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Container: &traitv1.ContainerTrait{
@@ -250,14 +250,14 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.True(t, ok)
})
t.Run("not same traits", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ oldKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Container: &traitv1.ContainerTrait{
@@ -267,8 +267,8 @@ func TestSameTraits(t *testing.T) {
},
},
}
- newKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ newKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Owner: &traitv1.OwnerTrait{
@@ -279,14 +279,14 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.False(t, ok)
})
t.Run("same traits with annotations", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ oldKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Container: &traitv1.ContainerTrait{
@@ -296,7 +296,7 @@ func TestSameTraits(t *testing.T) {
},
},
}
- newKlb := &v1alpha1.KameletBinding{
+ newKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:1",
@@ -304,20 +304,20 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.True(t, ok)
})
t.Run("same traits with annotations only", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
+ oldKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:1",
},
},
}
- newKlb := &v1alpha1.KameletBinding{
+ newKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:1",
@@ -325,14 +325,14 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.True(t, ok)
})
t.Run("not same traits with annotations", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
- Spec: v1alpha1.KameletBindingSpec{
+ oldKlb := &v1alpha1.Binding{
+ Spec: v1alpha1.BindingSpec{
Integration: &v1.IntegrationSpec{
Traits: v1.Traits{
Container: &traitv1.ContainerTrait{
@@ -342,7 +342,7 @@ func TestSameTraits(t *testing.T) {
},
},
}
- newKlb := &v1alpha1.KameletBinding{
+ newKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:2",
@@ -350,20 +350,20 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.False(t, ok)
})
t.Run("not same traits with annotations only", func(t *testing.T) {
- oldKlb := &v1alpha1.KameletBinding{
+ oldKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:1",
},
},
}
- newKlb := &v1alpha1.KameletBinding{
+ newKlb := &v1alpha1.Binding{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
v1.TraitAnnotationPrefix + "container.image": "foo/bar:2",
@@ -371,7 +371,7 @@ func TestSameTraits(t *testing.T) {
},
}
- ok, err := KameletBindingsHaveSameTraits(oldKlb, newKlb)
+ ok, err := BindingsHaveSameTraits(oldKlb, newKlb)
assert.NoError(t, err)
assert.False(t, ok)
})
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index 7e750befd..676a26ad8 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -58,7 +58,7 @@ func validateEndpoint(ctx BindingContext, e v1alpha1.Endpoint) error {
return errors.New("cannot use both ref and URI to specify an endpoint: only one of them should be used")
}
if e.Ref != nil && e.Ref.Namespace != "" && e.Ref.Namespace != ctx.Namespace {
- return errors.New("cross-namespace references are not allowed in kamelet binding")
+ return errors.New("cross-namespace references are not allowed inBinding")
}
return nil
}
diff --git a/pkg/util/bindings/kamelet.go b/pkg/util/bindings/kamelet.go
index ddb121ddd..42227379e 100644
--- a/pkg/util/bindings/kamelet.go
+++ b/pkg/util/bindings/kamelet.go
@@ -29,14 +29,14 @@ const (
datTypeActionKamelet = "data-type-action"
)
-// KameletBindingProvider converts a reference to a Kamelet into a Camel URI.
-type KameletBindingProvider struct{}
+// BindingConverter converts a reference to a Kamelet into a Camel URI.
+type BindingConverter struct{}
-func (k KameletBindingProvider) ID() string {
+func (k BindingConverter) ID() string {
return "kamelet"
}
-func (k KameletBindingProvider) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+func (k BindingConverter) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
if e.Ref == nil {
// works only on refs
return nil, nil
@@ -129,7 +129,7 @@ func (k KameletBindingProvider) Translate(ctx BindingContext, endpointCtx Endpoi
return nil, nil
}
-func (k KameletBindingProvider) DataTypeStep(e v1alpha1.Endpoint, id string, typeSlot v1alpha1.TypeSlot) (map[string]interface{}, map[string]string) {
+func (k BindingConverter) DataTypeStep(e v1alpha1.Endpoint, id string, typeSlot v1alpha1.TypeSlot) (map[string]interface{}, map[string]string) {
if e.DataTypes == nil {
return nil, nil
}
@@ -156,10 +156,10 @@ func (k KameletBindingProvider) DataTypeStep(e v1alpha1.Endpoint, id string, typ
return nil, nil
}
-func (k KameletBindingProvider) Order() int {
+func (k BindingConverter) Order() int {
return OrderStandard
}
func init() {
- RegisterBindingProvider(KameletBindingProvider{})
+ RegisterBindingProvider(BindingConverter{})
}
diff --git a/pkg/util/bindings/kamelet_test.go b/pkg/util/bindings/kamelet_test.go
index 9310c710b..1c12c4b8b 100644
--- a/pkg/util/bindings/kamelet_test.go
+++ b/pkg/util/bindings/kamelet_test.go
@@ -30,7 +30,7 @@ import (
"github.com/stretchr/testify/assert"
)
-func TestKameletBindingProvider(t *testing.T) {
+func TestBindingConverter(t *testing.T) {
testcases := []struct {
name string
endpointType v1alpha1.EndpointType
@@ -95,7 +95,7 @@ func TestKameletBindingProvider(t *testing.T) {
endpoint.Properties = asEndpointProperties(tc.endpointProperties)
}
- binding, err := KameletBindingProvider{}.Translate(
+ binding, err := BindingConverter{}.Translate(
BindingContext{
Ctx: ctx,
Client: client,
@@ -122,7 +122,7 @@ func TestKameletBindingProvider(t *testing.T) {
}
}
-func TestKameletBindingProviderWithDataTypes(t *testing.T) {
+func TestBindingConverterWithDataTypes(t *testing.T) {
testcases := []struct {
name string
endpointType v1alpha1.EndpointType
@@ -275,7 +275,7 @@ func TestKameletBindingProviderWithDataTypes(t *testing.T) {
}
}
- binding, err := KameletBindingProvider{}.Translate(
+ binding, err := BindingConverter{}.Translate(
BindingContext{
Ctx: ctx,
Client: client,
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index 0be3413be..7ebc4adf5 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -139,8 +139,8 @@ func (l Logger) ForKamelet(target *v1alpha1.Kamelet) Logger {
)
}
-// ForKameletBinding --.
-func (l Logger) ForKameletBinding(target *v1alpha1.KameletBinding) Logger {
+// ForBinding --.
+func (l Logger) ForBinding(target *v1alpha1.Binding) Logger {
return l.WithValues(
"api-version", target.APIVersion,
"kind", target.Kind,
diff --git a/script/gen_crd.sh b/script/gen_crd.sh
index b0dc55f61..d4e20f71d 100755
--- a/script/gen_crd.sh
+++ b/script/gen_crd.sh
@@ -68,4 +68,4 @@ deploy_crd integration integrations
deploy_crd integration-kit integrationkits
deploy_crd integration-platform integrationplatforms
deploy_crd kamelet kamelets
-deploy_crd kamelet-binding kameletbindings
+deploy_crd binding bindings
diff --git a/script/prepare-operators.sh b/script/prepare-operators.sh
index 9232324d3..a8a27357a 100755
--- a/script/prepare-operators.sh
+++ b/script/prepare-operators.sh
@@ -39,7 +39,7 @@ cp ./manifests/camel.apache.org_camelcatalogs.yaml k8s-operatorhub/$1/manifests/
cp ./manifests/camel.apache.org_integrationkits.yaml k8s-operatorhub/$1/manifests/integrationkits.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrationplatforms.yaml k8s-operatorhub/$1/manifests/integrationplatforms.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrations.yaml k8s-operatorhub/$1/manifests/integrations.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_kameletbindings.yaml k8s-operatorhub/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_bindings.yaml k8s-operatorhub/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml k8s-operatorhub/$1/manifests/kamelets.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml k8s-operatorhub/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml k8s-operatorhub/$1/metadata/annotations.yaml
@@ -50,7 +50,7 @@ cp ./manifests/camel.apache.org_camelcatalogs.yaml openshift-ecosystem/$1/manife
cp ./manifests/camel.apache.org_integrationkits.yaml openshift-ecosystem/$1/manifests/integrationkits.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrationplatforms.yaml openshift-ecosystem/$1/manifests/integrationplatforms.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_integrations.yaml openshift-ecosystem/$1/manifests/integrations.camel.apache.org.crd.yaml
-cp ./manifests/camel.apache.org_kameletbindings.yaml openshift-ecosystem/$1/manifests/kameletbindings.camel.apache.org.crd.yaml
+cp ./manifests/camel.apache.org_bindings.yaml openshift-ecosystem/$1/manifests/bindings.camel.apache.org.crd.yaml
cp ./manifests/camel.apache.org_kamelets.yaml openshift-ecosystem/$1/manifests/kamelets.camel.apache.org.crd.yaml
cp ./manifests/camel-k.clusterserviceversion.yaml openshift-ecosystem/$1/manifests/camel-k.v$1.clusterserviceversion.yaml
cp ./metadata/annotations.yaml openshift-ecosystem/$1/metadata/annotations.yaml
[camel-k] 06/18: chore: lint complains
Posted by pc...@apache.org.
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 981fcd13597c5106d214eaf605e706a90976db28
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Mar 28 17:30:25 2023 +0200
chore: lint complains
---
addons/keda/keda.go | 7 +++----
addons/keda/keda_test.go | 23 +++++++++++------------
pkg/resources/resources.go | 4 ++--
pkg/util/bindings/bindings_test.go | 11 +++++------
4 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 4e4ca5b17..7c9e3158d 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -27,7 +27,6 @@ import (
kedav1alpha1 "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/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/kamelet/repository"
"github.com/apache/camel-k/v2/pkg/metadata"
@@ -281,7 +280,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
}
if ctrlRef.Kind == camelv1.BindingKind {
scale.ObjectMeta.Name = ctrlRef.Name
- _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
+ _, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
if err != nil {
return err
}
@@ -297,7 +296,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectReference {
for _, o := range e.Integration.OwnerReferences {
- if o.Kind == camelv1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1alpha1.SchemeGroupVersion.Group) {
+ if o.Kind == camelv1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1.SchemeGroupVersion.Group) {
return &v1.ObjectReference{
APIVersion: o.APIVersion,
Kind: o.Kind,
@@ -320,7 +319,7 @@ func (t *kedaTrait) populateTriggersFromKamelets(e *trait.Environment) error {
kameletURIs := make(map[string][]string)
if err := metadata.Each(e.CamelCatalog, sources, func(_ int, meta metadata.IntegrationMetadata) bool {
for _, kameletURI := range meta.FromURIs {
- if kameletStr := source.ExtractKamelet(kameletURI); kameletStr != "" && camelv1alpha1.ValidKameletName(kameletStr) {
+ if kameletStr := source.ExtractKamelet(kameletURI); kameletStr != "" && camelv1.ValidKameletName(kameletStr) {
kamelet := kameletStr
if strings.Contains(kamelet, "/") {
kamelet = kamelet[0:strings.Index(kamelet, "/")]
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 420f72d05..015cb0d88 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -24,7 +24,6 @@ import (
"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/v1"
"github.com/apache/camel-k/v2/pkg/controller/binding"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util/camel"
@@ -126,8 +125,8 @@ func TestKameletAutoDetection(t *testing.T) {
},
},
Spec: camelv1.KameletSpec{
- Definition: &camelv1alpha1.JSONSchemaProps{
- Properties: map[string]camelv1alpha1.JSONSchemaProp{
+ Definition: &camelv1.JSONSchemaProps{
+ Properties: map[string]camelv1.JSONSchemaProp{
"a": {
XDescriptors: []string{
"urn:keda:metadata:a",
@@ -213,10 +212,10 @@ func TestBindingAutoDetection(t *testing.T) {
Name: "my-binding",
},
Spec: camelv1.BindingSpec{
- Source: camelv1alpha1.Endpoint{
+ Source: camelv1.Endpoint{
Ref: &corev1.ObjectReference{
Kind: "Kamelet",
- APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: camelv1.SchemeGroupVersion.String(),
Name: "my-kamelet",
},
Properties: asEndpointProperties(map[string]string{
@@ -225,7 +224,7 @@ func TestBindingAutoDetection(t *testing.T) {
"c": "v3",
}),
},
- Sink: camelv1alpha1.Endpoint{
+ Sink: camelv1.Endpoint{
URI: &logEndpoint,
},
},
@@ -241,8 +240,8 @@ func TestBindingAutoDetection(t *testing.T) {
},
},
Spec: camelv1.KameletSpec{
- Definition: &camelv1alpha1.JSONSchemaProps{
- Properties: map[string]camelv1alpha1.JSONSchemaProp{
+ Definition: &camelv1.JSONSchemaProps{
+ Properties: map[string]camelv1.JSONSchemaProp{
"a": {
XDescriptors: []string{
"urn:keda:metadata:a",
@@ -374,7 +373,7 @@ func TestHackKLBReplicas(t *testing.T) {
Name: "my-it",
OwnerReferences: []metav1.OwnerReference{
{
- APIVersion: camelv1alpha1.SchemeGroupVersion.String(),
+ APIVersion: camelv1.SchemeGroupVersion.String(),
Kind: "Binding",
Name: "my-klb",
},
@@ -392,7 +391,7 @@ func TestHackKLBReplicas(t *testing.T) {
assert.NoError(t, keda.Apply(env))
scalesClient, err := env.Client.ScalesClient()
assert.NoError(t, err)
- sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1alpha1.SchemeGroupVersion.WithResource("bindings").GroupResource(), "my-klb", metav1.GetOptions{})
+ sc, err := scalesClient.Scales("test").Get(env.Ctx, camelv1.SchemeGroupVersion.WithResource("bindings").GroupResource(), "my-klb", metav1.GetOptions{})
assert.NoError(t, err)
assert.Equal(t, int32(1), sc.Spec.Replicas)
}
@@ -493,12 +492,12 @@ func createBasicTestEnvironment(resources ...runtime.Object) *trait.Environment
}
}
-func asEndpointProperties(props map[string]string) *camelv1alpha1.EndpointProperties {
+func asEndpointProperties(props map[string]string) *camelv1.EndpointProperties {
serialized, err := json.Marshal(props)
if err != nil {
panic(err)
}
- return &camelv1alpha1.EndpointProperties{
+ return &camelv1.EndpointProperties{
RawMessage: serialized,
}
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 75e697c62..701371ab0 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -159,9 +159,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 571661,
+ uncompressedSize: 572531,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x23\xb7\xb5\x28\xfa\x3d\xbf\x02\x35\x71\x1d\x49\xdb\x22\x35\xe3\x24\xae\x9d\xa9\xd4\x71\x29\x1a\xd9\xd6\xf5\x8c\x86\x35\x92\x9d\xe3\x1a\x7b\xdb\x60\x37\x48\xe2\xa8\x09\x74\x00\x34\x25\xfa\xfa\xfe\xf7\x5b\x58\x00\xba\xd1\x7c\x09\xab\x29\x29\x9a\xa4\x91\x2a\x67\x48\xb1\x57\xe3\xb5\xde\xaf\x3f\x0c\x06\x83\x3f\xd0\x92\xff\xc0\x94\xe6\x52\xbc\x26\xb4\xe4\xec\xce\x30\x61\x3f\xe9\xe1\xcd\x7f\xeb\x21\x97\x27\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
},
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
diff --git a/pkg/util/bindings/bindings_test.go b/pkg/util/bindings/bindings_test.go
index cbf2e9b74..49c9ee63c 100644
--- a/pkg/util/bindings/bindings_test.go
+++ b/pkg/util/bindings/bindings_test.go
@@ -25,7 +25,6 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
- camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
@@ -38,9 +37,9 @@ func TestBindings(t *testing.T) {
testcases := []struct {
endpointType v1.EndpointType
endpoint v1.Endpoint
- profile camelv1.TraitProfile
+ profile v1.TraitProfile
uri string
- traits camelv1.Traits
+ traits v1.Traits
props map[string]string
}{
{
@@ -183,7 +182,7 @@ func TestBindings(t *testing.T) {
}),
},
uri: "knative:endpoint/sink?ce.override.ce-type=mytype",
- traits: camelv1.Traits{
+ traits: v1.Traits{
Knative: &traitv1.KnativeTrait{
SinkBinding: pointer.Bool(false),
Configuration: asKnativeConfig("https://myurl/hey"),
@@ -195,7 +194,7 @@ func TestBindings(t *testing.T) {
endpoint: v1.Endpoint{
URI: pointer.String("https://myurl/hey"),
},
- profile: camelv1.TraitProfileKubernetes,
+ profile: v1.TraitProfileKubernetes,
uri: "https://myurl/hey",
},
{
@@ -217,7 +216,7 @@ func TestBindings(t *testing.T) {
profile := tc.profile
if profile == "" {
- profile = camelv1.TraitProfileKnative
+ profile = v1.TraitProfileKnative
}
bindingContext := BindingContext{
[camel-k] 03/18: chore(test): add some CSVs dump info
Posted by pc...@apache.org.
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 1a3a7f758a86e118a73f3cbc496f59366d205a8a
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Mar 27 12:19:56 2023 +0200
chore(test): add some CSVs dump info
---
e2e/support/util/dump.go | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/e2e/support/util/dump.go b/e2e/support/util/dump.go
index 94efeac33..64741beb3 100644
--- a/e2e/support/util/dump.go
+++ b/e2e/support/util/dump.go
@@ -35,6 +35,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
routev1 "github.com/openshift/api/route/v1"
+ olm "github.com/operator-framework/api/pkg/operators/v1alpha1"
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
@@ -240,6 +241,22 @@ func Dump(ctx context.Context, c client.Client, ns string, t *testing.T) error {
}
}
+ // OLM CSV
+ csvs := olm.ClusterServiceVersionList{}
+ err = c.List(ctx, &csvs, ctrl.InNamespace(ns))
+ if err != nil {
+ return err
+ }
+ t.Logf("\nFound %d OLM CSVs:\n", len(csvs.Items))
+ for _, csv := range csvs.Items {
+ ref := csv
+ data, err := kubernetes.ToYAMLNoManagedFields(&ref)
+ if err != nil {
+ return err
+ }
+ t.Logf("---\n%s\n---\n", string(data))
+ }
+
// Some log from running pods
//
[camel-k] 11/18: chore(controller): keep KameletBindings reconciliation loop
Posted by pc...@apache.org.
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 167395a876e7702b1e651e4479e1f7c30a5eaa7f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Apr 3 15:28:59 2023 +0200
chore(controller): keep KameletBindings reconciliation loop
---
config/crd/bases/camel.apache.org_bindings.yaml | 2 +
config/rbac/operator-role.yaml | 5 +
config/rbac/user-cluster-role.yaml | 5 +
helm/camel-k/crds/crd-binding.yaml | 2 +
pkg/apis/camel/v1/binding_types.go | 2 +-
pkg/cmd/rebuild.go | 92 +------
pkg/cmd/rebuild_test.go | 62 -----
pkg/cmd/reset.go | 25 +-
.../{add_kameletbinding.go => add_binding.go} | 0
pkg/controller/add_kameletbinding.go | 4 +-
.../action.go} | 36 ++-
pkg/controller/kameletbinding/error_handler.go | 109 +++++++++
.../kameletbinding/error_handler_test.go | 103 ++++++++
pkg/controller/kameletbinding/initialize.go | 131 ++++++++++
pkg/controller/kameletbinding/integration.go | 265 +++++++++++++++++++++
.../kameletbinding/kameletbinding_controller.go | 239 +++++++++++++++++++
.../log.go} | 11 +-
pkg/controller/kameletbinding/monitor.go | 218 +++++++++++++++++
pkg/event/manager.go | 32 +++
pkg/resources/resources.go | 12 +-
pkg/trait/util.go | 68 ++++++
pkg/util/bindings/api_support.go | 10 +
pkg/util/bindings/api_v1alpha1.go | 55 +++++
pkg/util/bindings/catalog.go | 48 +++-
pkg/util/bindings/v1alpha1_kamelet.go | 164 +++++++++++++
pkg/util/log/log.go | 12 +
26 files changed, 1537 insertions(+), 175 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/crd/bases/camel.apache.org_bindings.yaml
index d2a6833c1..a2694d60a 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/crd/bases/camel.apache.org_bindings.yaml
@@ -33,6 +33,8 @@ spec:
kind: Binding
listKind: BindingList
plural: bindings
+ shortNames:
+ - bd
singular: binding
scope: Namespaced
versions:
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index 0c9dc702d..1a5904312 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -31,6 +31,8 @@ rules:
- integrationplatforms
- integrations
- bindings
+ # Deprecated: kameletbindings CR
+ - kameletbindings
- kamelets
verbs:
- create
@@ -56,6 +58,9 @@ rules:
- integrations/status
- bindings/status
- bindings/scale
+ # Deprecated: kameletbindings CR
+ - kameletbindings/status
+ - kameletbindings/scale
- kamelets/status
verbs:
- get
diff --git a/config/rbac/user-cluster-role.yaml b/config/rbac/user-cluster-role.yaml
index 86e19096b..8942be225 100644
--- a/config/rbac/user-cluster-role.yaml
+++ b/config/rbac/user-cluster-role.yaml
@@ -34,6 +34,8 @@ rules:
- integrationplatforms
- integrations
- bindings
+ # Deprecated: kameletbindings CR
+ - kameletbindings
- kamelets
verbs:
- create
@@ -55,6 +57,9 @@ rules:
- integrations/status
- bindings/scale
- bindings/status
+ # Deprecated: kameletbindings CR
+ - kameletbindings/scale
+ - kameletbindings/status
- kamelets/status
verbs:
- get
diff --git a/helm/camel-k/crds/crd-binding.yaml b/helm/camel-k/crds/crd-binding.yaml
index d2a6833c1..a2694d60a 100644
--- a/helm/camel-k/crds/crd-binding.yaml
+++ b/helm/camel-k/crds/crd-binding.yaml
@@ -33,6 +33,8 @@ spec:
kind: Binding
listKind: BindingList
plural: bindings
+ shortNames:
+ - bd
singular: binding
scope: Namespaced
versions:
diff --git a/pkg/apis/camel/v1/binding_types.go b/pkg/apis/camel/v1/binding_types.go
index 550141542..6d22c550d 100644
--- a/pkg/apis/camel/v1/binding_types.go
+++ b/pkg/apis/camel/v1/binding_types.go
@@ -24,7 +24,7 @@ import (
// +genclient
// +kubebuilder:object:root=true
-// +kubebuilder:resource:path=bindings,scope=Namespaced,categories=kamel;camel
+// +kubebuilder:resource:path=bindings,scope=Namespaced,shortName=bd,categories=kamel;camel
// +kubebuilder:subresource:status
// +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
// +genclient:method=UpdateScale,verb=update,subresource=scale,input=k8s.io/api/autoscaling/v1.Scale,result=k8s.io/api/autoscaling/v1.Scale
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index f4505bf39..5b30d158d 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -22,14 +22,11 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
- "k8s.io/apimachinery/pkg/labels"
- "k8s.io/apimachinery/pkg/selection"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
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"
)
func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdOptions) {
@@ -71,76 +68,6 @@ func (o *rebuildCmdOptions) validate(args []string) error {
}
func (o *rebuildCmdOptions) run(cmd *cobra.Command, args []string) error {
- errKlbs := o.rebuildBindingType(cmd, args)
- errIts := o.rebuildIntegrationType(cmd, args)
-
- if errIts != nil && errKlbs != nil {
- return errors.Wrap(errIts, errKlbs.Error())
- }
-
- return nil
-}
-
-func (o *rebuildCmdOptions) rebuildBindingType(cmd *cobra.Command, args []string) error {
- c, err := o.GetCmdClient()
- if err != nil {
- return err
- }
- var bindings []v1.Binding
- if o.RebuildAll {
- if bindings, err = o.listAllBindings(c); err != nil {
- return err
- }
- } else if len(args) > 0 {
- if bindings, err = o.getBindings(c, args); err != nil {
- return err
- }
- }
-
- if err = o.rebuildBindings(c, bindings); err != nil {
- return err
- }
-
- fmt.Fprintln(cmd.OutOrStdout(), len(bindings), "bindings have been rebuilt")
- return nil
-}
-
-func (o *rebuildCmdOptions) listAllBindings(c client.Client) ([]v1.Binding, error) {
- list := v1.NewBindingList()
- if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
- return nil, errors.Wrap(err, fmt.Sprintf("could not retrieve bindings from namespace %s", o.Namespace))
- }
- return list.Items, nil
-}
-
-func (o *rebuildCmdOptions) getBindings(c client.Client, names []string) ([]v1.Binding, error) {
- klbs := make([]v1.Binding, 0, len(names))
- for _, n := range names {
- klb := v1.NewBinding(o.Namespace, n)
- key := k8sclient.ObjectKey{
- Name: n,
- Namespace: o.Namespace,
- }
- if err := c.Get(o.Context, key, &klb); err != nil {
- return nil, errors.Wrap(err, fmt.Sprintf("could not find binding %s in namespace %s", klb.Name, o.Namespace))
- }
- klbs = append(klbs, klb)
- }
- return klbs, nil
-}
-
-func (o *rebuildCmdOptions) rebuildBindings(c k8sclient.StatusClient, bindings []v1.Binding) error {
- for _, i := range bindings {
- klb := i
- klb.Status = v1.BindingStatus{}
- if err := c.Status().Update(o.Context, &klb); err != nil {
- return errors.Wrap(err, fmt.Sprintf("could not rebuild binding %s in namespace %s", klb.Name, o.Namespace))
- }
- }
- return nil
-}
-
-func (o *rebuildCmdOptions) rebuildIntegrationType(cmd *cobra.Command, args []string) error {
c, err := o.GetCmdClient()
if err != nil {
return err
@@ -166,19 +93,7 @@ func (o *rebuildCmdOptions) rebuildIntegrationType(cmd *cobra.Command, args []st
func (o *rebuildCmdOptions) listAllIntegrations(c client.Client) ([]v1.Integration, error) {
list := v1.NewIntegrationList()
- // Integrations controlled by Bindings are not included
- excludeItsFromKlbs, err := labels.NewRequirement(kubernetes.CamelCreatorLabelKind, selection.NotEquals, []string{
- "Binding",
- })
- if err != nil {
- return list.Items, err
- }
- if err := c.List(o.Context, &list,
- k8sclient.InNamespace(o.Namespace),
- k8sclient.MatchingLabelsSelector{
- Selector: labels.NewSelector().Add(*excludeItsFromKlbs),
- },
- ); err != nil {
+ if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not retrieve integrations from namespace %s", o.Namespace))
}
return list.Items, nil
@@ -195,10 +110,7 @@ func (o *rebuildCmdOptions) getIntegrations(c client.Client, names []string) ([]
if err := c.Get(o.Context, key, &it); err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not find integration %s in namespace %s", it.Name, o.Namespace))
}
- // Integrations controlled by Bindings are not included
- if it.Labels[kubernetes.CamelCreatorLabelKind] != "Binding" {
- ints = append(ints, it)
- }
+ ints = append(ints, it)
}
return ints, nil
}
diff --git a/pkg/cmd/rebuild_test.go b/pkg/cmd/rebuild_test.go
index 4b7ac33c5..021c1cf6b 100644
--- a/pkg/cmd/rebuild_test.go
+++ b/pkg/cmd/rebuild_test.go
@@ -20,7 +20,6 @@ package cmd
import (
"testing"
- "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
@@ -65,64 +64,3 @@ func TestRebuildAllFlag(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, true, rebuildCmdOptions.RebuildAll)
}
-
-func TestRebuildAllBindingsAndIntegrations(t *testing.T) {
- defaultIntegration := nominalIntegration("my-it-test")
- defaultKB := nominalBinding("my-kb-test-rebuild")
- itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
- itGeneratedByKlb.Labels = map[string]string{
- kubernetes.CamelCreatorLabelKind: "Binding",
- }
-
- _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
- output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "--all")
- assert.Nil(t, err)
- assert.Contains(t, output, "1 bindings have been rebuilt")
- assert.Contains(t, output, "1 integrations have been rebuilt")
-}
-
-func TestRebuildNone(t *testing.T) {
- defaultIntegration := nominalIntegration("my-it-test")
- defaultKB := nominalBinding("my-kb-test-rebuild")
- itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
- itGeneratedByKlb.Labels = map[string]string{
- kubernetes.CamelCreatorLabelKind: "Binding",
- }
-
- _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
- output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-missing")
- assert.NotNil(t, err)
- assert.NotContains(t, output, "have been rebuilt")
- assert.Contains(t, output, "could not find binding my-missing in namespace default")
- assert.Contains(t, output, "could not find integration my-missing in namespace default")
-}
-
-func TestRebuildBindingOnly(t *testing.T) {
- defaultIntegration := nominalIntegration("my-it-test")
- defaultKB := nominalBinding("my-kb-test-rebuild")
- itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
- itGeneratedByKlb.Labels = map[string]string{
- kubernetes.CamelCreatorLabelKind: "Binding",
- }
-
- _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
- output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-kb-test-rebuild")
- assert.Nil(t, err)
- assert.Contains(t, output, "1 bindings have been rebuilt")
- assert.NotContains(t, output, "1 integrations have been rebuilt")
-}
-
-func TestRebuildIntegrationOnly(t *testing.T) {
- defaultIntegration := nominalIntegration("my-it-test")
- defaultKB := nominalBinding("my-kb-test-rebuild")
- itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
- itGeneratedByKlb.Labels = map[string]string{
- kubernetes.CamelCreatorLabelKind: "Binding",
- }
-
- _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
- output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-it-test")
- assert.Nil(t, err)
- assert.NotContains(t, output, "1 bindings have been rebuilt")
- assert.Contains(t, output, "1 integrations have been rebuilt")
-}
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index 5a7023638..39a42ebf5 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -21,6 +21,7 @@ import (
"fmt"
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"
@@ -67,6 +68,12 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
return
}
fmt.Fprintln(cmd.OutOrStdout(), n, "bindings deleted from namespace", o.Namespace)
+
+ if n, err = o.deleteAllKameletBindings(c); err != nil {
+ fmt.Fprint(cmd.ErrOrStderr(), err)
+ return
+ }
+ fmt.Fprintln(cmd.OutOrStdout(), n, "kameletbindings deleted from namespace", o.Namespace)
}
if !o.SkipIntegrations {
@@ -128,12 +135,26 @@ func (o *resetCmdOptions) deleteAllIntegrationKits(c client.Client) (int, error)
func (o *resetCmdOptions) deleteAllBindings(c client.Client) (int, error) {
list := v1.NewBindingList()
if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
- return 0, errors.Wrap(err, fmt.Sprintf("could not retrieveBindings from namespace %s", o.Namespace))
+ return 0, errors.Wrap(err, fmt.Sprintf("could not retrieve Bindings from namespace %s", o.Namespace))
+ }
+ for _, i := range list.Items {
+ klb := i
+ if err := c.Delete(o.Context, &klb); err != nil {
+ return 0, errors.Wrap(err, fmt.Sprintf("could not delete Binding %s from namespace %s", klb.Name, klb.Namespace))
+ }
+ }
+ return len(list.Items), nil
+}
+
+func (o *resetCmdOptions) deleteAllKameletBindings(c client.Client) (int, error) {
+ list := v1alpha1.NewKameletBindingList()
+ if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
+ return 0, errors.Wrap(err, fmt.Sprintf("could not retrieve KameletBindings from namespace %s", o.Namespace))
}
for _, i := range list.Items {
klb := i
if err := c.Delete(o.Context, &klb); err != nil {
- return 0, errors.Wrap(err, fmt.Sprintf("could not deleteBinding %s from namespace %s", klb.Name, klb.Namespace))
+ return 0, errors.Wrap(err, fmt.Sprintf("could not delete KameletBinding %s from namespace %s", klb.Name, klb.Namespace))
}
}
return len(list.Items), nil
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/add_binding.go
similarity index 100%
copy from pkg/controller/add_kameletbinding.go
copy to pkg/controller/add_binding.go
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/add_kameletbinding.go
index 9e977f7a1..c517b61b0 100644
--- a/pkg/controller/add_kameletbinding.go
+++ b/pkg/controller/add_kameletbinding.go
@@ -18,9 +18,9 @@ limitations under the License.
package controller
import (
- "github.com/apache/camel-k/v2/pkg/controller/binding"
+ "github.com/apache/camel-k/v2/pkg/controller/kameletbinding"
)
func init() {
- addToManager = append(addToManager, binding.Add)
+ addToManager = append(addToManager, kameletbinding.Add)
}
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/kameletbinding/action.go
similarity index 50%
copy from pkg/controller/add_kameletbinding.go
copy to pkg/controller/kameletbinding/action.go
index 9e977f7a1..4900f70ba 100644
--- a/pkg/controller/add_kameletbinding.go
+++ b/pkg/controller/kameletbinding/action.go
@@ -15,12 +15,40 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package controller
+package kameletbinding
import (
- "github.com/apache/camel-k/v2/pkg/controller/binding"
+ "context"
+
+ "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"
)
-func init() {
- addToManager = append(addToManager, binding.Add)
+// Action --.
+type Action interface {
+ client.Injectable
+ log.Injectable
+
+ // a user friendly name for the action
+ Name() string
+
+ // returns true if the action can handle the binding
+ CanHandle(kb *v1alpha1.KameletBinding) bool
+
+ // executes the handling function
+ Handle(ctx context.Context, kb *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error)
+}
+
+type baseAction struct {
+ client client.Client
+ L log.Logger
+}
+
+func (action *baseAction) InjectClient(client client.Client) {
+ action.client = client
+}
+
+func (action *baseAction) InjectLogger(log log.Logger) {
+ action.L = log
}
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/kameletbinding/error_handler.go
new file mode 100644
index 000000000..571934a1a
--- /dev/null
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -0,0 +1,109 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "encoding/json"
+ "fmt"
+
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/util/bindings"
+ "github.com/pkg/errors"
+)
+
+func maybeErrorHandler(errHandlConf *v1alpha1.ErrorHandlerSpec, bindingContext bindings.V1alpha1BindingContext) (*bindings.Binding, error) {
+ var errorHandlerBinding *bindings.Binding
+ if errHandlConf != nil {
+ errorHandlerSpec, err := parseErrorHandler(errHandlConf.RawMessage)
+ if err != nil {
+ return nil, errors.Wrap(err, "could not parse error handler")
+ }
+ // We need to get the translated URI from any referenced resource (ie, kamelets)
+ if errorHandlerSpec.Type() == v1alpha1.ErrorHandlerTypeSink {
+ errorHandlerBinding, err = bindings.TranslateV1alpha1(bindingContext, bindings.V1alpha1EndpointContext{Type: v1alpha1.EndpointTypeErrorHandler}, *errorHandlerSpec.Endpoint())
+ if err != nil {
+ return nil, errors.Wrap(err, "could not determine error handler URI")
+ }
+ } else {
+ // Create a new binding otherwise in order to store error handler application properties
+ errorHandlerBinding = &bindings.Binding{
+ ApplicationProperties: make(map[string]string),
+ }
+ }
+
+ err = setErrorHandlerConfiguration(errorHandlerBinding, errorHandlerSpec)
+ if err != nil {
+ return nil, errors.Wrap(err, "could not set integration error handler")
+ }
+
+ return errorHandlerBinding, nil
+ }
+ return nil, nil
+}
+
+func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler, error) {
+ var properties map[v1alpha1.ErrorHandlerType]v1alpha1.RawMessage
+ err := json.Unmarshal(rawMessage, &properties)
+ if err != nil {
+ return nil, err
+ }
+ if len(properties) > 1 {
+ return nil, errors.Errorf("You must provide just 1 error handler, provided %d", len(properties))
+ }
+
+ for errHandlType, errHandlValue := range properties {
+ var dst v1alpha1.ErrorHandler
+ switch errHandlType {
+ case v1alpha1.ErrorHandlerTypeNone:
+ dst = new(v1alpha1.ErrorHandlerNone)
+ case v1alpha1.ErrorHandlerTypeLog:
+ dst = new(v1alpha1.ErrorHandlerLog)
+ case v1alpha1.ErrorHandlerTypeSink:
+ dst = new(v1alpha1.ErrorHandlerSink)
+ default:
+ return nil, errors.Errorf("Unknown error handler type %s", errHandlType)
+ }
+
+ err := json.Unmarshal(errHandlValue, dst)
+ if err != nil {
+ return nil, err
+ }
+
+ return dst, nil
+ }
+
+ return nil, errors.New("You must provide any supported error handler")
+}
+
+func setErrorHandlerConfiguration(errorHandlerBinding *bindings.Binding, errorHandler v1alpha1.ErrorHandler) error {
+ properties, err := errorHandler.Configuration()
+ if err != nil {
+ return err
+ }
+ // initialize map if not yet initialized
+ if errorHandlerBinding.ApplicationProperties == nil {
+ errorHandlerBinding.ApplicationProperties = make(map[string]string)
+ }
+ for key, value := range properties {
+ errorHandlerBinding.ApplicationProperties[key] = fmt.Sprintf("%v", value)
+ }
+ if errorHandler.Type() == v1alpha1.ErrorHandlerTypeSink && errorHandlerBinding.URI != "" {
+ errorHandlerBinding.ApplicationProperties[fmt.Sprintf("%s.deadLetterUri", v1alpha1.ErrorHandlerAppPropertiesPrefix)] = fmt.Sprintf("%v", errorHandlerBinding.URI)
+ }
+ return nil
+}
diff --git a/pkg/controller/kameletbinding/error_handler_test.go b/pkg/controller/kameletbinding/error_handler_test.go
new file mode 100644
index 000000000..6abbf2187
--- /dev/null
+++ b/pkg/controller/kameletbinding/error_handler_test.go
@@ -0,0 +1,103 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "fmt"
+ "testing"
+
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestParseErrorHandlerNoneDoesSucceed(t *testing.T) {
+ noErrorHandler, err := parseErrorHandler(
+ []byte(`{"none": null}`),
+ )
+ assert.Nil(t, err)
+ assert.Equal(t, v1alpha1.ErrorHandlerTypeNone, noErrorHandler.Type())
+ parameters, err := noErrorHandler.Configuration()
+ assert.Nil(t, err)
+ assert.Equal(t, "#class:org.apache.camel.builder.NoErrorHandlerBuilder", parameters[v1alpha1.ErrorHandlerAppPropertiesPrefix])
+ assert.Equal(t, v1alpha1.ErrorHandlerRefDefaultName, parameters[v1alpha1.ErrorHandlerRefName])
+}
+
+func TestParseErrorHandlerLogDoesSucceed(t *testing.T) {
+ logErrorHandler, err := parseErrorHandler(
+ []byte(`{"log": null}`),
+ )
+ assert.Nil(t, err)
+ assert.Equal(t, v1alpha1.ErrorHandlerTypeLog, logErrorHandler.Type())
+ parameters, err := logErrorHandler.Configuration()
+ assert.Nil(t, err)
+ assert.Equal(t, "#class:org.apache.camel.builder.DefaultErrorHandlerBuilder", parameters[v1alpha1.ErrorHandlerAppPropertiesPrefix])
+ assert.Equal(t, v1alpha1.ErrorHandlerRefDefaultName, parameters[v1alpha1.ErrorHandlerRefName])
+}
+
+func TestParseErrorHandlerLogWithParametersDoesSucceed(t *testing.T) {
+ logErrorHandler, err := parseErrorHandler(
+ []byte(`{"log": {"parameters": {"param1": "value1", "param2": "value2"}}}`),
+ )
+ assert.Nil(t, err)
+ assert.Equal(t, v1alpha1.ErrorHandlerTypeLog, logErrorHandler.Type())
+ parameters, err := logErrorHandler.Configuration()
+ assert.Nil(t, err)
+ assert.Equal(t, "#class:org.apache.camel.builder.DefaultErrorHandlerBuilder", parameters[v1alpha1.ErrorHandlerAppPropertiesPrefix])
+ assert.Equal(t, "value1", parameters["camel.beans.defaultErrorHandler.param1"])
+ assert.Equal(t, "value2", parameters["camel.beans.defaultErrorHandler.param2"])
+ assert.Equal(t, v1alpha1.ErrorHandlerRefDefaultName, parameters[v1alpha1.ErrorHandlerRefName])
+}
+
+func TestParseErrorHandlerSinkDoesSucceed(t *testing.T) {
+ fmt.Println("Test")
+ sinkErrorHandler, err := parseErrorHandler(
+ []byte(`{"sink": {"endpoint": {"uri": "someUri"}}}`),
+ )
+ assert.Nil(t, err)
+ assert.NotNil(t, sinkErrorHandler)
+ assert.Equal(t, v1alpha1.ErrorHandlerTypeSink, sinkErrorHandler.Type())
+ assert.Equal(t, "someUri", *sinkErrorHandler.Endpoint().URI)
+ parameters, err := sinkErrorHandler.Configuration()
+ assert.Nil(t, err)
+ assert.Equal(t, "#class:org.apache.camel.builder.DeadLetterChannelBuilder", parameters[v1alpha1.ErrorHandlerAppPropertiesPrefix])
+ assert.Equal(t, v1alpha1.ErrorHandlerRefDefaultName, parameters[v1alpha1.ErrorHandlerRefName])
+}
+
+func TestParseErrorHandlerSinkWithParametersDoesSucceed(t *testing.T) {
+ sinkErrorHandler, err := parseErrorHandler(
+ []byte(`{
+ "sink": {
+ "endpoint": {
+ "uri": "someUri"
+ },
+ "parameters":
+ {"param1": "value1", "param2": "value2"}
+ }
+ }`),
+ )
+ assert.Nil(t, err)
+ assert.NotNil(t, sinkErrorHandler)
+ assert.Equal(t, v1alpha1.ErrorHandlerTypeSink, sinkErrorHandler.Type())
+ assert.Equal(t, "someUri", *sinkErrorHandler.Endpoint().URI)
+ parameters, err := sinkErrorHandler.Configuration()
+ assert.Nil(t, err)
+ assert.Equal(t, "#class:org.apache.camel.builder.DeadLetterChannelBuilder", parameters[v1alpha1.ErrorHandlerAppPropertiesPrefix])
+ assert.Equal(t, v1alpha1.ErrorHandlerRefDefaultName, parameters[v1alpha1.ErrorHandlerRefName])
+ assert.Equal(t, "value1", parameters["camel.beans.defaultErrorHandler.param1"])
+ assert.Equal(t, "value2", parameters["camel.beans.defaultErrorHandler.param2"])
+}
diff --git a/pkg/controller/kameletbinding/initialize.go b/pkg/controller/kameletbinding/initialize.go
new file mode 100644
index 000000000..35afba27f
--- /dev/null
+++ b/pkg/controller/kameletbinding/initialize.go
@@ -0,0 +1,131 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "context"
+ "strings"
+
+ v1alpha1 "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"
+ "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// NewInitializeAction returns a action that initializes the KameletBinding configuration when not provided by the user.
+func NewInitializeAction() Action {
+ return &initializeAction{}
+}
+
+type initializeAction struct {
+ baseAction
+}
+
+func (action *initializeAction) Name() string {
+ return "initialize"
+}
+
+func (action *initializeAction) CanHandle(binding *v1alpha1.KameletBinding) bool {
+ return binding.Status.Phase == v1alpha1.KameletBindingPhaseNone
+}
+
+func (action *initializeAction) Handle(ctx context.Context, binding *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error) {
+ it, err := CreateIntegrationFor(ctx, action.client, binding)
+ if err != nil {
+ binding.Status.Phase = v1alpha1.KameletBindingPhaseError
+ binding.Status.SetErrorCondition(v1alpha1.KameletBindingIntegrationConditionError,
+ "Couldn't create an Integration custom resource", err)
+ return binding, err
+ }
+
+ if _, err := kubernetes.ReplaceResource(ctx, action.client, it); err != nil {
+ return nil, errors.Wrap(err, "could not create integration for KameletBinding")
+ }
+
+ // propagate Kamelet icon (best effort)
+ action.propagateIcon(ctx, binding)
+
+ target := binding.DeepCopy()
+ target.Status.Phase = v1alpha1.KameletBindingPhaseCreating
+ return target, nil
+}
+
+func (action *initializeAction) propagateIcon(ctx context.Context, binding *v1alpha1.KameletBinding) {
+ icon, err := action.findIcon(ctx, binding)
+ if err != nil {
+ action.L.Errorf(err, "cannot find icon for KameletBinding %q", binding.Name)
+ return
+ }
+ if icon == "" {
+ return
+ }
+ // compute patch
+ clone := binding.DeepCopy()
+ clone.Annotations = make(map[string]string)
+ for k, v := range binding.Annotations {
+ clone.Annotations[k] = v
+ }
+ if _, ok := clone.Annotations[v1alpha1.AnnotationIcon]; !ok {
+ clone.Annotations[v1alpha1.AnnotationIcon] = icon
+ }
+ p, err := patch.MergePatch(binding, clone)
+ if err != nil {
+ action.L.Errorf(err, "cannot compute patch to update icon for KameletBinding %q", binding.Name)
+ return
+ }
+ if len(p) > 0 {
+ if err := action.client.Patch(ctx, clone, client.RawPatch(types.MergePatchType, p)); err != nil {
+ action.L.Errorf(err, "cannot apply merge patch to update icon for KameletBinding %q", binding.Name)
+ return
+ }
+ }
+}
+
+func (action *initializeAction) findIcon(ctx context.Context, binding *v1alpha1.KameletBinding) (string, error) {
+ var kameletRef *corev1.ObjectReference
+ if binding.Spec.Source.Ref != nil && binding.Spec.Source.Ref.Kind == "Kamelet" && strings.HasPrefix(binding.Spec.Source.Ref.APIVersion, "camel.apache.org/") {
+ kameletRef = binding.Spec.Source.Ref
+ } else if binding.Spec.Sink.Ref != nil && binding.Spec.Sink.Ref.Kind == "Kamelet" && strings.HasPrefix(binding.Spec.Sink.Ref.APIVersion, "camel.apache.org/") {
+ kameletRef = binding.Spec.Sink.Ref
+ }
+
+ if kameletRef == nil {
+ return "", nil
+ }
+
+ repo, err := repository.New(ctx, action.client, binding.Namespace, platform.GetOperatorNamespace())
+ if err != nil {
+ return "", err
+ }
+
+ kamelet, err := repo.Get(ctx, kameletRef.Name)
+ if err != nil {
+ return "", err
+ }
+ if kamelet == nil {
+ return "", nil
+ }
+
+ return kamelet.Annotations[v1alpha1.AnnotationIcon], nil
+}
diff --git a/pkg/controller/kameletbinding/integration.go b/pkg/controller/kameletbinding/integration.go
new file mode 100644
index 000000000..1d4fdc796
--- /dev/null
+++ b/pkg/controller/kameletbinding/integration.go
@@ -0,0 +1,265 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "context"
+ "encoding/json"
+ "sort"
+
+ "github.com/pkg/errors"
+
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ 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 (
+ endpointTypeSourceContext = bindings.V1alpha1EndpointContext{Type: v1alpha1.EndpointTypeSource}
+ endpointTypeSinkContext = bindings.V1alpha1EndpointContext{Type: v1alpha1.EndpointTypeSink}
+)
+
+func CreateIntegrationFor(ctx context.Context, c client.Client, binding *v1alpha1.KameletBinding) (*v1.Integration, error) {
+ controller := true
+ blockOwnerDeletion := true
+ annotations := util.CopyMap(binding.Annotations)
+ // avoid propagating the icon to the integration as it's heavyweight and not needed
+ delete(annotations, v1alpha1.AnnotationIcon)
+
+ it := v1.Integration{
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: binding.Namespace,
+ Name: binding.Name,
+ Annotations: annotations,
+ Labels: util.CopyMap(binding.Labels),
+ OwnerReferences: []metav1.OwnerReference{
+ {
+ APIVersion: binding.APIVersion,
+ Kind: binding.Kind,
+ Name: binding.Name,
+ UID: binding.UID,
+ Controller: &controller,
+ BlockOwnerDeletion: &blockOwnerDeletion,
+ },
+ },
+ },
+ }
+
+ // creator labels
+ if it.GetLabels() == nil {
+ it.SetLabels(make(map[string]string))
+ }
+ it.GetLabels()[kubernetes.CamelCreatorLabelKind] = binding.Kind
+ it.GetLabels()[kubernetes.CamelCreatorLabelName] = binding.Name
+
+ // start from the integration spec defined in the binding
+ if binding.Spec.Integration != nil {
+ it.Spec = *binding.Spec.Integration.DeepCopy()
+ }
+
+ // Set replicas (or override podspecable value) if present
+ if binding.Spec.Replicas != nil {
+ replicas := *binding.Spec.Replicas
+ it.Spec.Replicas = &replicas
+ }
+
+ profile, err := determineProfile(ctx, c, binding)
+ if err != nil {
+ return nil, err
+ }
+ it.Spec.Profile = profile
+
+ if binding.Spec.ServiceAccountName != "" {
+ it.Spec.ServiceAccountName = binding.Spec.ServiceAccountName
+ }
+
+ bindingContext := bindings.V1alpha1BindingContext{
+ Ctx: ctx,
+ Client: c,
+ Namespace: it.Namespace,
+ Profile: profile,
+ }
+
+ from, err := bindings.TranslateV1alpha1(bindingContext, endpointTypeSourceContext, binding.Spec.Source)
+ if err != nil {
+ return nil, errors.Wrap(err, "could not determine source URI")
+ }
+ to, err := bindings.TranslateV1alpha1(bindingContext, endpointTypeSinkContext, binding.Spec.Sink)
+ if err != nil {
+ return nil, errors.Wrap(err, "could not determine sink URI")
+ }
+ // error handler is optional
+ errorHandler, err := maybeErrorHandler(binding.Spec.ErrorHandler, bindingContext)
+ if err != nil {
+ return nil, errors.Wrap(err, "could not determine error handler")
+ }
+
+ steps := make([]*bindings.Binding, 0, len(binding.Spec.Steps))
+ for idx, step := range binding.Spec.Steps {
+ position := idx
+ stepKameletBinding, err := bindings.TranslateV1alpha1(bindingContext, bindings.V1alpha1EndpointContext{
+ Type: v1alpha1.EndpointTypeAction,
+ Position: &position,
+ }, step)
+ if err != nil {
+ return nil, errors.Wrapf(err, "could not determine URI for step %d", idx)
+ }
+ steps = append(steps, stepKameletBinding)
+ }
+
+ if to.Step == nil && to.URI == "" {
+ return nil, errors.Errorf("illegal step definition for sink step: either Step or URI should be provided")
+ }
+ if from.URI == "" {
+ return nil, errors.Errorf("illegal step definition for source step: URI should be provided")
+ }
+ for index, step := range steps {
+ if step.Step == nil && step.URI == "" {
+ return nil, errors.Errorf("illegal step definition for step %d: either Step or URI should be provided", index)
+ }
+ }
+
+ if err := configureKameletBinding(&it, from); err != nil {
+ return nil, err
+ }
+
+ if err := configureKameletBinding(&it, steps...); err != nil {
+ return nil, err
+ }
+
+ if err := configureKameletBinding(&it, to); err != nil {
+ return nil, err
+ }
+
+ if err := configureKameletBinding(&it, errorHandler); err != nil {
+ return nil, err
+ }
+
+ if it.Spec.Configuration != nil {
+ sort.SliceStable(it.Spec.Configuration, func(i, j int) bool {
+ mi, mj := it.Spec.Configuration[i], it.Spec.Configuration[j]
+ switch {
+ case mi.Type != mj.Type:
+ return mi.Type < mj.Type
+ default:
+ return mi.Value < mj.Value
+ }
+ })
+ }
+
+ dslSteps := make([]map[string]interface{}, 0)
+
+ if from.Step != nil {
+ dslSteps = append(dslSteps, from.AsYamlDSL())
+ }
+
+ for _, step := range steps {
+ dslSteps = append(dslSteps, step.AsYamlDSL())
+ }
+
+ if to.Step != nil {
+ dslSteps = append(dslSteps, to.AsYamlDSL())
+ }
+ dslSteps = append(dslSteps, map[string]interface{}{
+ "to": to.URI,
+ })
+
+ fromWrapper := map[string]interface{}{
+ "uri": from.URI,
+ "steps": dslSteps,
+ }
+
+ flowRoute := map[string]interface{}{
+ "route": map[string]interface{}{
+ "id": "binding",
+ "from": fromWrapper,
+ },
+ }
+ encodedRoute, err := json.Marshal(flowRoute)
+ if err != nil {
+ return nil, err
+ }
+ it.Spec.Flows = append(it.Spec.Flows, v1.Flow{RawMessage: encodedRoute})
+
+ return &it, nil
+}
+
+func configureKameletBinding(integration *v1.Integration, bindings ...*bindings.Binding) error {
+ for _, b := range bindings {
+ if b == nil {
+ continue
+ }
+ if err := integration.Spec.Traits.Merge(b.Traits); err != nil {
+ return err
+ }
+ for k, v := range b.ApplicationProperties {
+ entry, err := property.EncodePropertyFileEntry(k, v)
+ if err != nil {
+ return err
+ }
+
+ integration.Spec.Configuration = append(integration.Spec.Configuration, v1.ConfigurationSpec{
+ Type: "property",
+ Value: entry,
+ })
+ }
+
+ }
+
+ return nil
+}
+
+func determineProfile(ctx context.Context, c client.Client, binding *v1alpha1.KameletBinding) (v1.TraitProfile, error) {
+ if binding.Spec.Integration != nil && binding.Spec.Integration.Profile != "" {
+ return binding.Spec.Integration.Profile, nil
+ }
+ pl, err := platform.GetForResource(ctx, c, binding)
+ if err != nil && !k8serrors.IsNotFound(err) {
+ return "", errors.Wrap(err, "error while retrieving the integration platform")
+ }
+ if pl != nil {
+ if pl.Status.Profile != "" {
+ return pl.Status.Profile, nil
+ }
+ if pl.Spec.Profile != "" {
+ return pl.Spec.Profile, nil
+ }
+ }
+ if ok, err := knative.IsInstalled(c); err != nil {
+ return "", err
+ } else if ok {
+ return v1.TraitProfileKnative, nil
+ }
+ if pl != nil {
+ // Determine profile from cluster type
+ plProfile := platform.GetProfile(pl)
+ if plProfile != "" {
+ return plProfile, nil
+ }
+ }
+ return v1.DefaultTraitProfile, nil
+}
diff --git a/pkg/controller/kameletbinding/kameletbinding_controller.go b/pkg/controller/kameletbinding/kameletbinding_controller.go
new file mode 100644
index 000000000..0553b4d92
--- /dev/null
+++ b/pkg/controller/kameletbinding/kameletbinding_controller.go
@@ -0,0 +1,239 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "context"
+
+ "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/client-go/tools/record"
+
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/controller"
+ "sigs.k8s.io/controller-runtime/pkg/event"
+ "sigs.k8s.io/controller-runtime/pkg/handler"
+ "sigs.k8s.io/controller-runtime/pkg/manager"
+ "sigs.k8s.io/controller-runtime/pkg/reconcile"
+ "sigs.k8s.io/controller-runtime/pkg/source"
+
+ "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
+// and Start it when the Manager is Started.
+func Add(ctx context.Context, mgr manager.Manager, c client.Client) error {
+ return add(mgr, newReconciler(mgr, c))
+}
+
+func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
+ return monitoring.NewInstrumentedReconciler(
+ &ReconcileKameletBinding{
+ client: c,
+ scheme: mgr.GetScheme(),
+ recorder: mgr.GetEventRecorderFor("camel-k-kamelet-binding-controller"),
+ },
+ schema.GroupVersionKind{
+ Group: v1alpha1.SchemeGroupVersion.Group,
+ Version: v1alpha1.SchemeGroupVersion.Version,
+ Kind: v1alpha1.KameletBindingKind,
+ },
+ )
+}
+
+func add(mgr manager.Manager, r reconcile.Reconciler) error {
+ c, err := controller.New("kamelet-binding-controller", mgr, controller.Options{Reconciler: r})
+ if err != nil {
+ return err
+ }
+
+ // Watch for changes to primary resource KameletBinding
+ err = c.Watch(&source.Kind{Type: &v1alpha1.KameletBinding{}},
+ &handler.EnqueueRequestForObject{},
+ platform.FilteringFuncs{
+ UpdateFunc: func(e event.UpdateEvent) bool {
+ oldKameletBinding, ok := e.ObjectOld.(*v1alpha1.KameletBinding)
+ if !ok {
+ return false
+ }
+ newKameletBinding, ok := e.ObjectNew.(*v1alpha1.KameletBinding)
+ if !ok {
+ return false
+ }
+
+ // If traits have changed, the reconciliation loop must kick in as
+ // traits may have impact
+ sameTraits, err := trait.KameletBindingsHaveSameTraits(oldKameletBinding, newKameletBinding)
+ if err != nil {
+ Log.ForKameletBinding(newKameletBinding).Error(
+ err,
+ "unable to determine if old and new resource have the same traits")
+ }
+ if !sameTraits {
+ return true
+ }
+
+ // Ignore updates to the binding status in which case metadata.Generation
+ // does not change, or except when the binding phase changes as it's used
+ // to transition from one phase to another
+ return oldKameletBinding.Generation != newKameletBinding.Generation ||
+ oldKameletBinding.Status.Phase != newKameletBinding.Status.Phase
+ },
+ DeleteFunc: func(e event.DeleteEvent) bool {
+ // Evaluates to false if the object has been confirmed deleted
+ return !e.DeleteStateUnknown
+ },
+ },
+ )
+ if err != nil {
+ return err
+ }
+
+ // Watch Integration to propagate changes downstream
+ err = c.Watch(&source.Kind{Type: &v1.Integration{}}, &handler.EnqueueRequestForOwner{
+ OwnerType: &v1alpha1.KameletBinding{},
+ IsController: false,
+ })
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+var _ reconcile.Reconciler = &ReconcileKameletBinding{}
+
+// ReconcileKameletBinding reconciles a KameletBinding object.
+type ReconcileKameletBinding struct {
+ // This client, initialized using mgr.Client() above, is a split client
+ // that reads objects from the cache and writes to the API server
+ client client.Client
+ scheme *runtime.Scheme
+ recorder record.EventRecorder
+}
+
+// Reconcile reads that state of the cluster for a KameletBinding object and makes changes based
+// on the state read and what is in the KameletBinding.Spec
+// Note:
+// The Controller will requeue the Request to be processed again if the returned error is non-nil or
+// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
+func (r *ReconcileKameletBinding) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
+ rlog := Log.WithValues("request-namespace", request.Namespace, "request-name", request.Name)
+ rlog.Info("Reconciling KameletBinding")
+
+ // Make sure the operator is allowed to act on namespace
+ if ok, err := platform.IsOperatorAllowedOnNamespace(ctx, r.client, request.Namespace); err != nil {
+ return reconcile.Result{}, err
+ } else if !ok {
+ rlog.Info("Ignoring request because namespace is locked")
+ return reconcile.Result{}, nil
+ }
+
+ // Fetch the KameletBinding instance
+ var instance v1alpha1.KameletBinding
+
+ if err := r.client.Get(ctx, request.NamespacedName, &instance); err != nil {
+ if errors.IsNotFound(err) {
+ // Request object not found, could have been deleted after reconcile request.
+ // Owned objects are automatically garbage collected. For additional cleanup
+ // logic use finalizers.
+
+ // Return and don't requeue
+ return reconcile.Result{}, nil
+ }
+ // Error reading the object - requeue the request.
+ return reconcile.Result{}, err
+ }
+
+ // Only process resources assigned to the operator
+ if !platform.IsOperatorHandlerConsideringLock(ctx, r.client, request.Namespace, &instance) {
+ rlog.Info("Ignoring request because resource is not assigned to current operator")
+ return reconcile.Result{}, nil
+ }
+
+ actions := []Action{
+ NewInitializeAction(),
+ NewMonitorAction(),
+ }
+
+ var err error
+
+ target := instance.DeepCopy()
+ targetLog := rlog.ForKameletBinding(target)
+
+ for _, a := range actions {
+ a.InjectClient(r.client)
+ a.InjectLogger(targetLog)
+
+ if a.CanHandle(target) {
+ targetLog.Infof("Invoking action %s", a.Name())
+
+ target, err = a.Handle(ctx, target)
+ if err != nil {
+ camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, &instance, target, err)
+ // Update the binding (mostly just to update its phase) if the new instance is returned
+ if target != nil {
+ _ = r.update(ctx, &instance, target, &targetLog)
+ }
+ return reconcile.Result{}, err
+ }
+
+ if target != nil {
+ if err := r.update(ctx, &instance, target, &targetLog); err != nil {
+ camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, &instance, target, err)
+ return reconcile.Result{}, err
+ }
+ }
+
+ // handle one action at time so the resource
+ // is always at its latest state
+ camelevent.NotifyKameletBindingUpdated(ctx, r.client, r.recorder, &instance, target)
+ break
+ }
+ }
+
+ return reconcile.Result{}, nil
+}
+
+func (r *ReconcileKameletBinding) update(ctx context.Context, base *v1alpha1.KameletBinding, target *v1alpha1.KameletBinding, log *log.Logger) error {
+ target.Status.ObservedGeneration = base.Generation
+
+ if err := r.client.Status().Patch(ctx, target, ctrl.MergeFrom(base)); err != nil {
+ camelevent.NotifyKameletBindingError(ctx, r.client, r.recorder, base, target, err)
+ return err
+ }
+
+ if target.Status.Phase != base.Status.Phase {
+ log.Info(
+ "state transition",
+ "phase-from", base.Status.Phase,
+ "phase-to", target.Status.Phase,
+ )
+ }
+
+ return nil
+}
diff --git a/pkg/controller/add_kameletbinding.go b/pkg/controller/kameletbinding/log.go
similarity index 83%
copy from pkg/controller/add_kameletbinding.go
copy to pkg/controller/kameletbinding/log.go
index 9e977f7a1..a7a70a117 100644
--- a/pkg/controller/add_kameletbinding.go
+++ b/pkg/controller/kameletbinding/log.go
@@ -15,12 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package controller
+package kameletbinding
-import (
- "github.com/apache/camel-k/v2/pkg/controller/binding"
-)
+import "github.com/apache/camel-k/v2/pkg/util/log"
-func init() {
- addToManager = append(addToManager, binding.Add)
-}
+// Log --.
+var Log = log.Log.WithName("controller").WithName("kameletbinding")
diff --git a/pkg/controller/kameletbinding/monitor.go b/pkg/controller/kameletbinding/monitor.go
new file mode 100644
index 000000000..26cbea1f0
--- /dev/null
+++ b/pkg/controller/kameletbinding/monitor.go
@@ -0,0 +1,218 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kameletbinding
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/pkg/errors"
+
+ corev1 "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/api/equality"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+
+ "sigs.k8s.io/controller-runtime/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/trait"
+)
+
+// NewMonitorAction returns an action that monitors the Binding after it's fully initialized.
+func NewMonitorAction() Action {
+ return &monitorAction{}
+}
+
+type monitorAction struct {
+ baseAction
+}
+
+func (action *monitorAction) Name() string {
+ return "monitor"
+}
+
+func (action *monitorAction) CanHandle(binding *v1alpha1.KameletBinding) bool {
+ return binding.Status.Phase == v1alpha1.KameletBindingPhaseCreating ||
+ (binding.Status.Phase == v1alpha1.KameletBindingPhaseError &&
+ binding.Status.GetCondition(v1alpha1.KameletBindingIntegrationConditionError) == nil) ||
+ binding.Status.Phase == v1alpha1.KameletBindingPhaseReady
+}
+
+func (action *monitorAction) Handle(ctx context.Context, binding *v1alpha1.KameletBinding) (*v1alpha1.KameletBinding, error) {
+ key := client.ObjectKey{
+ Namespace: binding.Namespace,
+ Name: binding.Name,
+ }
+ it := v1.Integration{}
+ if err := action.client.Get(ctx, key, &it); err != nil && k8serrors.IsNotFound(err) {
+ target := binding.DeepCopy()
+ // Rebuild the integration
+ target.Status.Phase = v1alpha1.KameletBindingPhaseNone
+ target.Status.SetCondition(
+ v1alpha1.KameletBindingConditionReady,
+ corev1.ConditionFalse,
+ "",
+ "",
+ )
+ return target, nil
+ } else if err != nil {
+ return nil, errors.Wrapf(err, "could not load integration for Binding %q", binding.Name)
+ }
+
+ operatorIDChanged := v1.GetOperatorIDAnnotation(binding) != "" &&
+ (v1.GetOperatorIDAnnotation(binding) != v1.GetOperatorIDAnnotation(&it))
+
+ sameTraits, err := trait.IntegrationAndKameletBindingSameTraits(&it, binding)
+ if err != nil {
+ return nil, err
+ }
+
+ // Check if the integration needs to be changed
+ expected, err := CreateIntegrationFor(ctx, action.client, binding)
+ if err != nil {
+ binding.Status.Phase = v1alpha1.KameletBindingPhaseError
+ binding.Status.SetErrorCondition(v1alpha1.KameletBindingIntegrationConditionError,
+ "Couldn't create an Integration custom resource", err)
+ return binding, err
+ }
+
+ semanticEquality := equality.Semantic.DeepDerivative(expected.Spec, it.Spec)
+
+ if !semanticEquality || operatorIDChanged || !sameTraits {
+ action.L.Info(
+ "Binding needs a rebuild",
+ "semantic-equality", !semanticEquality,
+ "operatorid-changed", operatorIDChanged,
+ "traits-changed", !sameTraits)
+
+ // Binding has changed and needs rebuild
+ target := binding.DeepCopy()
+ // Rebuild the integration
+ target.Status.Phase = v1alpha1.KameletBindingPhaseNone
+ target.Status.SetCondition(
+ v1alpha1.KameletBindingConditionReady,
+ corev1.ConditionFalse,
+ "",
+ "",
+ )
+ return target, nil
+ }
+
+ // Map integration phase and conditions to Binding
+ target := binding.DeepCopy()
+
+ switch it.Status.Phase {
+
+ case v1.IntegrationPhaseRunning:
+ target.Status.Phase = v1alpha1.KameletBindingPhaseReady
+ setKameletBindingReadyCondition(target, &it)
+
+ case v1.IntegrationPhaseError:
+ target.Status.Phase = v1alpha1.KameletBindingPhaseError
+ setKameletBindingReadyCondition(target, &it)
+
+ default:
+ target.Status.Phase = v1alpha1.KameletBindingPhaseCreating
+
+ c := v1alpha1.KameletBindingCondition{
+ Type: v1alpha1.KameletBindingConditionReady,
+ Status: corev1.ConditionFalse,
+ Reason: string(target.Status.Phase),
+ Message: fmt.Sprintf("Integration %q is in %q phase", it.GetName(), target.Status.Phase),
+ }
+
+ if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
+ if condition.Pods != nil {
+ c.Pods = make([]v1.PodCondition, 0, len(condition.Pods))
+ c.Pods = append(c.Pods, condition.Pods...)
+ }
+ }
+
+ target.Status.SetConditions(c)
+ }
+
+ // Mirror status replicas and selector
+ target.Status.Replicas = it.Status.Replicas
+ target.Status.Selector = it.Status.Selector
+
+ return target, nil
+}
+
+func setBindingReadyCondition(kb *v1.Binding, it *v1.Integration) {
+ if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
+ message := condition.Message
+ if message == "" {
+ message = fmt.Sprintf("Integration %q readiness condition is %q", it.GetName(), condition.Status)
+ }
+
+ c := v1.BindingCondition{
+ Type: v1.BindingConditionReady,
+ Status: condition.Status,
+ Reason: condition.Reason,
+ Message: message,
+ }
+
+ if condition.Pods != nil {
+ c.Pods = make([]v1.PodCondition, 0, len(condition.Pods))
+ c.Pods = append(c.Pods, condition.Pods...)
+ }
+
+ kb.Status.SetConditions(c)
+
+ } else {
+ kb.Status.SetCondition(
+ v1.BindingConditionReady,
+ corev1.ConditionUnknown,
+ "",
+ fmt.Sprintf("Integration %q does not have a readiness condition", it.GetName()),
+ )
+ }
+}
+
+// Deprecated
+func setKameletBindingReadyCondition(kb *v1alpha1.KameletBinding, it *v1.Integration) {
+ if condition := it.Status.GetCondition(v1.IntegrationConditionReady); condition != nil {
+ message := condition.Message
+ if message == "" {
+ message = fmt.Sprintf("Integration %q readiness condition is %q", it.GetName(), condition.Status)
+ }
+
+ c := v1alpha1.KameletBindingCondition{
+ Type: v1alpha1.KameletBindingConditionReady,
+ Status: condition.Status,
+ Reason: condition.Reason,
+ Message: message,
+ }
+
+ if condition.Pods != nil {
+ c.Pods = make([]v1.PodCondition, 0, len(condition.Pods))
+ c.Pods = append(c.Pods, condition.Pods...)
+ }
+
+ kb.Status.SetConditions(c)
+
+ } else {
+ kb.Status.SetCondition(
+ v1alpha1.KameletBindingConditionReady,
+ corev1.ConditionUnknown,
+ "",
+ fmt.Sprintf("Integration %q does not have a readiness condition", it.GetName()),
+ )
+ }
+}
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 0a019d161..55c788589 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -28,6 +28,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime/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/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/log"
@@ -254,6 +255,37 @@ func NotifyBindingError(ctx context.Context, c client.Client, recorder record.Ev
recorder.Eventf(k, corev1.EventTypeWarning, ReasonKameletError, "Cannot reconcile Binding %s: %v", k.Name, err)
}
+// NotifyKameletBindingUpdated automatically generates events when a KameletBinding changes.
+// Deprecated
+func NotifyKameletBindingUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding) {
+ if newResource == nil {
+ return
+ }
+ oldPhase := ""
+ var oldConditions []v1.ResourceCondition
+ if old != nil {
+ oldPhase = string(old.Status.Phase)
+ oldConditions = old.Status.GetConditions()
+ }
+ if newResource.Status.Phase != v1alpha1.KameletBindingPhaseNone {
+ notifyIfConditionUpdated(recorder, newResource, oldConditions, newResource.Status.GetConditions(), "KameletBinding", newResource.Name, ReasonBindingConditionChanged)
+ }
+ notifyIfPhaseUpdated(ctx, c, recorder, newResource, oldPhase, string(newResource.Status.Phase), "KameletBinding", newResource.Name, ReasonBindingPhaseUpdated, "")
+}
+
+// NotifyKameletBindingError automatically generates error events when the binding reconcile cycle phase has an error.
+// Deprecated
+func NotifyKameletBindingError(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1alpha1.KameletBinding, err error) {
+ k := old
+ if newResource != nil {
+ k = newResource
+ }
+ if k == nil {
+ return
+ }
+ recorder.Eventf(k, corev1.EventTypeWarning, ReasonKameletError, "Cannot reconcile KameletBinding %s: %v", k.Name, err)
+}
+
// NotifyBuildUpdated automatically generates events when a build changes.
func NotifyBuildUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, old, newResource *v1.Build) {
if newResource == nil {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index ce7e3ddd5..c2d833616 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -117,9 +117,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_bindings.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_bindings.yaml",
modTime: time.Time{},
- uncompressedSize: 572366,
+ uncompressedSize: 572391,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...]
},
"/crd/bases/camel.apache.org_builds.yaml": &vfsgenÛ°CompressedFileInfo{
name: "camel.apache.org_builds.yaml",
@@ -460,9 +460,9 @@ var assets = func() http.FileSystem {
"/rbac/operator-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role.yaml",
modTime: time.Time{},
- uncompressedSize: 3021,
+ uncompressedSize: 3164,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x8f\xdb\x36\x13\xbd\xeb\x57\x0c\xac\x4b\x02\xec\xda\xdf\xd7\x53\xe1\x9e\xdc\x64\xb7\x35\x1a\xd8\xc0\xda\x69\x90\xe3\x88\x1a\xcb\x53\x53\x1c\x76\x48\xad\xd7\xfd\xf5\x05\x65\x29\xf6\xae\xec\xa0\x68\x02\x6c\x7d\x31\x35\x1c\xbd\x79\xf3\xe6\x51\x60\x0e\xb7\xdf\xef\x97\xe5\xf0\x81\x0d\xb9\x40\x25\x44\x81\xb8\x25\x98\x79\x34\x5b\x82\x95\x6c\xe2\x1e\x95\xe0\x5e\x1a\x57\x62\x64\x71\xf0\x66\xb6\xba\x7f\x0b\x8d\x2b\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x94\xf0\x65\x57\x1a\x20\xc9\x29\x22\x27\x32\x1f\x09\xca\x0a\xa4\x31\x9b\xd5\x1e\xcb\xed\xc2\x54\x68\x77\x75\xba\xdb\xc3\x90\x5f\x1f\xb5\xb1\x07\x0f\x86\x55\xb4\xbb\xd2\x84\x0b\xed\xaa\xa2\xea\xd5\x7b\xaf\x91\x53\x18\x7f\xbf\x4f\x92\xc2\x07\x56\x64\x3c\x15\x10\x04\xc2\x96\x60\x6e\x51\x6d\x09\x32\xd9\x84\x3d\x3a\x82\x07\xa9\x4d\x81\x81\xc5\xc0\xbb\x79\xf6\xf0\x1e\x6a\x53\x90\x03\x [...]
},
"/rbac/patch-role-to-clusterrole.yaml": &vfsgenÛ°CompressedFileInfo{
name: "patch-role-to-clusterrole.yaml",
@@ -481,9 +481,9 @@ var assets = func() http.FileSystem {
"/rbac/user-cluster-role.yaml": &vfsgenÛ°CompressedFileInfo{
name: "user-cluster-role.yaml",
modTime: time.Time{},
- uncompressedSize: 1804,
+ uncompressedSize: 1947,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xa4\xcb\x2e\x10\xcb\x6d\x4f\x85\x7b\x72\xb3\x49\x6b\x74\x61\x03\x91\xb7\x8b\x3d\x8e\xc5\xb1\x34\x30\x45\xaa\x24\x15\x6d\xfa\xf5\x05\x29\x2b\x76\x9a\xcd\xa1\xc5\xfa\x62\x6a\x66\xf4\xe6\xbd\x37\x43\x15\x58\x7c\xbf\x5f\x56\xe0\xa3\xd4\x6c\x3c\x2b\x04\x8b\xd0\x32\xd6\x3d\xd5\x2d\xa3\xb2\xc7\x30\x92\x63\xdc\xdb\xc1\x28\x0a\x62\x0d\xde\xad\xab\xfb\xf7\x18\x8c\x62\x07\x6b\x18\xd6\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x8f\xdb\x36\x10\xbd\xeb\x57\x3c\x48\x97\x04\x58\xdb\x6d\x4f\x85\x7b\x72\xf7\xa3\x35\x1a\xd8\xc0\xca\x69\x90\xe3\x58\x1c\x4b\x84\x29\x52\x25\x47\xab\x6c\x7f\x7d\x41\xda\x5a\x6b\xe3\xec\xa1\x41\x7c\x31\xf5\x66\x34\xf3\xde\xbc\xa1\x0a\xcc\x7e\xdc\x2f\x2b\xf0\x41\x57\x6c\x03\x2b\x88\x83\x34\x8c\x55\x47\x55\xc3\x28\xdd\x41\x06\xf2\x8c\x07\xd7\x5b\x45\xa2\x9d\xc5\xbb\x55\xf9\xf0\x1e\xbd\x55\xec\xe1\x2c\xc3\x79\x [...]
},
"/samples": &vfsgenÛ°DirInfo{
name: "samples",
diff --git a/pkg/trait/util.go b/pkg/trait/util.go
index c1b26a1d3..fa7d03229 100644
--- a/pkg/trait/util.go
+++ b/pkg/trait/util.go
@@ -34,6 +34,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime/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/apache/camel-k/v2/pkg/metadata"
"github.com/apache/camel-k/v2/pkg/util"
@@ -387,6 +388,21 @@ func BindingsHaveSameTraits(i1 *v1.Binding, i2 *v1.Binding) (bool, error) {
return Equals(c1, c2), nil
}
+// KameletBindingsHaveSameTraits return if traits are the same.
+// Deprecated
+func KameletBindingsHaveSameTraits(i1 *v1alpha1.KameletBinding, i2 *v1alpha1.KameletBinding) (bool, error) {
+ c1, err := NewTraitsOptionsForKameletBinding(i1)
+ if err != nil {
+ return false, err
+ }
+ c2, err := NewTraitsOptionsForKameletBinding(i2)
+ if err != nil {
+ return false, err
+ }
+
+ return Equals(c1, c2), nil
+}
+
// IntegrationAndBindingSameTraits return if traits are the same.
// The comparison is done for the subset of traits defines on the binding as during the trait processing,
// some traits may be added to the Integration i.e. knative configuration in case of sink binding.
@@ -410,6 +426,30 @@ func IntegrationAndBindingSameTraits(i1 *v1.Integration, i2 *v1.Binding) (bool,
return Equals(klbOpts, toCompare), nil
}
+// IntegrationAndBindingSameTraits return if traits are the same.
+// The comparison is done for the subset of traits defines on the binding as during the trait processing,
+// some traits may be added to the Integration i.e. knative configuration in case of sink binding.
+// Deprecated
+func IntegrationAndKameletBindingSameTraits(i1 *v1.Integration, i2 *v1alpha1.KameletBinding) (bool, error) {
+ itOpts, err := NewTraitsOptionsForIntegration(i1)
+ if err != nil {
+ return false, err
+ }
+ klbOpts, err := NewTraitsOptionsForKameletBinding(i2)
+ if err != nil {
+ return false, err
+ }
+
+ toCompare := make(Options)
+ for k := range klbOpts {
+ if v, ok := itOpts[k]; ok {
+ toCompare[k] = v
+ }
+ }
+
+ return Equals(klbOpts, toCompare), nil
+}
+
// IntegrationAndKitHaveSameTraits return if traits are the same.
func IntegrationAndKitHaveSameTraits(i1 *v1.Integration, i2 *v1.IntegrationKit) (bool, error) {
itOpts, err := NewTraitsOptionsForIntegration(i1)
@@ -505,6 +545,34 @@ func NewTraitsOptionsForBinding(i *v1.Binding) (Options, error) {
return m1, nil
}
+// Deprecated
+func NewTraitsOptionsForKameletBinding(i *v1alpha1.KameletBinding) (Options, error) {
+ if i.Spec.Integration != nil {
+ m1, err := ToTraitMap(i.Spec.Integration.Traits)
+ if err != nil {
+ return nil, err
+ }
+
+ m2, err := FromAnnotations(&i.ObjectMeta)
+ if err != nil {
+ return nil, err
+ }
+
+ for k, v := range m2 {
+ m1[k] = v
+ }
+
+ return m1, nil
+ }
+
+ m1, err := FromAnnotations(&i.ObjectMeta)
+ if err != nil {
+ return nil, err
+ }
+
+ return m1, nil
+}
+
func FromAnnotations(meta *metav1.ObjectMeta) (Options, error) {
options := make(Options)
diff --git a/pkg/util/bindings/api_support.go b/pkg/util/bindings/api_support.go
index e103b0d84..c06b5a123 100644
--- a/pkg/util/bindings/api_support.go
+++ b/pkg/util/bindings/api_support.go
@@ -40,3 +40,13 @@ func (c EndpointContext) GenerateID() string {
}
return id
}
+
+// GenerateID generates an identifier based on the context type and its optional position.
+// Deprecated
+func (c V1alpha1EndpointContext) GenerateID() string {
+ id := string(c.Type)
+ if c.Position != nil {
+ id = fmt.Sprintf("%s-%d", id, *c.Position)
+ }
+ return id
+}
diff --git a/pkg/util/bindings/api_v1alpha1.go b/pkg/util/bindings/api_v1alpha1.go
new file mode 100644
index 000000000..7639a2f91
--- /dev/null
+++ b/pkg/util/bindings/api_v1alpha1.go
@@ -0,0 +1,55 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package bindings provides APIs to transform Kubernetes objects into Camel URIs equivalents
+package bindings
+
+import (
+ "context"
+
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/v2/pkg/client"
+)
+
+// V1alpha1BindingProvider maps a Binding endpoint into Camel K resources.
+// Deprecated
+type V1alpha1BindingProvider interface {
+ // ID returns the name of the binding provider
+ ID() string
+ // Translate does the actual mapping
+ Translate(ctx V1alpha1BindingContext, endpointContext V1alpha1EndpointContext, endpoint v1alpha1.Endpoint) (*Binding, error)
+ // Order returns the relative order of execution of the binding provider
+ Order() int
+}
+
+// V1alpha1BindingContext --
+// nolint: containedctx
+// Deprecated
+type V1alpha1BindingContext struct {
+ Ctx context.Context
+ Client client.Client
+ Namespace string
+ Profile v1.TraitProfile
+}
+
+// V1alpha1EndpointContext --
+// Deprecated
+type V1alpha1EndpointContext struct {
+ Type v1alpha1.EndpointType
+ Position *int
+}
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index 6f7eb6c56..ce3199fed 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -22,10 +22,12 @@ import (
"sort"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
)
var bindingProviders []BindingProvider
+// RegisterBindingProvider --
func RegisterBindingProvider(bp BindingProvider) {
bindingProviders = append(bindingProviders, bp)
sort.Slice(bindingProviders, func(i, j int) bool {
@@ -36,6 +38,21 @@ func RegisterBindingProvider(bp BindingProvider) {
})
}
+// Deprecated
+var v1alpha1BindingProviders []V1alpha1BindingProvider
+
+// V1alpha1RegisterBindingProvider --
+// Deprecated
+func V1alpha1RegisterBindingProvider(bp V1alpha1BindingProvider) {
+ v1alpha1BindingProviders = append(v1alpha1BindingProviders, bp)
+ sort.Slice(v1alpha1BindingProviders, func(i, j int) bool {
+ bi := v1alpha1BindingProviders[i]
+ bj := v1alpha1BindingProviders[j]
+ return (bi.Order() < bj.Order()) ||
+ (bi.Order() == bj.Order() && bi.ID() < bj.ID())
+ })
+}
+
// Translate execute all chained binding providers, returning the first success or the first error.
func Translate(ctx BindingContext, endpointCtx EndpointContext, endpoint v1.Endpoint) (*Binding, error) {
if err := validateEndpoint(ctx, endpoint); err != nil {
@@ -58,7 +75,36 @@ func validateEndpoint(ctx BindingContext, e v1.Endpoint) error {
return errors.New("cannot use both ref and URI to specify an endpoint: only one of them should be used")
}
if e.Ref != nil && e.Ref.Namespace != "" && e.Ref.Namespace != ctx.Namespace {
- return errors.New("cross-namespace references are not allowed inBinding")
+ return errors.New("cross-namespace references are not allowed in Binding")
+ }
+ return nil
+}
+
+// TranslateV1alpha1 execute all chained binding providers, returning the first success or the first error.
+// Deprecated
+func TranslateV1alpha1(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, endpoint v1alpha1.Endpoint) (*Binding, error) {
+ if err := validateEndpointV1alpha1(ctx, endpoint); err != nil {
+ return nil, err
+ }
+
+ for _, bp := range v1alpha1BindingProviders {
+ b, err := bp.Translate(ctx, endpointCtx, endpoint)
+ if b != nil || err != nil {
+ return b, err
+ }
+ }
+ return nil, nil
+}
+
+// Deprecated
+func validateEndpointV1alpha1(ctx V1alpha1BindingContext, e v1alpha1.Endpoint) error {
+ if e.Ref == nil && e.URI == nil {
+ return errors.New("no ref or URI specified in endpoint")
+ } else if e.Ref != nil && e.URI != nil {
+ return errors.New("cannot use both ref and URI to specify an endpoint: only one of them should be used")
+ }
+ if e.Ref != nil && e.Ref.Namespace != "" && e.Ref.Namespace != ctx.Namespace {
+ return errors.New("cross-namespace references are not allowed in KameletBinding")
}
return nil
}
diff --git a/pkg/util/bindings/v1alpha1_kamelet.go b/pkg/util/bindings/v1alpha1_kamelet.go
new file mode 100644
index 000000000..682db9317
--- /dev/null
+++ b/pkg/util/bindings/v1alpha1_kamelet.go
@@ -0,0 +1,164 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package bindings
+
+import (
+ "fmt"
+ "net/url"
+
+ v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
+
+ "k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// V1alpha1BindingConverter converts a reference to a Kamelet into a Camel URI.
+// Deprecated
+type V1alpha1BindingConverter struct{}
+
+func (k V1alpha1BindingConverter) ID() string {
+ return "kamelet"
+}
+
+func (k V1alpha1BindingConverter) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+ if e.Ref == nil {
+ // works only on refs
+ return nil, nil
+ }
+ gv, err := schema.ParseGroupVersion(e.Ref.APIVersion)
+ if err != nil {
+ return nil, err
+ }
+ // it translates only Kamelet refs
+ if e.Ref.Kind == v1.KameletKind && gv.Group == v1.SchemeGroupVersion.Group {
+ kameletName := url.PathEscape(e.Ref.Name)
+
+ props, err := e.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+
+ id, idPresent := props[v1.KameletIDProperty]
+ if idPresent {
+ delete(props, v1.KameletIDProperty)
+ } else {
+ id = endpointCtx.GenerateID()
+ }
+
+ binding := Binding{}
+ binding.ApplicationProperties = make(map[string]string)
+ for k, v := range props {
+ propKey := fmt.Sprintf("camel.kamelet.%s.%s.%s", kameletName, id, k)
+ binding.ApplicationProperties[propKey] = v
+ }
+
+ switch endpointCtx.Type {
+ case v1alpha1.EndpointTypeAction:
+ steps := make([]map[string]interface{}, 0)
+
+ if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
+ steps = append(steps, in)
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ steps = append(steps, map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": fmt.Sprintf("%s/%s", kameletName, url.PathEscape(id)),
+ },
+ })
+
+ if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
+ steps = append(steps, out)
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ if len(steps) > 1 {
+ binding.Step = map[string]interface{}{
+ "pipeline": map[string]interface{}{
+ "id": fmt.Sprintf("%s-pipeline", id),
+ "steps": steps,
+ },
+ }
+ } else {
+ binding.Step = steps[0]
+ }
+ case v1alpha1.EndpointTypeSource:
+ if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
+ binding.Step = out
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ case v1alpha1.EndpointTypeSink:
+ if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
+ binding.Step = in
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ default:
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ }
+
+ return &binding, nil
+ }
+ return nil, nil
+}
+
+func (k V1alpha1BindingConverter) DataTypeStep(e v1alpha1.Endpoint, id string, typeSlot v1alpha1.TypeSlot) (map[string]interface{}, map[string]string) {
+ if e.DataTypes == nil {
+ return nil, nil
+ }
+
+ if inDataType, ok := e.DataTypes[typeSlot]; ok {
+ scheme := "camel"
+ if inDataType.Scheme != "" {
+ scheme = inDataType.Scheme
+ }
+
+ props := make(map[string]string, 2)
+ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.scheme", datTypeActionKamelet, id, typeSlot)] = scheme
+ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format", datTypeActionKamelet, id, typeSlot)] = inDataType.Format
+
+ stepDsl := map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": fmt.Sprintf("%s/%s-%s", datTypeActionKamelet, url.PathEscape(id), typeSlot),
+ },
+ }
+
+ return stepDsl, props
+ }
+
+ return nil, nil
+}
+
+func (k V1alpha1BindingConverter) Order() int {
+ return OrderStandard
+}
+
+func init() {
+ V1alpha1RegisterBindingProvider(V1alpha1BindingConverter{})
+}
diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go
index 3bf028560..c3ef3ae11 100644
--- a/pkg/util/log/log.go
+++ b/pkg/util/log/log.go
@@ -21,6 +21,7 @@ import (
"fmt"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/go-logr/logr"
logf "sigs.k8s.io/controller-runtime/pkg/log"
)
@@ -148,6 +149,17 @@ func (l Logger) ForBinding(target *v1.Binding) Logger {
)
}
+// ForKameletBinding --.
+// Deprecated: use ForBinding instead
+func (l Logger) ForKameletBinding(target *v1alpha1.KameletBinding) Logger {
+ return l.WithValues(
+ "api-version", target.APIVersion,
+ "kind", target.Kind,
+ "ns", target.Namespace,
+ "name", target.Name,
+ )
+}
+
// ForCatalog --.
func (l Logger) ForCatalog(target *v1.CamelCatalog) Logger {
return l.WithValues(
[camel-k] 15/18: chore(e2e): revert usage of KameletBinding
Posted by pc...@apache.org.
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 8072d0f999ca4227aa76c8185ee537608a901375
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Apr 5 12:22:09 2023 +0200
chore(e2e): revert usage of KameletBinding
This will need to be changed to Pipe as soon as the Yaks model is changed.
---
e2e/yaks/common/kamelet-beans/kamelet.feature | 4 ++--
.../kamelet-binding-autoload/kamelet-autoload-specific.feature | 10 +++++-----
.../common/kamelet-binding-autoload/kamelet-autoload.feature | 8 ++++----
e2e/yaks/common/kamelet-binding-broker/kamelet.feature | 2 +-
.../common/kamelet-binding-broker/logger-sink-binding.yaml | 4 ++--
.../common/kamelet-binding-broker/timer-source-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-binding-http/kamelet.feature | 2 +-
.../kamelet-binding-http/timer-source-binding-display.yaml | 4 ++--
.../kamelet-binding-property-encoding/properties-binding.yaml | 2 +-
.../kamelet-binding-property-encoding/properties.feature | 2 +-
e2e/yaks/common/kamelet-binding/kamelet.feature | 2 +-
e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-binding/timer-source-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-data-types/event-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature | 4 ++--
e2e/yaks/common/kamelet-data-types/timer-to-log.yaml | 4 ++--
e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature | 4 ++--
e2e/yaks/common/kamelet-steps/steps-binding.feature | 2 +-
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 4 ++--
e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +-
20 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/e2e/yaks/common/kamelet-beans/kamelet.feature b/e2e/yaks/common/kamelet-beans/kamelet.feature
index 25fcb9e97..892f534ef 100644
--- a/e2e/yaks/common/kamelet-beans/kamelet.feature
+++ b/e2e/yaks/common/kamelet-beans/kamelet.feature
@@ -9,7 +9,7 @@ Feature: Kamelets can declare local beans
Scenario: Kamelets templates can use beans
Given bind Kamelet beans-source to uri log:info
- When create Binding binding
- Then Binding binding should be available
+ When create KameletBinding binding
+ Then KameletBinding binding should be available
Then Camel K integration binding should be running
Then Camel K integration binding should print Bean time is 0!
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
index 6cc3c633a..635bbee13 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
@@ -7,17 +7,17 @@ Feature: Camel K can load specific secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding can load specific settings for Kamelet
+ Scenario: KameletBinding can load specific settings for Kamelet
Given create Kubernetes service stub-service-2 with target port 8080
And bind Kamelet timer-source to uri http://stub-service-2.${YAKS_NAMESPACE}.svc.cluster.local/specific
- And Binding source properties
+ And KameletBinding source properties
| id | specific |
- When create Binding binding-specific
- Then Binding binding-specific should be available
+ When create KameletBinding binding-specific
+ Then KameletBinding binding-specific should be available
Scenario: Verify specific binding
Given HTTP server "stub-service-2"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: specific
And receive POST /specific
- And delete Binding binding-specific
+ And delete KameletBinding binding-specific
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
index 0c567d1e6..d5cc6ba81 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
@@ -7,15 +7,15 @@ Feature: Camel K can load default secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding can load default settings for Kamelet
+ Scenario: KameletBinding can load default settings for Kamelet
Given create Kubernetes service stub-service with target port 8080
And bind Kamelet timer-source to uri http://stub-service.${YAKS_NAMESPACE}.svc.cluster.local/default
- When create Binding binding
- Then Binding binding should be available
+ When create KameletBinding binding
+ Then KameletBinding binding should be available
Scenario: Verify default binding
Given HTTP server "stub-service"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: default
And receive POST /default
- And delete Binding binding
+ And delete KameletBinding binding
diff --git a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
index 110cbd889..c4d10c636 100644
--- a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets to the broker
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Sending event to the custom broker with Binding
+ Scenario: Sending event to the custom broker with KameletBinding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Custom Event from sample-broker
diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
index d34af676b..523f21e58 100644
--- a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
index 00cbbfef4..585be4820 100644
--- a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-http/kamelet.feature b/e2e/yaks/common/kamelet-binding-http/kamelet.feature
index 07a1ed6e7..dbe5b8304 100644
--- a/e2e/yaks/common/kamelet-binding-http/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding-http/kamelet.feature
@@ -5,7 +5,7 @@ Feature: Camel K can bind Kamelets via HTTP
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding to a HTTP URI should use CloudEvents
+ Scenario: KameletBinding to a HTTP URI should use CloudEvents
Given Camel K integration display is running
Then Camel K integration display should print type: org.apache.camel.event
Then Camel K integration display should print Hello
diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
index 68d5ce441..70c9d096d 100644
--- a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding-display
spec:
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index cbdbaea61..aa1823da0 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-kind: Binding
+kind: KameletBinding
apiVersion: camel.apache.org/v1
metadata:
name: properties-binding
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
index 7b1b961f8..c3afc634f 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
@@ -23,4 +23,4 @@ Feature: Ensure that Kamelets support multiline configuration
"""
And expect HTTP request header: Content-Type="application/json;charset=UTF-8"
And receive POST /events
- And delete Binding properties-binding
+ And delete KameletBinding properties-binding
diff --git a/e2e/yaks/common/kamelet-binding/kamelet.feature b/e2e/yaks/common/kamelet-binding/kamelet.feature
index c8e1c1402..107a80c92 100644
--- a/e2e/yaks/common/kamelet-binding/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Running integration using a simple Kamelet with Binding
+ Scenario: Running integration using a simple Kamelet with KameletBinding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Kamelets
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index c29fe5051..8b892b67b 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index eea5967c1..7752e3347 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-data-types/event-binding.yaml b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
index 880ffe8ed..17f3079c9 100644
--- a/e2e/yaks/common/kamelet-data-types/event-binding.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: event-binding
spec:
diff --git a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
index 2ea9c2ff9..443366db0 100644
--- a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
+++ b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
@@ -6,13 +6,13 @@ Feature: Kamelets with data types
| delayBetweenAttempts | 4000 |
Scenario: Kamelet event data type conversion
- Given load Binding event-binding.yaml
+ Given load KameletBinding event-binding.yaml
Given Camel K integration event-binding is running
Then Camel K integration event-binding should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration event-binding should print BodyType: String, Body: Hello from Camel K!
Scenario: Kamelet timer-to-log conversion
- Given load Binding timer-to-log.yaml
+ Given load KameletBinding timer-to-log.yaml
Given Camel K integration timer-to-log is running
Then Camel K integration timer-to-log should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration timer-to-log should print BodyType: String, Body: Hello from Camel K!
diff --git a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
index c145bb894..38c258480 100644
--- a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
+++ b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-to-log
spec:
diff --git a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
index 7815a17d3..6f6b42afc 100644
--- a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
+++ b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
@@ -22,7 +22,7 @@ from:
Scenario: Bind Kamelet to service
Given create Kubernetes service greeting-service with target port 8080
And bind Kamelet no-props-source to uri log:info
- When create Binding no-props-source-uri
- Then Binding no-props-source-uri should be available
+ When create KameletBinding no-props-source-uri
+ Then KameletBinding no-props-source-uri should be available
Then Camel K integration no-props-source-uri should be running
Then Camel K integration no-props-source-uri should print Hello World
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.feature b/e2e/yaks/common/kamelet-steps/steps-binding.feature
index 35d71fced..a9980cfc3 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.feature
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.feature
@@ -1,4 +1,4 @@
-Feature: Bindings can have multiple processing steps
+Feature: KameletBindings can have multiple processing steps
Background:
Given Camel K resource polling configuration
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
index ceb4e6b2b..ec9946f3a 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: steps-binding
spec:
diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml b/e2e/yaks/common/knative-sinkbinding/source.yaml
index 9ec23fa81..f37427147 100644
--- a/e2e/yaks/common/knative-sinkbinding/source.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/source.yaml
@@ -21,7 +21,7 @@
period: "1000"
steps:
- set-body:
- constant: "Hello SinkBinding !!!"
+ constant: "Hello SinkKameletBinding !!!"
- transform:
simple: "${body.toUpperCase()}"
- to: "log:info"
[camel-k] 14/18: chore(api): rename Binding to Pipe
Posted by pc...@apache.org.
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 23dfdea9f8e81cf5b5c12815f6c92f7b5245a9d5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Apr 5 12:09:25 2023 +0200
chore(api): rename Binding to Pipe
---
addons/keda/keda.go | 4 +-
addons/keda/keda_test.go | 14 +-
config/crd/bases/camel.apache.org_bindings.yaml | 8514 --------------------
.../bases/camel.apache.org_kameletbindings.yaml | 2 +-
.../crd/bases/camel.apache.org_pipes.yaml | 65 +-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 500 +-
docs/modules/ROOT/partials/apis/crds-html.adoc | 40 +-
e2e/common/misc/kamelet_binding_test.go | 10 +-
e2e/common/misc/scale_binding_test.go | 12 +-
e2e/common/traits/errored_trait_test.go | 6 +-
e2e/common/traits/health_test.go | 4 +-
e2e/install/kustomize/common.go | 2 +-
e2e/knative/kamelet_test.go | 4 +-
e2e/support/test_support.go | 32 +-
helm/camel-k/crds/crd-binding.yaml | 8514 --------------------
helm/camel-k/crds/crd-kamelet-binding.yaml | 2 +-
.../camel/v1/{binding_types.go => pipe_types.go} | 94 +-
...ding_types_support.go => pipe_types_support.go} | 46 +-
..._support_test.go => pipe_types_support_test.go} | 0
pkg/apis/camel/v1/register.go | 4 +-
pkg/apis/camel/v1/zz_generated.deepcopy.go | 298 +-
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
.../camel/v1/{binding.go => pipe.go} | 52 +-
.../v1/{bindingcondition.go => pipecondition.go} | 26 +-
.../camel/v1/{bindingspec.go => pipespec.go} | 24 +-
.../camel/v1/{bindingstatus.go => pipestatus.go} | 30 +-
pkg/client/camel/applyconfiguration/utils.go | 16 +-
.../versioned/typed/camel/v1/camel_client.go | 10 +-
.../versioned/typed/camel/v1/fake/fake_binding.go | 214 -
.../typed/camel/v1/fake/fake_camel_client.go | 8 +-
.../versioned/typed/camel/v1/fake/fake_pipe.go | 214 +
.../typed/camel/v1/generated_expansion.go | 4 +-
.../typed/camel/v1/{binding.go => pipe.go} | 162 +-
.../externalversions/camel/v1/interface.go | 14 +-
.../camel/v1/{binding.go => pipe.go} | 38 +-
.../camel/informers/externalversions/generic.go | 4 +-
pkg/client/camel/listers/camel/v1/binding.go | 100 -
.../camel/listers/camel/v1/expansion_generated.go | 16 +-
pkg/client/camel/listers/camel/v1/pipe.go | 100 +
pkg/cmd/bind.go | 14 +-
pkg/cmd/bind_test.go | 14 +-
pkg/cmd/delete.go | 14 +-
pkg/cmd/promote.go | 38 +-
pkg/cmd/promote_test.go | 12 +-
pkg/cmd/reset.go | 14 +-
pkg/controller/{add_binding.go => add_pipe.go} | 6 +-
pkg/controller/{binding => pipe}/action.go | 8 +-
pkg/controller/{binding => pipe}/error_handler.go | 2 +-
.../{binding => pipe}/error_handler_test.go | 2 +-
pkg/controller/{binding => pipe}/initialize.go | 28 +-
pkg/controller/{binding => pipe}/integration.go | 6 +-
pkg/controller/{binding => pipe}/log.go | 4 +-
pkg/controller/{binding => pipe}/monitor.go | 60 +-
.../pipe_controller.go} | 58 +-
pkg/event/manager.go | 32 +-
pkg/resources/resources.go | 16 +-
pkg/trait/util.go | 18 +-
pkg/trait/util_test.go | 58 +-
pkg/util/log/log.go | 4 +-
59 files changed, 1289 insertions(+), 18320 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 7c9e3158d..f3b270305 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -278,7 +278,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
if err != nil {
return err
}
- if ctrlRef.Kind == camelv1.BindingKind {
+ if ctrlRef.Kind == camelv1.PipeKind {
scale.ObjectMeta.Name = ctrlRef.Name
_, err = scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx, camelv1.SchemeGroupVersion.WithResource("bindings").GroupResource(), &scale, metav1.UpdateOptions{})
if err != nil {
@@ -296,7 +296,7 @@ func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectReference {
for _, o := range e.Integration.OwnerReferences {
- if o.Kind == camelv1.BindingKind && strings.HasPrefix(o.APIVersion, camelv1.SchemeGroupVersion.Group) {
+ if o.Kind == camelv1.PipeKind && strings.HasPrefix(o.APIVersion, camelv1.SchemeGroupVersion.Group) {
return &v1.ObjectReference{
APIVersion: o.APIVersion,
Kind: o.Kind,
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 015cb0d88..15503862b 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -24,7 +24,7 @@ import (
"github.com/apache/camel-k/v2/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- "github.com/apache/camel-k/v2/pkg/controller/binding"
+ "github.com/apache/camel-k/v2/pkg/controller/pipe"
"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"
@@ -202,16 +202,16 @@ func TestKameletAutoDetection(t *testing.T) {
assert.Contains(t, secret.StringData, "cc")
}
-func TestBindingAutoDetection(t *testing.T) {
+func TestPipeAutoDetection(t *testing.T) {
keda, _ := NewKedaTrait().(*kedaTrait)
keda.Enabled = pointer.Bool(true)
logEndpoint := "log:info"
- klb := camelv1.Binding{
+ klb := camelv1.Pipe{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-binding",
},
- Spec: camelv1.BindingSpec{
+ Spec: camelv1.PipeSpec{
Source: camelv1.Endpoint{
Ref: &corev1.ObjectReference{
Kind: "Kamelet",
@@ -276,7 +276,7 @@ func TestBindingAutoDetection(t *testing.T) {
},
})
- it, err := binding.CreateIntegrationFor(env.Ctx, env.Client, &klb)
+ it, err := pipe.CreateIntegrationFor(env.Ctx, env.Client, &klb)
assert.NoError(t, err)
assert.NotNil(t, it)
env.Integration = it
@@ -361,7 +361,7 @@ func TestHackKLBReplicas(t *testing.T) {
})
keda.HackControllerReplicas = pointer.Bool(true)
env := createBasicTestEnvironment(
- &camelv1.Binding{
+ &camelv1.Pipe{
ObjectMeta: metav1.ObjectMeta{
Namespace: "test",
Name: "my-klb",
@@ -374,7 +374,7 @@ func TestHackKLBReplicas(t *testing.T) {
OwnerReferences: []metav1.OwnerReference{
{
APIVersion: camelv1.SchemeGroupVersion.String(),
- Kind: "Binding",
+ Kind: "Pipe",
Name: "my-klb",
},
},
diff --git a/config/crd/bases/camel.apache.org_bindings.yaml b/config/crd/bases/camel.apache.org_bindings.yaml
index a2694d60a..658e8dc7e 100644
--- a/config/crd/bases/camel.apache.org_bindings.yaml
+++ b/config/crd/bases/camel.apache.org_bindings.yaml
@@ -15,8517 +15,3 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- annotations:
- controller-gen.kubebuilder.io/version: v0.6.1
- creationTimestamp: null
- labels:
- app: camel-k
- name: bindings.camel.apache.org
-spec:
- group: camel.apache.org
- names:
- categories:
- - kamel
- - camel
- kind: Binding
- listKind: BindingList
- plural: bindings
- shortNames:
- - bd
- singular: binding
- scope: Namespaced
- versions:
- - additionalPrinterColumns:
- - description: TheBinding phase
- jsonPath: .status.phase
- name: Phase
- type: string
- - description: The number of pods
- jsonPath: .status.replicas
- name: Replicas
- type: integer
- name: v1
- schema:
- openAPIV3Schema:
- description: Binding is the Schema for the kamelets binding API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: the specification of a Binding
- properties:
- errorHandler:
- description: ErrorHandler is an optional handler called upon an error
- occuring in the integration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- integration:
- description: Integration is an optional integration used to specify
- custom parameters
- properties:
- configuration:
- description: 'Deprecated: Use camel trait (camel.properties) to
- manage properties Use mount trait (mount.configs) to manage
- configs Use mount trait (mount.resources) to manage resources
- Use mount trait (mount.volumes) to manage volumes'
- items:
- description: ConfigurationSpec represents a generic configuration
- specification
- properties:
- type:
- description: 'represents the type of configuration, ie:
- property, configmap, secret, ...'
- type: string
- value:
- description: the value to assign to the configuration (syntax
- may vary depending on the `Type`)
- type: string
- required:
- - type
- - value
- type: object
- type: array
- dependencies:
- description: the list of Camel or Maven dependencies required
- by the Integration
- items:
- type: string
- type: array
- flows:
- description: a source in YAML DSL language which contain the routes
- to run
- items:
- description: Flow is an unstructured object representing a Camel
- Flow in YAML/JSON DSL
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: array
- integrationKit:
- description: the reference of the `IntegrationKit` which is used
- for this Integration
- properties:
- apiVersion:
- description: API version of the referent.
- type: string
- fieldPath:
- description: 'If referring to a piece of an object instead
- of an entire object, this string should contain a valid
- JSON/Go field access statement, such as desiredState.manifest.containers[2].
- For example, if the object reference is to a container within
- a pod, this would take on a value like: "spec.containers{name}"
- (where "name" refers to the name of the container that triggered
- the event) or if no container name is specified "spec.containers[2]"
- (container with index 2 in this pod). This syntax is chosen
- only to have some well-defined way of referencing a part
- of an object. TODO: this design is not final and this field
- is subject to change in the future.'
- type: string
- kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- namespace:
- description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
- type: string
- resourceVersion:
- description: 'Specific resourceVersion to which this reference
- is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
- type: string
- uid:
- description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
- type: string
- type: object
- profile:
- description: the profile needed to run this Integration
- type: string
- replicas:
- description: the number of `Pods` needed for the running Integration
- format: int32
- type: integer
- repositories:
- description: additional Maven repositories to be used
- items:
- type: string
- type: array
- serviceAccountName:
- description: custom SA to use for the Integration
- type: string
- sources:
- description: the sources which contain the Camel routes to run
- items:
- description: SourceSpec defines the configuration for one or
- more routes to be executed in a certain Camel DSL language
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
- interceptors:
- description: Interceptors are optional identifiers the org.apache.camel.k.RoutesLoader
- uses to pre/post process sources
- items:
- type: string
- type: array
- language:
- description: specify which is the language (Camel DSL) used
- to interpret this source code
- type: string
- loader:
- description: Loader is an optional id of the org.apache.camel.k.RoutesLoader
- that will interpret this source at runtime
- type: string
- name:
- description: the name of the specification
- type: string
- path:
- description: the path where the file is stored
- type: string
- property-names:
- description: List of property names defined in the source
- (e.g. if type is "template")
- items:
- type: string
- type: array
- rawContent:
- description: the source code (binary)
- format: byte
- type: string
- type:
- description: Type defines the kind of source described by
- this object
- type: string
- type: object
- type: array
- template:
- description: Pod template customization
- properties:
- spec:
- description: the specification
- properties:
- activeDeadlineSeconds:
- description: ActiveDeadlineSeconds
- format: int64
- type: integer
- containers:
- description: Containers
- items:
- description: A single application container that you
- want to run within a pod.
- properties:
- args:
- description: 'Arguments to the entrypoint. The container
- image''s CMD is used if this is not provided.
- Variable references $(VAR_NAME) are expanded using
- the container''s environment. If a variable cannot
- be resolved, the reference in the input string
- will be unchanged. Double $$ are reduced to a
- single $, which allows for escaping the $(VAR_NAME)
- syntax: i.e. "$$(VAR_NAME)" will produce the string
- literal "$(VAR_NAME)". Escaped references will
- never be expanded, regardless of whether the variable
- exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- command:
- description: 'Entrypoint array. Not executed within
- a shell. The container image''s ENTRYPOINT is
- used if this is not provided. Variable references
- $(VAR_NAME) are expanded using the container''s
- environment. If a variable cannot be resolved,
- the reference in the input string will be unchanged.
- Double $$ are reduced to a single $, which allows
- for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
- will produce the string literal "$(VAR_NAME)".
- Escaped references will never be expanded, regardless
- of whether the variable exists or not. Cannot
- be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- env:
- description: List of environment variables to set
- in the container. Cannot be updated.
- items:
- description: EnvVar represents an environment
- variable present in a Container.
- properties:
- name:
- description: Name of the environment variable.
- Must be a C_IDENTIFIER.
- type: string
- value:
- description: 'Variable references $(VAR_NAME)
- are expanded using the previously defined
- environment variables in the container and
- any service environment variables. If a
- variable cannot be resolved, the reference
- in the input string will be unchanged. Double
- $$ are reduced to a single $, which allows
- for escaping the $(VAR_NAME) syntax: i.e.
- "$$(VAR_NAME)" will produce the string literal
- "$(VAR_NAME)". Escaped references will never
- be expanded, regardless of whether the variable
- exists or not. Defaults to "".'
- type: string
- valueFrom:
- description: Source for the environment variable's
- value. Cannot be used if value is not empty.
- properties:
- configMapKeyRef:
- description: Selects a key of a ConfigMap.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- fieldRef:
- description: 'Selects a field of the pod:
- supports metadata.name, metadata.namespace,
- `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
- spec.nodeName, spec.serviceAccountName,
- status.hostIP, status.podIP, status.podIPs.'
- properties:
- apiVersion:
- description: Version of the schema
- the FieldPath is written in terms
- of, defaults to "v1".
- type: string
- fieldPath:
- description: Path of the field to
- select in the specified API version.
- type: string
- required:
- - fieldPath
- type: object
- resourceFieldRef:
- description: 'Selects a resource of the
- container: only resources limits and
- requests (limits.cpu, limits.memory,
- limits.ephemeral-storage, requests.cpu,
- requests.memory and requests.ephemeral-storage)
- are currently supported.'
- properties:
- containerName:
- description: 'Container name: required
- for volumes, optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the output
- format of the exposed resources,
- defaults to "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required: resource to
- select'
- type: string
- required:
- - resource
- type: object
- secretKeyRef:
- description: Selects a key of a secret
- in the pod's namespace
- properties:
- key:
- description: The key of the secret
- to select from. Must be a valid
- secret key.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- type: object
- required:
- - name
- type: object
- type: array
- envFrom:
- description: List of sources to populate environment
- variables in the container. The keys defined within
- a source must be a C_IDENTIFIER. All invalid keys
- will be reported as an event when the container
- is starting. When a key exists in multiple sources,
- the value associated with the last source will
- take precedence. Values defined by an Env with
- a duplicate key will take precedence. Cannot be
- updated.
- items:
- description: EnvFromSource represents the source
- of a set of ConfigMaps
- properties:
- configMapRef:
- description: The ConfigMap to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- must be defined
- type: boolean
- type: object
- prefix:
- description: An optional identifier to prepend
- to each key in the ConfigMap. Must be a
- C_IDENTIFIER.
- type: string
- secretRef:
- description: The Secret to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- must be defined
- type: boolean
- type: object
- type: object
- type: array
- image:
- description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
- This field is optional to allow higher level config
- management to default or override container images
- in workload controllers like Deployments and StatefulSets.'
- type: string
- imagePullPolicy:
- description: 'Image pull policy. One of Always,
- Never, IfNotPresent. Defaults to Always if :latest
- tag is specified, or IfNotPresent otherwise. Cannot
- be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
- type: string
- lifecycle:
- description: Actions that the management system
- should take in response to container lifecycle
- events. Cannot be updated.
- properties:
- postStart:
- description: 'PostStart is called immediately
- after a container is created. If the handler
- fails, the container is terminated and restarted
- according to its restart policy. Other management
- of the container blocks until the hook completes.
- More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- preStop:
- description: 'PreStop is called immediately
- before a container is terminated due to an
- API request or management event such as liveness/startup
- probe failure, preemption, resource contention,
- etc. The handler is not called if the container
- crashes or exits. The Pod''s termination grace
- period countdown begins before the PreStop
- hook is executed. Regardless of the outcome
- of the handler, the container will eventually
- terminate within the Pod''s termination grace
- period (unless delayed by finalizers). Other
- management of the container blocks until the
- hook completes or until the termination grace
- period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- type: object
- livenessProbe:
- description: 'Periodic probe of container liveness.
- Container will be restarted if the probe fails.
- Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- name:
- description: Name of the container specified as
- a DNS_LABEL. Each container in a pod must have
- a unique name (DNS_LABEL). Cannot be updated.
- type: string
- ports:
- description: List of ports to expose from the container.
- Not specifying a port here DOES NOT prevent that
- port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container
- will be accessible from the network. Modifying
- this array with strategic merge patch may corrupt
- the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
- Cannot be updated.
- items:
- description: ContainerPort represents a network
- port in a single container.
- properties:
- containerPort:
- description: Number of port to expose on the
- pod's IP address. This must be a valid port
- number, 0 < x < 65536.
- format: int32
- type: integer
- hostIP:
- description: What host IP to bind the external
- port to.
- type: string
- hostPort:
- description: Number of port to expose on the
- host. If specified, this must be a valid
- port number, 0 < x < 65536. If HostNetwork
- is specified, this must match ContainerPort.
- Most containers do not need this.
- format: int32
- type: integer
- name:
- description: If specified, this must be an
- IANA_SVC_NAME and unique within the pod.
- Each named port in a pod must have a unique
- name. Name for the port that can be referred
- to by services.
- type: string
- protocol:
- default: TCP
- description: Protocol for port. Must be UDP,
- TCP, or SCTP. Defaults to "TCP".
- type: string
- required:
- - containerPort
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - containerPort
- - protocol
- x-kubernetes-list-type: map
- readinessProbe:
- description: 'Periodic probe of container service
- readiness. Container will be removed from service
- endpoints if the probe fails. Cannot be updated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- resources:
- description: 'Compute Resources required by this
- container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- properties:
- limits:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Limits describes the maximum amount
- of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- requests:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Requests describes the minimum
- amount of compute resources required. If Requests
- is omitted for a container, it defaults to
- Limits if that is explicitly specified, otherwise
- to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- type: object
- securityContext:
- description: 'SecurityContext defines the security
- options the container should be run with. If set,
- the fields of SecurityContext override the equivalent
- fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
- properties:
- allowPrivilegeEscalation:
- description: 'AllowPrivilegeEscalation controls
- whether a process can gain more privileges
- than its parent process. This bool directly
- controls if the no_new_privs flag will be
- set on the container process. AllowPrivilegeEscalation
- is true always when the container is: 1) run
- as Privileged 2) has CAP_SYS_ADMIN Note that
- this field cannot be set when spec.os.name
- is windows.'
- type: boolean
- capabilities:
- description: The capabilities to add/drop when
- running containers. Defaults to the default
- set of capabilities granted by the container
- runtime. Note that this field cannot be set
- when spec.os.name is windows.
- properties:
- add:
- description: Added capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- drop:
- description: Removed capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- type: object
- privileged:
- description: Run container in privileged mode.
- Processes in privileged containers are essentially
- equivalent to root on the host. Defaults to
- false. Note that this field cannot be set
- when spec.os.name is windows.
- type: boolean
- procMount:
- description: procMount denotes the type of proc
- mount to use for the containers. The default
- is DefaultProcMount which uses the container
- runtime defaults for readonly paths and masked
- paths. This requires the ProcMountType feature
- flag to be enabled. Note that this field cannot
- be set when spec.os.name is windows.
- type: string
- readOnlyRootFilesystem:
- description: Whether this container has a read-only
- root filesystem. Default is false. Note that
- this field cannot be set when spec.os.name
- is windows.
- type: boolean
- runAsGroup:
- description: The GID to run the entrypoint of
- the container process. Uses runtime default
- if unset. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- format: int64
- type: integer
- runAsNonRoot:
- description: Indicates that the container must
- run as a non-root user. If true, the Kubelet
- will validate the image at runtime to ensure
- that it does not run as UID 0 (root) and fail
- to start the container if it does. If unset
- or false, no such validation will be performed.
- May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence.
- type: boolean
- runAsUser:
- description: The UID to run the entrypoint of
- the container process. Defaults to user specified
- in image metadata if unspecified. May also
- be set in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext, the
- value specified in SecurityContext takes precedence.
- Note that this field cannot be set when spec.os.name
- is windows.
- format: int64
- type: integer
- seLinuxOptions:
- description: The SELinux context to be applied
- to the container. If unspecified, the container
- runtime will allocate a random SELinux context
- for each container. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- properties:
- level:
- description: Level is SELinux level label
- that applies to the container.
- type: string
- role:
- description: Role is a SELinux role label
- that applies to the container.
- type: string
- type:
- description: Type is a SELinux type label
- that applies to the container.
- type: string
- user:
- description: User is a SELinux user label
- that applies to the container.
- type: string
- type: object
- seccompProfile:
- description: The seccomp options to use by this
- container. If seccomp options are provided
- at both the pod & container level, the container
- options override the pod options. Note that
- this field cannot be set when spec.os.name
- is windows.
- properties:
- localhostProfile:
- description: localhostProfile indicates
- a profile defined in a file on the node
- should be used. The profile must be preconfigured
- on the node to work. Must be a descending
- path, relative to the kubelet's configured
- seccomp profile location. Must only be
- set if type is "Localhost".
- type: string
- type:
- description: "type indicates which kind
- of seccomp profile will be applied. Valid
- options are: \n Localhost - a profile
- defined in a file on the node should be
- used. RuntimeDefault - the container runtime
- default profile should be used. Unconfined
- - no profile should be applied."
- type: string
- required:
- - type
- type: object
- windowsOptions:
- description: The Windows specific settings applied
- to all containers. If unspecified, the options
- from the PodSecurityContext will be used.
- If set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is linux.
- properties:
- gmsaCredentialSpec:
- description: GMSACredentialSpec is where
- the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
- inlines the contents of the GMSA credential
- spec named by the GMSACredentialSpecName
- field.
- type: string
- gmsaCredentialSpecName:
- description: GMSACredentialSpecName is the
- name of the GMSA credential spec to use.
- type: string
- hostProcess:
- description: HostProcess determines if a
- container should be run as a 'Host Process'
- container. This field is alpha-level and
- will only be honored by components that
- enable the WindowsHostProcessContainers
- feature flag. Setting this field without
- the feature flag will result in errors
- when validating the Pod. All of a Pod's
- containers must have the same effective
- HostProcess value (it is not allowed to
- have a mix of HostProcess containers and
- non-HostProcess containers). In addition,
- if HostProcess is true then HostNetwork
- must also be set to true.
- type: boolean
- runAsUserName:
- description: The UserName in Windows to
- run the entrypoint of the container process.
- Defaults to the user specified in image
- metadata if unspecified. May also be set
- in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext,
- the value specified in SecurityContext
- takes precedence.
- type: string
- type: object
- type: object
- startupProbe:
- description: 'StartupProbe indicates that the Pod
- has successfully initialized. If specified, no
- other probes are executed until this completes
- successfully. If this probe fails, the Pod will
- be restarted, just as if the livenessProbe failed.
- This can be used to provide different probe parameters
- at the beginning of a Pod''s lifecycle, when it
- might take a long time to load data or warm a
- cache, than during steady-state operation. This
- cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- stdin:
- description: Whether this container should allocate
- a buffer for stdin in the container runtime. If
- this is not set, reads from stdin in the container
- will always result in EOF. Default is false.
- type: boolean
- stdinOnce:
- description: Whether the container runtime should
- close the stdin channel after it has been opened
- by a single attach. When stdin is true the stdin
- stream will remain open across multiple attach
- sessions. If stdinOnce is set to true, stdin is
- opened on container start, is empty until the
- first client attaches to stdin, and then remains
- open and accepts data until the client disconnects,
- at which time stdin is closed and remains closed
- until the container is restarted. If this flag
- is false, a container processes that reads from
- stdin will never receive an EOF. Default is false
- type: boolean
- terminationMessagePath:
- description: 'Optional: Path at which the file to
- which the container''s termination message will
- be written is mounted into the container''s filesystem.
- Message written is intended to be brief final
- status, such as an assertion failure message.
- Will be truncated by the node if greater than
- 4096 bytes. The total message length across all
- containers will be limited to 12kb. Defaults to
- /dev/termination-log. Cannot be updated.'
- type: string
- terminationMessagePolicy:
- description: Indicate how the termination message
- should be populated. File will use the contents
- of terminationMessagePath to populate the container
- status message on both success and failure. FallbackToLogsOnError
- will use the last chunk of container log output
- if the termination message file is empty and the
- container exited with an error. The log output
- is limited to 2048 bytes or 80 lines, whichever
- is smaller. Defaults to File. Cannot be updated.
- type: string
- tty:
- description: Whether this container should allocate
- a TTY for itself, also requires 'stdin' to be
- true. Default is false.
- type: boolean
- volumeDevices:
- description: volumeDevices is the list of block
- devices to be used by the container.
- items:
- description: volumeDevice describes a mapping
- of a raw block device within a container.
- properties:
- devicePath:
- description: devicePath is the path inside
- of the container that the device will be
- mapped to.
- type: string
- name:
- description: name must match the name of a
- persistentVolumeClaim in the pod
- type: string
- required:
- - devicePath
- - name
- type: object
- type: array
- volumeMounts:
- description: Pod volumes to mount into the container's
- filesystem. Cannot be updated.
- items:
- description: VolumeMount describes a mounting
- of a Volume within a container.
- properties:
- mountPath:
- description: Path within the container at
- which the volume should be mounted. Must
- not contain ':'.
- type: string
- mountPropagation:
- description: mountPropagation determines how
- mounts are propagated from the host to container
- and the other way around. When not set,
- MountPropagationNone is used. This field
- is beta in 1.10.
- type: string
- name:
- description: This must match the Name of a
- Volume.
- type: string
- readOnly:
- description: Mounted read-only if true, read-write
- otherwise (false or unspecified). Defaults
- to false.
- type: boolean
- subPath:
- description: Path within the volume from which
- the container's volume should be mounted.
- Defaults to "" (volume's root).
- type: string
- subPathExpr:
- description: Expanded path within the volume
- from which the container's volume should
- be mounted. Behaves similarly to SubPath
- but environment variable references $(VAR_NAME)
- are expanded using the container's environment.
- Defaults to "" (volume's root). SubPathExpr
- and SubPath are mutually exclusive.
- type: string
- required:
- - mountPath
- - name
- type: object
- type: array
- workingDir:
- description: Container's working directory. If not
- specified, the container runtime's default will
- be used, which might be configured in the container
- image. Cannot be updated.
- type: string
- required:
- - name
- type: object
- type: array
- dnsPolicy:
- description: DNSPolicy
- type: string
- ephemeralContainers:
- description: EphemeralContainers
- items:
- description: "An EphemeralContainer is a temporary container
- that you may add to an existing Pod for user-initiated
- activities such as debugging. Ephemeral containers
- have no resource or scheduling guarantees, and they
- will not be restarted when they exit or when a Pod
- is removed or restarted. The kubelet may evict a Pod
- if an ephemeral container causes the Pod to exceed
- its resource allocation. \n To add an ephemeral container,
- use the ephemeralcontainers subresource of an existing
- Pod. Ephemeral containers may not be removed or restarted."
- properties:
- args:
- description: 'Arguments to the entrypoint. The image''s
- CMD is used if this is not provided. Variable
- references $(VAR_NAME) are expanded using the
- container''s environment. If a variable cannot
- be resolved, the reference in the input string
- will be unchanged. Double $$ are reduced to a
- single $, which allows for escaping the $(VAR_NAME)
- syntax: i.e. "$$(VAR_NAME)" will produce the string
- literal "$(VAR_NAME)". Escaped references will
- never be expanded, regardless of whether the variable
- exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- command:
- description: 'Entrypoint array. Not executed within
- a shell. The image''s ENTRYPOINT is used if this
- is not provided. Variable references $(VAR_NAME)
- are expanded using the container''s environment.
- If a variable cannot be resolved, the reference
- in the input string will be unchanged. Double
- $$ are reduced to a single $, which allows for
- escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
- will produce the string literal "$(VAR_NAME)".
- Escaped references will never be expanded, regardless
- of whether the variable exists or not. Cannot
- be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- env:
- description: List of environment variables to set
- in the container. Cannot be updated.
- items:
- description: EnvVar represents an environment
- variable present in a Container.
- properties:
- name:
- description: Name of the environment variable.
- Must be a C_IDENTIFIER.
- type: string
- value:
- description: 'Variable references $(VAR_NAME)
- are expanded using the previously defined
- environment variables in the container and
- any service environment variables. If a
- variable cannot be resolved, the reference
- in the input string will be unchanged. Double
- $$ are reduced to a single $, which allows
- for escaping the $(VAR_NAME) syntax: i.e.
- "$$(VAR_NAME)" will produce the string literal
- "$(VAR_NAME)". Escaped references will never
- be expanded, regardless of whether the variable
- exists or not. Defaults to "".'
- type: string
- valueFrom:
- description: Source for the environment variable's
- value. Cannot be used if value is not empty.
- properties:
- configMapKeyRef:
- description: Selects a key of a ConfigMap.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- fieldRef:
- description: 'Selects a field of the pod:
- supports metadata.name, metadata.namespace,
- `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
- spec.nodeName, spec.serviceAccountName,
- status.hostIP, status.podIP, status.podIPs.'
- properties:
- apiVersion:
- description: Version of the schema
- the FieldPath is written in terms
- of, defaults to "v1".
- type: string
- fieldPath:
- description: Path of the field to
- select in the specified API version.
- type: string
- required:
- - fieldPath
- type: object
- resourceFieldRef:
- description: 'Selects a resource of the
- container: only resources limits and
- requests (limits.cpu, limits.memory,
- limits.ephemeral-storage, requests.cpu,
- requests.memory and requests.ephemeral-storage)
- are currently supported.'
- properties:
- containerName:
- description: 'Container name: required
- for volumes, optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the output
- format of the exposed resources,
- defaults to "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required: resource to
- select'
- type: string
- required:
- - resource
- type: object
- secretKeyRef:
- description: Selects a key of a secret
- in the pod's namespace
- properties:
- key:
- description: The key of the secret
- to select from. Must be a valid
- secret key.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- type: object
- required:
- - name
- type: object
- type: array
- envFrom:
- description: List of sources to populate environment
- variables in the container. The keys defined within
- a source must be a C_IDENTIFIER. All invalid keys
- will be reported as an event when the container
- is starting. When a key exists in multiple sources,
- the value associated with the last source will
- take precedence. Values defined by an Env with
- a duplicate key will take precedence. Cannot be
- updated.
- items:
- description: EnvFromSource represents the source
- of a set of ConfigMaps
- properties:
- configMapRef:
- description: The ConfigMap to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- must be defined
- type: boolean
- type: object
- prefix:
- description: An optional identifier to prepend
- to each key in the ConfigMap. Must be a
- C_IDENTIFIER.
- type: string
- secretRef:
- description: The Secret to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- must be defined
- type: boolean
- type: object
- type: object
- type: array
- image:
- description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images'
- type: string
- imagePullPolicy:
- description: 'Image pull policy. One of Always,
- Never, IfNotPresent. Defaults to Always if :latest
- tag is specified, or IfNotPresent otherwise. Cannot
- be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
- type: string
- lifecycle:
- description: Lifecycle is not allowed for ephemeral
- containers.
- properties:
- postStart:
- description: 'PostStart is called immediately
- after a container is created. If the handler
- fails, the container is terminated and restarted
- according to its restart policy. Other management
- of the container blocks until the hook completes.
- More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- preStop:
- description: 'PreStop is called immediately
- before a container is terminated due to an
- API request or management event such as liveness/startup
- probe failure, preemption, resource contention,
- etc. The handler is not called if the container
- crashes or exits. The Pod''s termination grace
- period countdown begins before the PreStop
- hook is executed. Regardless of the outcome
- of the handler, the container will eventually
- terminate within the Pod''s termination grace
- period (unless delayed by finalizers). Other
- management of the container blocks until the
- hook completes or until the termination grace
- period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- type: object
- livenessProbe:
- description: Probes are not allowed for ephemeral
- containers.
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- name:
- description: Name of the ephemeral container specified
- as a DNS_LABEL. This name must be unique among
- all containers, init containers and ephemeral
- containers.
- type: string
- ports:
- description: Ports are not allowed for ephemeral
- containers.
- items:
- description: ContainerPort represents a network
- port in a single container.
- properties:
- containerPort:
- description: Number of port to expose on the
- pod's IP address. This must be a valid port
- number, 0 < x < 65536.
- format: int32
- type: integer
- hostIP:
- description: What host IP to bind the external
- port to.
- type: string
- hostPort:
- description: Number of port to expose on the
- host. If specified, this must be a valid
- port number, 0 < x < 65536. If HostNetwork
- is specified, this must match ContainerPort.
- Most containers do not need this.
- format: int32
- type: integer
- name:
- description: If specified, this must be an
- IANA_SVC_NAME and unique within the pod.
- Each named port in a pod must have a unique
- name. Name for the port that can be referred
- to by services.
- type: string
- protocol:
- default: TCP
- description: Protocol for port. Must be UDP,
- TCP, or SCTP. Defaults to "TCP".
- type: string
- required:
- - containerPort
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - containerPort
- - protocol
- x-kubernetes-list-type: map
- readinessProbe:
- description: Probes are not allowed for ephemeral
- containers.
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- resources:
- description: Resources are not allowed for ephemeral
- containers. Ephemeral containers use spare resources
- already allocated to the pod.
- properties:
- limits:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Limits describes the maximum amount
- of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- requests:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Requests describes the minimum
- amount of compute resources required. If Requests
- is omitted for a container, it defaults to
- Limits if that is explicitly specified, otherwise
- to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- type: object
- securityContext:
- description: 'Optional: SecurityContext defines
- the security options the ephemeral container should
- be run with. If set, the fields of SecurityContext
- override the equivalent fields of PodSecurityContext.'
- properties:
- allowPrivilegeEscalation:
- description: 'AllowPrivilegeEscalation controls
- whether a process can gain more privileges
- than its parent process. This bool directly
- controls if the no_new_privs flag will be
- set on the container process. AllowPrivilegeEscalation
- is true always when the container is: 1) run
- as Privileged 2) has CAP_SYS_ADMIN Note that
- this field cannot be set when spec.os.name
- is windows.'
- type: boolean
- capabilities:
- description: The capabilities to add/drop when
- running containers. Defaults to the default
- set of capabilities granted by the container
- runtime. Note that this field cannot be set
- when spec.os.name is windows.
- properties:
- add:
- description: Added capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- drop:
- description: Removed capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- type: object
- privileged:
- description: Run container in privileged mode.
- Processes in privileged containers are essentially
- equivalent to root on the host. Defaults to
- false. Note that this field cannot be set
- when spec.os.name is windows.
- type: boolean
- procMount:
- description: procMount denotes the type of proc
- mount to use for the containers. The default
- is DefaultProcMount which uses the container
- runtime defaults for readonly paths and masked
- paths. This requires the ProcMountType feature
- flag to be enabled. Note that this field cannot
- be set when spec.os.name is windows.
- type: string
- readOnlyRootFilesystem:
- description: Whether this container has a read-only
- root filesystem. Default is false. Note that
- this field cannot be set when spec.os.name
- is windows.
- type: boolean
- runAsGroup:
- description: The GID to run the entrypoint of
- the container process. Uses runtime default
- if unset. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- format: int64
- type: integer
- runAsNonRoot:
- description: Indicates that the container must
- run as a non-root user. If true, the Kubelet
- will validate the image at runtime to ensure
- that it does not run as UID 0 (root) and fail
- to start the container if it does. If unset
- or false, no such validation will be performed.
- May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence.
- type: boolean
- runAsUser:
- description: The UID to run the entrypoint of
- the container process. Defaults to user specified
- in image metadata if unspecified. May also
- be set in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext, the
- value specified in SecurityContext takes precedence.
- Note that this field cannot be set when spec.os.name
- is windows.
- format: int64
- type: integer
- seLinuxOptions:
- description: The SELinux context to be applied
- to the container. If unspecified, the container
- runtime will allocate a random SELinux context
- for each container. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- properties:
- level:
- description: Level is SELinux level label
- that applies to the container.
- type: string
- role:
- description: Role is a SELinux role label
- that applies to the container.
- type: string
- type:
- description: Type is a SELinux type label
- that applies to the container.
- type: string
- user:
- description: User is a SELinux user label
- that applies to the container.
- type: string
- type: object
- seccompProfile:
- description: The seccomp options to use by this
- container. If seccomp options are provided
- at both the pod & container level, the container
- options override the pod options. Note that
- this field cannot be set when spec.os.name
- is windows.
- properties:
- localhostProfile:
- description: localhostProfile indicates
- a profile defined in a file on the node
- should be used. The profile must be preconfigured
- on the node to work. Must be a descending
- path, relative to the kubelet's configured
- seccomp profile location. Must only be
- set if type is "Localhost".
- type: string
- type:
- description: "type indicates which kind
- of seccomp profile will be applied. Valid
- options are: \n Localhost - a profile
- defined in a file on the node should be
- used. RuntimeDefault - the container runtime
- default profile should be used. Unconfined
- - no profile should be applied."
- type: string
- required:
- - type
- type: object
- windowsOptions:
- description: The Windows specific settings applied
- to all containers. If unspecified, the options
- from the PodSecurityContext will be used.
- If set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is linux.
- properties:
- gmsaCredentialSpec:
- description: GMSACredentialSpec is where
- the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
- inlines the contents of the GMSA credential
- spec named by the GMSACredentialSpecName
- field.
- type: string
- gmsaCredentialSpecName:
- description: GMSACredentialSpecName is the
- name of the GMSA credential spec to use.
- type: string
- hostProcess:
- description: HostProcess determines if a
- container should be run as a 'Host Process'
- container. This field is alpha-level and
- will only be honored by components that
- enable the WindowsHostProcessContainers
- feature flag. Setting this field without
- the feature flag will result in errors
- when validating the Pod. All of a Pod's
- containers must have the same effective
- HostProcess value (it is not allowed to
- have a mix of HostProcess containers and
- non-HostProcess containers). In addition,
- if HostProcess is true then HostNetwork
- must also be set to true.
- type: boolean
- runAsUserName:
- description: The UserName in Windows to
- run the entrypoint of the container process.
- Defaults to the user specified in image
- metadata if unspecified. May also be set
- in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext,
- the value specified in SecurityContext
- takes precedence.
- type: string
- type: object
- type: object
- startupProbe:
- description: Probes are not allowed for ephemeral
- containers.
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- stdin:
- description: Whether this container should allocate
- a buffer for stdin in the container runtime. If
- this is not set, reads from stdin in the container
- will always result in EOF. Default is false.
- type: boolean
- stdinOnce:
- description: Whether the container runtime should
- close the stdin channel after it has been opened
- by a single attach. When stdin is true the stdin
- stream will remain open across multiple attach
- sessions. If stdinOnce is set to true, stdin is
- opened on container start, is empty until the
- first client attaches to stdin, and then remains
- open and accepts data until the client disconnects,
- at which time stdin is closed and remains closed
- until the container is restarted. If this flag
- is false, a container processes that reads from
- stdin will never receive an EOF. Default is false
- type: boolean
- targetContainerName:
- description: "If set, the name of the container
- from PodSpec that this ephemeral container targets.
- The ephemeral container will be run in the namespaces
- (IPC, PID, etc) of this container. If not set
- then the ephemeral container uses the namespaces
- configured in the Pod spec. \n The container runtime
- must implement support for this feature. If the
- runtime does not support namespace targeting then
- the result of setting this field is undefined."
- type: string
- terminationMessagePath:
- description: 'Optional: Path at which the file to
- which the container''s termination message will
- be written is mounted into the container''s filesystem.
- Message written is intended to be brief final
- status, such as an assertion failure message.
- Will be truncated by the node if greater than
- 4096 bytes. The total message length across all
- containers will be limited to 12kb. Defaults to
- /dev/termination-log. Cannot be updated.'
- type: string
- terminationMessagePolicy:
- description: Indicate how the termination message
- should be populated. File will use the contents
- of terminationMessagePath to populate the container
- status message on both success and failure. FallbackToLogsOnError
- will use the last chunk of container log output
- if the termination message file is empty and the
- container exited with an error. The log output
- is limited to 2048 bytes or 80 lines, whichever
- is smaller. Defaults to File. Cannot be updated.
- type: string
- tty:
- description: Whether this container should allocate
- a TTY for itself, also requires 'stdin' to be
- true. Default is false.
- type: boolean
- volumeDevices:
- description: volumeDevices is the list of block
- devices to be used by the container.
- items:
- description: volumeDevice describes a mapping
- of a raw block device within a container.
- properties:
- devicePath:
- description: devicePath is the path inside
- of the container that the device will be
- mapped to.
- type: string
- name:
- description: name must match the name of a
- persistentVolumeClaim in the pod
- type: string
- required:
- - devicePath
- - name
- type: object
- type: array
- volumeMounts:
- description: Pod volumes to mount into the container's
- filesystem. Subpath mounts are not allowed for
- ephemeral containers. Cannot be updated.
- items:
- description: VolumeMount describes a mounting
- of a Volume within a container.
- properties:
- mountPath:
- description: Path within the container at
- which the volume should be mounted. Must
- not contain ':'.
- type: string
- mountPropagation:
- description: mountPropagation determines how
- mounts are propagated from the host to container
- and the other way around. When not set,
- MountPropagationNone is used. This field
- is beta in 1.10.
- type: string
- name:
- description: This must match the Name of a
- Volume.
- type: string
- readOnly:
- description: Mounted read-only if true, read-write
- otherwise (false or unspecified). Defaults
- to false.
- type: boolean
- subPath:
- description: Path within the volume from which
- the container's volume should be mounted.
- Defaults to "" (volume's root).
- type: string
- subPathExpr:
- description: Expanded path within the volume
- from which the container's volume should
- be mounted. Behaves similarly to SubPath
- but environment variable references $(VAR_NAME)
- are expanded using the container's environment.
- Defaults to "" (volume's root). SubPathExpr
- and SubPath are mutually exclusive.
- type: string
- required:
- - mountPath
- - name
- type: object
- type: array
- workingDir:
- description: Container's working directory. If not
- specified, the container runtime's default will
- be used, which might be configured in the container
- image. Cannot be updated.
- type: string
- required:
- - name
- type: object
- type: array
- initContainers:
- description: InitContainers
- items:
- description: A single application container that you
- want to run within a pod.
- properties:
- args:
- description: 'Arguments to the entrypoint. The container
- image''s CMD is used if this is not provided.
- Variable references $(VAR_NAME) are expanded using
- the container''s environment. If a variable cannot
- be resolved, the reference in the input string
- will be unchanged. Double $$ are reduced to a
- single $, which allows for escaping the $(VAR_NAME)
- syntax: i.e. "$$(VAR_NAME)" will produce the string
- literal "$(VAR_NAME)". Escaped references will
- never be expanded, regardless of whether the variable
- exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- command:
- description: 'Entrypoint array. Not executed within
- a shell. The container image''s ENTRYPOINT is
- used if this is not provided. Variable references
- $(VAR_NAME) are expanded using the container''s
- environment. If a variable cannot be resolved,
- the reference in the input string will be unchanged.
- Double $$ are reduced to a single $, which allows
- for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
- will produce the string literal "$(VAR_NAME)".
- Escaped references will never be expanded, regardless
- of whether the variable exists or not. Cannot
- be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
- items:
- type: string
- type: array
- env:
- description: List of environment variables to set
- in the container. Cannot be updated.
- items:
- description: EnvVar represents an environment
- variable present in a Container.
- properties:
- name:
- description: Name of the environment variable.
- Must be a C_IDENTIFIER.
- type: string
- value:
- description: 'Variable references $(VAR_NAME)
- are expanded using the previously defined
- environment variables in the container and
- any service environment variables. If a
- variable cannot be resolved, the reference
- in the input string will be unchanged. Double
- $$ are reduced to a single $, which allows
- for escaping the $(VAR_NAME) syntax: i.e.
- "$$(VAR_NAME)" will produce the string literal
- "$(VAR_NAME)". Escaped references will never
- be expanded, regardless of whether the variable
- exists or not. Defaults to "".'
- type: string
- valueFrom:
- description: Source for the environment variable's
- value. Cannot be used if value is not empty.
- properties:
- configMapKeyRef:
- description: Selects a key of a ConfigMap.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- fieldRef:
- description: 'Selects a field of the pod:
- supports metadata.name, metadata.namespace,
- `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
- spec.nodeName, spec.serviceAccountName,
- status.hostIP, status.podIP, status.podIPs.'
- properties:
- apiVersion:
- description: Version of the schema
- the FieldPath is written in terms
- of, defaults to "v1".
- type: string
- fieldPath:
- description: Path of the field to
- select in the specified API version.
- type: string
- required:
- - fieldPath
- type: object
- resourceFieldRef:
- description: 'Selects a resource of the
- container: only resources limits and
- requests (limits.cpu, limits.memory,
- limits.ephemeral-storage, requests.cpu,
- requests.memory and requests.ephemeral-storage)
- are currently supported.'
- properties:
- containerName:
- description: 'Container name: required
- for volumes, optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the output
- format of the exposed resources,
- defaults to "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required: resource to
- select'
- type: string
- required:
- - resource
- type: object
- secretKeyRef:
- description: Selects a key of a secret
- in the pod's namespace
- properties:
- key:
- description: The key of the secret
- to select from. Must be a valid
- secret key.
- type: string
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- or its key must be defined
- type: boolean
- required:
- - key
- type: object
- type: object
- required:
- - name
- type: object
- type: array
- envFrom:
- description: List of sources to populate environment
- variables in the container. The keys defined within
- a source must be a C_IDENTIFIER. All invalid keys
- will be reported as an event when the container
- is starting. When a key exists in multiple sources,
- the value associated with the last source will
- take precedence. Values defined by an Env with
- a duplicate key will take precedence. Cannot be
- updated.
- items:
- description: EnvFromSource represents the source
- of a set of ConfigMaps
- properties:
- configMapRef:
- description: The ConfigMap to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap
- must be defined
- type: boolean
- type: object
- prefix:
- description: An optional identifier to prepend
- to each key in the ConfigMap. Must be a
- C_IDENTIFIER.
- type: string
- secretRef:
- description: The Secret to select from
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret
- must be defined
- type: boolean
- type: object
- type: object
- type: array
- image:
- description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
- This field is optional to allow higher level config
- management to default or override container images
- in workload controllers like Deployments and StatefulSets.'
- type: string
- imagePullPolicy:
- description: 'Image pull policy. One of Always,
- Never, IfNotPresent. Defaults to Always if :latest
- tag is specified, or IfNotPresent otherwise. Cannot
- be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
- type: string
- lifecycle:
- description: Actions that the management system
- should take in response to container lifecycle
- events. Cannot be updated.
- properties:
- postStart:
- description: 'PostStart is called immediately
- after a container is created. If the handler
- fails, the container is terminated and restarted
- according to its restart policy. Other management
- of the container blocks until the hook completes.
- More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- preStop:
- description: 'PreStop is called immediately
- before a container is terminated due to an
- API request or management event such as liveness/startup
- probe failure, preemption, resource contention,
- etc. The handler is not called if the container
- crashes or exits. The Pod''s termination grace
- period countdown begins before the PreStop
- hook is executed. Regardless of the outcome
- of the handler, the container will eventually
- terminate within the Pod''s termination grace
- period (unless delayed by finalizers). Other
- management of the container blocks until the
- hook completes or until the termination grace
- period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
- properties:
- exec:
- description: Exec specifies the action to
- take.
- properties:
- command:
- description: Command is the command
- line to execute inside the container,
- the working directory for the command is
- root ('/') in the container's filesystem.
- The command is simply exec'd, it is
- not run inside a shell, so traditional
- shell instructions ('|', etc) won't
- work. To use a shell, you need to
- explicitly call out to that shell.
- Exit status of 0 is treated as live/healthy
- and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- httpGet:
- description: HTTPGet specifies the http
- request to perform.
- properties:
- host:
- description: Host name to connect to,
- defaults to the pod IP. You probably
- want to set "Host" in httpHeaders
- instead.
- type: string
- httpHeaders:
- description: Custom headers to set in
- the request. HTTP allows repeated
- headers.
- items:
- description: HTTPHeader describes
- a custom header to be used in HTTP
- probes
- properties:
- name:
- description: The header field
- name
- type: string
- value:
- description: The header field
- value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- tcpSocket:
- description: Deprecated. TCPSocket is NOT
- supported as a LifecycleHandler and kept
- for the backward compatibility. There
- are no validation of this field and lifecycle
- hooks will fail in runtime when tcp handler
- is specified.
- properties:
- host:
- description: 'Optional: Host name to
- connect to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number
- must be in the range 1 to 65535. Name
- must be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- type: object
- type: object
- livenessProbe:
- description: 'Periodic probe of container liveness.
- Container will be restarted if the probe fails.
- Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- name:
- description: Name of the container specified as
- a DNS_LABEL. Each container in a pod must have
- a unique name (DNS_LABEL). Cannot be updated.
- type: string
- ports:
- description: List of ports to expose from the container.
- Not specifying a port here DOES NOT prevent that
- port from being exposed. Any port which is listening
- on the default "0.0.0.0" address inside a container
- will be accessible from the network. Modifying
- this array with strategic merge patch may corrupt
- the data. For more information See https://github.com/kubernetes/kubernetes/issues/108255.
- Cannot be updated.
- items:
- description: ContainerPort represents a network
- port in a single container.
- properties:
- containerPort:
- description: Number of port to expose on the
- pod's IP address. This must be a valid port
- number, 0 < x < 65536.
- format: int32
- type: integer
- hostIP:
- description: What host IP to bind the external
- port to.
- type: string
- hostPort:
- description: Number of port to expose on the
- host. If specified, this must be a valid
- port number, 0 < x < 65536. If HostNetwork
- is specified, this must match ContainerPort.
- Most containers do not need this.
- format: int32
- type: integer
- name:
- description: If specified, this must be an
- IANA_SVC_NAME and unique within the pod.
- Each named port in a pod must have a unique
- name. Name for the port that can be referred
- to by services.
- type: string
- protocol:
- default: TCP
- description: Protocol for port. Must be UDP,
- TCP, or SCTP. Defaults to "TCP".
- type: string
- required:
- - containerPort
- type: object
- type: array
- x-kubernetes-list-map-keys:
- - containerPort
- - protocol
- x-kubernetes-list-type: map
- readinessProbe:
- description: 'Periodic probe of container service
- readiness. Container will be removed from service
- endpoints if the probe fails. Cannot be updated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- resources:
- description: 'Compute Resources required by this
- container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- properties:
- limits:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Limits describes the maximum amount
- of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- requests:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Requests describes the minimum
- amount of compute resources required. If Requests
- is omitted for a container, it defaults to
- Limits if that is explicitly specified, otherwise
- to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- type: object
- securityContext:
- description: 'SecurityContext defines the security
- options the container should be run with. If set,
- the fields of SecurityContext override the equivalent
- fields of PodSecurityContext. More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
- properties:
- allowPrivilegeEscalation:
- description: 'AllowPrivilegeEscalation controls
- whether a process can gain more privileges
- than its parent process. This bool directly
- controls if the no_new_privs flag will be
- set on the container process. AllowPrivilegeEscalation
- is true always when the container is: 1) run
- as Privileged 2) has CAP_SYS_ADMIN Note that
- this field cannot be set when spec.os.name
- is windows.'
- type: boolean
- capabilities:
- description: The capabilities to add/drop when
- running containers. Defaults to the default
- set of capabilities granted by the container
- runtime. Note that this field cannot be set
- when spec.os.name is windows.
- properties:
- add:
- description: Added capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- drop:
- description: Removed capabilities
- items:
- description: Capability represent POSIX
- capabilities type
- type: string
- type: array
- type: object
- privileged:
- description: Run container in privileged mode.
- Processes in privileged containers are essentially
- equivalent to root on the host. Defaults to
- false. Note that this field cannot be set
- when spec.os.name is windows.
- type: boolean
- procMount:
- description: procMount denotes the type of proc
- mount to use for the containers. The default
- is DefaultProcMount which uses the container
- runtime defaults for readonly paths and masked
- paths. This requires the ProcMountType feature
- flag to be enabled. Note that this field cannot
- be set when spec.os.name is windows.
- type: string
- readOnlyRootFilesystem:
- description: Whether this container has a read-only
- root filesystem. Default is false. Note that
- this field cannot be set when spec.os.name
- is windows.
- type: boolean
- runAsGroup:
- description: The GID to run the entrypoint of
- the container process. Uses runtime default
- if unset. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- format: int64
- type: integer
- runAsNonRoot:
- description: Indicates that the container must
- run as a non-root user. If true, the Kubelet
- will validate the image at runtime to ensure
- that it does not run as UID 0 (root) and fail
- to start the container if it does. If unset
- or false, no such validation will be performed.
- May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence.
- type: boolean
- runAsUser:
- description: The UID to run the entrypoint of
- the container process. Defaults to user specified
- in image metadata if unspecified. May also
- be set in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext, the
- value specified in SecurityContext takes precedence.
- Note that this field cannot be set when spec.os.name
- is windows.
- format: int64
- type: integer
- seLinuxOptions:
- description: The SELinux context to be applied
- to the container. If unspecified, the container
- runtime will allocate a random SELinux context
- for each container. May also be set in PodSecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is windows.
- properties:
- level:
- description: Level is SELinux level label
- that applies to the container.
- type: string
- role:
- description: Role is a SELinux role label
- that applies to the container.
- type: string
- type:
- description: Type is a SELinux type label
- that applies to the container.
- type: string
- user:
- description: User is a SELinux user label
- that applies to the container.
- type: string
- type: object
- seccompProfile:
- description: The seccomp options to use by this
- container. If seccomp options are provided
- at both the pod & container level, the container
- options override the pod options. Note that
- this field cannot be set when spec.os.name
- is windows.
- properties:
- localhostProfile:
- description: localhostProfile indicates
- a profile defined in a file on the node
- should be used. The profile must be preconfigured
- on the node to work. Must be a descending
- path, relative to the kubelet's configured
- seccomp profile location. Must only be
- set if type is "Localhost".
- type: string
- type:
- description: "type indicates which kind
- of seccomp profile will be applied. Valid
- options are: \n Localhost - a profile
- defined in a file on the node should be
- used. RuntimeDefault - the container runtime
- default profile should be used. Unconfined
- - no profile should be applied."
- type: string
- required:
- - type
- type: object
- windowsOptions:
- description: The Windows specific settings applied
- to all containers. If unspecified, the options
- from the PodSecurityContext will be used.
- If set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence. Note that this field cannot be
- set when spec.os.name is linux.
- properties:
- gmsaCredentialSpec:
- description: GMSACredentialSpec is where
- the GMSA admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
- inlines the contents of the GMSA credential
- spec named by the GMSACredentialSpecName
- field.
- type: string
- gmsaCredentialSpecName:
- description: GMSACredentialSpecName is the
- name of the GMSA credential spec to use.
- type: string
- hostProcess:
- description: HostProcess determines if a
- container should be run as a 'Host Process'
- container. This field is alpha-level and
- will only be honored by components that
- enable the WindowsHostProcessContainers
- feature flag. Setting this field without
- the feature flag will result in errors
- when validating the Pod. All of a Pod's
- containers must have the same effective
- HostProcess value (it is not allowed to
- have a mix of HostProcess containers and
- non-HostProcess containers). In addition,
- if HostProcess is true then HostNetwork
- must also be set to true.
- type: boolean
- runAsUserName:
- description: The UserName in Windows to
- run the entrypoint of the container process.
- Defaults to the user specified in image
- metadata if unspecified. May also be set
- in PodSecurityContext. If set in both
- SecurityContext and PodSecurityContext,
- the value specified in SecurityContext
- takes precedence.
- type: string
- type: object
- type: object
- startupProbe:
- description: 'StartupProbe indicates that the Pod
- has successfully initialized. If specified, no
- other probes are executed until this completes
- successfully. If this probe fails, the Pod will
- be restarted, just as if the livenessProbe failed.
- This can be used to provide different probe parameters
- at the beginning of a Pod''s lifecycle, when it
- might take a long time to load data or warm a
- cache, than during steady-state operation. This
- cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- properties:
- exec:
- description: Exec specifies the action to take.
- properties:
- command:
- description: Command is the command line
- to execute inside the container, the working
- directory for the command is root ('/')
- in the container's filesystem. The command
- is simply exec'd, it is not run inside
- a shell, so traditional shell instructions
- ('|', etc) won't work. To use a shell,
- you need to explicitly call out to that
- shell. Exit status of 0 is treated as
- live/healthy and non-zero is unhealthy.
- items:
- type: string
- type: array
- type: object
- failureThreshold:
- description: Minimum consecutive failures for
- the probe to be considered failed after having
- succeeded. Defaults to 3. Minimum value is
- 1.
- format: int32
- type: integer
- grpc:
- description: GRPC specifies an action involving
- a GRPC port. This is a beta field and requires
- enabling GRPCContainerProbe feature gate.
- properties:
- port:
- description: Port number of the gRPC service.
- Number must be in the range 1 to 65535.
- format: int32
- type: integer
- service:
- description: "Service is the name of the
- service to place in the gRPC HealthCheckRequest
- (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
- \n If this is not specified, the default
- behavior is defined by gRPC."
- type: string
- required:
- - port
- type: object
- httpGet:
- description: HTTPGet specifies the http request
- to perform.
- properties:
- host:
- description: Host name to connect to, defaults
- to the pod IP. You probably want to set
- "Host" in httpHeaders instead.
- type: string
- httpHeaders:
- description: Custom headers to set in the
- request. HTTP allows repeated headers.
- items:
- description: HTTPHeader describes a custom
- header to be used in HTTP probes
- properties:
- name:
- description: The header field name
- type: string
- value:
- description: The header field value
- type: string
- required:
- - name
- - value
- type: object
- type: array
- path:
- description: Path to access on the HTTP
- server.
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Name or number of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- scheme:
- description: Scheme to use for connecting
- to the host. Defaults to HTTP.
- type: string
- required:
- - port
- type: object
- initialDelaySeconds:
- description: 'Number of seconds after the container
- has started before liveness probes are initiated.
- More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- periodSeconds:
- description: How often (in seconds) to perform
- the probe. Default to 10 seconds. Minimum
- value is 1.
- format: int32
- type: integer
- successThreshold:
- description: Minimum consecutive successes for
- the probe to be considered successful after
- having failed. Defaults to 1. Must be 1 for
- liveness and startup. Minimum value is 1.
- format: int32
- type: integer
- tcpSocket:
- description: TCPSocket specifies an action involving
- a TCP port.
- properties:
- host:
- description: 'Optional: Host name to connect
- to, defaults to the pod IP.'
- type: string
- port:
- anyOf:
- - type: integer
- - type: string
- description: Number or name of the port
- to access on the container. Number must
- be in the range 1 to 65535. Name must
- be an IANA_SVC_NAME.
- x-kubernetes-int-or-string: true
- required:
- - port
- type: object
- terminationGracePeriodSeconds:
- description: Optional duration in seconds the
- pod needs to terminate gracefully upon probe
- failure. The grace period is the duration
- in seconds after the processes running in
- the pod are sent a termination signal and
- the time when the processes are forcibly halted
- with a kill signal. Set this value longer
- than the expected cleanup time for your process.
- If this value is nil, the pod's terminationGracePeriodSeconds
- will be used. Otherwise, this value overrides
- the value provided by the pod spec. Value
- must be non-negative integer. The value zero
- indicates stop immediately via the kill signal
- (no opportunity to shut down). This is a beta
- field and requires enabling ProbeTerminationGracePeriod
- feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
- is used if unset.
- format: int64
- type: integer
- timeoutSeconds:
- description: 'Number of seconds after which
- the probe times out. Defaults to 1 second.
- Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
- format: int32
- type: integer
- type: object
- stdin:
- description: Whether this container should allocate
- a buffer for stdin in the container runtime. If
- this is not set, reads from stdin in the container
- will always result in EOF. Default is false.
- type: boolean
- stdinOnce:
- description: Whether the container runtime should
- close the stdin channel after it has been opened
- by a single attach. When stdin is true the stdin
- stream will remain open across multiple attach
- sessions. If stdinOnce is set to true, stdin is
- opened on container start, is empty until the
- first client attaches to stdin, and then remains
- open and accepts data until the client disconnects,
- at which time stdin is closed and remains closed
- until the container is restarted. If this flag
- is false, a container processes that reads from
- stdin will never receive an EOF. Default is false
- type: boolean
- terminationMessagePath:
- description: 'Optional: Path at which the file to
- which the container''s termination message will
- be written is mounted into the container''s filesystem.
- Message written is intended to be brief final
- status, such as an assertion failure message.
- Will be truncated by the node if greater than
- 4096 bytes. The total message length across all
- containers will be limited to 12kb. Defaults to
- /dev/termination-log. Cannot be updated.'
- type: string
- terminationMessagePolicy:
- description: Indicate how the termination message
- should be populated. File will use the contents
- of terminationMessagePath to populate the container
- status message on both success and failure. FallbackToLogsOnError
- will use the last chunk of container log output
- if the termination message file is empty and the
- container exited with an error. The log output
- is limited to 2048 bytes or 80 lines, whichever
- is smaller. Defaults to File. Cannot be updated.
- type: string
- tty:
- description: Whether this container should allocate
- a TTY for itself, also requires 'stdin' to be
- true. Default is false.
- type: boolean
- volumeDevices:
- description: volumeDevices is the list of block
- devices to be used by the container.
- items:
- description: volumeDevice describes a mapping
- of a raw block device within a container.
- properties:
- devicePath:
- description: devicePath is the path inside
- of the container that the device will be
- mapped to.
- type: string
- name:
- description: name must match the name of a
- persistentVolumeClaim in the pod
- type: string
- required:
- - devicePath
- - name
- type: object
- type: array
- volumeMounts:
- description: Pod volumes to mount into the container's
- filesystem. Cannot be updated.
- items:
- description: VolumeMount describes a mounting
- of a Volume within a container.
- properties:
- mountPath:
- description: Path within the container at
- which the volume should be mounted. Must
- not contain ':'.
- type: string
- mountPropagation:
- description: mountPropagation determines how
- mounts are propagated from the host to container
- and the other way around. When not set,
- MountPropagationNone is used. This field
- is beta in 1.10.
- type: string
- name:
- description: This must match the Name of a
- Volume.
- type: string
- readOnly:
- description: Mounted read-only if true, read-write
- otherwise (false or unspecified). Defaults
- to false.
- type: boolean
- subPath:
- description: Path within the volume from which
- the container's volume should be mounted.
- Defaults to "" (volume's root).
- type: string
- subPathExpr:
- description: Expanded path within the volume
- from which the container's volume should
- be mounted. Behaves similarly to SubPath
- but environment variable references $(VAR_NAME)
- are expanded using the container's environment.
- Defaults to "" (volume's root). SubPathExpr
- and SubPath are mutually exclusive.
- type: string
- required:
- - mountPath
- - name
- type: object
- type: array
- workingDir:
- description: Container's working directory. If not
- specified, the container runtime's default will
- be used, which might be configured in the container
- image. Cannot be updated.
- type: string
- required:
- - name
- type: object
- type: array
- nodeSelector:
- additionalProperties:
- type: string
- description: NodeSelector
- type: object
- restartPolicy:
- description: RestartPolicy
- type: string
- securityContext:
- description: PodSecurityContext
- properties:
- fsGroup:
- description: "A special supplemental group that applies
- to all containers in a pod. Some volume types allow
- the Kubelet to change the ownership of that volume
- to be owned by the pod: \n 1. The owning GID will
- be the FSGroup 2. The setgid bit is set (new files
- created in the volume will be owned by FSGroup)
- 3. The permission bits are OR'd with rw-rw---- \n
- If unset, the Kubelet will not modify the ownership
- and permissions of any volume. Note that this field
- cannot be set when spec.os.name is windows."
- format: int64
- type: integer
- fsGroupChangePolicy:
- description: 'fsGroupChangePolicy defines behavior
- of changing ownership and permission of the volume
- before being exposed inside Pod. This field will
- only apply to volume types which support fsGroup
- based ownership(and permissions). It will have no
- effect on ephemeral volume types such as: secret,
- configmaps and emptydir. Valid values are "OnRootMismatch"
- and "Always". If not specified, "Always" is used.
- Note that this field cannot be set when spec.os.name
- is windows.'
- type: string
- runAsGroup:
- description: The GID to run the entrypoint of the
- container process. Uses runtime default if unset.
- May also be set in SecurityContext. If set in both
- SecurityContext and PodSecurityContext, the value
- specified in SecurityContext takes precedence for
- that container. Note that this field cannot be set
- when spec.os.name is windows.
- format: int64
- type: integer
- runAsNonRoot:
- description: Indicates that the container must run
- as a non-root user. If true, the Kubelet will validate
- the image at runtime to ensure that it does not
- run as UID 0 (root) and fail to start the container
- if it does. If unset or false, no such validation
- will be performed. May also be set in SecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes precedence.
- type: boolean
- runAsUser:
- description: The UID to run the entrypoint of the
- container process. Defaults to user specified in
- image metadata if unspecified. May also be set in
- SecurityContext. If set in both SecurityContext
- and PodSecurityContext, the value specified in SecurityContext
- takes precedence for that container. Note that this
- field cannot be set when spec.os.name is windows.
- format: int64
- type: integer
- seLinuxOptions:
- description: The SELinux context to be applied to
- all containers. If unspecified, the container runtime
- will allocate a random SELinux context for each
- container. May also be set in SecurityContext. If
- set in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes precedence
- for that container. Note that this field cannot
- be set when spec.os.name is windows.
- properties:
- level:
- description: Level is SELinux level label that
- applies to the container.
- type: string
- role:
- description: Role is a SELinux role label that
- applies to the container.
- type: string
- type:
- description: Type is a SELinux type label that
- applies to the container.
- type: string
- user:
- description: User is a SELinux user label that
- applies to the container.
- type: string
- type: object
- seccompProfile:
- description: The seccomp options to use by the containers
- in this pod. Note that this field cannot be set
- when spec.os.name is windows.
- properties:
- localhostProfile:
- description: localhostProfile indicates a profile
- defined in a file on the node should be used.
- The profile must be preconfigured on the node
- to work. Must be a descending path, relative
- to the kubelet's configured seccomp profile
- location. Must only be set if type is "Localhost".
- type: string
- type:
- description: "type indicates which kind of seccomp
- profile will be applied. Valid options are:
- \n Localhost - a profile defined in a file on
- the node should be used. RuntimeDefault - the
- container runtime default profile should be
- used. Unconfined - no profile should be applied."
- type: string
- required:
- - type
- type: object
- supplementalGroups:
- description: A list of groups applied to the first
- process run in each container, in addition to the
- container's primary GID. If unspecified, no groups
- will be added to any container. Note that this field
- cannot be set when spec.os.name is windows.
- items:
- format: int64
- type: integer
- type: array
- sysctls:
- description: Sysctls hold a list of namespaced sysctls
- used for the pod. Pods with unsupported sysctls
- (by the container runtime) might fail to launch.
- Note that this field cannot be set when spec.os.name
- is windows.
- items:
- description: Sysctl defines a kernel parameter to
- be set
- properties:
- name:
- description: Name of a property to set
- type: string
- value:
- description: Value of a property to set
- type: string
- required:
- - name
- - value
- type: object
- type: array
- windowsOptions:
- description: The Windows specific settings applied
- to all containers. If unspecified, the options within
- a container's SecurityContext will be used. If set
- in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes precedence.
- Note that this field cannot be set when spec.os.name
- is linux.
- properties:
- gmsaCredentialSpec:
- description: GMSACredentialSpec is where the GMSA
- admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
- inlines the contents of the GMSA credential
- spec named by the GMSACredentialSpecName field.
- type: string
- gmsaCredentialSpecName:
- description: GMSACredentialSpecName is the name
- of the GMSA credential spec to use.
- type: string
- hostProcess:
- description: HostProcess determines if a container
- should be run as a 'Host Process' container.
- This field is alpha-level and will only be honored
- by components that enable the WindowsHostProcessContainers
- feature flag. Setting this field without the
- feature flag will result in errors when validating
- the Pod. All of a Pod's containers must have
- the same effective HostProcess value (it is
- not allowed to have a mix of HostProcess containers
- and non-HostProcess containers). In addition,
- if HostProcess is true then HostNetwork must
- also be set to true.
- type: boolean
- runAsUserName:
- description: The UserName in Windows to run the
- entrypoint of the container process. Defaults
- to the user specified in image metadata if unspecified.
- May also be set in PodSecurityContext. If set
- in both SecurityContext and PodSecurityContext,
- the value specified in SecurityContext takes
- precedence.
- type: string
- type: object
- type: object
- terminationGracePeriodSeconds:
- description: TerminationGracePeriodSeconds
- format: int64
- type: integer
- topologySpreadConstraints:
- description: TopologySpreadConstraints
- items:
- description: TopologySpreadConstraint specifies how
- to spread matching pods among the given topology.
- properties:
- labelSelector:
- description: LabelSelector is used to find matching
- pods. Pods that match this label selector are
- counted to determine the number of pods in their
- corresponding topology domain.
- properties:
- matchExpressions:
- description: matchExpressions is a list of label
- selector requirements. The requirements are
- ANDed.
- items:
- description: A label selector requirement
- is a selector that contains values, a key,
- and an operator that relates the key and
- values.
- properties:
- key:
- description: key is the label key that
- the selector applies to.
- type: string
- operator:
- description: operator represents a key's
- relationship to a set of values. Valid
- operators are In, NotIn, Exists and
- DoesNotExist.
- type: string
- values:
- description: values is an array of string
- values. If the operator is In or NotIn,
- the values array must be non-empty.
- If the operator is Exists or DoesNotExist,
- the values array must be empty. This
- array is replaced during a strategic
- merge patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map of {key,value}
- pairs. A single {key,value} in the matchLabels
- map is equivalent to an element of matchExpressions,
- whose key field is "key", the operator is
- "In", and the values array contains only "value".
- The requirements are ANDed.
- type: object
- type: object
- matchLabelKeys:
- description: MatchLabelKeys is a set of pod label
- keys to select the pods over which spreading will
- be calculated. The keys are used to lookup values
- from the incoming pod labels, those key-value
- labels are ANDed with labelSelector to select
- the group of existing pods over which spreading
- will be calculated for the incoming pod. Keys
- that don't exist in the incoming pod labels will
- be ignored. A null or empty list means only match
- against labelSelector.
- items:
- type: string
- type: array
- x-kubernetes-list-type: atomic
- maxSkew:
- description: 'MaxSkew describes the degree to which
- pods may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
- it is the maximum permitted difference between
- the number of matching pods in the target topology
- and the global minimum. The global minimum is
- the minimum number of matching pods in an eligible
- domain or zero if the number of eligible domains
- is less than MinDomains. For example, in a 3-zone
- cluster, MaxSkew is set to 1, and pods with the
- same labelSelector spread as 2/2/1: In this case,
- the global minimum is 1. | zone1 | zone2 | zone3
- | | P P | P P | P | - if MaxSkew is 1,
- incoming pod can only be scheduled to zone3 to
- become 2/2/2; scheduling it onto zone1(zone2)
- would make the ActualSkew(3-1) on zone1(zone2)
- violate MaxSkew(1). - if MaxSkew is 2, incoming
- pod can be scheduled onto any zone. When `whenUnsatisfiable=ScheduleAnyway`,
- it is used to give higher precedence to topologies
- that satisfy it. It''s a required field. Default
- value is 1 and 0 is not allowed.'
- format: int32
- type: integer
- minDomains:
- description: "MinDomains indicates a minimum number
- of eligible domains. When the number of eligible
- domains with matching topology keys is less than
- minDomains, Pod Topology Spread treats \"global
- minimum\" as 0, and then the calculation of Skew
- is performed. And when the number of eligible
- domains with matching topology keys equals or
- greater than minDomains, this value has no effect
- on scheduling. As a result, when the number of
- eligible domains is less than minDomains, scheduler
- won't schedule more than maxSkew Pods to those
- domains. If value is nil, the constraint behaves
- as if MinDomains is equal to 1. Valid values are
- integers greater than 0. When value is not nil,
- WhenUnsatisfiable must be DoNotSchedule. \n For
- example, in a 3-zone cluster, MaxSkew is set to
- 2, MinDomains is set to 5 and pods with the same
- labelSelector spread as 2/2/2: | zone1 | zone2
- | zone3 | | P P | P P | P P | The number
- of domains is less than 5(MinDomains), so \"global
- minimum\" is treated as 0. In this situation,
- new pod with the same labelSelector cannot be
- scheduled, because computed skew will be 3(3 -
- 0) if new Pod is scheduled to any of the three
- zones, it will violate MaxSkew. \n This is a beta
- field and requires the MinDomainsInPodTopologySpread
- feature gate to be enabled (enabled by default)."
- format: int32
- type: integer
- nodeAffinityPolicy:
- description: "NodeAffinityPolicy indicates how we
- will treat Pod's nodeAffinity/nodeSelector when
- calculating pod topology spread skew. Options
- are: - Honor: only nodes matching nodeAffinity/nodeSelector
- are included in the calculations. - Ignore: nodeAffinity/nodeSelector
- are ignored. All nodes are included in the calculations.
- \n If this value is nil, the behavior is equivalent
- to the Honor policy. This is a alpha-level feature
- enabled by the NodeInclusionPolicyInPodTopologySpread
- feature flag."
- type: string
- nodeTaintsPolicy:
- description: "NodeTaintsPolicy indicates how we
- will treat node taints when calculating pod topology
- spread skew. Options are: - Honor: nodes without
- taints, along with tainted nodes for which the
- incoming pod has a toleration, are included. -
- Ignore: node taints are ignored. All nodes are
- included. \n If this value is nil, the behavior
- is equivalent to the Ignore policy. This is a
- alpha-level feature enabled by the NodeInclusionPolicyInPodTopologySpread
- feature flag."
- type: string
- topologyKey:
- description: TopologyKey is the key of node labels.
- Nodes that have a label with this key and identical
- values are considered to be in the same topology.
- We consider each <key, value> as a "bucket", and
- try to put balanced number of pods into each bucket.
- We define a domain as a particular instance of
- a topology. Also, we define an eligible domain
- as a domain whose nodes meet the requirements
- of nodeAffinityPolicy and nodeTaintsPolicy. e.g.
- If TopologyKey is "kubernetes.io/hostname", each
- Node is a domain of that topology. And, if TopologyKey
- is "topology.kubernetes.io/zone", each zone is
- a domain of that topology. It's a required field.
- type: string
- whenUnsatisfiable:
- description: 'WhenUnsatisfiable indicates how to
- deal with a pod if it doesn''t satisfy the spread
- constraint. - DoNotSchedule (default) tells the
- scheduler not to schedule it. - ScheduleAnyway
- tells the scheduler to schedule the pod in any
- location, but giving higher precedence to topologies
- that would help reduce the skew. A constraint
- is considered "Unsatisfiable" for an incoming
- pod if and only if every possible node assignment
- for that pod would violate "MaxSkew" on some topology.
- For example, in a 3-zone cluster, MaxSkew is set
- to 1, and pods with the same labelSelector spread
- as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P |
- If WhenUnsatisfiable is set to DoNotSchedule,
- incoming pod can only be scheduled to zone2(zone3)
- to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3)
- satisfies MaxSkew(1). In other words, the cluster
- can still be imbalanced, but scheduler won''t
- make it *more* imbalanced. It''s a required field.'
- type: string
- required:
- - maxSkew
- - topologyKey
- - whenUnsatisfiable
- type: object
- type: array
- volumes:
- description: Volumes
- items:
- description: Volume represents a named volume in a pod
- that may be accessed by any container in the pod.
- properties:
- awsElasticBlockStore:
- description: 'awsElasticBlockStore represents an
- AWS Disk resource that is attached to a kubelet''s
- host machine and then exposed to the pod. More
- info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
- properties:
- fsType:
- description: 'fsType is the filesystem type
- of the volume that you want to mount. Tip:
- Ensure that the filesystem type is supported
- by the host operating system. Examples: "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
- TODO: how do we prevent errors in the filesystem
- from compromising the machine'
- type: string
- partition:
- description: 'partition is the partition in
- the volume that you want to mount. If omitted,
- the default is to mount by volume name. Examples:
- For volume /dev/sda1, you specify the partition
- as "1". Similarly, the volume partition for
- /dev/sda is "0" (or you can leave the property
- empty).'
- format: int32
- type: integer
- readOnly:
- description: 'readOnly value true will force
- the readOnly setting in VolumeMounts. More
- info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
- type: boolean
- volumeID:
- description: 'volumeID is unique ID of the persistent
- disk resource in AWS (Amazon EBS volume).
- More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
- type: string
- required:
- - volumeID
- type: object
- azureDisk:
- description: azureDisk represents an Azure Data
- Disk mount on the host and bind mount to the pod.
- properties:
- cachingMode:
- description: 'cachingMode is the Host Caching
- mode: None, Read Only, Read Write.'
- type: string
- diskName:
- description: diskName is the Name of the data
- disk in the blob storage
- type: string
- diskURI:
- description: diskURI is the URI of data disk
- in the blob storage
- type: string
- fsType:
- description: fsType is Filesystem type to mount.
- Must be a filesystem type supported by the
- host operating system. Ex. "ext4", "xfs",
- "ntfs". Implicitly inferred to be "ext4" if
- unspecified.
- type: string
- kind:
- description: 'kind expected values are Shared:
- multiple blob disks per storage account Dedicated:
- single blob disk per storage account Managed:
- azure managed data disk (only in managed availability
- set). defaults to shared'
- type: string
- readOnly:
- description: readOnly Defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts.
- type: boolean
- required:
- - diskName
- - diskURI
- type: object
- azureFile:
- description: azureFile represents an Azure File
- Service mount on the host and bind mount to the
- pod.
- properties:
- readOnly:
- description: readOnly defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts.
- type: boolean
- secretName:
- description: secretName is the name of secret
- that contains Azure Storage Account Name and
- Key
- type: string
- shareName:
- description: shareName is the azure share Name
- type: string
- required:
- - secretName
- - shareName
- type: object
- cephfs:
- description: cephFS represents a Ceph FS mount on
- the host that shares a pod's lifetime
- properties:
- monitors:
- description: 'monitors is Required: Monitors
- is a collection of Ceph monitors More info:
- https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
- items:
- type: string
- type: array
- path:
- description: 'path is Optional: Used as the
- mounted root, rather than the full Ceph tree,
- default is /'
- type: string
- readOnly:
- description: 'readOnly is Optional: Defaults
- to false (read/write). ReadOnly here will
- force the ReadOnly setting in VolumeMounts.
- More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
- type: boolean
- secretFile:
- description: 'secretFile is Optional: SecretFile
- is the path to key ring for User, default
- is /etc/ceph/user.secret More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
- type: string
- secretRef:
- description: 'secretRef is Optional: SecretRef
- is reference to the authentication secret
- for User, default is empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- user:
- description: 'user is optional: User is the
- rados user name, default is admin More info:
- https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
- type: string
- required:
- - monitors
- type: object
- cinder:
- description: 'cinder represents a cinder volume
- attached and mounted on kubelets host machine.
- More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
- properties:
- fsType:
- description: 'fsType is the filesystem type
- to mount. Must be a filesystem type supported
- by the host operating system. Examples: "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
- type: string
- readOnly:
- description: 'readOnly defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
- type: boolean
- secretRef:
- description: 'secretRef is optional: points
- to a secret object containing parameters used
- to connect to OpenStack.'
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- volumeID:
- description: 'volumeID used to identify the
- volume in cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
- type: string
- required:
- - volumeID
- type: object
- configMap:
- description: configMap represents a configMap that
- should populate this volume
- properties:
- defaultMode:
- description: 'defaultMode is optional: mode
- bits used to set permissions on created files
- by default. Must be an octal value between
- 0000 and 0777 or a decimal value between 0
- and 511. YAML accepts both octal and decimal
- values, JSON requires decimal values for mode
- bits. Defaults to 0644. Directories within
- the path are not affected by this setting.
- This might be in conflict with other options
- that affect the file mode, like fsGroup, and
- the result can be other mode bits set.'
- format: int32
- type: integer
- items:
- description: items if unspecified, each key-value
- pair in the Data field of the referenced ConfigMap
- will be projected into the volume as a file
- whose name is the key and content is the value.
- If specified, the listed keys will be projected
- into the specified paths, and unlisted keys
- will not be present. If a key is specified
- which is not present in the ConfigMap, the
- volume setup will error unless it is marked
- optional. Paths must be relative and may not
- contain the '..' path or start with '..'.
- items:
- description: Maps a string key to a path within
- a volume.
- properties:
- key:
- description: key is the key to project.
- type: string
- mode:
- description: 'mode is Optional: mode bits
- used to set permissions on this file.
- Must be an octal value between 0000
- and 0777 or a decimal value between
- 0 and 511. YAML accepts both octal and
- decimal values, JSON requires decimal
- values for mode bits. If not specified,
- the volume defaultMode will be used.
- This might be in conflict with other
- options that affect the file mode, like
- fsGroup, and the result can be other
- mode bits set.'
- format: int32
- type: integer
- path:
- description: path is the relative path
- of the file to map the key to. May not
- be an absolute path. May not contain
- the path element '..'. May not start
- with the string '..'.
- type: string
- required:
- - key
- - path
- type: object
- type: array
- name:
- description: 'Name of the referent. More info:
- https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: optional specify whether the ConfigMap
- or its keys must be defined
- type: boolean
- type: object
- csi:
- description: csi (Container Storage Interface) represents
- ephemeral storage that is handled by certain external
- CSI drivers (Beta feature).
- properties:
- driver:
- description: driver is the name of the CSI driver
- that handles this volume. Consult with your
- admin for the correct name as registered in
- the cluster.
- type: string
- fsType:
- description: fsType to mount. Ex. "ext4", "xfs",
- "ntfs". If not provided, the empty value is
- passed to the associated CSI driver which
- will determine the default filesystem to apply.
- type: string
- nodePublishSecretRef:
- description: nodePublishSecretRef is a reference
- to the secret object containing sensitive
- information to pass to the CSI driver to complete
- the CSI NodePublishVolume and NodeUnpublishVolume
- calls. This field is optional, and may be
- empty if no secret is required. If the secret
- object contains more than one secret, all
- secret references are passed.
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- readOnly:
- description: readOnly specifies a read-only
- configuration for the volume. Defaults to
- false (read/write).
- type: boolean
- volumeAttributes:
- additionalProperties:
- type: string
- description: volumeAttributes stores driver-specific
- properties that are passed to the CSI driver.
- Consult your driver's documentation for supported
- values.
- type: object
- required:
- - driver
- type: object
- downwardAPI:
- description: downwardAPI represents downward API
- about the pod that should populate this volume
- properties:
- defaultMode:
- description: 'Optional: mode bits to use on
- created files by default. Must be a Optional:
- mode bits used to set permissions on created
- files by default. Must be an octal value between
- 0000 and 0777 or a decimal value between 0
- and 511. YAML accepts both octal and decimal
- values, JSON requires decimal values for mode
- bits. Defaults to 0644. Directories within
- the path are not affected by this setting.
- This might be in conflict with other options
- that affect the file mode, like fsGroup, and
- the result can be other mode bits set.'
- format: int32
- type: integer
- items:
- description: Items is a list of downward API
- volume file
- items:
- description: DownwardAPIVolumeFile represents
- information to create the file containing
- the pod field
- properties:
- fieldRef:
- description: 'Required: Selects a field
- of the pod: only annotations, labels,
- name and namespace are supported.'
- properties:
- apiVersion:
- description: Version of the schema
- the FieldPath is written in terms
- of, defaults to "v1".
- type: string
- fieldPath:
- description: Path of the field to
- select in the specified API version.
- type: string
- required:
- - fieldPath
- type: object
- mode:
- description: 'Optional: mode bits used
- to set permissions on this file, must
- be an octal value between 0000 and 0777
- or a decimal value between 0 and 511.
- YAML accepts both octal and decimal
- values, JSON requires decimal values
- for mode bits. If not specified, the
- volume defaultMode will be used. This
- might be in conflict with other options
- that affect the file mode, like fsGroup,
- and the result can be other mode bits
- set.'
- format: int32
- type: integer
- path:
- description: 'Required: Path is the relative
- path name of the file to be created.
- Must not be absolute or contain the
- ''..'' path. Must be utf-8 encoded.
- The first item of the relative path
- must not start with ''..'''
- type: string
- resourceFieldRef:
- description: 'Selects a resource of the
- container: only resources limits and
- requests (limits.cpu, limits.memory,
- requests.cpu and requests.memory) are
- currently supported.'
- properties:
- containerName:
- description: 'Container name: required
- for volumes, optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the output
- format of the exposed resources,
- defaults to "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required: resource to
- select'
- type: string
- required:
- - resource
- type: object
- required:
- - path
- type: object
- type: array
- type: object
- emptyDir:
- description: 'emptyDir represents a temporary directory
- that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
- properties:
- medium:
- description: 'medium represents what type of
- storage medium should back this directory.
- The default is "" which means to use the node''s
- default medium. Must be an empty string (default)
- or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
- type: string
- sizeLimit:
- anyOf:
- - type: integer
- - type: string
- description: 'sizeLimit is the total amount
- of local storage required for this EmptyDir
- volume. The size limit is also applicable
- for memory medium. The maximum usage on memory
- medium EmptyDir would be the minimum value
- between the SizeLimit specified here and the
- sum of memory limits of all containers in
- a pod. The default is nil which means that
- the limit is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- type: object
- ephemeral:
- description: "ephemeral represents a volume that
- is handled by a cluster storage driver. The volume's
- lifecycle is tied to the pod that defines it -
- it will be created before the pod starts, and
- deleted when the pod is removed. \n Use this if:
- a) the volume is only needed while the pod runs,
- b) features of normal volumes like restoring from
- snapshot or capacity tracking are needed, c)
- the storage driver is specified through a storage
- class, and d) the storage driver supports dynamic
- volume provisioning through a PersistentVolumeClaim
- (see EphemeralVolumeSource for more information
- on the connection between this volume type and
- PersistentVolumeClaim). \n Use PersistentVolumeClaim
- or one of the vendor-specific APIs for volumes
- that persist for longer than the lifecycle of
- an individual pod. \n Use CSI for light-weight
- local ephemeral volumes if the CSI driver is meant
- to be used that way - see the documentation of
- the driver for more information. \n A pod can
- use both types of ephemeral volumes and persistent
- volumes at the same time."
- properties:
- volumeClaimTemplate:
- description: "Will be used to create a stand-alone
- PVC to provision the volume. The pod in which
- this EphemeralVolumeSource is embedded will
- be the owner of the PVC, i.e. the PVC will
- be deleted together with the pod. The name
- of the PVC will be `<pod name>-<volume name>`
- where `<volume name>` is the name from the
- `PodSpec.Volumes` array entry. Pod validation
- will reject the pod if the concatenated name
- is not valid for a PVC (for example, too long).
- \n An existing PVC with that name that is
- not owned by the pod will *not* be used for
- the pod to avoid using an unrelated volume
- by mistake. Starting the pod is then blocked
- until the unrelated PVC is removed. If such
- a pre-created PVC is meant to be used by the
- pod, the PVC has to updated with an owner
- reference to the pod once the pod exists.
- Normally this should not be necessary, but
- it may be useful when manually reconstructing
- a broken cluster. \n This field is read-only
- and no changes will be made by Kubernetes
- to the PVC after it has been created. \n Required,
- must not be nil."
- properties:
- metadata:
- description: May contain labels and annotations
- that will be copied into the PVC when
- creating it. No other fields are allowed
- and will be rejected during validation.
- type: object
- spec:
- description: The specification for the PersistentVolumeClaim.
- The entire content is copied unchanged
- into the PVC that gets created from this
- template. The same fields as in a PersistentVolumeClaim
- are also valid here.
- properties:
- accessModes:
- description: 'accessModes contains the
- desired access modes the volume should
- have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
- items:
- type: string
- type: array
- dataSource:
- description: 'dataSource field can be
- used to specify either: * An existing
- VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
- * An existing PVC (PersistentVolumeClaim)
- If the provisioner or an external
- controller can support the specified
- data source, it will create a new
- volume based on the contents of the
- specified data source. If the AnyVolumeDataSource
- feature gate is enabled, this field
- will always have the same contents
- as the DataSourceRef field.'
- properties:
- apiGroup:
- description: APIGroup is the group
- for the resource being referenced.
- If APIGroup is not specified,
- the specified Kind must be in
- the core API group. For any other
- third-party types, APIGroup is
- required.
- type: string
- kind:
- description: Kind is the type of
- resource being referenced
- type: string
- name:
- description: Name is the name of
- resource being referenced
- type: string
- required:
- - kind
- - name
- type: object
- dataSourceRef:
- description: 'dataSourceRef specifies
- the object from which to populate
- the volume with data, if a non-empty
- volume is desired. This may be any
- local object from a non-empty API
- group (non core object) or a PersistentVolumeClaim
- object. When this field is specified,
- volume binding will only succeed if
- the type of the specified object matches
- some installed volume populator or
- dynamic provisioner. This field will
- replace the functionality of the DataSource
- field and as such if both fields are
- non-empty, they must have the same
- value. For backwards compatibility,
- both fields (DataSource and DataSourceRef)
- will be set to the same value automatically
- if one of them is empty and the other
- is non-empty. There are two important
- differences between DataSource and
- DataSourceRef: * While DataSource
- only allows two specific types of
- objects, DataSourceRef allows any
- non-core object, as well as PersistentVolumeClaim
- objects. * While DataSource ignores
- disallowed values (dropping them),
- DataSourceRef preserves all values,
- and generates an error if a disallowed
- value is specified. (Beta) Using
- this field requires the AnyVolumeDataSource
- feature gate to be enabled.'
- properties:
- apiGroup:
- description: APIGroup is the group
- for the resource being referenced.
- If APIGroup is not specified,
- the specified Kind must be in
- the core API group. For any other
- third-party types, APIGroup is
- required.
- type: string
- kind:
- description: Kind is the type of
- resource being referenced
- type: string
- name:
- description: Name is the name of
- resource being referenced
- type: string
- required:
- - kind
- - name
- type: object
- resources:
- description: 'resources represents the
- minimum resources the volume should
- have. If RecoverVolumeExpansionFailure
- feature is enabled users are allowed
- to specify resource requirements that
- are lower than previous value but
- must still be higher than capacity
- recorded in the status field of the
- claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
- properties:
- limits:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Limits describes the
- maximum amount of compute resources
- allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- requests:
- additionalProperties:
- anyOf:
- - type: integer
- - type: string
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- description: 'Requests describes
- the minimum amount of compute
- resources required. If Requests
- is omitted for a container, it
- defaults to Limits if that is
- explicitly specified, otherwise
- to an implementation-defined value.
- More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
- type: object
- type: object
- selector:
- description: selector is a label query
- over volumes to consider for binding.
- properties:
- matchExpressions:
- description: matchExpressions is
- a list of label selector requirements.
- The requirements are ANDed.
- items:
- description: A label selector
- requirement is a selector that
- contains values, a key, and
- an operator that relates the
- key and values.
- properties:
- key:
- description: key is the label
- key that the selector applies
- to.
- type: string
- operator:
- description: operator represents
- a key's relationship to
- a set of values. Valid operators
- are In, NotIn, Exists and
- DoesNotExist.
- type: string
- values:
- description: values is an
- array of string values.
- If the operator is In or
- NotIn, the values array
- must be non-empty. If the
- operator is Exists or DoesNotExist,
- the values array must be
- empty. This array is replaced
- during a strategic merge
- patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map
- of {key,value} pairs. A single
- {key,value} in the matchLabels
- map is equivalent to an element
- of matchExpressions, whose key
- field is "key", the operator is
- "In", and the values array contains
- only "value". The requirements
- are ANDed.
- type: object
- type: object
- storageClassName:
- description: 'storageClassName is the
- name of the StorageClass required
- by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
- type: string
- volumeMode:
- description: volumeMode defines what
- type of volume is required by the
- claim. Value of Filesystem is implied
- when not included in claim spec.
- type: string
- volumeName:
- description: volumeName is the binding
- reference to the PersistentVolume
- backing this claim.
- type: string
- type: object
- required:
- - spec
- type: object
- type: object
- fc:
- description: fc represents a Fibre Channel resource
- that is attached to a kubelet's host machine and
- then exposed to the pod.
- properties:
- fsType:
- description: 'fsType is the filesystem type
- to mount. Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified. TODO: how do we prevent errors
- in the filesystem from compromising the machine'
- type: string
- lun:
- description: 'lun is Optional: FC target lun
- number'
- format: int32
- type: integer
- readOnly:
- description: 'readOnly is Optional: Defaults
- to false (read/write). ReadOnly here will
- force the ReadOnly setting in VolumeMounts.'
- type: boolean
- targetWWNs:
- description: 'targetWWNs is Optional: FC target
- worldwide names (WWNs)'
- items:
- type: string
- type: array
- wwids:
- description: 'wwids Optional: FC volume world
- wide identifiers (wwids) Either wwids or combination
- of targetWWNs and lun must be set, but not
- both simultaneously.'
- items:
- type: string
- type: array
- type: object
- flexVolume:
- description: flexVolume represents a generic volume
- resource that is provisioned/attached using an
- exec based plugin.
- properties:
- driver:
- description: driver is the name of the driver
- to use for this volume.
- type: string
- fsType:
- description: fsType is the filesystem type to
- mount. Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs", "ntfs". The default filesystem depends
- on FlexVolume script.
- type: string
- options:
- additionalProperties:
- type: string
- description: 'options is Optional: this field
- holds extra command options if any.'
- type: object
- readOnly:
- description: 'readOnly is Optional: defaults
- to false (read/write). ReadOnly here will
- force the ReadOnly setting in VolumeMounts.'
- type: boolean
- secretRef:
- description: 'secretRef is Optional: secretRef
- is reference to the secret object containing
- sensitive information to pass to the plugin
- scripts. This may be empty if no secret object
- is specified. If the secret object contains
- more than one secret, all secrets are passed
- to the plugin scripts.'
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- required:
- - driver
- type: object
- flocker:
- description: flocker represents a Flocker volume
- attached to a kubelet's host machine. This depends
- on the Flocker control service being running
- properties:
- datasetName:
- description: datasetName is Name of the dataset
- stored as metadata -> name on the dataset
- for Flocker should be considered as deprecated
- type: string
- datasetUUID:
- description: datasetUUID is the UUID of the
- dataset. This is unique identifier of a Flocker
- dataset
- type: string
- type: object
- gcePersistentDisk:
- description: 'gcePersistentDisk represents a GCE
- Disk resource that is attached to a kubelet''s
- host machine and then exposed to the pod. More
- info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
- properties:
- fsType:
- description: 'fsType is filesystem type of the
- volume that you want to mount. Tip: Ensure
- that the filesystem type is supported by the
- host operating system. Examples: "ext4", "xfs",
- "ntfs". Implicitly inferred to be "ext4" if
- unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
- TODO: how do we prevent errors in the filesystem
- from compromising the machine'
- type: string
- partition:
- description: 'partition is the partition in
- the volume that you want to mount. If omitted,
- the default is to mount by volume name. Examples:
- For volume /dev/sda1, you specify the partition
- as "1". Similarly, the volume partition for
- /dev/sda is "0" (or you can leave the property
- empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
- format: int32
- type: integer
- pdName:
- description: 'pdName is unique name of the PD
- resource in GCE. Used to identify the disk
- in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
- type: string
- readOnly:
- description: 'readOnly here will force the ReadOnly
- setting in VolumeMounts. Defaults to false.
- More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
- type: boolean
- required:
- - pdName
- type: object
- gitRepo:
- description: 'gitRepo represents a git repository
- at a particular revision. DEPRECATED: GitRepo
- is deprecated. To provision a container with a
- git repo, mount an EmptyDir into an InitContainer
- that clones the repo using git, then mount the
- EmptyDir into the Pod''s container.'
- properties:
- directory:
- description: directory is the target directory
- name. Must not contain or start with '..'. If
- '.' is supplied, the volume directory will
- be the git repository. Otherwise, if specified,
- the volume will contain the git repository
- in the subdirectory with the given name.
- type: string
- repository:
- description: repository is the URL
- type: string
- revision:
- description: revision is the commit hash for
- the specified revision.
- type: string
- required:
- - repository
- type: object
- glusterfs:
- description: 'glusterfs represents a Glusterfs mount
- on the host that shares a pod''s lifetime. More
- info: https://examples.k8s.io/volumes/glusterfs/README.md'
- properties:
- endpoints:
- description: 'endpoints is the endpoint name
- that details Glusterfs topology. More info:
- https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
- type: string
- path:
- description: 'path is the Glusterfs volume path.
- More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
- type: string
- readOnly:
- description: 'readOnly here will force the Glusterfs
- volume to be mounted with read-only permissions.
- Defaults to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
- type: boolean
- required:
- - endpoints
- - path
- type: object
- hostPath:
- description: 'hostPath represents a pre-existing
- file or directory on the host machine that is
- directly exposed to the container. This is generally
- used for system agents or other privileged things
- that are allowed to see the host machine. Most
- containers will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
- --- TODO(jonesdl) We need to restrict who can
- use host directory mounts and who can/can not
- mount host directories as read/write.'
- properties:
- path:
- description: 'path of the directory on the host.
- If the path is a symlink, it will follow the
- link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
- type: string
- type:
- description: 'type for HostPath Volume Defaults
- to "" More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
- type: string
- required:
- - path
- type: object
- iscsi:
- description: 'iscsi represents an ISCSI Disk resource
- that is attached to a kubelet''s host machine
- and then exposed to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
- properties:
- chapAuthDiscovery:
- description: chapAuthDiscovery defines whether
- support iSCSI Discovery CHAP authentication
- type: boolean
- chapAuthSession:
- description: chapAuthSession defines whether
- support iSCSI Session CHAP authentication
- type: boolean
- fsType:
- description: 'fsType is the filesystem type
- of the volume that you want to mount. Tip:
- Ensure that the filesystem type is supported
- by the host operating system. Examples: "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
- TODO: how do we prevent errors in the filesystem
- from compromising the machine'
- type: string
- initiatorName:
- description: initiatorName is the custom iSCSI
- Initiator Name. If initiatorName is specified
- with iscsiInterface simultaneously, new iSCSI
- interface <target portal>:<volume name> will
- be created for the connection.
- type: string
- iqn:
- description: iqn is the target iSCSI Qualified
- Name.
- type: string
- iscsiInterface:
- description: iscsiInterface is the interface
- Name that uses an iSCSI transport. Defaults
- to 'default' (tcp).
- type: string
- lun:
- description: lun represents iSCSI Target Lun
- number.
- format: int32
- type: integer
- portals:
- description: portals is the iSCSI Target Portal
- List. The portal is either an IP or ip_addr:port
- if the port is other than default (typically
- TCP ports 860 and 3260).
- items:
- type: string
- type: array
- readOnly:
- description: readOnly here will force the ReadOnly
- setting in VolumeMounts. Defaults to false.
- type: boolean
- secretRef:
- description: secretRef is the CHAP Secret for
- iSCSI target and initiator authentication
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- targetPortal:
- description: targetPortal is iSCSI Target Portal.
- The Portal is either an IP or ip_addr:port
- if the port is other than default (typically
- TCP ports 860 and 3260).
- type: string
- required:
- - iqn
- - lun
- - targetPortal
- type: object
- name:
- description: 'name of the volume. Must be a DNS_LABEL
- and unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- nfs:
- description: 'nfs represents an NFS mount on the
- host that shares a pod''s lifetime More info:
- https://kubernetes.io/docs/concepts/storage/volumes#nfs'
- properties:
- path:
- description: 'path that is exported by the NFS
- server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
- type: string
- readOnly:
- description: 'readOnly here will force the NFS
- export to be mounted with read-only permissions.
- Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
- type: boolean
- server:
- description: 'server is the hostname or IP address
- of the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
- type: string
- required:
- - path
- - server
- type: object
- persistentVolumeClaim:
- description: 'persistentVolumeClaimVolumeSource
- represents a reference to a PersistentVolumeClaim
- in the same namespace. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
- properties:
- claimName:
- description: 'claimName is the name of a PersistentVolumeClaim
- in the same namespace as the pod using this
- volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
- type: string
- readOnly:
- description: readOnly Will force the ReadOnly
- setting in VolumeMounts. Default false.
- type: boolean
- required:
- - claimName
- type: object
- photonPersistentDisk:
- description: photonPersistentDisk represents a PhotonController
- persistent disk attached and mounted on kubelets
- host machine
- properties:
- fsType:
- description: fsType is the filesystem type to
- mount. Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified.
- type: string
- pdID:
- description: pdID is the ID that identifies
- Photon Controller persistent disk
- type: string
- required:
- - pdID
- type: object
- portworxVolume:
- description: portworxVolume represents a portworx
- volume attached and mounted on kubelets host machine
- properties:
- fsType:
- description: fSType represents the filesystem
- type to mount Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs". Implicitly inferred to be "ext4" if
- unspecified.
- type: string
- readOnly:
- description: readOnly defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts.
- type: boolean
- volumeID:
- description: volumeID uniquely identifies a
- Portworx volume
- type: string
- required:
- - volumeID
- type: object
- projected:
- description: projected items for all in one resources
- secrets, configmaps, and downward API
- properties:
- defaultMode:
- description: defaultMode are the mode bits used
- to set permissions on created files by default.
- Must be an octal value between 0000 and 0777
- or a decimal value between 0 and 511. YAML
- accepts both octal and decimal values, JSON
- requires decimal values for mode bits. Directories
- within the path are not affected by this setting.
- This might be in conflict with other options
- that affect the file mode, like fsGroup, and
- the result can be other mode bits set.
- format: int32
- type: integer
- sources:
- description: sources is the list of volume projections
- items:
- description: Projection that may be projected
- along with other supported volume types
- properties:
- configMap:
- description: configMap information about
- the configMap data to project
- properties:
- items:
- description: items if unspecified,
- each key-value pair in the Data
- field of the referenced ConfigMap
- will be projected into the volume
- as a file whose name is the key
- and content is the value. If specified,
- the listed keys will be projected
- into the specified paths, and unlisted
- keys will not be present. If a key
- is specified which is not present
- in the ConfigMap, the volume setup
- will error unless it is marked optional.
- Paths must be relative and may not
- contain the '..' path or start with
- '..'.
- items:
- description: Maps a string key to
- a path within a volume.
- properties:
- key:
- description: key is the key
- to project.
- type: string
- mode:
- description: 'mode is Optional:
- mode bits used to set permissions
- on this file. Must be an octal
- value between 0000 and 0777
- or a decimal value between
- 0 and 511. YAML accepts both
- octal and decimal values,
- JSON requires decimal values
- for mode bits. If not specified,
- the volume defaultMode will
- be used. This might be in
- conflict with other options
- that affect the file mode,
- like fsGroup, and the result
- can be other mode bits set.'
- format: int32
- type: integer
- path:
- description: path is the relative
- path of the file to map the
- key to. May not be an absolute
- path. May not contain the
- path element '..'. May not
- start with the string '..'.
- type: string
- required:
- - key
- - path
- type: object
- type: array
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: optional specify whether
- the ConfigMap or its keys must be
- defined
- type: boolean
- type: object
- downwardAPI:
- description: downwardAPI information about
- the downwardAPI data to project
- properties:
- items:
- description: Items is a list of DownwardAPIVolume
- file
- items:
- description: DownwardAPIVolumeFile
- represents information to create
- the file containing the pod field
- properties:
- fieldRef:
- description: 'Required: Selects
- a field of the pod: only annotations,
- labels, name and namespace
- are supported.'
- properties:
- apiVersion:
- description: Version of
- the schema the FieldPath
- is written in terms of,
- defaults to "v1".
- type: string
- fieldPath:
- description: Path of the
- field to select in the
- specified API version.
- type: string
- required:
- - fieldPath
- type: object
- mode:
- description: 'Optional: mode
- bits used to set permissions
- on this file, must be an octal
- value between 0000 and 0777
- or a decimal value between
- 0 and 511. YAML accepts both
- octal and decimal values,
- JSON requires decimal values
- for mode bits. If not specified,
- the volume defaultMode will
- be used. This might be in
- conflict with other options
- that affect the file mode,
- like fsGroup, and the result
- can be other mode bits set.'
- format: int32
- type: integer
- path:
- description: 'Required: Path
- is the relative path name
- of the file to be created.
- Must not be absolute or contain
- the ''..'' path. Must be utf-8
- encoded. The first item of
- the relative path must not
- start with ''..'''
- type: string
- resourceFieldRef:
- description: 'Selects a resource
- of the container: only resources
- limits and requests (limits.cpu,
- limits.memory, requests.cpu
- and requests.memory) are currently
- supported.'
- properties:
- containerName:
- description: 'Container
- name: required for volumes,
- optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the
- output format of the exposed
- resources, defaults to
- "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required:
- resource to select'
- type: string
- required:
- - resource
- type: object
- required:
- - path
- type: object
- type: array
- type: object
- secret:
- description: secret information about
- the secret data to project
- properties:
- items:
- description: items if unspecified,
- each key-value pair in the Data
- field of the referenced Secret will
- be projected into the volume as
- a file whose name is the key and
- content is the value. If specified,
- the listed keys will be projected
- into the specified paths, and unlisted
- keys will not be present. If a key
- is specified which is not present
- in the Secret, the volume setup
- will error unless it is marked optional.
- Paths must be relative and may not
- contain the '..' path or start with
- '..'.
- items:
- description: Maps a string key to
- a path within a volume.
- properties:
- key:
- description: key is the key
- to project.
- type: string
- mode:
- description: 'mode is Optional:
- mode bits used to set permissions
- on this file. Must be an octal
- value between 0000 and 0777
- or a decimal value between
- 0 and 511. YAML accepts both
- octal and decimal values,
- JSON requires decimal values
- for mode bits. If not specified,
- the volume defaultMode will
- be used. This might be in
- conflict with other options
- that affect the file mode,
- like fsGroup, and the result
- can be other mode bits set.'
- format: int32
- type: integer
- path:
- description: path is the relative
- path of the file to map the
- key to. May not be an absolute
- path. May not contain the
- path element '..'. May not
- start with the string '..'.
- type: string
- required:
- - key
- - path
- type: object
- type: array
- name:
- description: 'Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- optional:
- description: optional field specify
- whether the Secret or its key must
- be defined
- type: boolean
- type: object
- serviceAccountToken:
- description: serviceAccountToken is information
- about the serviceAccountToken data to
- project
- properties:
- audience:
- description: audience is the intended
- audience of the token. A recipient
- of a token must identify itself
- with an identifier specified in
- the audience of the token, and otherwise
- should reject the token. The audience
- defaults to the identifier of the
- apiserver.
- type: string
- expirationSeconds:
- description: expirationSeconds is
- the requested duration of validity
- of the service account token. As
- the token approaches expiration,
- the kubelet volume plugin will proactively
- rotate the service account token.
- The kubelet will start trying to
- rotate the token if the token is
- older than 80 percent of its time
- to live or if the token is older
- than 24 hours.Defaults to 1 hour
- and must be at least 10 minutes.
- format: int64
- type: integer
- path:
- description: path is the path relative
- to the mount point of the file to
- project the token into.
- type: string
- required:
- - path
- type: object
- type: object
- type: array
- type: object
- quobyte:
- description: quobyte represents a Quobyte mount
- on the host that shares a pod's lifetime
- properties:
- group:
- description: group to map volume access to Default
- is no group
- type: string
- readOnly:
- description: readOnly here will force the Quobyte
- volume to be mounted with read-only permissions.
- Defaults to false.
- type: boolean
- registry:
- description: registry represents a single or
- multiple Quobyte Registry services specified
- as a string as host:port pair (multiple entries
- are separated with commas) which acts as the
- central registry for volumes
- type: string
- tenant:
- description: tenant owning the given Quobyte
- volume in the Backend Used with dynamically
- provisioned Quobyte volumes, value is set
- by the plugin
- type: string
- user:
- description: user to map volume access to Defaults
- to serivceaccount user
- type: string
- volume:
- description: volume is a string that references
- an already created Quobyte volume by name.
- type: string
- required:
- - registry
- - volume
- type: object
- rbd:
- description: 'rbd represents a Rados Block Device
- mount on the host that shares a pod''s lifetime.
- More info: https://examples.k8s.io/volumes/rbd/README.md'
- properties:
- fsType:
- description: 'fsType is the filesystem type
- of the volume that you want to mount. Tip:
- Ensure that the filesystem type is supported
- by the host operating system. Examples: "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
- TODO: how do we prevent errors in the filesystem
- from compromising the machine'
- type: string
- image:
- description: 'image is the rados image name.
- More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- type: string
- keyring:
- description: 'keyring is the path to key ring
- for RBDUser. Default is /etc/ceph/keyring.
- More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- type: string
- monitors:
- description: 'monitors is a collection of Ceph
- monitors. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- items:
- type: string
- type: array
- pool:
- description: 'pool is the rados pool name. Default
- is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- type: string
- readOnly:
- description: 'readOnly here will force the ReadOnly
- setting in VolumeMounts. Defaults to false.
- More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- type: boolean
- secretRef:
- description: 'secretRef is name of the authentication
- secret for RBDUser. If provided overrides
- keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- user:
- description: 'user is the rados user name. Default
- is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
- type: string
- required:
- - image
- - monitors
- type: object
- scaleIO:
- description: scaleIO represents a ScaleIO persistent
- volume attached and mounted on Kubernetes nodes.
- properties:
- fsType:
- description: fsType is the filesystem type to
- mount. Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs", "ntfs". Default is "xfs".
- type: string
- gateway:
- description: gateway is the host address of
- the ScaleIO API Gateway.
- type: string
- protectionDomain:
- description: protectionDomain is the name of
- the ScaleIO Protection Domain for the configured
- storage.
- type: string
- readOnly:
- description: readOnly Defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts.
- type: boolean
- secretRef:
- description: secretRef references to the secret
- for ScaleIO user and other sensitive information.
- If this is not provided, Login operation will
- fail.
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- sslEnabled:
- description: sslEnabled Flag enable/disable
- SSL communication with Gateway, default false
- type: boolean
- storageMode:
- description: storageMode indicates whether the
- storage for a volume should be ThickProvisioned
- or ThinProvisioned. Default is ThinProvisioned.
- type: string
- storagePool:
- description: storagePool is the ScaleIO Storage
- Pool associated with the protection domain.
- type: string
- system:
- description: system is the name of the storage
- system as configured in ScaleIO.
- type: string
- volumeName:
- description: volumeName is the name of a volume
- already created in the ScaleIO system that
- is associated with this volume source.
- type: string
- required:
- - gateway
- - secretRef
- - system
- type: object
- secret:
- description: 'secret represents a secret that should
- populate this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
- properties:
- defaultMode:
- description: 'defaultMode is Optional: mode
- bits used to set permissions on created files
- by default. Must be an octal value between
- 0000 and 0777 or a decimal value between 0
- and 511. YAML accepts both octal and decimal
- values, JSON requires decimal values for mode
- bits. Defaults to 0644. Directories within
- the path are not affected by this setting.
- This might be in conflict with other options
- that affect the file mode, like fsGroup, and
- the result can be other mode bits set.'
- format: int32
- type: integer
- items:
- description: items If unspecified, each key-value
- pair in the Data field of the referenced Secret
- will be projected into the volume as a file
- whose name is the key and content is the value.
- If specified, the listed keys will be projected
- into the specified paths, and unlisted keys
- will not be present. If a key is specified
- which is not present in the Secret, the volume
- setup will error unless it is marked optional.
- Paths must be relative and may not contain
- the '..' path or start with '..'.
- items:
- description: Maps a string key to a path within
- a volume.
- properties:
- key:
- description: key is the key to project.
- type: string
- mode:
- description: 'mode is Optional: mode bits
- used to set permissions on this file.
- Must be an octal value between 0000
- and 0777 or a decimal value between
- 0 and 511. YAML accepts both octal and
- decimal values, JSON requires decimal
- values for mode bits. If not specified,
- the volume defaultMode will be used.
- This might be in conflict with other
- options that affect the file mode, like
- fsGroup, and the result can be other
- mode bits set.'
- format: int32
- type: integer
- path:
- description: path is the relative path
- of the file to map the key to. May not
- be an absolute path. May not contain
- the path element '..'. May not start
- with the string '..'.
- type: string
- required:
- - key
- - path
- type: object
- type: array
- optional:
- description: optional field specify whether
- the Secret or its keys must be defined
- type: boolean
- secretName:
- description: 'secretName is the name of the
- secret in the pod''s namespace to use. More
- info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
- type: string
- type: object
- storageos:
- description: storageOS represents a StorageOS volume
- attached and mounted on Kubernetes nodes.
- properties:
- fsType:
- description: fsType is the filesystem type to
- mount. Must be a filesystem type supported
- by the host operating system. Ex. "ext4",
- "xfs", "ntfs". Implicitly inferred to be "ext4"
- if unspecified.
- type: string
- readOnly:
- description: readOnly defaults to false (read/write).
- ReadOnly here will force the ReadOnly setting
- in VolumeMounts.
- type: boolean
- secretRef:
- description: secretRef specifies the secret
- to use for obtaining the StorageOS API credentials. If
- not specified, default values will be attempted.
- properties:
- name:
- description: 'Name of the referent. More
- info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion,
- kind, uid?'
- type: string
- type: object
- volumeName:
- description: volumeName is the human-readable
- name of the StorageOS volume. Volume names
- are only unique within a namespace.
- type: string
- volumeNamespace:
- description: volumeNamespace specifies the scope
- of the volume within StorageOS. If no namespace
- is specified then the Pod's namespace will
- be used. This allows the Kubernetes name
- scoping to be mirrored within StorageOS for
- tighter integration. Set VolumeName to any
- name to override the default behaviour. Set
- to "default" if you are not using namespaces
- within StorageOS. Namespaces that do not pre-exist
- within StorageOS will be created.
- type: string
- type: object
- vsphereVolume:
- description: vsphereVolume represents a vSphere
- volume attached and mounted on kubelets host machine
- properties:
- fsType:
- description: fsType is filesystem type to mount.
- Must be a filesystem type supported by the
- host operating system. Ex. "ext4", "xfs",
- "ntfs". Implicitly inferred to be "ext4" if
- unspecified.
- type: string
- storagePolicyID:
- description: storagePolicyID is the storage
- Policy Based Management (SPBM) profile ID
- associated with the StoragePolicyName.
- type: string
- storagePolicyName:
- description: storagePolicyName is the storage
- Policy Based Management (SPBM) profile name.
- type: string
- volumePath:
- description: volumePath is the path that identifies
- vSphere volume vmdk
- type: string
- required:
- - volumePath
- type: object
- required:
- - name
- type: object
- type: array
- required:
- - containers
- type: object
- type: object
- traits:
- description: the traits needed to run this Integration
- properties:
- 3scale:
- description: 'Deprecated: for backward compatibility.'
- properties:
- configuration:
- description: TraitConfiguration parameters configuration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- required:
- - configuration
- type: object
- addons:
- additionalProperties:
- description: AddonTrait represents the configuration of
- an addon trait
- type: object
- x-kubernetes-preserve-unknown-fields: true
- description: The extension point with addon traits
- type: object
- affinity:
- description: The configuration of Affinity trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- nodeAffinityLabels:
- description: Defines a set of nodes the integration pod(s)
- are eligible to be scheduled on, based on labels on
- the node.
- items:
- type: string
- type: array
- podAffinity:
- description: Always co-locates multiple replicas of the
- integration in the same node (default *false*).
- type: boolean
- podAffinityLabels:
- description: Defines a set of pods (namely those matching
- the label selector, relative to the given namespace)
- that the integration pod(s) should be co-located with.
- items:
- type: string
- type: array
- podAntiAffinity:
- description: Never co-locates multiple replicas of the
- integration in the same node (default *false*).
- type: boolean
- podAntiAffinityLabels:
- description: Defines a set of pods (namely those matching
- the label selector, relative to the given namespace)
- that the integration pod(s) should not be co-located
- with.
- items:
- type: string
- type: array
- type: object
- builder:
- description: The configuration of Builder trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- properties:
- description: A list of properties to be provided to the
- build task
- items:
- type: string
- type: array
- strategy:
- description: The strategy to use, either `pod` or `routine`
- (default routine)
- type: string
- verbose:
- description: Enable verbose logging on build components
- that support it (e.g. Kaniko build pod).
- type: boolean
- type: object
- camel:
- description: The configuration of Camel trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- properties:
- description: A list of properties to be provided to the
- Integration runtime
- items:
- type: string
- type: array
- runtimeVersion:
- description: The camel-k-runtime version to use for the
- integration. It overrides the default version set in
- the Integration Platform.
- type: string
- type: object
- container:
- description: The configuration of Container trait
- properties:
- auto:
- description: To automatically enable the trait
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- expose:
- description: Can be used to enable/disable exposure via
- kubernetes Service.
- type: boolean
- image:
- description: The main container image
- type: string
- imagePullPolicy:
- description: 'The pull policy: Always|Never|IfNotPresent'
- enum:
- - Always
- - Never
- - IfNotPresent
- type: string
- limitCPU:
- description: The maximum amount of CPU required.
- type: string
- limitMemory:
- description: The maximum amount of memory required.
- type: string
- name:
- description: The main container name. It's named `integration`
- by default.
- type: string
- port:
- description: To configure a different port exposed by
- the container (default `8080`).
- type: integer
- portName:
- description: To configure a different port name for the
- port exposed by the container. It defaults to `http`
- only when the `expose` parameter is true.
- type: string
- requestCPU:
- description: The minimum amount of CPU required.
- type: string
- requestMemory:
- description: The minimum amount of memory required.
- type: string
- servicePort:
- description: To configure under which service port the
- container port is to be exposed (default `80`).
- type: integer
- servicePortName:
- description: To configure under which service port name
- the container port is to be exposed (default `http`).
- type: string
- type: object
- cron:
- description: The configuration of Cron trait
- properties:
- activeDeadlineSeconds:
- description: Specifies the duration in seconds, relative
- to the start time, that the job may be continuously
- active before it is considered to be failed. It defaults
- to 60s.
- format: int64
- type: integer
- auto:
- description: "Automatically deploy the integration as
- CronJob when all routes are either starting from a periodic
- consumer (only `cron`, `timer` and `quartz` are supported)
- or a passive consumer (e.g. `direct` is a passive consumer).
- \n It's required that all periodic consumers have the
- same period, and it can be expressed as cron schedule
- (e.g. `1m` can be expressed as `0/1 * * * *`, while
- `35m` or `50s` cannot)."
- type: boolean
- backoffLimit:
- description: Specifies the number of retries before marking
- the job failed. It defaults to 2.
- format: int32
- type: integer
- components:
- description: "A comma separated list of the Camel components
- that need to be customized in order for them to work
- when the schedule is triggered externally by Kubernetes.
- A specific customizer is activated for each specified
- component. E.g. for the `timer` component, the `cron-timer`
- customizer is activated (it's present in the `org.apache.camel.k:camel-k-cron`
- library). \n Supported components are currently: `cron`,
- `timer` and `quartz`."
- type: string
- concurrencyPolicy:
- description: 'Specifies how to treat concurrent executions
- of a Job. Valid values are: - "Allow": allows CronJobs
- to run concurrently; - "Forbid" (default): forbids concurrent
- runs, skipping next run if previous run hasn''t finished
- yet; - "Replace": cancels currently running job and
- replaces it with a new one'
- enum:
- - Allow
- - Forbid
- - Replace
- type: string
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- fallback:
- description: Use the default Camel implementation of the
- `cron` endpoint (`quartz`) instead of trying to materialize
- the integration as Kubernetes CronJob.
- type: boolean
- schedule:
- description: The CronJob schedule for the whole integration.
- If multiple routes are declared, they must have the
- same schedule for this mechanism to work correctly.
- type: string
- startingDeadlineSeconds:
- description: Optional deadline in seconds for starting
- the job if it misses scheduled time for any reason. Missed
- jobs executions will be counted as failed ones.
- format: int64
- type: integer
- type: object
- dependencies:
- description: The configuration of Dependencies trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- type: object
- deployer:
- description: The configuration of Deployer trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- kind:
- description: Allows to explicitly select the desired deployment
- kind between `deployment`, `cron-job` or `knative-service`
- when creating the resources for running the integration.
- enum:
- - deployment
- - cron-job
- - knative-service
- type: string
- useSSA:
- description: Use server-side apply to update the owned
- resources (default `true`). Note that it automatically
- falls back to client-side patching, if SSA is not available,
- e.g., on old Kubernetes clusters.
- type: boolean
- type: object
- deployment:
- description: The configuration of Deployment trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- progressDeadlineSeconds:
- description: The maximum time in seconds for the deployment
- to make progress before it is considered to be failed.
- It defaults to 60s.
- format: int32
- type: integer
- rollingUpdateMaxSurge:
- description: 'The maximum number of pods that can be scheduled
- above the desired number of pods. Value can be an absolute
- number (ex: 5) or a percentage of desired pods (ex:
- 10%). This can not be 0 if MaxUnavailable is 0. Absolute
- number is calculated from percentage by rounding up.
- Defaults to 25%.'
- type: integer
- rollingUpdateMaxUnavailable:
- description: 'The maximum number of pods that can be unavailable
- during the update. Value can be an absolute number (ex:
- 5) or a percentage of desired pods (ex: 10%). Absolute
- number is calculated from percentage by rounding down.
- This can not be 0 if MaxSurge is 0. Defaults to 25%.'
- type: integer
- strategy:
- description: The deployment strategy to use to replace
- existing pods with new ones.
- enum:
- - Recreate
- - RollingUpdate
- type: string
- type: object
- environment:
- description: The configuration of Environment trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- containerMeta:
- description: Enables injection of `NAMESPACE` and `POD_NAME`
- environment variables (default `true`)
- type: boolean
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- httpProxy:
- description: Propagates the `HTTP_PROXY`, `HTTPS_PROXY`
- and `NO_PROXY` environment variables (default `true`)
- type: boolean
- vars:
- description: A list of environment variables to be added
- to the integration container. The syntax is KEY=VALUE,
- e.g., `MY_VAR="my value"`. These take precedence over
- the previously defined environment variables.
- items:
- type: string
- type: array
- type: object
- error-handler:
- description: The configuration of Error Handler trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- ref:
- description: The error handler ref name provided or found
- in application properties
- type: string
- type: object
- gc:
- description: The configuration of GC trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- discoveryCache:
- description: 'Discovery client cache to be used, either
- `disabled`, `disk` or `memory` (default `memory`). Deprecated:
- to be removed from trait configuration.'
- enum:
- - disabled
- - disk
- - memory
- type: string
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- type: object
- health:
- description: The configuration of Health trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- livenessFailureThreshold:
- description: Minimum consecutive failures for the liveness
- probe to be considered failed after having succeeded.
- format: int32
- type: integer
- livenessInitialDelay:
- description: Number of seconds after the container has
- started before the liveness probe is initiated.
- format: int32
- type: integer
- livenessPeriod:
- description: How often to perform the liveness probe.
- format: int32
- type: integer
- livenessProbeEnabled:
- description: Configures the liveness probe for the integration
- container (default `false`).
- type: boolean
- livenessScheme:
- description: Scheme to use when connecting to the liveness
- probe (default `HTTP`).
- type: string
- livenessSuccessThreshold:
- description: Minimum consecutive successes for the liveness
- probe to be considered successful after having failed.
- format: int32
- type: integer
- livenessTimeout:
- description: Number of seconds after which the liveness
- probe times out.
- format: int32
- type: integer
- readinessFailureThreshold:
- description: Minimum consecutive failures for the readiness
- probe to be considered failed after having succeeded.
- format: int32
- type: integer
- readinessInitialDelay:
- description: Number of seconds after the container has
- started before the readiness probe is initiated.
- format: int32
- type: integer
- readinessPeriod:
- description: How often to perform the readiness probe.
- format: int32
- type: integer
- readinessProbeEnabled:
- description: Configures the readiness probe for the integration
- container (default `true`).
- type: boolean
- readinessScheme:
- description: Scheme to use when connecting to the readiness
- probe (default `HTTP`).
- type: string
- readinessSuccessThreshold:
- description: Minimum consecutive successes for the readiness
- probe to be considered successful after having failed.
- format: int32
- type: integer
- readinessTimeout:
- description: Number of seconds after which the readiness
- probe times out.
- format: int32
- type: integer
- type: object
- ingress:
- description: The configuration of Ingress trait
- properties:
- annotations:
- additionalProperties:
- type: string
- description: 'The annotations added to the ingress. This
- can be used to set controller specific annotations,
- e.g., when using the NGINX Ingress controller: See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md'
- type: object
- auto:
- description: To automatically add an ingress whenever
- the integration uses an HTTP endpoint consumer.
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- host:
- description: To configure the host exposed by the ingress.
- type: string
- path:
- description: To configure the path exposed by the ingress
- (default `/`).
- type: string
- pathType:
- description: To configure the path type exposed by the
- ingress. One of `Exact`, `Prefix`, `ImplementationSpecific`
- (default to `Prefix`).
- enum:
- - Exact
- - Prefix
- - ImplementationSpecific
- type: string
- type: object
- istio:
- description: The configuration of Istio trait
- properties:
- allow:
- description: Configures a (comma-separated) list of CIDR
- subnets that should not be intercepted by the Istio
- proxy (`10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` by
- default).
- type: string
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- inject:
- description: Forces the value for labels `sidecar.istio.io/inject`.
- By default the label is set to `true` on deployment
- and not set on Knative Service.
- type: boolean
- type: object
- jolokia:
- description: The configuration of Jolokia trait
- properties:
- CACert:
- description: The PEM encoded CA certification file path,
- used to verify client certificates, applicable when
- `protocol` is `https` and `use-ssl-client-authentication`
- is `true` (default `/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt`
- for OpenShift).
- type: string
- clientPrincipal:
- description: The principal(s) which must be given in a
- client certificate to allow access to the Jolokia endpoint,
- applicable when `protocol` is `https` and `use-ssl-client-authentication`
- is `true` (default `clientPrincipal=cn=system:master-proxy`,
- `cn=hawtio-online.hawtio.svc` and `cn=fuse-console.fuse.svc`
- for OpenShift).
- items:
- type: string
- type: array
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- discoveryEnabled:
- description: Listen for multicast requests (default `false`)
- type: boolean
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- extendedClientCheck:
- description: Mandate the client certificate contains a
- client flag in the extended key usage section, applicable
- when `protocol` is `https` and `use-ssl-client-authentication`
- is `true` (default `true` for OpenShift).
- type: boolean
- host:
- description: The Host address to which the Jolokia agent
- should bind to. If `"\*"` or `"0.0.0.0"` is given, the
- servers binds to every network interface (default `"*"`).
- type: string
- options:
- description: A list of additional Jolokia options as defined
- in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM
- agent configuration options]
- items:
- type: string
- type: array
- password:
- description: The password used for authentication, applicable
- when the `user` option is set.
- type: string
- port:
- description: The Jolokia endpoint port (default `8778`).
- type: integer
- protocol:
- description: The protocol to use, either `http` or `https`
- (default `https` for OpenShift)
- type: string
- useSSLClientAuthentication:
- description: Whether client certificates should be used
- for authentication (default `true` for OpenShift).
- type: boolean
- user:
- description: The user to be used for authentication
- type: string
- type: object
- jvm:
- description: The configuration of JVM trait
- properties:
- classpath:
- description: Additional JVM classpath (use `Linux` classpath
- separator)
- type: string
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- debug:
- description: Activates remote debugging, so that a debugger
- can be attached to the JVM, e.g., using port-forwarding
- type: boolean
- debugAddress:
- description: Transport address at which to listen for
- the newly launched JVM (default `*:5005`)
- type: string
- debugSuspend:
- description: Suspends the target JVM immediately before
- the main class is loaded
- type: boolean
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- options:
- description: A list of JVM options
- items:
- type: string
- type: array
- printCommand:
- description: Prints the command used the start the JVM
- in the container logs (default `true`)
- type: boolean
- type: object
- kamelets:
- description: The configuration of Kamelets trait
- properties:
- auto:
- description: Automatically inject all referenced Kamelets
- and their default configuration (enabled by default)
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- list:
- description: Comma separated list of Kamelet names to
- load into the current integration
- type: string
- type: object
- keda:
- description: 'Deprecated: for backward compatibility.'
- properties:
- configuration:
- description: TraitConfiguration parameters configuration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- required:
- - configuration
- type: object
- knative:
- description: The configuration of Knative trait
- properties:
- auto:
- description: Enable automatic discovery of all trait properties.
- type: boolean
- channelSinks:
- description: List of channels used as destination of integration
- routes. Can contain simple channel names or full Camel
- URIs.
- items:
- type: string
- type: array
- channelSources:
- description: List of channels used as source of integration
- routes. Can contain simple channel names or full Camel
- URIs.
- items:
- type: string
- type: array
- config:
- description: Can be used to inject a Knative complete
- configuration in JSON format.
- type: string
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- endpointSinks:
- description: List of endpoints used as destination of
- integration routes. Can contain simple endpoint names
- or full Camel URIs.
- items:
- type: string
- type: array
- endpointSources:
- description: List of channels used as source of integration
- routes.
- items:
- type: string
- type: array
- eventSinks:
- description: List of event types that the integration
- will produce. Can contain simple event types or full
- Camel URIs (to use a specific broker).
- items:
- type: string
- type: array
- eventSources:
- description: List of event types that the integration
- will be subscribed to. Can contain simple event types
- or full Camel URIs (to use a specific broker different
- from "default").
- items:
- type: string
- type: array
- filterSourceChannels:
- description: Enables filtering on events based on the
- header "ce-knativehistory". Since this header has been
- removed in newer versions of Knative, filtering is disabled
- by default.
- type: boolean
- namespaceLabel:
- description: 'Enables the camel-k-operator to set the
- "bindings.knative.dev/include=true" label to the namespace
- As Knative requires this label to perform injection
- of K_SINK URL into the service. If this is false, the
- integration pod may start and fail, read the SinkBinding
- Knative documentation. (default: true)'
- type: boolean
- sinkBinding:
- description: Allows binding the integration to a sink
- via a Knative SinkBinding resource. This can be used
- when the integration targets a single sink. It's enabled
- by default when the integration targets a single sink
- (except when the integration is owned by a Knative source).
- type: boolean
- type: object
- knative-service:
- description: The configuration of Knative Service trait
- properties:
- auto:
- description: "Automatically deploy the integration as
- Knative service when all conditions hold: \n * Integration
- is using the Knative profile * All routes are either
- starting from an HTTP based consumer or a passive consumer
- (e.g. `direct` is a passive consumer)"
- type: boolean
- autoscalingMetric:
- description: "Configures the Knative autoscaling metric
- property (e.g. to set `concurrency` based or `cpu` based
- autoscaling). \n Refer to the Knative documentation
- for more information."
- type: string
- autoscalingTarget:
- description: "Sets the allowed concurrency level or CPU
- percentage (depending on the autoscaling metric) for
- each Pod. \n Refer to the Knative documentation for
- more information."
- type: integer
- class:
- description: "Configures the Knative autoscaling class
- property (e.g. to set `hpa.autoscaling.knative.dev`
- or `kpa.autoscaling.knative.dev` autoscaling). \n Refer
- to the Knative documentation for more information."
- enum:
- - kpa.autoscaling.knative.dev
- - hpa.autoscaling.knative.dev
- type: string
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- maxScale:
- description: "An upper bound for the number of Pods that
- can be running in parallel for the integration. Knative
- has its own cap value that depends on the installation.
- \n Refer to the Knative documentation for more information."
- type: integer
- minScale:
- description: "The minimum number of Pods that should be
- running at any time for the integration. It's **zero**
- by default, meaning that the integration is scaled down
- to zero when not used for a configured amount of time.
- \n Refer to the Knative documentation for more information."
- type: integer
- rolloutDuration:
- description: Enables to gradually shift traffic to the
- latest Revision and sets the rollout duration. It's
- disabled by default and must be expressed as a Golang
- `time.Duration` string representation, rounded to a
- second precision.
- type: string
- visibility:
- description: "Setting `cluster-local`, Knative service
- becomes a private service. Specifically, this option
- applies the `networking.knative.dev/visibility` label
- to Knative service. \n Refer to the Knative documentation
- for more information."
- enum:
- - cluster-local
- type: string
- type: object
- logging:
- description: The configuration of Logging trait
- properties:
- color:
- description: Colorize the log output
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- format:
- description: Logs message format
- type: string
- json:
- description: Output the logs in JSON
- type: boolean
- jsonPrettyPrint:
- description: Enable "pretty printing" of the JSON logs
- type: boolean
- level:
- description: Adjust the logging level (defaults to INFO)
- enum:
- - FATAL
- - WARN
- - INFO
- - DEBUG
- - TRACE
- type: string
- type: object
- master:
- description: 'Deprecated: for backward compatibility.'
- properties:
- configuration:
- description: TraitConfiguration parameters configuration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- required:
- - configuration
- type: object
- mount:
- description: The configuration of Mount trait
- properties:
- configs:
- description: 'A list of configuration pointing to configmap/secret.
- The configuration are expected to be UTF-8 resources
- as they are processed by runtime Camel Context and tried
- to be parsed as property files. They are also made available
- on the classpath in order to ease their usage directly
- from the Route. Syntax: [configmap|secret]:name[/key],
- where name represents the resource name and key optionally
- represents the resource key to be filtered'
- items:
- type: string
- type: array
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- resources:
- description: 'A list of resources (text or binary content)
- pointing to configmap/secret. The resources are expected
- to be any resource type (text or binary content). The
- destination path can be either a default location or
- any path specified by the user. Syntax: [configmap|secret]:name[/key][@path],
- where name represents the resource name, key optionally
- represents the resource key to be filtered and path
- represents the destination path'
- items:
- type: string
- type: array
- volumes:
- description: 'A list of Persistent Volume Claims to be
- mounted. Syntax: [pvcname:/container/path]'
- items:
- type: string
- type: array
- type: object
- openapi:
- description: The configuration of OpenAPI trait
- properties:
- configmaps:
- description: The configmaps holding the spec of the OpenAPI
- items:
- type: string
- type: array
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- type: object
- owner:
- description: The configuration of Owner trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- targetAnnotations:
- description: The set of annotations to be transferred
- items:
- type: string
- type: array
- targetLabels:
- description: The set of labels to be transferred
- items:
- type: string
- type: array
- type: object
- pdb:
- description: The configuration of PDB trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- maxUnavailable:
- description: The number of pods for the Integration that
- can be unavailable after an eviction. It can be either
- an absolute number or a percentage (default `1` if `min-available`
- is also not set). Only one of `max-unavailable` and
- `min-available` can be specified.
- type: string
- minAvailable:
- description: The number of pods for the Integration that
- must still be available after an eviction. It can be
- either an absolute number or a percentage. Only one
- of `min-available` and `max-unavailable` can be specified.
- type: string
- type: object
- platform:
- description: The configuration of Platform trait
- properties:
- auto:
- description: To automatically detect from the environment
- if a default platform can be created (it will be created
- on OpenShift only).
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- createDefault:
- description: To create a default (empty) platform when
- the platform is missing.
- type: boolean
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- global:
- description: Indicates if the platform should be created
- globally in the case of global operator (default true).
- type: boolean
- type: object
- pod:
- description: The configuration of Pod trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- type: object
- prometheus:
- description: The configuration of Prometheus trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- podMonitor:
- description: Whether a `PodMonitor` resource is created
- (default `true`).
- type: boolean
- podMonitorLabels:
- description: The `PodMonitor` resource labels, applicable
- when `pod-monitor` is `true`.
- items:
- type: string
- type: array
- type: object
- pull-secret:
- description: The configuration of Pull Secret trait
- properties:
- auto:
- description: Automatically configures the platform registry
- secret on the pod if it is of type `kubernetes.io/dockerconfigjson`.
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- imagePullerDelegation:
- description: When using a global operator with a shared
- platform, this enables delegation of the `system:image-puller`
- cluster role on the operator namespace to the integration
- service account.
- type: boolean
- secretName:
- description: The pull secret name to set on the Pod. If
- left empty this is automatically taken from the `IntegrationPlatform`
- registry configuration.
- type: string
- type: object
- quarkus:
- description: The configuration of Quarkus trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- packageTypes:
- description: The Quarkus package types, either `fast-jar`
- or `native` (default `fast-jar`). In case both `fast-jar`
- and `native` are specified, two `IntegrationKit` resources
- are created, with the `native` kit having precedence
- over the `fast-jar` one once ready. The order influences
- the resolution of the current kit for the integration.
- The kit corresponding to the first package type will
- be assigned to the integration in case no existing kit
- that matches the integration exists.
- items:
- description: Quarkus package type.
- enum:
- - fast-jar
- - native
- type: string
- type: array
- type: object
- registry:
- description: The configuration of Registry trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- type: object
- route:
- description: The configuration of Route trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- host:
- description: To configure the host exposed by the route.
- type: string
- tlsCACertificate:
- description: "The TLS CA certificate contents. \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsCACertificateSecret:
- description: "The secret name and key reference to the
- TLS CA certificate. The format is \"secret-name[/key-name]\",
- the value represents the secret name, if there is only
- one key in the secret it will be read, otherwise you
- can set a key name separated with a \"/\". \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsCertificate:
- description: "The TLS certificate contents. \n Refer to
- the OpenShift route documentation for additional information."
- type: string
- tlsCertificateSecret:
- description: "The secret name and key reference to the
- TLS certificate. The format is \"secret-name[/key-name]\",
- the value represents the secret name, if there is only
- one key in the secret it will be read, otherwise you
- can set a key name separated with a \"/\". \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsDestinationCACertificate:
- description: "The destination CA certificate provides
- the contents of the ca certificate of the final destination.
- \ When using reencrypt termination this file should
- be provided in order to have routers use it for health
- checks on the secure connection. If this field is not
- specified, the router may provide its own destination
- CA and perform hostname validation using the short service
- name (service.namespace.svc), which allows infrastructure
- generated certificates to automatically verify. \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsDestinationCACertificateSecret:
- description: "The secret name and key reference to the
- destination CA certificate. The format is \"secret-name[/key-name]\",
- the value represents the secret name, if there is only
- one key in the secret it will be read, otherwise you
- can set a key name separated with a \"/\". \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsInsecureEdgeTerminationPolicy:
- description: "To configure how to deal with insecure traffic,
- e.g. `Allow`, `Disable` or `Redirect` traffic. \n Refer
- to the OpenShift route documentation for additional
- information."
- enum:
- - None
- - Allow
- - Redirect
- type: string
- tlsKey:
- description: "The TLS certificate key contents. \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsKeySecret:
- description: "The secret name and key reference to the
- TLS certificate key. The format is \"secret-name[/key-name]\",
- the value represents the secret name, if there is only
- one key in the secret it will be read, otherwise you
- can set a key name separated with a \"/\". \n Refer
- to the OpenShift route documentation for additional
- information."
- type: string
- tlsTermination:
- description: "The TLS termination type, like `edge`, `passthrough`
- or `reencrypt`. \n Refer to the OpenShift route documentation
- for additional information."
- enum:
- - edge
- - reencrypt
- - passthrough
- type: string
- type: object
- service:
- description: The configuration of Service trait
- properties:
- auto:
- description: To automatically detect from the code if
- a Service needs to be created.
- type: boolean
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- nodePort:
- description: 'Enable Service to be exposed as NodePort
- (default `false`). Deprecated: Use service type instead.'
- type: boolean
- type:
- description: The type of service to be used, either 'ClusterIP',
- 'NodePort' or 'LoadBalancer'.
- enum:
- - ClusterIP
- - NodePort
- - LoadBalancer
- type: string
- type: object
- service-binding:
- description: The configuration of Service Binding trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- services:
- description: List of Services in the form [[apigroup/]version:]kind:[namespace/]name
- items:
- type: string
- type: array
- type: object
- strimzi:
- description: 'Deprecated: for backward compatibility.'
- properties:
- configuration:
- description: TraitConfiguration parameters configuration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- required:
- - configuration
- type: object
- toleration:
- description: The configuration of Toleration trait
- properties:
- configuration:
- description: 'Legacy trait configuration parameters. Deprecated:
- for backward compatibility.'
- type: object
- x-kubernetes-preserve-unknown-fields: true
- enabled:
- description: Can be used to enable or disable a trait.
- All traits share this common property.
- type: boolean
- taints:
- description: The list of taints to tolerate, in the form
- `Key[=Value]:Effect[:Seconds]`
- items:
- type: string
- type: array
- type: object
- tracing:
- description: 'Deprecated: for backward compatibility.'
- properties:
- configuration:
- description: TraitConfiguration parameters configuration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- required:
- - configuration
- type: object
- type: object
- type: object
- replicas:
- description: Replicas is the number of desired replicas for the binding
- format: int32
- type: integer
- serviceAccountName:
- description: Custom SA to use for the binding
- type: string
- sink:
- description: Sink is the destination of the integration defined by
- this binding
- properties:
- dataTypes:
- additionalProperties:
- description: DataTypeReference references to the specification
- of a data type by its scheme and format name
- properties:
- format:
- description: the data type format name
- type: string
- scheme:
- description: the data type component scheme
- type: string
- type: object
- description: DataTypes defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- type: object
- properties:
- description: Properties are a key value representation of endpoint
- properties
- type: object
- x-kubernetes-preserve-unknown-fields: true
- ref:
- description: Ref can be used to declare a Kubernetes resource
- as source/sink endpoint
- properties:
- apiVersion:
- description: API version of the referent.
- type: string
- fieldPath:
- description: 'If referring to a piece of an object instead
- of an entire object, this string should contain a valid
- JSON/Go field access statement, such as desiredState.manifest.containers[2].
- For example, if the object reference is to a container within
- a pod, this would take on a value like: "spec.containers{name}"
- (where "name" refers to the name of the container that triggered
- the event) or if no container name is specified "spec.containers[2]"
- (container with index 2 in this pod). This syntax is chosen
- only to have some well-defined way of referencing a part
- of an object. TODO: this design is not final and this field
- is subject to change in the future.'
- type: string
- kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- namespace:
- description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
- type: string
- resourceVersion:
- description: 'Specific resourceVersion to which this reference
- is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
- type: string
- uid:
- description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
- type: string
- type: object
- types:
- additionalProperties:
- description: 'EventTypeSpec represents a specification for an
- event type Deprecated: In favor of using DataTypeSpec'
- properties:
- mediaType:
- description: media type as expected for HTTP media types
- (ie, application/json)
- type: string
- schema:
- description: the expected schema for the event
- properties:
- $schema:
- description: JSONSchemaURL represents a schema url.
- type: string
- description:
- type: string
- example:
- description: 'JSON represents any valid JSON value.
- These types are supported: bool, int64, float64, string,
- []interface{}, map[string]interface{} and nil.'
- x-kubernetes-preserve-unknown-fields: true
- externalDocs:
- description: ExternalDocumentation allows referencing
- an external resource for extended documentation.
- properties:
- description:
- type: string
- url:
- type: string
- type: object
- id:
- type: string
- properties:
- additionalProperties:
- properties:
- default:
- description: default is a default value for undefined
- object fields.
- x-kubernetes-preserve-unknown-fields: true
- deprecated:
- type: boolean
- description:
- type: string
- enum:
- items:
- description: 'JSON represents any valid JSON
- value. These types are supported: bool, int64,
- float64, string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- type: array
- example:
- description: 'JSON represents any valid JSON value.
- These types are supported: bool, int64, float64,
- string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- exclusiveMaximum:
- type: boolean
- exclusiveMinimum:
- type: boolean
- format:
- description: "format is an OpenAPI v3 format string.
- Unknown formats are ignored. The following formats
- are validated: \n - bsonobjectid: a bson object
- ID, i.e. a 24 characters hex string - uri: an
- URI as parsed by Golang net/url.ParseRequestURI
- - email: an email address as parsed by Golang
- net/mail.ParseAddress - hostname: a valid representation
- for an Internet host name, as defined by RFC
- 1034, section 3.1 [RFC1034]. - ipv4: an IPv4
- IP as parsed by Golang net.ParseIP - ipv6: an
- IPv6 IP as parsed by Golang net.ParseIP - cidr:
- a CIDR as parsed by Golang net.ParseCIDR - mac:
- a MAC address as parsed by Golang net.ParseMAC
- - uuid: an UUID that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid3: an UUID3 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid4: an UUID4 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - uuid5: an UUID5 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - isbn: an ISBN10 or ISBN13 number string like
- \"0321751043\" or \"978-0321751041\" - isbn10:
- an ISBN10 number string like \"0321751043\"
- - isbn13: an ISBN13 number string like \"978-0321751041\"
- - creditcard: a credit card number defined by
- the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
- with any non digit characters mixed in - ssn:
- a U.S. social security number following the
- regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ -
- hexcolor: an hexadecimal color code like \"#FFFFFF\"
- following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- - rgbcolor: an RGB color code like rgb like
- \"rgb(255,255,255)\" - byte: base64 encoded
- binary data - password: any kind of string -
- date: a date string like \"2006-01-02\" as defined
- by full-date in RFC3339 - duration: a duration
- string like \"22 ns\" as parsed by Golang time.ParseDuration
- or compatible with Scala duration format - datetime:
- a date time string like \"2014-12-15T19:30:20.000Z\"
- as defined by date-time in RFC3339."
- type: string
- id:
- type: string
- maxItems:
- format: int64
- type: integer
- maxLength:
- format: int64
- type: integer
- maxProperties:
- format: int64
- type: integer
- maximum:
- description: A Number represents a JSON number
- literal.
- type: string
- minItems:
- format: int64
- type: integer
- minLength:
- format: int64
- type: integer
- minProperties:
- format: int64
- type: integer
- minimum:
- description: A Number represents a JSON number
- literal.
- type: string
- multipleOf:
- description: A Number represents a JSON number
- literal.
- type: string
- nullable:
- type: boolean
- pattern:
- type: string
- title:
- type: string
- type:
- type: string
- uniqueItems:
- type: boolean
- x-descriptors:
- description: XDescriptors is a list of extended
- properties that trigger a custom behavior in
- external systems
- items:
- type: string
- type: array
- type: object
- type: object
- required:
- items:
- type: string
- type: array
- title:
- type: string
- type:
- type: string
- type: object
- type: object
- description: 'Types defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- Deprecated: In favor of using DataTypes'
- type: object
- uri:
- description: URI can be used to specify the (Camel) endpoint explicitly
- type: string
- type: object
- source:
- description: Source is the starting point of the integration defined
- by this binding
- properties:
- dataTypes:
- additionalProperties:
- description: DataTypeReference references to the specification
- of a data type by its scheme and format name
- properties:
- format:
- description: the data type format name
- type: string
- scheme:
- description: the data type component scheme
- type: string
- type: object
- description: DataTypes defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- type: object
- properties:
- description: Properties are a key value representation of endpoint
- properties
- type: object
- x-kubernetes-preserve-unknown-fields: true
- ref:
- description: Ref can be used to declare a Kubernetes resource
- as source/sink endpoint
- properties:
- apiVersion:
- description: API version of the referent.
- type: string
- fieldPath:
- description: 'If referring to a piece of an object instead
- of an entire object, this string should contain a valid
- JSON/Go field access statement, such as desiredState.manifest.containers[2].
- For example, if the object reference is to a container within
- a pod, this would take on a value like: "spec.containers{name}"
- (where "name" refers to the name of the container that triggered
- the event) or if no container name is specified "spec.containers[2]"
- (container with index 2 in this pod). This syntax is chosen
- only to have some well-defined way of referencing a part
- of an object. TODO: this design is not final and this field
- is subject to change in the future.'
- type: string
- kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- namespace:
- description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
- type: string
- resourceVersion:
- description: 'Specific resourceVersion to which this reference
- is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
- type: string
- uid:
- description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
- type: string
- type: object
- types:
- additionalProperties:
- description: 'EventTypeSpec represents a specification for an
- event type Deprecated: In favor of using DataTypeSpec'
- properties:
- mediaType:
- description: media type as expected for HTTP media types
- (ie, application/json)
- type: string
- schema:
- description: the expected schema for the event
- properties:
- $schema:
- description: JSONSchemaURL represents a schema url.
- type: string
- description:
- type: string
- example:
- description: 'JSON represents any valid JSON value.
- These types are supported: bool, int64, float64, string,
- []interface{}, map[string]interface{} and nil.'
- x-kubernetes-preserve-unknown-fields: true
- externalDocs:
- description: ExternalDocumentation allows referencing
- an external resource for extended documentation.
- properties:
- description:
- type: string
- url:
- type: string
- type: object
- id:
- type: string
- properties:
- additionalProperties:
- properties:
- default:
- description: default is a default value for undefined
- object fields.
- x-kubernetes-preserve-unknown-fields: true
- deprecated:
- type: boolean
- description:
- type: string
- enum:
- items:
- description: 'JSON represents any valid JSON
- value. These types are supported: bool, int64,
- float64, string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- type: array
- example:
- description: 'JSON represents any valid JSON value.
- These types are supported: bool, int64, float64,
- string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- exclusiveMaximum:
- type: boolean
- exclusiveMinimum:
- type: boolean
- format:
- description: "format is an OpenAPI v3 format string.
- Unknown formats are ignored. The following formats
- are validated: \n - bsonobjectid: a bson object
- ID, i.e. a 24 characters hex string - uri: an
- URI as parsed by Golang net/url.ParseRequestURI
- - email: an email address as parsed by Golang
- net/mail.ParseAddress - hostname: a valid representation
- for an Internet host name, as defined by RFC
- 1034, section 3.1 [RFC1034]. - ipv4: an IPv4
- IP as parsed by Golang net.ParseIP - ipv6: an
- IPv6 IP as parsed by Golang net.ParseIP - cidr:
- a CIDR as parsed by Golang net.ParseCIDR - mac:
- a MAC address as parsed by Golang net.ParseMAC
- - uuid: an UUID that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid3: an UUID3 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid4: an UUID4 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - uuid5: an UUID5 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - isbn: an ISBN10 or ISBN13 number string like
- \"0321751043\" or \"978-0321751041\" - isbn10:
- an ISBN10 number string like \"0321751043\"
- - isbn13: an ISBN13 number string like \"978-0321751041\"
- - creditcard: a credit card number defined by
- the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
- with any non digit characters mixed in - ssn:
- a U.S. social security number following the
- regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$ -
- hexcolor: an hexadecimal color code like \"#FFFFFF\"
- following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- - rgbcolor: an RGB color code like rgb like
- \"rgb(255,255,255)\" - byte: base64 encoded
- binary data - password: any kind of string -
- date: a date string like \"2006-01-02\" as defined
- by full-date in RFC3339 - duration: a duration
- string like \"22 ns\" as parsed by Golang time.ParseDuration
- or compatible with Scala duration format - datetime:
- a date time string like \"2014-12-15T19:30:20.000Z\"
- as defined by date-time in RFC3339."
- type: string
- id:
- type: string
- maxItems:
- format: int64
- type: integer
- maxLength:
- format: int64
- type: integer
- maxProperties:
- format: int64
- type: integer
- maximum:
- description: A Number represents a JSON number
- literal.
- type: string
- minItems:
- format: int64
- type: integer
- minLength:
- format: int64
- type: integer
- minProperties:
- format: int64
- type: integer
- minimum:
- description: A Number represents a JSON number
- literal.
- type: string
- multipleOf:
- description: A Number represents a JSON number
- literal.
- type: string
- nullable:
- type: boolean
- pattern:
- type: string
- title:
- type: string
- type:
- type: string
- uniqueItems:
- type: boolean
- x-descriptors:
- description: XDescriptors is a list of extended
- properties that trigger a custom behavior in
- external systems
- items:
- type: string
- type: array
- type: object
- type: object
- required:
- items:
- type: string
- type: array
- title:
- type: string
- type:
- type: string
- type: object
- type: object
- description: 'Types defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- Deprecated: In favor of using DataTypes'
- type: object
- uri:
- description: URI can be used to specify the (Camel) endpoint explicitly
- type: string
- type: object
- steps:
- description: Steps contains an optional list of intermediate steps
- that are executed between the Source and the Sink
- items:
- description: Endpoint represents a source/sink external entity (could
- be any Kubernetes resource or Camel URI)
- properties:
- dataTypes:
- additionalProperties:
- description: DataTypeReference references to the specification
- of a data type by its scheme and format name
- properties:
- format:
- description: the data type format name
- type: string
- scheme:
- description: the data type component scheme
- type: string
- type: object
- description: DataTypes defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- type: object
- properties:
- description: Properties are a key value representation of endpoint
- properties
- type: object
- x-kubernetes-preserve-unknown-fields: true
- ref:
- description: Ref can be used to declare a Kubernetes resource
- as source/sink endpoint
- properties:
- apiVersion:
- description: API version of the referent.
- type: string
- fieldPath:
- description: 'If referring to a piece of an object instead
- of an entire object, this string should contain a valid
- JSON/Go field access statement, such as desiredState.manifest.containers[2].
- For example, if the object reference is to a container
- within a pod, this would take on a value like: "spec.containers{name}"
- (where "name" refers to the name of the container that
- triggered the event) or if no container name is specified
- "spec.containers[2]" (container with index 2 in this pod).
- This syntax is chosen only to have some well-defined way
- of referencing a part of an object. TODO: this design
- is not final and this field is subject to change in the
- future.'
- type: string
- kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- namespace:
- description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
- type: string
- resourceVersion:
- description: 'Specific resourceVersion to which this reference
- is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
- type: string
- uid:
- description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
- type: string
- type: object
- types:
- additionalProperties:
- description: 'EventTypeSpec represents a specification for
- an event type Deprecated: In favor of using DataTypeSpec'
- properties:
- mediaType:
- description: media type as expected for HTTP media types
- (ie, application/json)
- type: string
- schema:
- description: the expected schema for the event
- properties:
- $schema:
- description: JSONSchemaURL represents a schema url.
- type: string
- description:
- type: string
- example:
- description: 'JSON represents any valid JSON value.
- These types are supported: bool, int64, float64,
- string, []interface{}, map[string]interface{} and
- nil.'
- x-kubernetes-preserve-unknown-fields: true
- externalDocs:
- description: ExternalDocumentation allows referencing
- an external resource for extended documentation.
- properties:
- description:
- type: string
- url:
- type: string
- type: object
- id:
- type: string
- properties:
- additionalProperties:
- properties:
- default:
- description: default is a default value for
- undefined object fields.
- x-kubernetes-preserve-unknown-fields: true
- deprecated:
- type: boolean
- description:
- type: string
- enum:
- items:
- description: 'JSON represents any valid JSON
- value. These types are supported: bool,
- int64, float64, string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- type: array
- example:
- description: 'JSON represents any valid JSON
- value. These types are supported: bool, int64,
- float64, string, []interface{}, map[string]interface{}
- and nil.'
- x-kubernetes-preserve-unknown-fields: true
- exclusiveMaximum:
- type: boolean
- exclusiveMinimum:
- type: boolean
- format:
- description: "format is an OpenAPI v3 format
- string. Unknown formats are ignored. The following
- formats are validated: \n - bsonobjectid:
- a bson object ID, i.e. a 24 characters hex
- string - uri: an URI as parsed by Golang net/url.ParseRequestURI
- - email: an email address as parsed by Golang
- net/mail.ParseAddress - hostname: a valid
- representation for an Internet host name,
- as defined by RFC 1034, section 3.1 [RFC1034].
- - ipv4: an IPv4 IP as parsed by Golang net.ParseIP
- - ipv6: an IPv6 IP as parsed by Golang net.ParseIP
- - cidr: a CIDR as parsed by Golang net.ParseCIDR
- - mac: a MAC address as parsed by Golang net.ParseMAC
- - uuid: an UUID that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid3: an UUID3 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?3[0-9a-f]{3}-?[0-9a-f]{4}-?[0-9a-f]{12}$
- - uuid4: an UUID4 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?4[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - uuid5: an UUID5 that allows uppercase defined
- by the regex (?i)^[0-9a-f]{8}-?[0-9a-f]{4}-?5[0-9a-f]{3}-?[89ab][0-9a-f]{3}-?[0-9a-f]{12}$
- - isbn: an ISBN10 or ISBN13 number string
- like \"0321751043\" or \"978-0321751041\"
- - isbn10: an ISBN10 number string like \"0321751043\"
- - isbn13: an ISBN13 number string like \"978-0321751041\"
- - creditcard: a credit card number defined
- by the regex ^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6(?:011|5[0-9][0-9])[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|(?:2131|1800|35\\\\d{3})\\\\d{11})$
- with any non digit characters mixed in - ssn:
- a U.S. social security number following the
- regex ^\\\\d{3}[- ]?\\\\d{2}[- ]?\\\\d{4}$
- - hexcolor: an hexadecimal color code like
- \"#FFFFFF\" following the regex ^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$
- - rgbcolor: an RGB color code like rgb like
- \"rgb(255,255,255)\" - byte: base64 encoded
- binary data - password: any kind of string
- - date: a date string like \"2006-01-02\"
- as defined by full-date in RFC3339 - duration:
- a duration string like \"22 ns\" as parsed
- by Golang time.ParseDuration or compatible
- with Scala duration format - datetime: a date
- time string like \"2014-12-15T19:30:20.000Z\"
- as defined by date-time in RFC3339."
- type: string
- id:
- type: string
- maxItems:
- format: int64
- type: integer
- maxLength:
- format: int64
- type: integer
- maxProperties:
- format: int64
- type: integer
- maximum:
- description: A Number represents a JSON number
- literal.
- type: string
- minItems:
- format: int64
- type: integer
- minLength:
- format: int64
- type: integer
- minProperties:
- format: int64
- type: integer
- minimum:
- description: A Number represents a JSON number
- literal.
- type: string
- multipleOf:
- description: A Number represents a JSON number
- literal.
- type: string
- nullable:
- type: boolean
- pattern:
- type: string
- title:
- type: string
- type:
- type: string
- uniqueItems:
- type: boolean
- x-descriptors:
- description: XDescriptors is a list of extended
- properties that trigger a custom behavior
- in external systems
- items:
- type: string
- type: array
- type: object
- type: object
- required:
- items:
- type: string
- type: array
- title:
- type: string
- type:
- type: string
- type: object
- type: object
- description: 'Types defines the data type of the data produced/consumed
- by the endpoint and references a given data type specification.
- Deprecated: In favor of using DataTypes'
- type: object
- uri:
- description: URI can be used to specify the (Camel) endpoint
- explicitly
- type: string
- type: object
- type: array
- type: object
- status:
- description: the status of a Binding
- properties:
- conditions:
- description: Conditions --
- items:
- description: BindingCondition describes the state of a resource
- at a certain point.
- properties:
- lastTransitionTime:
- description: Last time the condition transitioned from one status
- to another.
- format: date-time
- type: string
- lastUpdateTime:
- description: The last time this condition was updated.
- format: date-time
- type: string
- message:
- description: A human readable message indicating details about
- the transition.
- type: string
- pods:
- description: Pods collect health and conditions information
- from the owned PODs
- items:
- properties:
- condition:
- description: PodCondition contains details for the current
- condition of this pod.
- properties:
- lastProbeTime:
- description: Last time we probed the condition.
- format: date-time
- type: string
- lastTransitionTime:
- description: Last time the condition transitioned
- from one status to another.
- format: date-time
- type: string
- message:
- description: Human-readable message indicating details
- about last transition.
- type: string
- reason:
- description: Unique, one-word, CamelCase reason for
- the condition's last transition.
- type: string
- status:
- description: 'Status is the status of the condition.
- Can be True, False, Unknown. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-conditions'
- type: string
- type:
- description: 'Type is the type of the condition. More
- info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-conditions'
- type: string
- required:
- - status
- - type
- type: object
- health:
- items:
- properties:
- data:
- description: RawMessage is a raw encoded JSON value.
- It implements Marshaler and Unmarshaler and can
- be used to delay JSON decoding or precompute a
- JSON encoding.
- x-kubernetes-preserve-unknown-fields: true
- name:
- type: string
- status:
- type: string
- type: object
- type: array
- name:
- type: string
- required:
- - condition
- type: object
- type: array
- reason:
- description: The reason for the condition's last transition.
- type: string
- status:
- description: Status of the condition, one of True, False, Unknown.
- type: string
- type:
- description: Type of binding condition.
- type: string
- required:
- - status
- - type
- type: object
- type: array
- observedGeneration:
- description: ObservedGeneration is the most recent generation observed
- for this Binding.
- format: int64
- type: integer
- phase:
- description: Phase --
- type: string
- replicas:
- description: Replicas is the number of actual replicas of the binding
- format: int32
- type: integer
- selector:
- description: Selector allows to identify pods belonging to the binding
- type: string
- type: object
- type: object
- served: true
- storage: true
- subresources:
- scale:
- labelSelectorPath: .status.selector
- specReplicasPath: .spec.replicas
- statusReplicasPath: .status.replicas
- status: {}
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index dce3df057..7eb4a77b2 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -48,7 +48,7 @@ spec:
name: Replicas
type: integer
deprecated: true
- deprecationWarning: v1apha1.KameletBinding is deprecated, please, use v1.Binding
+ deprecationWarning: v1apha1.KameletBinding is deprecated, please, use v1.Pipe
instead
name: v1alpha1
schema:
diff --git a/helm/camel-k/crds/crd-binding.yaml b/config/crd/bases/camel.apache.org_pipes.yaml
similarity index 99%
copy from helm/camel-k/crds/crd-binding.yaml
copy to config/crd/bases/camel.apache.org_pipes.yaml
index a2694d60a..e9db2996e 100644
--- a/helm/camel-k/crds/crd-binding.yaml
+++ b/config/crd/bases/camel.apache.org_pipes.yaml
@@ -1,45 +1,28 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
+---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
- labels:
- app: camel-k
- name: bindings.camel.apache.org
+ name: pipes.camel.apache.org
spec:
group: camel.apache.org
names:
categories:
- kamel
- camel
- kind: Binding
- listKind: BindingList
- plural: bindings
+ kind: Pipe
+ listKind: PipeList
+ plural: pipes
shortNames:
- - bd
- singular: binding
+ - pp
+ singular: pipe
scope: Namespaced
versions:
- additionalPrinterColumns:
- - description: TheBinding phase
+ - description: The Pipe phase
jsonPath: .status.phase
name: Phase
type: string
@@ -50,7 +33,7 @@ spec:
name: v1
schema:
openAPIV3Schema:
- description: Binding is the Schema for the kamelets binding API
+ description: Pipe is the Schema for the Pipe API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
@@ -65,7 +48,7 @@ spec:
metadata:
type: object
spec:
- description: the specification of a Binding
+ description: the specification of a Pipe
properties:
errorHandler:
description: ErrorHandler is an optional handler called upon an error
@@ -7689,15 +7672,15 @@ spec:
type: object
type: object
replicas:
- description: Replicas is the number of desired replicas for the binding
+ description: Replicas is the number of desired replicas for the Pipe
format: int32
type: integer
serviceAccountName:
- description: Custom SA to use for the binding
+ description: Custom SA to use for the Pipe
type: string
sink:
description: Sink is the destination of the integration defined by
- this binding
+ this Pipe
properties:
dataTypes:
additionalProperties:
@@ -7932,7 +7915,7 @@ spec:
type: object
source:
description: Source is the starting point of the integration defined
- by this binding
+ by this Pipe
properties:
dataTypes:
additionalProperties:
@@ -8410,13 +8393,13 @@ spec:
type: array
type: object
status:
- description: the status of a Binding
+ description: the status of a Pipe
properties:
conditions:
description: Conditions --
items:
- description: BindingCondition describes the state of a resource
- at a certain point.
+ description: PipeCondition describes the state of a resource at
+ a certain point.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
@@ -8497,7 +8480,7 @@ spec:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
- description: Type of binding condition.
+ description: Type of pipe condition.
type: string
required:
- status
@@ -8506,18 +8489,18 @@ spec:
type: array
observedGeneration:
description: ObservedGeneration is the most recent generation observed
- for this Binding.
+ for this Pipe.
format: int64
type: integer
phase:
description: Phase --
type: string
replicas:
- description: Replicas is the number of actual replicas of the binding
+ description: Replicas is the number of actual replicas of the pipe
format: int32
type: integer
selector:
- description: Selector allows to identify pods belonging to the binding
+ description: Selector allows to identify pods belonging to the pipe
type: string
type: object
type: object
@@ -8529,3 +8512,9 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
+status:
+ acceptedNames:
+ kind: ""
+ plural: ""
+ conditions: []
+ storedVersions: []
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 097671dc4..96d354d2d 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -5,48 +5,6 @@ Package v1 contains API Schema definitions for the camel v1 API group
== Resource Types
-[#_camel_apache_org_v1_Binding]
-=== Binding
-
-Binding is the Schema for the kamelets binding API
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`apiVersion` +
-string
-|`camel.apache.org/v1`
-
-|`kind` +
-string
-|`Binding`
-|`metadata` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
-|
-
-
-
-
-Refer to the Kubernetes API documentation for the fields of the `metadata` field.
-|`spec` +
-*xref:#_camel_apache_org_v1_BindingSpec[BindingSpec]*
-|
-
-
-the specification of a Binding
-
-|`status` +
-*xref:#_camel_apache_org_v1_BindingStatus[BindingStatus]*
-|
-
-
-the status of a Binding
-
-
-|===
-
[#_camel_apache_org_v1_Build]
=== Build
@@ -303,6 +261,48 @@ the desired specification
the actual status of the resource
+|===
+
+[#_camel_apache_org_v1_Pipe]
+=== Pipe
+
+Pipe is the Schema for the Pipe API
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`apiVersion` +
+string
+|`camel.apache.org/v1`
+
+|`kind` +
+string
+|`Pipe`
+|`metadata` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#objectmeta-v1-meta[Kubernetes meta/v1.ObjectMeta]*
+|
+
+
+
+
+Refer to the Kubernetes API documentation for the fields of the `metadata` field.
+|`spec` +
+*xref:#_camel_apache_org_v1_PipeSpec[PipeSpec]*
+|
+
+
+the specification of a Pipe
+
+|`status` +
+*xref:#_camel_apache_org_v1_PipeStatus[PipeStatus]*
+|
+
+
+the status of a Pipe
+
+
|===
== Internal Types
@@ -424,210 +424,6 @@ BeanProperties represent an unstructured object properties to be set on a bean
-|===
-
-[#_camel_apache_org_v1_BindingCondition]
-=== BindingCondition
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_BindingStatus, BindingStatus>>
-
-BindingCondition describes the state of a resource at a certain point.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`type` +
-*xref:#_camel_apache_org_v1_BindingConditionType[BindingConditionType]*
-|
-
-
-Type of binding condition.
-
-|`status` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
-|
-
-
-Status of the condition, one of True, False, Unknown.
-
-|`lastUpdateTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-The last time this condition was updated.
-
-|`lastTransitionTime` +
-*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
-|
-
-
-Last time the condition transitioned from one status to another.
-
-|`reason` +
-string
-|
-
-
-The reason for the condition's last transition.
-
-|`message` +
-string
-|
-
-
-A human readable message indicating details about the transition.
-
-|`pods` +
-*xref:#_camel_apache_org_v1_PodCondition[[\]PodCondition]*
-|
-
-
-Pods collect health and conditions information from the owned PODs
-
-
-|===
-
-[#_camel_apache_org_v1_BindingConditionType]
-=== BindingConditionType(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_BindingCondition, BindingCondition>>
-
-BindingConditionType --
-
-
-[#_camel_apache_org_v1_BindingPhase]
-=== BindingPhase(`string` alias)
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_BindingStatus, BindingStatus>>
-
-BindingPhase --
-
-
-[#_camel_apache_org_v1_BindingSpec]
-=== BindingSpec
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_Binding, Binding>>
-
-BindingSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`integration` +
-*xref:#_camel_apache_org_v1_IntegrationSpec[IntegrationSpec]*
-|
-
-
-Integration is an optional integration used to specify custom parameters
-
-|`source` +
-*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
-|
-
-
-Source is the starting point of the integration defined by this binding
-
-|`sink` +
-*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
-|
-
-
-Sink is the destination of the integration defined by this binding
-
-|`errorHandler` +
-*xref:#_camel_apache_org_v1_ErrorHandlerSpec[ErrorHandlerSpec]*
-|
-
-
-ErrorHandler is an optional handler called upon an error occuring in the integration
-
-|`steps` +
-*xref:#_camel_apache_org_v1_Endpoint[[\]Endpoint]*
-|
-
-
-Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of desired replicas for the binding
-
-|`serviceAccountName` +
-string
-|
-
-
-Custom SA to use for the binding
-
-
-|===
-
-[#_camel_apache_org_v1_BindingStatus]
-=== BindingStatus
-
-*Appears on:*
-
-* <<#_camel_apache_org_v1_Binding, Binding>>
-
-BindingStatus specify the status of a binding
-
-[cols="2,2a",options="header"]
-|===
-|Field
-|Description
-
-|`observedGeneration` +
-int64
-|
-
-
-ObservedGeneration is the most recent generation observed for this Binding.
-
-|`phase` +
-*xref:#_camel_apache_org_v1_BindingPhase[BindingPhase]*
-|
-
-
-Phase --
-
-|`conditions` +
-*xref:#_camel_apache_org_v1_BindingCondition[[\]BindingCondition]*
-|
-
-
-Conditions --
-
-|`replicas` +
-int32
-|
-
-
-Replicas is the number of actual replicas of the binding
-
-|`selector` +
-string
-|
-
-
-Selector allows to identify pods belonging to the binding
-
-
|===
[#_camel_apache_org_v1_BuildCondition]
@@ -1687,8 +1483,8 @@ one to many header specifications
*Appears on:*
-* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
* <<#_camel_apache_org_v1_ErrorHandlerSink, ErrorHandlerSink>>
+* <<#_camel_apache_org_v1_PipeSpec, PipeSpec>>
Endpoint represents a source/sink external entity (could be any Kubernetes resource or Camel URI)
@@ -1876,7 +1672,7 @@ ErrorHandlerSink represents a sink error handler type which behave like a dead l
*Appears on:*
-* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
+* <<#_camel_apache_org_v1_PipeSpec, PipeSpec>>
ErrorHandlerSpec represents an unstructured object for an error handler
@@ -2969,7 +2765,7 @@ generic information related to the build of Camel K operator software
*Appears on:*
* <<#_camel_apache_org_v1_Integration, Integration>>
-* <<#_camel_apache_org_v1_BindingSpec, BindingSpec>>
+* <<#_camel_apache_org_v1_PipeSpec, PipeSpec>>
IntegrationSpec specifies the configuration of an Integration.
The Integration will be watched by the operator which will be in charge to run the related application, according to the configuration specified.
@@ -3998,6 +3794,210 @@ e.g., `-V,--no-transfer-progress,-Dstyle.color=never`.
See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
+|===
+
+[#_camel_apache_org_v1_PipeCondition]
+=== PipeCondition
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_PipeStatus, PipeStatus>>
+
+PipeCondition describes the state of a resource at a certain point.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`type` +
+*xref:#_camel_apache_org_v1_PipeConditionType[PipeConditionType]*
+|
+
+
+Type of pipe condition.
+
+|`status` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#conditionstatus-v1-core[Kubernetes core/v1.ConditionStatus]*
+|
+
+
+Status of the condition, one of True, False, Unknown.
+
+|`lastUpdateTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+The last time this condition was updated.
+
+|`lastTransitionTime` +
+*https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#time-v1-meta[Kubernetes meta/v1.Time]*
+|
+
+
+Last time the condition transitioned from one status to another.
+
+|`reason` +
+string
+|
+
+
+The reason for the condition's last transition.
+
+|`message` +
+string
+|
+
+
+A human readable message indicating details about the transition.
+
+|`pods` +
+*xref:#_camel_apache_org_v1_PodCondition[[\]PodCondition]*
+|
+
+
+Pods collect health and conditions information from the owned PODs
+
+
+|===
+
+[#_camel_apache_org_v1_PipeConditionType]
+=== PipeConditionType(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_PipeCondition, PipeCondition>>
+
+PipeConditionType --
+
+
+[#_camel_apache_org_v1_PipePhase]
+=== PipePhase(`string` alias)
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_PipeStatus, PipeStatus>>
+
+PipePhase --
+
+
+[#_camel_apache_org_v1_PipeSpec]
+=== PipeSpec
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Pipe, Pipe>>
+
+PipeSpec defines the binding between a source and a sink. It can include custom parameters and additional intermediate steps and error handling.
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`integration` +
+*xref:#_camel_apache_org_v1_IntegrationSpec[IntegrationSpec]*
+|
+
+
+Integration is an optional integration used to specify custom parameters
+
+|`source` +
+*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
+|
+
+
+Source is the starting point of the integration defined by this Pipe
+
+|`sink` +
+*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
+|
+
+
+Sink is the destination of the integration defined by this Pipe
+
+|`errorHandler` +
+*xref:#_camel_apache_org_v1_ErrorHandlerSpec[ErrorHandlerSpec]*
+|
+
+
+ErrorHandler is an optional handler called upon an error occuring in the integration
+
+|`steps` +
+*xref:#_camel_apache_org_v1_Endpoint[[\]Endpoint]*
+|
+
+
+Steps contains an optional list of intermediate steps that are executed between the Source and the Sink
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of desired replicas for the Pipe
+
+|`serviceAccountName` +
+string
+|
+
+
+Custom SA to use for the Pipe
+
+
+|===
+
+[#_camel_apache_org_v1_PipeStatus]
+=== PipeStatus
+
+*Appears on:*
+
+* <<#_camel_apache_org_v1_Pipe, Pipe>>
+
+PipeStatus specify the status of a Pipe
+
+[cols="2,2a",options="header"]
+|===
+|Field
+|Description
+
+|`observedGeneration` +
+int64
+|
+
+
+ObservedGeneration is the most recent generation observed for this Pipe.
+
+|`phase` +
+*xref:#_camel_apache_org_v1_PipePhase[PipePhase]*
+|
+
+
+Phase --
+
+|`conditions` +
+*xref:#_camel_apache_org_v1_PipeCondition[[\]PipeCondition]*
+|
+
+
+Conditions --
+
+|`replicas` +
+int32
+|
+
+
+Replicas is the number of actual replicas of the pipe
+
+|`selector` +
+string
+|
+
+
+Selector allows to identify pods belonging to the pipe
+
+
|===
[#_camel_apache_org_v1_PluginProperties]
@@ -4011,8 +4011,8 @@ See https://maven.apache.org/ref/3.8.4/maven-embedder/cli.html.
*Appears on:*
-* <<#_camel_apache_org_v1_BindingCondition, BindingCondition>>
* <<#_camel_apache_org_v1_IntegrationCondition, IntegrationCondition>>
+* <<#_camel_apache_org_v1_PipeCondition, PipeCondition>>
diff --git a/docs/modules/ROOT/partials/apis/crds-html.adoc b/docs/modules/ROOT/partials/apis/crds-html.adoc
index 8ae089c6d..53fc8c68d 100644
--- a/docs/modules/ROOT/partials/apis/crds-html.adoc
+++ b/docs/modules/ROOT/partials/apis/crds-html.adoc
@@ -3083,7 +3083,7 @@ map[string]string
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1.Integration">Integration</a>,
-<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.PipeSpec">BindingSpec</a>)
</p>
<div>
<p>IntegrationSpec defines the desired state of Integration</p>
@@ -4968,7 +4968,7 @@ Resource Types:
<ul><li>
<a href="#camel.apache.org/v1.Kamelet">Kamelet</a>
</li><li>
-<a href="#camel.apache.org/v1.Binding">Binding</a>
+<a href="#camel.apache.org/v1.Pipe">Binding</a>
</li></ul>
<h3 id="camel.apache.org/v1.Kamelet">Kamelet
</h3>
@@ -5114,7 +5114,7 @@ KameletStatus
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1.Binding">Binding
+<h3 id="camel.apache.org/v1.Pipe">Binding
</h3>
<div>
<p>Binding is the Schema for the kamelets binding API</p>
@@ -5162,7 +5162,7 @@ Refer to the Kubernetes API documentation for the fields of the
<td>
<code>spec</code><br/>
<em>
-<a href="#camel.apache.org/v1.BindingSpec">
+<a href="#camel.apache.org/v1.PipeSpec">
BindingSpec
</a>
</em>
@@ -5254,7 +5254,7 @@ int32
<td>
<code>status</code><br/>
<em>
-<a href="#camel.apache.org/v1.BindingStatus">
+<a href="#camel.apache.org/v1.PipeStatus">
BindingStatus
</a>
</em>
@@ -5305,7 +5305,7 @@ RawMessage
<p>
(<em>Appears on:</em>
<a href="#camel.apache.org/v1alpha1.ErrorHandlerSink">ErrorHandlerSink</a>,
-<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.PipeSpec">BindingSpec</a>)
</p>
<div>
<p>Endpoint represents a source/sink external entity</p>
@@ -5549,7 +5549,7 @@ Endpoint
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BindingSpec">BindingSpec</a>)
+<a href="#camel.apache.org/v1.PipeSpec">BindingSpec</a>)
</p>
<div>
<p>ErrorHandlerSpec represents an unstructured object for an error handler</p>
@@ -6111,11 +6111,11 @@ string
<div>
<p>JSONSchemaURL represents a schema url.</p>
</div>
-<h3 id="camel.apache.org/v1.BindingCondition">BindingCondition
+<h3 id="camel.apache.org/v1.PipeCondition">BindingCondition
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BindingStatus">BindingStatus</a>)
+<a href="#camel.apache.org/v1.PipeStatus">BindingStatus</a>)
</p>
<div>
<p>BindingCondition describes the state of a resource at a certain point.</p>
@@ -6132,7 +6132,7 @@ string
<td>
<code>type</code><br/>
<em>
-<a href="#camel.apache.org/v1.BindingConditionType">
+<a href="#camel.apache.org/v1.PipeConditionType">
BindingConditionType
</a>
</em>
@@ -6204,27 +6204,27 @@ string
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1.BindingConditionType">BindingConditionType
+<h3 id="camel.apache.org/v1.PipeConditionType">BindingConditionType
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BindingCondition">BindingCondition</a>)
+<a href="#camel.apache.org/v1.PipeCondition">BindingCondition</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1.BindingPhase">BindingPhase
+<h3 id="camel.apache.org/v1.PipePhase">BindingPhase
(<code>string</code> alias)</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.BindingStatus">BindingStatus</a>)
+<a href="#camel.apache.org/v1.PipeStatus">BindingStatus</a>)
</p>
<div>
</div>
-<h3 id="camel.apache.org/v1.BindingSpec">BindingSpec
+<h3 id="camel.apache.org/v1.PipeSpec">BindingSpec
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.Binding">Binding</a>)
+<a href="#camel.apache.org/v1.Pipe">Binding</a>)
</p>
<div>
<p>BindingSpec –</p>
@@ -6315,11 +6315,11 @@ int32
</tr>
</tbody>
</table>
-<h3 id="camel.apache.org/v1.BindingStatus">BindingStatus
+<h3 id="camel.apache.org/v1.PipeStatus">BindingStatus
</h3>
<p>
(<em>Appears on:</em>
-<a href="#camel.apache.org/v1.Binding">Binding</a>)
+<a href="#camel.apache.org/v1.Pipe">Binding</a>)
</p>
<div>
<p>BindingStatus –</p>
@@ -6336,7 +6336,7 @@ int32
<td>
<code>phase</code><br/>
<em>
-<a href="#camel.apache.org/v1.BindingPhase">
+<a href="#camel.apache.org/v1.PipePhase">
BindingPhase
</a>
</em>
@@ -6349,7 +6349,7 @@ BindingPhase
<td>
<code>conditions</code><br/>
<em>
-<a href="#camel.apache.org/v1.BindingCondition">
+<a href="#camel.apache.org/v1.PipeCondition">
[]BindingCondition
</a>
</em>
diff --git a/e2e/common/misc/kamelet_binding_test.go b/e2e/common/misc/kamelet_binding_test.go
index a6dad0373..825e6a8ae 100644
--- a/e2e/common/misc/kamelet_binding_test.go
+++ b/e2e/common/misc/kamelet_binding_test.go
@@ -122,13 +122,13 @@ func TestBinding(t *testing.T) {
// Binding with wrong spec
t.Run("test Binding with wrong spec", func(t *testing.T) {
name := "bad-klb"
- kb := v1.NewBinding(ns, name)
- kb.Spec = v1.BindingSpec{}
+ kb := v1.NewPipe(ns, name)
+ kb.Spec = v1.PipeSpec{}
_, err := kubernetes.ReplaceResource(TestContext, TestClient(), &kb)
Eventually(err).Should(BeNil())
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.BindingPhaseError))
- Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
- Eventually(BindingCondition(ns, name, v1.BindingIntegrationConditionError), TestTimeoutShort).Should(
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).ShouldNot(Equal(corev1.ConditionTrue))
+ Eventually(BindingCondition(ns, name, v1.PipeIntegrationConditionError), TestTimeoutShort).Should(
WithTransform(BindingConditionMessage, And(
ContainSubstring("could not determine source URI"),
ContainSubstring("no ref or URI specified in endpoint"),
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index 55f552701..663c3ee01 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -53,7 +53,7 @@ func TestBindingScale(t *testing.T) {
Expect(KamelBindWithID(operatorID, ns, "timer-source?message=HelloBinding", "log-sink", "--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("HelloBinding"))
t.Run("Update binding scale spec", func(t *testing.T) {
@@ -69,7 +69,7 @@ func TestBindingScale(t *testing.T) {
// Check the readiness condition becomes truthy back
Eventually(IntegrationConditionStatus(ns, name, v1.IntegrationConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
// Finally check the readiness condition becomes truthy back onBinding
- Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
+ Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutMedium).Should(Equal(corev1.ConditionTrue))
})
t.Run("ScaleBinding with polymorphic client", func(t *testing.T) {
@@ -82,7 +82,7 @@ func TestBindingScale(t *testing.T) {
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling
- Expect(BindingConditionStatus(ns, name, v1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(BindingConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Integration scale subresource Spec field
Eventually(IntegrationSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 2)))
@@ -101,18 +101,18 @@ func TestBindingScale(t *testing.T) {
Expect(err).To(BeNil())
// Getter
- bindingScale, err := camel.CamelV1().Bindings(ns).GetScale(TestContext, name, metav1.GetOptions{})
+ bindingScale, err := camel.CamelV1().Pipes(ns).GetScale(TestContext, name, metav1.GetOptions{})
Expect(err).To(BeNil())
Expect(bindingScale.Spec.Replicas).To(BeNumerically("==", 2))
Expect(bindingScale.Status.Replicas).To(BeNumerically("==", 2))
// Setter
bindingScale.Spec.Replicas = 1
- _, err = camel.CamelV1().Bindings(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
+ _, err = camel.CamelV1().Pipes(ns).UpdateScale(TestContext, name, bindingScale, metav1.UpdateOptions{})
Expect(err).To(BeNil())
// Check the readiness condition is still truthy as down-scaling inBinding
- Expect(BindingConditionStatus(ns, name, v1.BindingConditionReady)()).To(Equal(corev1.ConditionTrue))
+ Expect(BindingConditionStatus(ns, name, v1.PipeConditionReady)()).To(Equal(corev1.ConditionTrue))
// Check the Binding scale subresource Spec field
Eventually(BindingSpecReplicas(ns, name), TestTimeoutShort).
Should(gstruct.PointTo(BeNumerically("==", 1)))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index cf4b5f324..5c55ba56e 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -57,9 +57,9 @@ func TestErroredTrait(t *testing.T) {
"-t", "kamelets.list=missing",
).Execute()).To(Succeed())
// Binding
- Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.BindingPhaseError))
- Eventually(BindingConditionStatus(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(BindingCondition(ns, name, v1.BindingConditionReady), TestTimeoutShort).Should(
+ Eventually(BindingPhase(ns, name), TestTimeoutShort).Should(Equal(v1.PipePhaseError))
+ Eventually(BindingConditionStatus(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(BindingCondition(ns, name, v1.PipeConditionReady), TestTimeoutShort).Should(
WithTransform(BindingConditionMessage, And(
ContainSubstring("error during trait customization"),
ContainSubstring("[missing] not found"),
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 09d62548f..34147f9b2 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -239,8 +239,8 @@ func TestHealthTrait(t *testing.T) {
return data["check.kind"].(string) == "READINESS" && data["route.status"].(string) == "Stopped" && data["route.id"].(string) == "binding"
}))
- Eventually(BindingCondition(ns, name, camelv1.BindingConditionReady), TestTimeoutLong).Should(
- Satisfy(func(c *camelv1.BindingCondition) bool {
+ Eventually(BindingCondition(ns, name, camelv1.PipeConditionReady), TestTimeoutLong).Should(
+ Satisfy(func(c *camelv1.PipeCondition) bool {
if c.Status != corev1.ConditionFalse {
return false
}
diff --git a/e2e/install/kustomize/common.go b/e2e/install/kustomize/common.go
index 6a9064b66..88009ccfd 100644
--- a/e2e/install/kustomize/common.go
+++ b/e2e/install/kustomize/common.go
@@ -36,7 +36,7 @@ import (
const (
// v1.Build, v1.Integration
// v1.IntegrationKit, v1.IntegrationPlatform
- // v1.Kamelet, v1.Binding,
+ // v1.Kamelet, v1.Pipe,
// v1alpha1.Kamelet, v1alpha1.KameletBinding
ExpectedCRDs = 8
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 4cf765052..56d039751 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -71,7 +71,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(BindingCondition(ns, timerBinding, v1.BindingConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(BindingCondition(ns, timerBinding, v1.PipeConditionReady), TestTimeoutMedium).Should(And(
WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(BindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
@@ -84,7 +84,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "test-kamelet-display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(BindingCondition(ns, timerBinding, v1.BindingConditionReady), TestTimeoutMedium).
+ Eventually(BindingCondition(ns, timerBinding, v1.PipeConditionReady), TestTimeoutMedium).
Should(And(
WithTransform(BindingConditionStatusExtract, Equal(corev1.ConditionTrue)),
WithTransform(BindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index cffa9b416..b85605c59 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1068,9 +1068,9 @@ func ScaleIntegration(ns string, name string, replicas int32) error {
})
}
-func Binding(ns string, name string) func() *v1.Binding {
- return func() *v1.Binding {
- klb := v1.NewBinding(ns, name)
+func Binding(ns string, name string) func() *v1.Pipe {
+ return func() *v1.Pipe {
+ klb := v1.NewPipe(ns, name)
key := ctrl.ObjectKey{
Namespace: ns,
Name: name,
@@ -1084,8 +1084,8 @@ func Binding(ns string, name string) func() *v1.Binding {
}
}
-func BindingPhase(ns string, name string) func() v1.BindingPhase {
- return func() v1.BindingPhase {
+func BindingPhase(ns string, name string) func() v1.PipePhase {
+ return func() v1.PipePhase {
klb := Binding(ns, name)()
if klb == nil {
return ""
@@ -1114,8 +1114,8 @@ func BindingStatusReplicas(ns string, name string) func() *int32 {
}
}
-func BindingCondition(ns string, name string, conditionType v1.BindingConditionType) func() *v1.BindingCondition {
- return func() *v1.BindingCondition {
+func BindingCondition(ns string, name string, conditionType v1.PipeConditionType) func() *v1.PipeCondition {
+ return func() *v1.PipeCondition {
kb := Binding(ns, name)()
if kb == nil {
return nil
@@ -1128,28 +1128,28 @@ func BindingCondition(ns string, name string, conditionType v1.BindingConditionT
}
}
-func BindingConditionStatusExtract(c *v1.BindingCondition) corev1.ConditionStatus {
+func BindingConditionStatusExtract(c *v1.PipeCondition) corev1.ConditionStatus {
if c == nil {
return ""
}
return c.Status
}
-func BindingConditionReason(c *v1.BindingCondition) string {
+func BindingConditionReason(c *v1.PipeCondition) string {
if c == nil {
return ""
}
return c.Reason
}
-func BindingConditionMessage(c *v1.BindingCondition) string {
+func BindingConditionMessage(c *v1.PipeCondition) string {
if c == nil {
return ""
}
return c.Message
}
-func BindingConditionStatus(ns string, name string, conditionType v1.BindingConditionType) func() corev1.ConditionStatus {
+func BindingConditionStatus(ns string, name string, conditionType v1.PipeConditionType) func() corev1.ConditionStatus {
return func() corev1.ConditionStatus {
klb := Binding(ns, name)()
if klb == nil {
@@ -1163,7 +1163,7 @@ func BindingConditionStatus(ns string, name string, conditionType v1.BindingCond
}
}
-func UpdateBinding(ns string, name string, upd func(it *v1.Binding)) error {
+func UpdateBinding(ns string, name string, upd func(it *v1.Pipe)) error {
klb := Binding(ns, name)()
if klb == nil {
return fmt.Errorf("noBinding named %s found", name)
@@ -1181,7 +1181,7 @@ func UpdateBinding(ns string, name string, upd func(it *v1.Binding)) error {
}
func ScaleBinding(ns string, name string, replicas int32) error {
- return UpdateBinding(ns, name, func(klb *v1.Binding) {
+ return UpdateBinding(ns, name, func(klb *v1.Pipe) {
klb.Spec.Replicas = &replicas
})
}
@@ -1863,7 +1863,7 @@ func CRDs() func() []metav1.APIResource {
reflect.TypeOf(v1.IntegrationKit{}).Name(),
reflect.TypeOf(v1.IntegrationPlatform{}).Name(),
reflect.TypeOf(v1.Kamelet{}).Name(),
- reflect.TypeOf(v1.Binding{}).Name(),
+ reflect.TypeOf(v1.Pipe{}).Name(),
reflect.TypeOf(v1alpha1.KameletBinding{}).Name(),
}
@@ -2309,9 +2309,9 @@ func BindKameletTo(ns, name string, annotations map[string]string, from, to core
func BindKameletToWithErrorHandler(ns, name string, annotations map[string]string, from, to corev1.ObjectReference,
sourceProperties, sinkProperties map[string]string, errorHandler map[string]interface{}) func() error {
return func() error {
- kb := v1.NewBinding(ns, name)
+ kb := v1.NewPipe(ns, name)
kb.Annotations = annotations
- kb.Spec = v1.BindingSpec{
+ kb.Spec = v1.PipeSpec{
Source: v1.Endpoint{
Ref: &from,
Properties: asEndpointProperties(sourceProperties),
diff --git a/helm/camel-k/crds/crd-binding.yaml b/helm/camel-k/crds/crd-binding.yaml
index a2694d60a..658e8dc7e 100644
--- a/helm/camel-k/crds/crd-binding.yaml
+++ b/helm/camel-k/crds/crd-binding.yaml
@@ -15,8517 +15,3 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- annotations:
- controller-gen.kubebuilder.io/version: v0.6.1
- creationTimestamp: null
- labels:
- app: camel-k
- name: bindings.camel.apache.org
-spec:
- group: camel.apache.org
- names:
- categories:
- - kamel
- - camel
- kind: Binding
- listKind: BindingList
- plural: bindings
- shortNames:
- - bd
- singular: binding
- scope: Namespaced
- versions:
- - additionalPrinterColumns:
- - description: TheBinding phase
- jsonPath: .status.phase
- name: Phase
- type: string
- - description: The number of pods
- jsonPath: .status.replicas
- name: Replicas
- type: integer
- name: v1
- schema:
- openAPIV3Schema:
- description: Binding is the Schema for the kamelets binding API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: the specification of a Binding
- properties:
- errorHandler:
- description: ErrorHandler is an optional handler called upon an error
- occuring in the integration
- type: object
- x-kubernetes-preserve-unknown-fields: true
- integration:
- description: Integration is an optional integration used to specify
- custom parameters
- properties:
- configuration:
- description: 'Deprecated: Use camel trait (camel.properties) to
- manage properties Use mount trait (mount.configs) to manage
- configs Use mount trait (mount.resources) to manage resources
- Use mount trait (mount.volumes) to manage volumes'
- items:
- description: ConfigurationSpec represents a generic configuration
- specification
- properties:
- type:
- description: 'represents the type of configuration, ie:
- property, configmap, secret, ...'
- type: string
- value:
- description: the value to assign to the configuration (syntax
- may vary depending on the `Type`)
- type: string
- required:
- - type
- - value
- type: object
- type: array
- dependencies:
- description: the list of Camel or Maven dependencies required
- by the Integration
- items:
- type: string
- type: array
- flows:
- description: a source in YAML DSL language which contain the routes
- to run
- items:
- description: Flow is an unstructured object representing a Camel
- Flow in YAML/JSON DSL
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: array
- integrationKit:
- description: the reference of the `IntegrationKit` which is used
- for this Integration
- properties:
- apiVersion:
- description: API version of the referent.
- type: string
- fieldPath:
- description: 'If referring to a piece of an object instead
- of an entire object, this string should contain a valid
- JSON/Go field access statement, such as desiredState.manifest.containers[2].
- For example, if the object reference is to a container within
- a pod, this would take on a value like: "spec.containers{name}"
- (where "name" refers to the name of the container that triggered
- the event) or if no container name is specified "spec.containers[2]"
- (container with index 2 in this pod). This syntax is chosen
- only to have some well-defined way of referencing a part
- of an object. TODO: this design is not final and this field
- is subject to change in the future.'
- type: string
- kind:
- description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
- type: string
- namespace:
- description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
- type: string
- resourceVersion:
- description: 'Specific resourceVersion to which this reference
- is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
- type: string
- uid:
- description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
- type: string
- type: object
- profile:
- description: the profile needed to run this Integration
- type: string
- replicas:
- description: the number of `Pods` needed for the running Integration
- format: int32
- type: integer
- repositories:
- description: additional Maven repositories to be used
- items:
- type: string
- type: array
- serviceAccountName:
- description: custom SA to use for the Integration
- type: string
- sources:
- description: the sources which contain the Camel routes to run
- items:
- description: SourceSpec defines the configuration for one or
- more routes to be executed in a certain Camel DSL language
- properties:
- compression:
- description: if the content is compressed (base64 encrypted)
- type: boolean
- content:
- description: the source code (plain text)
- type: string
- contentKey:
- description: the confimap key holding the source content
- type: string
- contentRef:
- description: the confimap reference holding the source content
- type: string
- contentType:
- description: the content type (tipically text or binary)
- type: string
... 12091 lines suppressed ...
[camel-k] 17/18: fix(kamelets): register v1alpha1 binding providers
Posted by pc...@apache.org.
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 247a8296f10356bf3f7b78c890272bfa6db860cd
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Apr 10 14:46:22 2023 +0200
fix(kamelets): register v1alpha1 binding providers
---
addons/register_strimzi.go | 1 +
addons/strimzi/strimzi.go | 103 +++++++++++++
config/crd/bases/camel.apache.org_pipes.yaml | 25 +++-
.../properties-binding.yaml | 2 +-
e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +-
.../camel-k/crds/crd-pipe.yaml | 25 +++-
pkg/cmd/reset.go | 2 +-
pkg/util/bindings/camel_uri.go | 42 ++++++
pkg/util/bindings/catalog.go | 2 +-
pkg/util/bindings/kamelet.go | 146 ++++++++++++++++++
pkg/util/bindings/knative_ref.go | 82 +++++++++++
pkg/util/bindings/knative_uri.go | 77 ++++++++++
pkg/util/bindings/v1alpha1_kamelet.go | 164 ---------------------
script/gen_crd.sh | 2 +-
14 files changed, 492 insertions(+), 183 deletions(-)
diff --git a/addons/register_strimzi.go b/addons/register_strimzi.go
index 4fe8707cf..3d9922f9d 100644
--- a/addons/register_strimzi.go
+++ b/addons/register_strimzi.go
@@ -24,4 +24,5 @@ import (
func init() {
bindings.RegisterBindingProvider(strimzi.BindingProvider{})
+ bindings.V1alpha1RegisterBindingProvider(strimzi.V1alpha1BindingProvider{})
}
diff --git a/addons/strimzi/strimzi.go b/addons/strimzi/strimzi.go
index 4207f191a..e7558da80 100644
--- a/addons/strimzi/strimzi.go
+++ b/addons/strimzi/strimzi.go
@@ -25,6 +25,7 @@ import (
"github.com/apache/camel-k/v2/addons/strimzi/duck/v1beta2"
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/util/bindings"
"github.com/apache/camel-k/v2/pkg/util/uri"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -119,6 +120,108 @@ func (s BindingProvider) getBootstrapServers(ctx bindings.BindingContext, cluste
return "", fmt.Errorf("cluster %q has no listeners of type %q", clusterName, v1beta2.StrimziListenerTypePlain)
}
+// Order --.
func (s BindingProvider) Order() int {
return bindings.OrderStandard
}
+
+// V1alpha1BindingProvider allows to connect to a Kafka topic via Binding.
+// Deprecated.
+type V1alpha1BindingProvider struct {
+ Client internalclientset.Interface
+}
+
+// ID --.
+// Deprecated.
+func (s V1alpha1BindingProvider) ID() string {
+ return "strimzi"
+}
+
+// Translate --.
+// Deprecated.
+func (s V1alpha1BindingProvider) Translate(ctx bindings.V1alpha1BindingContext, _ bindings.V1alpha1EndpointContext, endpoint camelv1alpha1.Endpoint) (*bindings.Binding, error) {
+ if endpoint.Ref == nil {
+ // React only on refs
+ return nil, nil
+ }
+ gv, err := schema.ParseGroupVersion(endpoint.Ref.APIVersion)
+ if err != nil {
+ return nil, err
+ }
+
+ if gv.Group != v1beta2.StrimziGroup || endpoint.Ref.Kind != v1beta2.StrimziKindTopic {
+ // Only operates on Strimzi Topics
+ return nil, nil
+ }
+
+ props, err := endpoint.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+ if props == nil {
+ props = make(map[string]string)
+ }
+
+ if props["brokers"] == "" {
+ // build the client if needed
+ if s.Client == nil {
+ kafkaClient, err := internalclientset.NewForConfig(ctx.Client.GetConfig())
+ if err != nil {
+ return nil, err
+ }
+ s.Client = kafkaClient
+ }
+
+ // look them up
+ topic, err := s.Client.KafkaV1beta2().KafkaTopics(ctx.Namespace).Get(ctx.Ctx, endpoint.Ref.Name, v1.GetOptions{})
+ if err != nil {
+ return nil, err
+ }
+
+ clusterName := topic.Labels[v1beta2.StrimziKafkaClusterLabel]
+ if clusterName == "" {
+ return nil, fmt.Errorf("no %q label defined on topic %s", v1beta2.StrimziKafkaClusterLabel, endpoint.Ref.Name)
+ }
+
+ bootstrapServers, err := s.getBootstrapServers(ctx, clusterName)
+ if err != nil {
+ return nil, err
+ }
+
+ props["brokers"] = bootstrapServers
+ }
+
+ kafkaURI := fmt.Sprintf("kafka:%s", endpoint.Ref.Name)
+ kafkaURI = uri.AppendParameters(kafkaURI, props)
+
+ return &bindings.Binding{
+ URI: kafkaURI,
+ }, nil
+}
+
+// getBootstrapServers --.
+// Deprecated.
+func (s V1alpha1BindingProvider) getBootstrapServers(ctx bindings.V1alpha1BindingContext, clusterName string) (string, error) {
+ cluster, err := s.Client.KafkaV1beta2().Kafkas(ctx.Namespace).Get(ctx.Ctx, clusterName, v1.GetOptions{})
+ if err != nil {
+ return "", err
+ }
+
+ for _, l := range cluster.Status.Listeners {
+ if l.Type == v1beta2.StrimziListenerTypePlain {
+ if l.BootstrapServers == "" {
+ return "", fmt.Errorf("cluster %q has no bootstrap servers in %q listener", clusterName, v1beta2.StrimziListenerTypePlain)
+ }
+
+ return l.BootstrapServers, nil
+ }
+ }
+
+ return "", fmt.Errorf("cluster %q has no listeners of type %q", clusterName, v1beta2.StrimziListenerTypePlain)
+}
+
+// Order --.
+// Deprecated.
+func (s V1alpha1BindingProvider) Order() int {
+ return bindings.OrderStandard
+}
diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/config/crd/bases/camel.apache.org_pipes.yaml
index e9db2996e..a9fb01df8 100644
--- a/config/crd/bases/camel.apache.org_pipes.yaml
+++ b/config/crd/bases/camel.apache.org_pipes.yaml
@@ -1,11 +1,28 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
----
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
+ labels:
+ app: camel-k
name: pipes.camel.apache.org
spec:
group: camel.apache.org
@@ -8512,9 +8529,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: []
- storedVersions: []
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index aa1823da0..f7f9f069e 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -16,7 +16,7 @@
# ---------------------------------------------------------------------------
kind: KameletBinding
-apiVersion: camel.apache.org/v1
+apiVersion: camel.apache.org/v1alpha1
metadata:
name: properties-binding
spec:
diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml b/e2e/yaks/common/knative-sinkbinding/source.yaml
index f37427147..9ec23fa81 100644
--- a/e2e/yaks/common/knative-sinkbinding/source.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/source.yaml
@@ -21,7 +21,7 @@
period: "1000"
steps:
- set-body:
- constant: "Hello SinkKameletBinding !!!"
+ constant: "Hello SinkBinding !!!"
- transform:
simple: "${body.toUpperCase()}"
- to: "log:info"
diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/helm/camel-k/crds/crd-pipe.yaml
similarity index 99%
copy from config/crd/bases/camel.apache.org_pipes.yaml
copy to helm/camel-k/crds/crd-pipe.yaml
index e9db2996e..a9fb01df8 100644
--- a/config/crd/bases/camel.apache.org_pipes.yaml
+++ b/helm/camel-k/crds/crd-pipe.yaml
@@ -1,11 +1,28 @@
+# ---------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ---------------------------------------------------------------------------
----
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
+ labels:
+ app: camel-k
name: pipes.camel.apache.org
spec:
group: camel.apache.org
@@ -8512,9 +8529,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: []
- storedVersions: []
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index 35c9f78a3..8f08dd0ad 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -68,7 +68,7 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
fmt.Fprint(cmd.ErrOrStderr(), err)
return
}
- fmt.Fprintln(cmd.OutOrStdout(), n, "bindings deleted from namespace", o.Namespace)
+ fmt.Fprintln(cmd.OutOrStdout(), n, "pipes deleted from namespace", o.Namespace)
if n, err = o.deleteAllKameletBindings(c); err != nil {
fmt.Fprint(cmd.ErrOrStderr(), err)
diff --git a/pkg/util/bindings/camel_uri.go b/pkg/util/bindings/camel_uri.go
index 9c7cb56bb..8dad742ad 100644
--- a/pkg/util/bindings/camel_uri.go
+++ b/pkg/util/bindings/camel_uri.go
@@ -19,6 +19,7 @@ package bindings
import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/util/uri"
)
@@ -26,10 +27,12 @@ import (
// It's used as fallback if the URI scheme is not known by other providers.
type CamelURIBindingProvider struct{}
+// ID --.
func (k CamelURIBindingProvider) ID() string {
return "camel-uri"
}
+// Translate --.
func (k CamelURIBindingProvider) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1.Endpoint) (*Binding, error) {
if e.URI == nil {
// works only on uris
@@ -48,11 +51,50 @@ func (k CamelURIBindingProvider) Translate(ctx BindingContext, endpointCtx Endpo
}, nil
}
+// Order --.
func (k CamelURIBindingProvider) Order() int {
// Using it as fallback
return OrderLast
}
+// V1alpha1CamelURIBindingProvider --.
+// Deprecated .
+type V1alpha1CamelURIBindingProvider struct{}
+
+// ID --.
+// Deprecated .
+func (k V1alpha1CamelURIBindingProvider) ID() string {
+ return "camel-uri"
+}
+
+// Translate --.
+// Deprecated .
+func (k V1alpha1CamelURIBindingProvider) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+ if e.URI == nil {
+ // works only on uris
+ return nil, nil
+ }
+
+ endpointURI := *e.URI
+ props, err := e.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+ endpointURI = uri.AppendParameters(endpointURI, props)
+
+ return &Binding{
+ URI: endpointURI,
+ }, nil
+}
+
+// Order --
+// Deprecated .
+func (k V1alpha1CamelURIBindingProvider) Order() int {
+ // Using it as fallback
+ return OrderLast
+}
+
func init() {
RegisterBindingProvider(CamelURIBindingProvider{})
+ V1alpha1RegisterBindingProvider(V1alpha1CamelURIBindingProvider{})
}
diff --git a/pkg/util/bindings/catalog.go b/pkg/util/bindings/catalog.go
index a2119bb4b..7cd2552b0 100644
--- a/pkg/util/bindings/catalog.go
+++ b/pkg/util/bindings/catalog.go
@@ -75,7 +75,7 @@ func validateEndpoint(ctx BindingContext, e v1.Endpoint) error {
return errors.New("cannot use both ref and URI to specify an endpoint: only one of them should be used")
}
if e.Ref != nil && e.Ref.Namespace != "" && e.Ref.Namespace != ctx.Namespace {
- return errors.New("cross-namespace references are not allowed in Binding")
+ return errors.New("cross-namespace references are not allowed in Pipe")
}
return nil
}
diff --git a/pkg/util/bindings/kamelet.go b/pkg/util/bindings/kamelet.go
index 71a2c52ee..b25164bee 100644
--- a/pkg/util/bindings/kamelet.go
+++ b/pkg/util/bindings/kamelet.go
@@ -22,6 +22,7 @@ import (
"net/url"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
@@ -33,10 +34,12 @@ const (
// BindingConverter converts a reference to a Kamelet into a Camel URI.
type BindingConverter struct{}
+// ID --.
func (k BindingConverter) ID() string {
return "kamelet"
}
+// Translate --.
func (k BindingConverter) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1.Endpoint) (*Binding, error) {
if e.Ref == nil {
// works only on refs
@@ -130,6 +133,7 @@ func (k BindingConverter) Translate(ctx BindingContext, endpointCtx EndpointCont
return nil, nil
}
+// DataTypeStep --.
func (k BindingConverter) DataTypeStep(e v1.Endpoint, id string, typeSlot v1.TypeSlot) (map[string]interface{}, map[string]string) {
if e.DataTypes == nil {
return nil, nil
@@ -157,10 +161,152 @@ func (k BindingConverter) DataTypeStep(e v1.Endpoint, id string, typeSlot v1.Typ
return nil, nil
}
+// Order --.
func (k BindingConverter) Order() int {
return OrderStandard
}
+// V1alpha1BindingConverter converts a reference to a Kamelet into a Camel URI.
+// Deprecated.
+type V1alpha1BindingConverter struct{}
+
+// ID -- .
+// Deprecated.
+func (k V1alpha1BindingConverter) ID() string {
+ return "kamelet"
+}
+
+// Translate -- .
+// Deprecated.
+func (k V1alpha1BindingConverter) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+ if e.Ref == nil {
+ // works only on refs
+ return nil, nil
+ }
+ gv, err := schema.ParseGroupVersion(e.Ref.APIVersion)
+ if err != nil {
+ return nil, err
+ }
+ // it translates only Kamelet refs
+ if e.Ref.Kind == v1.KameletKind && gv.Group == v1.SchemeGroupVersion.Group {
+ kameletName := url.PathEscape(e.Ref.Name)
+
+ props, err := e.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+
+ id, idPresent := props[v1.KameletIDProperty]
+ if idPresent {
+ delete(props, v1.KameletIDProperty)
+ } else {
+ id = endpointCtx.GenerateID()
+ }
+
+ binding := Binding{}
+ binding.ApplicationProperties = make(map[string]string)
+ for k, v := range props {
+ propKey := fmt.Sprintf("camel.kamelet.%s.%s.%s", kameletName, id, k)
+ binding.ApplicationProperties[propKey] = v
+ }
+
+ switch endpointCtx.Type {
+ case v1alpha1.EndpointTypeAction:
+ steps := make([]map[string]interface{}, 0)
+
+ if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
+ steps = append(steps, in)
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ steps = append(steps, map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": fmt.Sprintf("%s/%s", kameletName, url.PathEscape(id)),
+ },
+ })
+
+ if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
+ steps = append(steps, out)
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ if len(steps) > 1 {
+ binding.Step = map[string]interface{}{
+ "pipeline": map[string]interface{}{
+ "id": fmt.Sprintf("%s-pipeline", id),
+ "steps": steps,
+ },
+ }
+ } else {
+ binding.Step = steps[0]
+ }
+ case v1alpha1.EndpointTypeSource:
+ if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
+ binding.Step = out
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ case v1alpha1.EndpointTypeSink:
+ if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
+ binding.Step = in
+ for k, v := range applicationProperties {
+ binding.ApplicationProperties[k] = v
+ }
+ }
+
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ default:
+ binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
+ }
+
+ return &binding, nil
+ }
+ return nil, nil
+}
+
+// DataTypeStep -- .
+// Deprecated.
+func (k V1alpha1BindingConverter) DataTypeStep(e v1alpha1.Endpoint, id string, typeSlot v1alpha1.TypeSlot) (map[string]interface{}, map[string]string) {
+ if e.DataTypes == nil {
+ return nil, nil
+ }
+
+ if inDataType, ok := e.DataTypes[typeSlot]; ok {
+ scheme := "camel"
+ if inDataType.Scheme != "" {
+ scheme = inDataType.Scheme
+ }
+
+ props := make(map[string]string, 2)
+ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.scheme", datTypeActionKamelet, id, typeSlot)] = scheme
+ props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format", datTypeActionKamelet, id, typeSlot)] = inDataType.Format
+
+ stepDsl := map[string]interface{}{
+ "kamelet": map[string]interface{}{
+ "name": fmt.Sprintf("%s/%s-%s", datTypeActionKamelet, url.PathEscape(id), typeSlot),
+ },
+ }
+
+ return stepDsl, props
+ }
+
+ return nil, nil
+}
+
+// Order -- .
+// Deprecated.
+func (k V1alpha1BindingConverter) Order() int {
+ return OrderStandard
+}
+
func init() {
RegisterBindingProvider(BindingConverter{})
+ V1alpha1RegisterBindingProvider(V1alpha1BindingConverter{})
}
diff --git a/pkg/util/bindings/knative_ref.go b/pkg/util/bindings/knative_ref.go
index f835c0ede..2859692a4 100644
--- a/pkg/util/bindings/knative_ref.go
+++ b/pkg/util/bindings/knative_ref.go
@@ -24,6 +24,7 @@ import (
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
knativeapis "github.com/apache/camel-k/v2/pkg/apis/camel/v1/knative"
+ v1alpha1 "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"
@@ -33,10 +34,12 @@ import (
// It's used as fallback if no other providers can decode the object reference.
type KnativeRefBindingProvider struct{}
+// ID --.
func (k KnativeRefBindingProvider) ID() string {
return "knative-ref"
}
+// Translate --.
func (k KnativeRefBindingProvider) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1.Endpoint) (*Binding, error) {
if e.Ref == nil {
// works only on refs
@@ -94,11 +97,90 @@ func (k KnativeRefBindingProvider) Translate(ctx BindingContext, endpointCtx End
}, nil
}
+// Order --.
func (k KnativeRefBindingProvider) Order() int {
// Executes as last, as it can be used as fallback for all unknown object references
return OrderLast
}
+// V1alpha1KnativeRefBindingProvider converts a reference to a Kubernetes object into a Camel URI.
+// It's used as fallback if no other providers can decode the object reference.
+// Deprecated.
+type V1alpha1KnativeRefBindingProvider struct{}
+
+// ID --.
+// Deprecated.
+func (k V1alpha1KnativeRefBindingProvider) ID() string {
+ return "knative-ref"
+}
+
+// Translate --.
+// Deprecated.
+func (k V1alpha1KnativeRefBindingProvider) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+ if e.Ref == nil {
+ // works only on refs
+ return nil, nil
+ }
+
+ serviceType, err := knative.GetServiceType(*e.Ref)
+ if err != nil {
+ return nil, err
+ }
+
+ if serviceType == nil {
+ endpointType := knativeapis.CamelServiceTypeEndpoint
+ serviceType = &endpointType
+ }
+
+ props, err := e.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+ if props == nil {
+ props = make(map[string]string)
+ }
+ if props["apiVersion"] == "" {
+ props["apiVersion"] = e.Ref.APIVersion
+ }
+ if props["kind"] == "" {
+ props["kind"] = e.Ref.Kind
+ }
+
+ var serviceURI string
+ if *serviceType == knativeapis.CamelServiceTypeEvent {
+ if props["name"] == "" {
+ props["name"] = e.Ref.Name
+ }
+ if eventType, ok := props["type"]; ok {
+ // consume prop
+ delete(props, "type")
+ 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/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`)
+ }
+ }
+ } else {
+ serviceURI = fmt.Sprintf("knative:%s/%s", *serviceType, url.PathEscape(e.Ref.Name))
+ }
+
+ serviceURI = uri.AppendParameters(serviceURI, props)
+ return &Binding{
+ URI: serviceURI,
+ }, nil
+}
+
+// Order --.
+// Deprecated.
+func (k V1alpha1KnativeRefBindingProvider) Order() int {
+ // Executes as last, as it can be used as fallback for all unknown object references
+ return OrderLast
+}
+
func init() {
RegisterBindingProvider(KnativeRefBindingProvider{})
+ V1alpha1RegisterBindingProvider(V1alpha1KnativeRefBindingProvider{})
}
diff --git a/pkg/util/bindings/knative_uri.go b/pkg/util/bindings/knative_uri.go
index 0621d2b8b..728dad28e 100644
--- a/pkg/util/bindings/knative_uri.go
+++ b/pkg/util/bindings/knative_uri.go
@@ -26,6 +26,7 @@ import (
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"
+ v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/v2/pkg/util/uri"
)
@@ -33,10 +34,12 @@ import (
// KnativeURIBindingProvider converts a HTTP/HTTPS URI into a Camel Knative endpoint (to call it via CloudEvents).
type KnativeURIBindingProvider struct{}
+// ID --.
func (k KnativeURIBindingProvider) ID() string {
return "knative-uri"
}
+// Translate --.
func (k KnativeURIBindingProvider) Translate(ctx BindingContext, endpointCtx EndpointContext, e v1.Endpoint) (*Binding, error) {
if e.URI == nil {
// works only on uris
@@ -92,10 +95,84 @@ func (k KnativeURIBindingProvider) Translate(ctx BindingContext, endpointCtx End
}, nil
}
+// Order --.
func (k KnativeURIBindingProvider) Order() int {
return OrderStandard
}
+// V1alpha1KnativeURIBindingProvider converts a HTTP/HTTPS URI into a Camel Knative endpoint (to call it via CloudEvents).
+type V1alpha1KnativeURIBindingProvider struct{}
+
+// ID --.
+// Deprecated.
+func (k V1alpha1KnativeURIBindingProvider) ID() string {
+ return "knative-uri"
+}
+
+// Translate --.
+// Deprecated.
+func (k V1alpha1KnativeURIBindingProvider) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
+ if e.URI == nil {
+ // works only on uris
+ return nil, nil
+ }
+ if ctx.Profile != v1.TraitProfileKnative {
+ // use cloudevent binding only in Knative trait profile
+ return nil, nil
+ }
+ if !strings.HasPrefix(*e.URI, "http:") && !strings.HasPrefix(*e.URI, "https:") {
+ // only translates http/https uri to Knative calls
+ return nil, nil
+ }
+ if endpointCtx.Type == v1alpha1.EndpointTypeSource {
+ // HTTP/HTTPS uri are translated to Knative endpoints only when used as sinks
+ return nil, nil
+ }
+
+ originalURI, err := url.Parse(*e.URI)
+ if err != nil {
+ return nil, err
+ }
+ env := knativeapis.NewCamelEnvironment()
+ svc, err := knativeapis.BuildCamelServiceDefinition("sink",
+ knativeapis.CamelEndpointKindSink,
+ knativeapis.CamelServiceTypeEndpoint,
+ *originalURI, "", "")
+ if err != nil {
+ return nil, err
+ }
+ env.Services = append(env.Services, svc)
+ config, err := env.Serialize()
+ if err != nil {
+ return nil, err
+ }
+
+ // Rewrite URI to match the service definition
+ serviceURI := "knative:endpoint/sink"
+ props, err := e.Properties.GetPropertyMap()
+ if err != nil {
+ return nil, err
+ }
+ serviceURI = uri.AppendParameters(serviceURI, props)
+
+ return &Binding{
+ URI: serviceURI,
+ Traits: v1.Traits{
+ Knative: &traitv1.KnativeTrait{
+ Configuration: config,
+ SinkBinding: pointer.Bool(false),
+ },
+ },
+ }, nil
+}
+
+// Order --.
+// Deprecated.
+func (k V1alpha1KnativeURIBindingProvider) Order() int {
+ return OrderStandard
+}
+
func init() {
RegisterBindingProvider(KnativeURIBindingProvider{})
+ V1alpha1RegisterBindingProvider(V1alpha1KnativeURIBindingProvider{})
}
diff --git a/pkg/util/bindings/v1alpha1_kamelet.go b/pkg/util/bindings/v1alpha1_kamelet.go
deleted file mode 100644
index 30734fc7b..000000000
--- a/pkg/util/bindings/v1alpha1_kamelet.go
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package bindings
-
-import (
- "fmt"
- "net/url"
-
- v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
- v1alpha1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1alpha1"
-
- "k8s.io/apimachinery/pkg/runtime/schema"
-)
-
-// V1alpha1BindingConverter converts a reference to a Kamelet into a Camel URI.
-// Deprecated.
-type V1alpha1BindingConverter struct{}
-
-func (k V1alpha1BindingConverter) ID() string {
- return "kamelet"
-}
-
-func (k V1alpha1BindingConverter) Translate(ctx V1alpha1BindingContext, endpointCtx V1alpha1EndpointContext, e v1alpha1.Endpoint) (*Binding, error) {
- if e.Ref == nil {
- // works only on refs
- return nil, nil
- }
- gv, err := schema.ParseGroupVersion(e.Ref.APIVersion)
- if err != nil {
- return nil, err
- }
- // it translates only Kamelet refs
- if e.Ref.Kind == v1.KameletKind && gv.Group == v1.SchemeGroupVersion.Group {
- kameletName := url.PathEscape(e.Ref.Name)
-
- props, err := e.Properties.GetPropertyMap()
- if err != nil {
- return nil, err
- }
-
- id, idPresent := props[v1.KameletIDProperty]
- if idPresent {
- delete(props, v1.KameletIDProperty)
- } else {
- id = endpointCtx.GenerateID()
- }
-
- binding := Binding{}
- binding.ApplicationProperties = make(map[string]string)
- for k, v := range props {
- propKey := fmt.Sprintf("camel.kamelet.%s.%s.%s", kameletName, id, k)
- binding.ApplicationProperties[propKey] = v
- }
-
- switch endpointCtx.Type {
- case v1alpha1.EndpointTypeAction:
- steps := make([]map[string]interface{}, 0)
-
- if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
- steps = append(steps, in)
- for k, v := range applicationProperties {
- binding.ApplicationProperties[k] = v
- }
- }
-
- steps = append(steps, map[string]interface{}{
- "kamelet": map[string]interface{}{
- "name": fmt.Sprintf("%s/%s", kameletName, url.PathEscape(id)),
- },
- })
-
- if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
- steps = append(steps, out)
- for k, v := range applicationProperties {
- binding.ApplicationProperties[k] = v
- }
- }
-
- if len(steps) > 1 {
- binding.Step = map[string]interface{}{
- "pipeline": map[string]interface{}{
- "id": fmt.Sprintf("%s-pipeline", id),
- "steps": steps,
- },
- }
- } else {
- binding.Step = steps[0]
- }
- case v1alpha1.EndpointTypeSource:
- if out, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotOut); out != nil {
- binding.Step = out
- for k, v := range applicationProperties {
- binding.ApplicationProperties[k] = v
- }
- }
-
- binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
- case v1alpha1.EndpointTypeSink:
- if in, applicationProperties := k.DataTypeStep(e, id, v1alpha1.TypeSlotIn); in != nil {
- binding.Step = in
- for k, v := range applicationProperties {
- binding.ApplicationProperties[k] = v
- }
- }
-
- binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
- default:
- binding.URI = fmt.Sprintf("kamelet:%s/%s", kameletName, url.PathEscape(id))
- }
-
- return &binding, nil
- }
- return nil, nil
-}
-
-func (k V1alpha1BindingConverter) DataTypeStep(e v1alpha1.Endpoint, id string, typeSlot v1alpha1.TypeSlot) (map[string]interface{}, map[string]string) {
- if e.DataTypes == nil {
- return nil, nil
- }
-
- if inDataType, ok := e.DataTypes[typeSlot]; ok {
- scheme := "camel"
- if inDataType.Scheme != "" {
- scheme = inDataType.Scheme
- }
-
- props := make(map[string]string, 2)
- props[fmt.Sprintf("camel.kamelet.%s.%s-%s.scheme", datTypeActionKamelet, id, typeSlot)] = scheme
- props[fmt.Sprintf("camel.kamelet.%s.%s-%s.format", datTypeActionKamelet, id, typeSlot)] = inDataType.Format
-
- stepDsl := map[string]interface{}{
- "kamelet": map[string]interface{}{
- "name": fmt.Sprintf("%s/%s-%s", datTypeActionKamelet, url.PathEscape(id), typeSlot),
- },
- }
-
- return stepDsl, props
- }
-
- return nil, nil
-}
-
-func (k V1alpha1BindingConverter) Order() int {
- return OrderStandard
-}
-
-func init() {
- V1alpha1RegisterBindingProvider(V1alpha1BindingConverter{})
-}
diff --git a/script/gen_crd.sh b/script/gen_crd.sh
index aa2c70787..0cbffbaae 100755
--- a/script/gen_crd.sh
+++ b/script/gen_crd.sh
@@ -69,4 +69,4 @@ deploy_crd integration-kit integrationkits
deploy_crd integration-platform integrationplatforms
deploy_crd kamelet kamelets
deploy_crd kamelet-binding kameletbindings
-deploy_crd binding bindings
\ No newline at end of file
+deploy_crd pipe pipes
\ No newline at end of file
[camel-k] 10/18: chore(cmd): rebuild replaces Bindings
Posted by pc...@apache.org.
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 cb2758bcc5d08c0bb1eb3dda1930c60fab51a749
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Apr 3 09:58:14 2023 +0200
chore(cmd): rebuild replaces Bindings
---
pkg/cmd/rebuild.go | 91 +++++++++++++++++++++++++++++++++++++++++++++++--
pkg/cmd/rebuild_test.go | 62 +++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+), 2 deletions(-)
diff --git a/pkg/cmd/rebuild.go b/pkg/cmd/rebuild.go
index 8d30feb8d..f4505bf39 100644
--- a/pkg/cmd/rebuild.go
+++ b/pkg/cmd/rebuild.go
@@ -22,11 +22,14 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
+ "k8s.io/apimachinery/pkg/labels"
+ "k8s.io/apimachinery/pkg/selection"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
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"
)
func newCmdRebuild(rootCmdOptions *RootCmdOptions) (*cobra.Command, *rebuildCmdOptions) {
@@ -68,11 +71,80 @@ func (o *rebuildCmdOptions) validate(args []string) error {
}
func (o *rebuildCmdOptions) run(cmd *cobra.Command, args []string) error {
+ errKlbs := o.rebuildBindingType(cmd, args)
+ errIts := o.rebuildIntegrationType(cmd, args)
+
+ if errIts != nil && errKlbs != nil {
+ return errors.Wrap(errIts, errKlbs.Error())
+ }
+
+ return nil
+}
+
+func (o *rebuildCmdOptions) rebuildBindingType(cmd *cobra.Command, args []string) error {
c, err := o.GetCmdClient()
if err != nil {
return err
}
+ var bindings []v1.Binding
+ if o.RebuildAll {
+ if bindings, err = o.listAllBindings(c); err != nil {
+ return err
+ }
+ } else if len(args) > 0 {
+ if bindings, err = o.getBindings(c, args); err != nil {
+ return err
+ }
+ }
+
+ if err = o.rebuildBindings(c, bindings); err != nil {
+ return err
+ }
+
+ fmt.Fprintln(cmd.OutOrStdout(), len(bindings), "bindings have been rebuilt")
+ return nil
+}
+
+func (o *rebuildCmdOptions) listAllBindings(c client.Client) ([]v1.Binding, error) {
+ list := v1.NewBindingList()
+ if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
+ return nil, errors.Wrap(err, fmt.Sprintf("could not retrieve bindings from namespace %s", o.Namespace))
+ }
+ return list.Items, nil
+}
+func (o *rebuildCmdOptions) getBindings(c client.Client, names []string) ([]v1.Binding, error) {
+ klbs := make([]v1.Binding, 0, len(names))
+ for _, n := range names {
+ klb := v1.NewBinding(o.Namespace, n)
+ key := k8sclient.ObjectKey{
+ Name: n,
+ Namespace: o.Namespace,
+ }
+ if err := c.Get(o.Context, key, &klb); err != nil {
+ return nil, errors.Wrap(err, fmt.Sprintf("could not find binding %s in namespace %s", klb.Name, o.Namespace))
+ }
+ klbs = append(klbs, klb)
+ }
+ return klbs, nil
+}
+
+func (o *rebuildCmdOptions) rebuildBindings(c k8sclient.StatusClient, bindings []v1.Binding) error {
+ for _, i := range bindings {
+ klb := i
+ klb.Status = v1.BindingStatus{}
+ if err := c.Status().Update(o.Context, &klb); err != nil {
+ return errors.Wrap(err, fmt.Sprintf("could not rebuild binding %s in namespace %s", klb.Name, o.Namespace))
+ }
+ }
+ return nil
+}
+
+func (o *rebuildCmdOptions) rebuildIntegrationType(cmd *cobra.Command, args []string) error {
+ c, err := o.GetCmdClient()
+ if err != nil {
+ return err
+ }
var integrations []v1.Integration
if o.RebuildAll {
if integrations, err = o.listAllIntegrations(c); err != nil {
@@ -94,7 +166,19 @@ func (o *rebuildCmdOptions) run(cmd *cobra.Command, args []string) error {
func (o *rebuildCmdOptions) listAllIntegrations(c client.Client) ([]v1.Integration, error) {
list := v1.NewIntegrationList()
- if err := c.List(o.Context, &list, k8sclient.InNamespace(o.Namespace)); err != nil {
+ // Integrations controlled by Bindings are not included
+ excludeItsFromKlbs, err := labels.NewRequirement(kubernetes.CamelCreatorLabelKind, selection.NotEquals, []string{
+ "Binding",
+ })
+ if err != nil {
+ return list.Items, err
+ }
+ if err := c.List(o.Context, &list,
+ k8sclient.InNamespace(o.Namespace),
+ k8sclient.MatchingLabelsSelector{
+ Selector: labels.NewSelector().Add(*excludeItsFromKlbs),
+ },
+ ); err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not retrieve integrations from namespace %s", o.Namespace))
}
return list.Items, nil
@@ -111,7 +195,10 @@ func (o *rebuildCmdOptions) getIntegrations(c client.Client, names []string) ([]
if err := c.Get(o.Context, key, &it); err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not find integration %s in namespace %s", it.Name, o.Namespace))
}
- ints = append(ints, it)
+ // Integrations controlled by Bindings are not included
+ if it.Labels[kubernetes.CamelCreatorLabelKind] != "Binding" {
+ ints = append(ints, it)
+ }
}
return ints, nil
}
diff --git a/pkg/cmd/rebuild_test.go b/pkg/cmd/rebuild_test.go
index 021c1cf6b..4b7ac33c5 100644
--- a/pkg/cmd/rebuild_test.go
+++ b/pkg/cmd/rebuild_test.go
@@ -20,6 +20,7 @@ package cmd
import (
"testing"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/test"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
@@ -64,3 +65,64 @@ func TestRebuildAllFlag(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, true, rebuildCmdOptions.RebuildAll)
}
+
+func TestRebuildAllBindingsAndIntegrations(t *testing.T) {
+ defaultIntegration := nominalIntegration("my-it-test")
+ defaultKB := nominalBinding("my-kb-test-rebuild")
+ itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
+ itGeneratedByKlb.Labels = map[string]string{
+ kubernetes.CamelCreatorLabelKind: "Binding",
+ }
+
+ _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
+ output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "--all")
+ assert.Nil(t, err)
+ assert.Contains(t, output, "1 bindings have been rebuilt")
+ assert.Contains(t, output, "1 integrations have been rebuilt")
+}
+
+func TestRebuildNone(t *testing.T) {
+ defaultIntegration := nominalIntegration("my-it-test")
+ defaultKB := nominalBinding("my-kb-test-rebuild")
+ itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
+ itGeneratedByKlb.Labels = map[string]string{
+ kubernetes.CamelCreatorLabelKind: "Binding",
+ }
+
+ _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
+ output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-missing")
+ assert.NotNil(t, err)
+ assert.NotContains(t, output, "have been rebuilt")
+ assert.Contains(t, output, "could not find binding my-missing in namespace default")
+ assert.Contains(t, output, "could not find integration my-missing in namespace default")
+}
+
+func TestRebuildBindingOnly(t *testing.T) {
+ defaultIntegration := nominalIntegration("my-it-test")
+ defaultKB := nominalBinding("my-kb-test-rebuild")
+ itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
+ itGeneratedByKlb.Labels = map[string]string{
+ kubernetes.CamelCreatorLabelKind: "Binding",
+ }
+
+ _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
+ output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-kb-test-rebuild")
+ assert.Nil(t, err)
+ assert.Contains(t, output, "1 bindings have been rebuilt")
+ assert.NotContains(t, output, "1 integrations have been rebuilt")
+}
+
+func TestRebuildIntegrationOnly(t *testing.T) {
+ defaultIntegration := nominalIntegration("my-it-test")
+ defaultKB := nominalBinding("my-kb-test-rebuild")
+ itGeneratedByKlb := nominalIntegration("my-kb-test-rebuild")
+ itGeneratedByKlb.Labels = map[string]string{
+ kubernetes.CamelCreatorLabelKind: "Binding",
+ }
+
+ _, rebuildCmd, _ := initializeRebuildOptions(t, &defaultIntegration, &defaultKB, &itGeneratedByKlb)
+ output, err := test.ExecuteCommand(rebuildCmd, cmdRebuild, "my-it-test")
+ assert.Nil(t, err)
+ assert.NotContains(t, output, "1 bindings have been rebuilt")
+ assert.Contains(t, output, "1 integrations have been rebuilt")
+}
[camel-k] 12/18: chore(e2e): crds number is 8 now
Posted by pc...@apache.org.
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 f6806a8fb03c70cda3a39f188cc70cf2831645a5
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Apr 4 09:42:37 2023 +0200
chore(e2e): crds number is 8 now
---
e2e/install/kustomize/common.go | 5 +++--
e2e/install/kustomize/setup_test.go | 3 +++
e2e/install/kustomize/uninstall_test.go | 4 ++++
e2e/support/test_support.go | 4 +++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/e2e/install/kustomize/common.go b/e2e/install/kustomize/common.go
index 12b542b04..6a9064b66 100644
--- a/e2e/install/kustomize/common.go
+++ b/e2e/install/kustomize/common.go
@@ -36,8 +36,9 @@ import (
const (
// v1.Build, v1.Integration
// v1.IntegrationKit, v1.IntegrationPlatform
- // v1.Kamelet, v1.Binding
- ExpectedCRDs = 6
+ // v1.Kamelet, v1.Binding,
+ // v1alpha1.Kamelet, v1alpha1.KameletBinding
+ ExpectedCRDs = 8
// camel-k-operator, camel-k-operator-events,
// camel-k-operator-knative, camel-k-operator-leases,
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index 7dc0a61f8..429f516e7 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -33,11 +33,13 @@ import (
)
func TestSetupKustomizeBasic(t *testing.T) {
+ RegisterTestingT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
UninstallAll()
+ Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
defer Cleanup()
@@ -69,6 +71,7 @@ func TestSetupKustomizeGlobal(t *testing.T) {
// Ensure no CRDs are already installed
UninstallAll()
+ Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
defer Cleanup()
diff --git a/e2e/install/kustomize/uninstall_test.go b/e2e/install/kustomize/uninstall_test.go
index 39c800976..efbef85ed 100644
--- a/e2e/install/kustomize/uninstall_test.go
+++ b/e2e/install/kustomize/uninstall_test.go
@@ -35,11 +35,13 @@ import (
)
func TestKustomizeUninstallBasic(t *testing.T) {
+ RegisterTestingT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
UninstallAll()
+ Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
defer Cleanup()
@@ -77,11 +79,13 @@ func TestKustomizeUninstallBasic(t *testing.T) {
}
func TestUninstallGlobal(t *testing.T) {
+ RegisterTestingT(t)
makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
UninstallAll()
+ Eventually(CRDs()).Should(HaveLen(0))
// Return the cluster to previous state
defer Cleanup()
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index a10a89cd5..cffa9b416 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -73,6 +73,7 @@ import (
"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"
+ v1alpha1 "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"
@@ -1863,9 +1864,10 @@ func CRDs() func() []metav1.APIResource {
reflect.TypeOf(v1.IntegrationPlatform{}).Name(),
reflect.TypeOf(v1.Kamelet{}).Name(),
reflect.TypeOf(v1.Binding{}).Name(),
+ reflect.TypeOf(v1alpha1.KameletBinding{}).Name(),
}
- versions := []string{"v1", "v1"}
+ versions := []string{"v1", "v1alpha1"}
present := []metav1.APIResource{}
for _, version := range versions {
[camel-k] 07/18: chore: add deprecated notice
Posted by pc...@apache.org.
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 4573f37876456836a2c8e9cbe8531c1685c80d0f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Mar 29 11:35:17 2023 +0200
chore: add deprecated notice
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 2 ++
config/crd/bases/camel.apache.org_kamelets.yaml | 2 ++
helm/camel-k/crds/crd-kamelet-binding.yaml | 2 ++
helm/camel-k/crds/crd-kamelet.yaml | 2 ++
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 1 +
pkg/apis/camel/v1alpha1/kamelet_types.go | 1 +
6 files changed, 10 insertions(+)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index bbec3c111..ede33f2ba 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -47,6 +47,8 @@ spec:
jsonPath: .status.replicas
name: Replicas
type: integer
+ deprecated: true
+ deprecationWarning: v1apha1 is deprecated, please, use v1 instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index 9eae88378..223b9b01d 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -750,6 +750,8 @@ spec:
jsonPath: .status.phase
name: Phase
type: string
+ deprecated: true
+ deprecationWarning: v1apha1 is deprecated, please, use v1 instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index bbec3c111..ede33f2ba 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -47,6 +47,8 @@ spec:
jsonPath: .status.replicas
name: Replicas
type: integer
+ deprecated: true
+ deprecationWarning: v1apha1 is deprecated, please, use v1 instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index 9eae88378..223b9b01d 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -750,6 +750,8 @@ spec:
jsonPath: .status.phase
name: Phase
type: string
+ deprecated: true
+ deprecationWarning: v1apha1 is deprecated, please, use v1 instead
name: v1alpha1
schema:
openAPIV3Schema:
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index 4659505a4..c529abf06 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -27,6 +27,7 @@ import (
)
// +genclient
+// +kubebuilder:deprecatedversion:warning="v1apha1 is deprecated, please, use v1 instead"
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index 0dba0c9ab..ec4c0a6b7 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -54,6 +54,7 @@ var (
)
// +genclient
+// +kubebuilder:deprecatedversion:warning="v1apha1 is deprecated, please, use v1 instead"
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=kamelets,scope=Namespaced,shortName=kl,categories=kamel;camel
// +kubebuilder:subresource:status