Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling #6029

Merged
merged 1 commit into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2545,7 +2545,7 @@ the container image as identified in the container registry
|


a list of Camel dependecies used by this kit
a list of Camel dependencies used by this kit

|`profile` +
*xref:#_camel_apache_org_v1_TraitProfile[TraitProfile]*
Expand Down Expand Up @@ -6725,7 +6725,7 @@ require to be activated at specific hours of the day or with a periodic delay of
For such tasks, the cron trait can materialize the integration as a Kubernetes CronJob instead of a standard deployment,
in order to save resources when the integration does not need to be executed.

Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instanciating a Kubernetes CronJob.
Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instantiating a Kubernetes CronJob.

WARNING: In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait, the component can't be customized.

Expand Down Expand Up @@ -9081,4 +9081,4 @@ Legacy trait configuration parameters.
Deprecated: for backward compatibility.


|===
|===
2 changes: 1 addition & 1 deletion docs/modules/traits/pages/cron.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require to be activated at specific hours of the day or with a periodic delay of
For such tasks, the cron trait can materialize the integration as a Kubernetes CronJob instead of a standard deployment,
in order to save resources when the integration does not need to be executed.

Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instanciating a Kubernetes CronJob.
Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instantiating a Kubernetes CronJob.

WARNING: In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait, the component can't be customized.

Expand Down
2 changes: 1 addition & 1 deletion helm/camel-k/crds/camel-k-crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2784,7 +2784,7 @@ spec:
type: object
type: array
dependencies:
description: a list of Camel dependecies used by this kit
description: a list of Camel dependencies used by this kit
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1/build_type_support_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func TestMatchingBuildsSchedulingSameDependenciesSameRuntime(t *testing.T) {
assert.Equal(t, buildA.Name, buildMatch.Name)
}

func TestMatchingBuildsSchedulingMutipleSubsets(t *testing.T) {
func TestMatchingBuildsSchedulingMultipleSubsets(t *testing.T) {
timestamp, _ := time.Parse("2006-01-02T15:04:05-0700", "2024-08-09T10:00:00Z")
creationTimestamp := v1.Time{Time: timestamp}
buildA := Build{
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1/integrationkit_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type IntegrationKit struct {
type IntegrationKitSpec struct {
// the container image as identified in the container registry
Image string `json:"image,omitempty"`
// a list of Camel dependecies used by this kit
// a list of Camel dependencies used by this kit
Dependencies []string `json:"dependencies,omitempty"`
// the profile which is expected by this kit
Profile TraitProfile `json:"profile,omitempty"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1/trait/cron.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package trait
// For such tasks, the cron trait can materialize the integration as a Kubernetes CronJob instead of a standard deployment,
// in order to save resources when the integration does not need to be executed.
//
// Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instanciating a Kubernetes CronJob.
// Integrations that start from the following components are evaluated by the cron trait: `timer`, `cron`, `quartz`. The trait does support multiple evaluated components only if they have the same schedule, else it will fallback to Camel implementation instead of instantiating a Kubernetes CronJob.
//
// WARNING: In case of native build-mode defined in xref:traits:quarkus.adoc[quarkus] trait, the component can't be customized.
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
type: object
type: array
dependencies:
description: a list of Camel dependecies used by this kit
description: a list of Camel dependencies used by this kit
items:
type: string
type: array
Expand Down
2 changes: 1 addition & 1 deletion pkg/trait/cron_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func TestCronMultipleScheduleFallback(t *testing.T) {

ct, _ := environment.GetTrait("cron").(*cronTrait)
assert.NotNil(t, ct)
assert.NotNil(t, ct.Fallback, "Should apply Fallback since non equivalent scheduling for mutiple cron compatible component")
assert.NotNil(t, ct.Fallback, "Should apply Fallback since non equivalent scheduling for multiple cron compatible component")
}

func TestCronDepsFallback(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion script/offline_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pom_min=${offline_dir}/pom-min.xml
camelk_mvn_ver=$(curl -s https://raw.githubusercontent.com/apache/camel-k/release-2.3.x/build/Dockerfile|grep MAVEN_DEFAULT_VERSION= |cut -d\" -f2)
# get the maven version set by the user from the parameters
mvn_ver=$($mvnCmd --version |grep "Apache Maven"|awk '{print $3}')
# the maven version executing the task MUST be exactly the same versin as set by the camel-k-operator
# the maven version executing the task MUST be exactly the same version as set by the camel-k-operator
if [ "${camelk_mvn_ver}" != "${mvn_ver}" ]; then
# if the maven version is different, download the correct maven version
url="https://archive.apache.org/dist/maven/maven-3/${camelk_mvn_ver}/binaries/apache-maven-${camelk_mvn_ver}-bin.tar.gz"
Expand Down
Loading