diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index edb8c14087..5f01f2a31f 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -6377,6 +6377,8 @@ string The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration Platform. +You can use a fixed version (for example "3.2.3") or a semantic version (for example "3.x") which will try to resolve +to the best matching Catalog existing on the cluster. |`properties` + []string diff --git a/docs/modules/traits/pages/camel.adoc b/docs/modules/traits/pages/camel.adoc index 3c7a29e364..627fd79a10 100755 --- a/docs/modules/traits/pages/camel.adoc +++ b/docs/modules/traits/pages/camel.adoc @@ -30,6 +30,8 @@ The following configuration options are available: | camel.runtime-version | string | The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration Platform. +You can use a fixed version (for example "3.2.3") or a semantic version (for example "3.x") which will try to resolve +to the best matching Catalog existing on the cluster. | camel.properties | []string diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml index 1d5bfb5378..31c285d645 100644 --- a/helm/camel-k/crds/crd-integration-kit.yaml +++ b/helm/camel-k/crds/crd-integration-kit.yaml @@ -355,7 +355,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object quarkus: diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index c66c8dd5fb..ef486bbb9c 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -671,7 +671,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: @@ -2573,7 +2576,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/helm/camel-k/crds/crd-integration-profile.yaml b/helm/camel-k/crds/crd-integration-profile.yaml index 21e0c93340..74d42a2d8a 100644 --- a/helm/camel-k/crds/crd-integration-profile.yaml +++ b/helm/camel-k/crds/crd-integration-profile.yaml @@ -547,7 +547,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: @@ -2332,7 +2335,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 48c5885ed3..f237421a6a 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -6566,7 +6566,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index d856f765f8..fec7f67d30 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -6851,7 +6851,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in - the Integration Platform. + the Integration Platform. You can use a fixed version + (for example "3.2.3") or a semantic version (for example + "3.x") which will try to resolve to the best matching + Catalog existing on the cluster. type: string type: object container: diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml index 860e4c44bc..29c53dfa1a 100644 --- a/helm/camel-k/crds/crd-pipe.yaml +++ b/helm/camel-k/crds/crd-pipe.yaml @@ -6849,7 +6849,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in - the Integration Platform. + the Integration Platform. You can use a fixed version + (for example "3.2.3") or a semantic version (for example + "3.x") which will try to resolve to the best matching + Catalog existing on the cluster. type: string type: object container: diff --git a/pkg/apis/camel/v1/trait/camel.go b/pkg/apis/camel/v1/trait/camel.go index 348ff56ea6..97603d359d 100644 --- a/pkg/apis/camel/v1/trait/camel.go +++ b/pkg/apis/camel/v1/trait/camel.go @@ -23,6 +23,8 @@ package trait type CamelTrait struct { PlatformBaseTrait `property:",squash" json:",inline"` // The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration Platform. + // You can use a fixed version (for example "3.2.3") or a semantic version (for example "3.x") which will try to resolve + // to the best matching Catalog existing on the cluster. RuntimeVersion string `property:"runtime-version" json:"runtimeVersion,omitempty"` // A list of properties to be provided to the Integration runtime Properties []string `property:"properties" json:"properties,omitempty"` diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml index 1d5bfb5378..31c285d645 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -355,7 +355,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object quarkus: diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml index c66c8dd5fb..ef486bbb9c 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -671,7 +671,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: @@ -2573,7 +2576,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml index 21e0c93340..74d42a2d8a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -547,7 +547,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: @@ -2332,7 +2335,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml index 48c5885ed3..f237421a6a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -6566,7 +6566,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in the Integration - Platform. + Platform. You can use a fixed version (for example "3.2.3") + or a semantic version (for example "3.x") which will try + to resolve to the best matching Catalog existing on the + cluster. type: string type: object container: diff --git a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml index d856f765f8..fec7f67d30 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -6851,7 +6851,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in - the Integration Platform. + the Integration Platform. You can use a fixed version + (for example "3.2.3") or a semantic version (for example + "3.x") which will try to resolve to the best matching + Catalog existing on the cluster. type: string type: object container: diff --git a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml index 860e4c44bc..29c53dfa1a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -6849,7 +6849,10 @@ spec: runtimeVersion: description: The camel-k-runtime version to use for the integration. It overrides the default version set in - the Integration Platform. + the Integration Platform. You can use a fixed version + (for example "3.2.3") or a semantic version (for example + "3.x") which will try to resolve to the best matching + Catalog existing on the cluster. type: string type: object container: