diff --git a/CHANGELOG.md b/CHANGELOG.md index 43a7aa5833..548c4a8e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,20 @@ **Closed issues:** +- Wrongly formatted license [\#5360](https://github.com/apache/camel-k/issues/5360) - CLI install synthetic environment variable duplicate in operator pod container [\#5349](https://github.com/apache/camel-k/issues/5349) - Flaky TestHealthTrait [\#5345](https://github.com/apache/camel-k/issues/5345) - IntegrationProfile empty description [\#5341](https://github.com/apache/camel-k/issues/5341) - OLM procedure, clear errors and warnings [\#5333](https://github.com/apache/camel-k/issues/5333) - Flaky TestOperatorBasic [\#5326](https://github.com/apache/camel-k/issues/5326) - fatal error: concurrent map read and map write [\#5315](https://github.com/apache/camel-k/issues/5315) +- Deprecate Spectrum publishing strategy [\#5314](https://github.com/apache/camel-k/issues/5314) **Merged pull requests:** +- chore\(ci\): Fix license check [\#5364](https://github.com/apache/camel-k/pull/5364) ([gansheer](https://github.com/gansheer)) +- feat\(trait\): Spectrum deprecation notice [\#5363](https://github.com/apache/camel-k/pull/5363) ([squakez](https://github.com/squakez)) +- chore\(deps\): bump knative.dev/serving from 0.39.3 to 0.40.1 [\#5358](https://github.com/apache/camel-k/pull/5358) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump github.com/prometheus/common from 0.52.2 to 0.52.3 [\#5352](https://github.com/apache/camel-k/pull/5352) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(install\): No duplicate envvars on operator pod container [\#5350](https://github.com/apache/camel-k/pull/5350) ([gansheer](https://github.com/gansheer)) - fix\(\#4922\): Fix flaky TestHealthTrait [\#5346](https://github.com/apache/camel-k/pull/5346) ([christophd](https://github.com/christophd)) diff --git a/coverage.out b/coverage.out index 3afe5cafba..dfb3549bc7 100644 --- a/coverage.out +++ b/coverage.out @@ -1442,21 +1442,21 @@ github.com/apache/camel-k/v2/pkg/trait/affinity.go:240: operatorToLabelSel github.com/apache/camel-k/v2/pkg/trait/builder.go:49: newBuilderTrait 100.0% github.com/apache/camel-k/v2/pkg/trait/builder.go:56: InfluencesKit 100.0% github.com/apache/camel-k/v2/pkg/trait/builder.go:60: Matches 90.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:89: Configure 44.4% -github.com/apache/camel-k/v2/pkg/trait/builder.go:134: existsTaskRequest 100.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:144: adaptDeprecatedFields 95.8% -github.com/apache/camel-k/v2/pkg/trait/builder.go:177: newOrAppend 100.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:187: Apply 88.9% -github.com/apache/camel-k/v2/pkg/trait/builder.go:317: failIntegrationKit 80.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:326: builderTask 64.1% -github.com/apache/camel-k/v2/pkg/trait/builder.go:447: getImageName 100.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:455: getBaseImage 100.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:464: customTasks 91.7% -github.com/apache/camel-k/v2/pkg/trait/builder.go:494: taskConfOrDefault 66.7% -github.com/apache/camel-k/v2/pkg/trait/builder.go:502: parseTasksConf 92.1% -github.com/apache/camel-k/v2/pkg/trait/builder.go:563: splitContainerCommand 100.0% -github.com/apache/camel-k/v2/pkg/trait/builder.go:577: filter 81.8% -github.com/apache/camel-k/v2/pkg/trait/builder.go:618: publishingOrUserTask 80.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:89: Configure 44.8% +github.com/apache/camel-k/v2/pkg/trait/builder.go:137: existsTaskRequest 100.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:147: adaptDeprecatedFields 95.8% +github.com/apache/camel-k/v2/pkg/trait/builder.go:180: newOrAppend 100.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:190: Apply 88.9% +github.com/apache/camel-k/v2/pkg/trait/builder.go:320: failIntegrationKit 80.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:329: builderTask 64.1% +github.com/apache/camel-k/v2/pkg/trait/builder.go:450: getImageName 100.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:458: getBaseImage 100.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:467: customTasks 91.7% +github.com/apache/camel-k/v2/pkg/trait/builder.go:497: taskConfOrDefault 66.7% +github.com/apache/camel-k/v2/pkg/trait/builder.go:505: parseTasksConf 92.1% +github.com/apache/camel-k/v2/pkg/trait/builder.go:566: splitContainerCommand 100.0% +github.com/apache/camel-k/v2/pkg/trait/builder.go:580: filter 81.8% +github.com/apache/camel-k/v2/pkg/trait/builder.go:621: publishingOrUserTask 80.0% github.com/apache/camel-k/v2/pkg/trait/camel.go:45: newCamelTrait 100.0% github.com/apache/camel-k/v2/pkg/trait/camel.go:52: InfluencesKit 100.0% github.com/apache/camel-k/v2/pkg/trait/camel.go:56: Matches 75.0% diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 32cb242ae9..ba237be3da 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -6297,7 +6297,7 @@ string A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. -Mind that you must include also the operator tasks (`builder`, `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) +Mind that you must include also the operator tasks (`builder`, `quarkus-native`, `package`, `jib`, `s2i`) if you need to execute them. Useful only with `pod` strategy. |`tasksRequestCPU` + diff --git a/docs/modules/traits/pages/builder.adoc b/docs/modules/traits/pages/builder.adoc index e637badbc0..5cd449cf1f 100755 --- a/docs/modules/traits/pages/builder.adoc +++ b/docs/modules/traits/pages/builder.adoc @@ -86,7 +86,7 @@ Syntax: [configmap\|secret]:name[/key], where name represents the resource name, | builder.tasks-filter | string | A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. -Mind that you must include also the operator tasks (`builder`, `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) +Mind that you must include also the operator tasks (`builder`, `quarkus-native`, `package`, `jib`, `s2i`) if you need to execute them. Useful only with `pod` strategy. | builder.tasks-request-cpu diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml index 31c285d645..d7639c3dac 100644 --- a/helm/camel-k/crds/crd-integration-kit.yaml +++ b/helm/camel-k/crds/crd-integration-kit.yaml @@ -302,8 +302,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index ef486bbb9c..374072a70d 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -618,8 +618,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific @@ -2523,8 +2523,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific diff --git a/helm/camel-k/crds/crd-integration-profile.yaml b/helm/camel-k/crds/crd-integration-profile.yaml index 74d42a2d8a..23ca191a9a 100644 --- a/helm/camel-k/crds/crd-integration-profile.yaml +++ b/helm/camel-k/crds/crd-integration-profile.yaml @@ -494,8 +494,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific @@ -2282,8 +2282,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index b27eda8c46..ae46e53c63 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -6551,8 +6551,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index 9bf957b309..cf74b58822 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -6833,9 +6833,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) - if you need to execute them. Useful only with `pod` - strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need + to execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml index 544356435c..2d5d48bfad 100644 --- a/helm/camel-k/crds/crd-pipe.yaml +++ b/helm/camel-k/crds/crd-pipe.yaml @@ -6831,9 +6831,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) - if you need to execute them. Useful only with `pod` - strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need + to execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the 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 31c285d645..d7639c3dac 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -302,8 +302,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific 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 ef486bbb9c..374072a70d 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -618,8 +618,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific @@ -2523,8 +2523,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific 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 74d42a2d8a..23ca191a9a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -494,8 +494,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific @@ -2282,8 +2282,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific 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 b27eda8c46..ae46e53c63 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -6551,8 +6551,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) if - you need to execute them. Useful only with `pod` strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need to + execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the specific 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 9bf957b309..cf74b58822 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -6833,9 +6833,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) - if you need to execute them. Useful only with `pod` - strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need + to execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the 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 544356435c..2d5d48bfad 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -6831,9 +6831,8 @@ spec: description: A list of tasks sorted by the order of execution in a csv format, ie, `,,...`. Mind that you must include also the operator tasks (`builder`, - `quarkus-native`, `package`, `jib`, `spectrum`, `s2i`) - if you need to execute them. Useful only with `pod` - strategy. + `quarkus-native`, `package`, `jib`, `s2i`) if you need + to execute them. Useful only with `pod` strategy. type: string tasksLimitCPU: description: A list of limit cpu configuration for the