diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 89d8845b7d..535a60d775 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -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]* @@ -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. @@ -9081,4 +9081,4 @@ Legacy trait configuration parameters. Deprecated: for backward compatibility. -|=== \ No newline at end of file +|=== diff --git a/docs/modules/traits/pages/cron.adoc b/docs/modules/traits/pages/cron.adoc index ec22a10955..483a8edf62 100755 --- a/docs/modules/traits/pages/cron.adoc +++ b/docs/modules/traits/pages/cron.adoc @@ -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. diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index 1bbfdfcb7f..a2c30d37ff 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -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 diff --git a/pkg/apis/camel/v1/build_type_support_test.go b/pkg/apis/camel/v1/build_type_support_test.go index 36ac9b3788..01aefdb15e 100644 --- a/pkg/apis/camel/v1/build_type_support_test.go +++ b/pkg/apis/camel/v1/build_type_support_test.go @@ -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{ diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go index 84f3b1fc8c..b4aa97c947 100644 --- a/pkg/apis/camel/v1/integrationkit_types.go +++ b/pkg/apis/camel/v1/integrationkit_types.go @@ -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"` diff --git a/pkg/apis/camel/v1/trait/cron.go b/pkg/apis/camel/v1/trait/cron.go index f65dc261e2..412caf2c16 100644 --- a/pkg/apis/camel/v1/trait/cron.go +++ b/pkg/apis/camel/v1/trait/cron.go @@ -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. // 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 e6190a4f3d..4edac9b887 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -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 diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go index e537e22ffb..d4a609c997 100644 --- a/pkg/trait/cron_test.go +++ b/pkg/trait/cron_test.go @@ -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) { diff --git a/script/offline_dependencies.sh b/script/offline_dependencies.sh index ca3840eeef..e13d26f80a 100755 --- a/script/offline_dependencies.sh +++ b/script/offline_dependencies.sh @@ -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"