(camel-k) branch main updated (44a48f56d -> 050b17c82)
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 44a48f56d fix(doc): more 404 links new 21d498705 feat(api): store executed traits in status new 050b17c82 feat: promote with traits The 2 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: addons/master/master.go| 82 +- addons/master/master_test.go | 78 + addons/resume/resume.go| 50 +- docs/modules/ROOT/pages/pipes/promoting.adoc | 13 + docs/modules/ROOT/pages/running/promoting.adoc | 12 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc |8 + docs/modules/traits/pages/resume.adoc |1 + helm/camel-k/crds/camel-k-crds.yaml| 1693 pkg/apis/camel/v1/integration_types.go |2 + pkg/apis/camel/v1/pipe_types_support.go| 36 + pkg/apis/camel/v1/pipe_types_support_test.go | 45 + pkg/apis/camel/v1/zz_generated.deepcopy.go |5 + .../camel/v1/integrationstatus.go |9 + pkg/cmd/promote.go | 51 +- pkg/cmd/promote_test.go| 91 ++ .../crd/bases/camel.apache.org_integrations.yaml | 1693 pkg/trait/affinity.go |4 - pkg/trait/builder_test.go |9 +- pkg/trait/camel.go | 10 +- pkg/trait/container.go | 147 +- pkg/trait/container_probes_test.go | 12 +- pkg/trait/container_test.go| 34 +- pkg/trait/cron.go | 29 +- pkg/trait/cron_test.go | 87 +- pkg/trait/environment.go |3 - pkg/trait/environment_test.go | 15 +- pkg/trait/health.go| 35 +- pkg/trait/health_test.go |4 +- pkg/trait/ingress.go | 34 +- pkg/trait/ingress_test.go |2 +- pkg/trait/istio.go | 17 +- pkg/trait/istio_test.go| 12 +- pkg/trait/jolokia.go | 15 +- pkg/trait/jolokia_test.go |5 +- pkg/trait/jvm.go |4 +- pkg/trait/kamelets.go | 15 +- pkg/trait/kamelets_test.go | 53 + pkg/trait/knative.go | 72 +- pkg/trait/knative_service.go | 28 +- pkg/trait/knative_service_test.go | 86 +- pkg/trait/knative_test.go | 83 +- pkg/trait/logging.go | 23 +- pkg/trait/logging_test.go |9 +- pkg/trait/mount_test.go| 12 +- pkg/trait/platform.go | 29 +- pkg/trait/prometheus.go|5 +- pkg/trait/route.go |3 - pkg/trait/route_test.go| 36 +- pkg/trait/security_context.go | 28 +- pkg/trait/security_context_test.go | 15 +- pkg/trait/service.go |3 +- pkg/trait/service_test.go | 82 +- pkg/trait/trait.go | 16 +- pkg/trait/trait_catalog.go | 65 +- pkg/trait/trait_catalog_test.go| 89 + pkg/trait/trait_test.go| 204 ++- pkg/trait/trait_types.go |7 +- pkg/trait/trait_types_test.go |6 +- pkg/trait/util.go |4 - 59 files changed, 4924 insertions(+), 396 deletions(-) create mode 100644 pkg/trait/trait_catalog_test.go
(camel-k) 02/02: feat: promote with traits
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 050b17c825f6d3abaaa9394dccc9b571440ddbbe Author: Pasquale Congiusti AuthorDate: Sat Sep 21 15:10:43 2024 +0200 feat: promote with traits --- docs/modules/ROOT/pages/pipes/promoting.adoc | 13 docs/modules/ROOT/pages/running/promoting.adoc | 12 pkg/apis/camel/v1/pipe_types_support.go| 36 ++ pkg/apis/camel/v1/pipe_types_support_test.go | 45 + pkg/cmd/promote.go | 51 ++- pkg/cmd/promote_test.go| 91 ++ 6 files changed, 233 insertions(+), 15 deletions(-) diff --git a/docs/modules/ROOT/pages/pipes/promoting.adoc b/docs/modules/ROOT/pages/pipes/promoting.adoc index 3c2b7a576..4f9a1805e 100644 --- a/docs/modules/ROOT/pages/pipes/promoting.adoc +++ b/docs/modules/ROOT/pages/pipes/promoting.adoc @@ -1,7 +1,9 @@ +[[promoting-pipes]] = Promoting Pipes across environments As soon as you have an Pipes running in your cluster, you will be challenged to move that Pipe to an higher environment. Ie, you can test your Pipe in a **development** environment, and, as soon as you're happy with the result, you will need to move it into a **production** environment. +[[cli-promote]] == CLI `promote` command You may already be familiar with this command as seen when xref:running/promoting.adoc[promoting Integrations across environments]. The command is smart enough to detect when you want to promote a Pipe or an Integration and it works exactly in the same manner. @@ -49,3 +51,14 @@ status: {} ``` As you may already have seen with the Integration example, also here the Pipe is reusing the very same container image. From a release perspective we are guaranteeing the **immutability** of the Pipe as the container used is exactly the same of the one we have tested in development (what we change are just the configurations, if any). + +[[traits]] +== Moving traits + +NOTE: this feature is available starting from version 2.5 + +When you use the `promote` subcommand, you're also keeping the status of any configured trait along with the new promoted Pipe. The tool is in fact in charge to recover the trait configuration of the source Pipe and port it over to the new Pipe promoted. + +This is particularly nice when you have certain traits which are requiring the scan the source code (for instance, Service trait). In this way, when you promote the new Pipe, the traits will be automatically configured to copy any parameter, replicating the very exact behavior between the source and destination environment. + +With this approach, you won't need to worry any longer about any trait which was requiring the source to be attached in order to automatically scan for features. diff --git a/docs/modules/ROOT/pages/running/promoting.adoc b/docs/modules/ROOT/pages/running/promoting.adoc index b3784b1e1..29204d356 100644 --- a/docs/modules/ROOT/pages/running/promoting.adoc +++ b/docs/modules/ROOT/pages/running/promoting.adoc @@ -3,6 +3,7 @@ As soon as you have an Integration running in your cluster, you will be challenged to move that Integration to an higher environment. Ie, you can test your Integration in a **development** environment, and, as soon as you're happy with the result, you will need to move it into a **production** environment. +[[cli-promote]] == CLI `promote` command Camel K has an opinionated way to achieve the promotion goal through the usage of `kamel promote` command. With this command you will be able to easily move an Integration from one namespace to another without worrying about any low level detail such as resources needed by the Integration. You only need to make sure that both the source operator and the destination operator are using the same container registry and that the destination namespace provides the required Configmaps, Secrets [...] @@ -52,3 +53,14 @@ hello, I am production! Something nice is that since the Integration is reusing the very same container image, the execution of the new application will be immediate. Also from a release perspective we are guaranteeing the **immutability** of the Integration as the container used is exactly the same of the one we have tested in development (what we change are just the configurations). Please notice that the Integration running in test is not altered in any way and will be running until any user will stop it. + +[[traits]] +== Moving traits + +NOTE: this feature is available starting from version 2.5 + +When you use the `promote` subcommand, you're also keeping the status of any configured trait along with the new promoted Integration. The tool is in fact in charge to recover the trait configuration of the source Integration and port it over to the new Integra
(camel-k) branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.77.0 deleted (was fe3cae500)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.77.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was fe3cae500 chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kamelets) branch main updated: fix(doc): missing links from original documentation
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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 5f374729 fix(doc): missing links from original documentation 5f374729 is described below commit 5f374729cb7731c436c27c2ceafb0f5a53f6c8b9 Author: Pasquale Congiusti AuthorDate: Thu Sep 19 17:27:55 2024 +0200 fix(doc): missing links from original documentation --- docs/modules/ROOT/pages/development.adoc | 50 docs/modules/ROOT/pages/index.adoc | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/docs/modules/ROOT/pages/development.adoc b/docs/modules/ROOT/pages/development.adoc index 9a7097ef..965d504f 100644 --- a/docs/modules/ROOT/pages/development.adoc +++ b/docs/modules/ROOT/pages/development.adoc @@ -326,54 +326,6 @@ kamel logs twitter-search-source-binding If everything goes right, you should get some tweets in the logs after the integration is created. -Refer to the xref:kamelets/kamelets-user.adoc[Kamelets User Guide] for more information on how to use it in different contexts (like Knative, Kafka, etc.). - -== Kamelet versions - -The catalog containing a set of Kamelets is generally developed in order to be used with a given Camel version (see the Apache Camel Kamelets catalog). However, when publishing the Kamelet to the cluster you may want to maintain more than one version for any reason (ie, to use a different dependency and be able to support multiple runtimes). You can therefore use the `.spec.versions` parameter to optionally maintain a set of alternative versions beside the main (and default) one. - -.my-timer-source.yaml -[source,yaml] - -apiVersion: camel.apache.org/v1 -kind: Kamelet -metadata: - name: my-timer-source -spec: - definition: -title: "Timer Example" - types: -out: - mediaType: text/plain - template: -from: - uri: timer:tick - steps: -- setBody: -constant: "Kamelet Main" -- to: "kamelet:sink" - versions: -v2: - definition: -title: "Timer Example 2" - types: -out: - mediaType: text/plain - template: -from: - uri: timer:tick - steps: -- setBody: -constant: "Kamelet V2" -- to: "kamelet:sink" - - -NOTE: make sure the overall content fits into 1 MiB, which is the storage limit for a Custom Resource. - -This is a way to handle multiple version on Kubernetes and may not be supported out of the box by Camel core. If the Integration will require specifically to use `kamelet:my-timer-source?kameletVersion=v2`, then, the operator will mount properly the specification on the running application. - -The `.spec.versions` field may not be necessarily supported by the core as it's meant to provide a way to handle versioning on the cluster only. The runtime must be provided with a materialized Kamelet file with the chosen spec (the operator is in charge of that). - == Kamelet data types A Kamelet usually encapsulates a specific functionality and serves a very opinionated use case with well-defined input parameters and outcome. @@ -1112,8 +1064,6 @@ kamel logs earthquake-source-binding If everything went well, you should see the events in the log. -Refer to the xref:kamelets/kamelets-user.adoc[Kamelets User Guide] for more information on how to use it in different contexts (like Knative, Kafka, etc.). - [[creating-sink]] == Creating a sink Kamelet diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 4ee97b68..4fd8fcf8 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -53,7 +53,7 @@ indexTable::[version="*",relative="avro-deserialize-action.adoc",cellformats="ut This page contains the default Apache Camel Kamelets catalog. -Consult the xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User Guide] for information about how to use these. +Consult the Kamelets User Guide for information about how to use these. **We love contributions for this catalog**: you can follow the Kamelets Developer Guide for information on how to create new Kamelets and contribute them to the official https://github.com/apache/camel-kamelets/[github.com/apache/camel-kamelets] repository.
(camel-kamelets) branch main updated: chore: docs update to include development guides
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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 15b21fdb chore: docs update to include development guides 15b21fdb is described below commit 15b21fdb94cb18131ff05ce9867bf685171695f4 Author: Pasquale Congiusti AuthorDate: Thu Sep 19 10:52:53 2024 +0200 chore: docs update to include development guides --- docs/modules/ROOT/pages/development.adoc | 1625 ++ docs/modules/ROOT/pages/index.adoc | 10 +- 2 files changed, 1634 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/development.adoc b/docs/modules/ROOT/pages/development.adoc new file mode 100644 index ..9a7097ef --- /dev/null +++ b/docs/modules/ROOT/pages/development.adoc @@ -0,0 +1,1625 @@ +[[kamelets-developer-guide]] += Kamelets Developer Guide + +[[kamelets-dev-introduction]] +== Introduction + +This document guides you through the process of developing a new Kamelet that can be used by any Apache Camel subproject supporting the +Kamelet technology stack and shared with others via Kamelet catalogs. + +== Basics + +If you started to learn a bit about Kamelets, you've seen that they can be used to create two kinds of connectors: + +- *Sources*: they produce data that can be injected into a destination +- *Sinks*: they consume data and optionally produce a response + +When creating a new Kamelet, you should first decide first which kind of Kamelet you're going to create, which depends on the use case you've in mind. +A Kamelet does a **single thing**, so if you want to provide both a source and a sink for your system, they are two Kamelets. + +In its essence, a Kamelet consists of a *single YAML file* that contains information on two distinct aspects of the connector: + +- *User view*: this part contains general documentation about the Kamelet, covering also the parameters that need to be configured in order to use it +- *Runtime aspects*: this part tells the Camel runtime how to implement what the Kamelet promises to do. Most of the times it contains a Camel route template in YAML DSL + +NOTE: We're ignoring here the part around data types of a Kamelet, which is not fundamental for the Kamelet to work and it is still subject to change + +We'll guide you through the process of creating a simple Kamelet by remapping a Camel component, then we'll go through a much more complicated real-world example. + +== Creating a simple Kamelet + +Since Apache Camel provides more than 300 components out of the box, it's easy to create a Kamelet starting from one of the components already available. +Most of the Kamelets available in the official catalog, in fact, are simple ones that contain only a remapping of the Kamelet properties into Camel endpoint parameters. +We're going to show an example shortly. + +Suppose that you want to provide a Kamelet that allows users to search data on Twitter, providing a stream of information about a given keyword. +Creating such a Kamelet is a fairly easy task: we can use options of the "camel-twitter" component without adding much processing logic. + +So the procedure of writing a simple Kamelet starts with scaffolding a new Kamelet resource, which can be done with the Camel JBang CLI (`camel`): + +[source] + +camel init twitter-search-source.kamelet.yaml + + +This produces a YAML file like the following one: + +.twitter-search-source.kamelet.yaml +[source,yaml] + +apiVersion: camel.apache.org/v1 +kind: Kamelet +metadata: + name: twitter-search-source + labels: +camel.apache.org/kamelet.type: "source" +spec: + definition: +title: "Timer" +description: "Produces periodic events with a custom payload" +required: + - message +properties: + period: +title: Period +description: The time interval between two events +type: integer +default: 1000 + message: +title: Message +description: The message to generate +type: string + dataTypes: +out: + default: text + types: +text: + mediaType: text/plain + template: +from: + uri: timer:tick + parameters: +period: "{{period}}" + steps: +- setBody: +constant: "{{message}}" +- to: "kamelet:sink" + + +We need to change the file to do what we want to achieve, that is, creating a route that searches a given keyword on Twitter. + +The route provided in the initial scaffold (timer-to-log) is not what we need, so we change it to the following: + +.twitter-search-source.kamelet.yaml +[source,yaml] + +apiVersion: camel.apache.org/v1 +kind: Kamelet +# ... +spec: +# ... + template: +from: +
(camel-website) branch main updated: fix: remove 404 links
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-website.git The following commit(s) were added to refs/heads/main by this push: new 912e6940 fix: remove 404 links 912e6940 is described below commit 912e6940926bd5c8e1566105de7642c3893dcfda Author: Pasquale Congiusti AuthorDate: Thu Sep 19 15:27:11 2024 +0200 fix: remove 404 links --- content/blog/2021/04/camel-k-140-Whatsnew/index.md | 2 +- content/blog/2021/05/Camel310-Whatsnew/index.md | 2 +- .../blog/2021/05/KameletToolingSupportInCamelURI/index.md | 2 +- content/blog/2021/11/low-code-camel/index.md| 13 - content/blog/2022/01/camel-keda/index.md| 6 +++--- content/blog/2023/07/camel-k-2-0/index.md | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/content/blog/2021/04/camel-k-140-Whatsnew/index.md b/content/blog/2021/04/camel-k-140-Whatsnew/index.md index bf9c19b3..9b25fa14 100644 --- a/content/blog/2021/04/camel-k-140-Whatsnew/index.md +++ b/content/blog/2021/04/camel-k-140-Whatsnew/index.md @@ -21,7 +21,7 @@ When installing the operator into a namespace (but also globally in the cluster) Or, you can use the new `kamel bind` command (see below). -**Note:** it's easy to write your own Kamelet and publish it to the Apache Catalog. Take a look at the [Kamelets developer guide](/camel-k/next/kamelets/kamelets-dev.html). +**Note:** it's easy to write your own Kamelet and publish it to the Apache Catalog. Take a look at the documentation online. ## Kamel bind command diff --git a/content/blog/2021/05/Camel310-Whatsnew/index.md b/content/blog/2021/05/Camel310-Whatsnew/index.md index e9645607..27620292 100644 --- a/content/blog/2021/05/Camel310-Whatsnew/index.md +++ b/content/blog/2021/05/Camel310-Whatsnew/index.md @@ -43,7 +43,7 @@ of problem. Then the XML dump is a _view_ of the routes from Camel point of view ### Kamelets -We have done significant work to [Kamelets](/camel-k/next/kamelets/kamelets-user.html) in this release. +We have done significant work to Kamelets in this release. Kamelets (route templates) are now more flexible and more isolated, which really helps to build more sophisticated Kamelets that are plug and play ready in any Camel runtime. diff --git a/content/blog/2021/05/KameletToolingSupportInCamelURI/index.md b/content/blog/2021/05/KameletToolingSupportInCamelURI/index.md index ca3576e0..b84c71e2 100644 --- a/content/blog/2021/05/KameletToolingSupportInCamelURI/index.md +++ b/content/blog/2021/05/KameletToolingSupportInCamelURI/index.md @@ -6,7 +6,7 @@ categories: ["Tooling","Camel K"] preview: "Kamelet tooling support for Camel URI" --- -[Kamelets](/camel-k/next/kamelets/kamelets-user.html) (Kamel route snippets) are a new concept introduced in Camel K that allow users to connect to external systems via a simplified interface, hiding all the low level details about how those connections are implemented. There are several ways to consume them. One of them is as [standard Camel Components](/camel-k/next/kamelets/kamelets-user.html#kamelets-usage-integration). In this case, completion is provided to fill the template id and [...] +Kamelets (Kamel route snippets) are a new concept introduced in Camel K that allow users to connect to external systems via a simplified interface, hiding all the low level details about how those connections are implemented. There are several ways to consume them. One of them is as standard Camel Components. In this case, completion is provided to fill the template id and the parameter names. It is currently based on a fixed set of Kamelets provided by a snapshot of the [kamelet catalog [...] diff --git a/content/blog/2021/11/low-code-camel/index.md b/content/blog/2021/11/low-code-camel/index.md index a9afdbe6..d067379c 100644 --- a/content/blog/2021/11/low-code-camel/index.md +++ b/content/blog/2021/11/low-code-camel/index.md @@ -61,20 +61,17 @@ We have now a wider [catalog of Kamelets](/camel-kamelets/next/) available upstr There's no doubt you'll find a use case which is not covered by a Kamelet. For example, what about moving data between parts of your organization? -In traditional Camel the approach you would have taken to address this problem is to create one or more ad hoc integrations to +In traditional Camel the approach you would have taken to address this problem is to create one or more ad hoc integrations to fullfill any of your needs. You'd develop a custom integration route for each use case you have in mind. The Kamelet approach is completely different. You develop a reusable Kamelet that is responsible of taking specific data out of your system (a **source**), or putting some data back into your system (a **sink**). On
(camel-k) branch main updated: fix(doc): more 404 links
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 The following commit(s) were added to refs/heads/main by this push: new 44a48f56d fix(doc): more 404 links 44a48f56d is described below commit 44a48f56d9aec199084ee4c5030cbd0de9ec9ff7 Author: Pasquale Congiusti AuthorDate: Thu Sep 19 15:58:11 2024 +0200 fix(doc): more 404 links --- addons/keda/keda.go| 2 +- docs/modules/ROOT/pages/troubleshooting/debugging.adoc | 2 +- docs/modules/traits/pages/keda.adoc| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/keda/keda.go b/addons/keda/keda.go index d4fb3816a..1c7ff2b56 100644 --- a/addons/keda/keda.go +++ b/addons/keda/keda.go @@ -66,7 +66,7 @@ const ( // via markers in the Kamelets. // // For information on how to use KEDA enabled Kamelets with the KEDA trait, refer to -// xref:ROOT:kamelets/kamelets-user.adoc#kamelet-keda-user[the KEDA section in the Kamelets user guide]. +// xref:ROOT:pipes/pipes.adoc#kamelet-keda-user[the KEDA section in the Pipes user guide]. // If you want to create Kamelets that contain KEDA metadata, refer to // xref:ROOT:kamelets/keda.adoc[the KEDA section in the Kamelets development guide]. // diff --git a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc index b7901bf53..6e685b0e4 100644 --- a/docs/modules/ROOT/pages/troubleshooting/debugging.adoc +++ b/docs/modules/ROOT/pages/troubleshooting/debugging.adoc @@ -57,6 +57,6 @@ When the debugging session is done, hitting kbd:[Ctrl+c] on the terminal where t 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. +However, you can troubleshoot individually each `Kamelet` definition by focusing on the specification `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 `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/docs/modules/traits/pages/keda.adoc b/docs/modules/traits/pages/keda.adoc index 0ecaf9c93..c198016e8 100644 --- a/docs/modules/traits/pages/keda.adoc +++ b/docs/modules/traits/pages/keda.adoc @@ -8,7 +8,7 @@ The trait can be either manually configured using the `triggers` option or autom via markers in the Kamelets. For information on how to use KEDA enabled Kamelets with the KEDA trait, refer to -xref:ROOT:kamelets/kamelets-user.adoc#kamelet-keda-user[the KEDA section in the Kamelets user guide]. +xref:ROOT:pipes/pipes.adoc#kamelet-keda-user[the KEDA section in the Pipes user guide]. If you want to create Kamelets that contain KEDA metadata, refer to xref:ROOT:kamelets/keda.adoc[the KEDA section in the Kamelets development guide].
(camel-kamelets) branch main updated: fix: removed missing link
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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new c588367d fix: removed missing link c588367d is described below commit c588367d8a81896373fc19d1af1adba93ffe4884 Author: Pasquale Congiusti AuthorDate: Thu Sep 19 14:58:50 2024 +0200 fix: removed missing link --- docs/modules/ROOT/pages/index.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 4e73892f..77307eea 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -47,8 +47,7 @@ This page contains the default Apache Camel Kamelets catalog. Consult the xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User Guide] for information about how to use these. -**We love contributions for this catalog**: you can follow the xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-dev.adoc[Kamelets Developer Guide] -for information on how to create new Kamelets and contribute them to the official https://github.com/apache/camel-kamelets/[github.com/apache/camel-kamelets] repository. +**We love contributions for this catalog**: you can follow the Kamelets Developer Guide for information on how to create new Kamelets and contribute them to the official https://github.com/apache/camel-kamelets/[github.com/apache/camel-kamelets] repository. [indexBlock,'xref=$xref']
(camel-k) branch main updated: chore(doc): kamelets reorganization
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 The following commit(s) were added to refs/heads/main by this push: new 3460abd56 chore(doc): kamelets reorganization 3460abd56 is described below commit 3460abd56020bd0da402160d46fe9c753b8087d2 Author: Pasquale Congiusti AuthorDate: Thu Sep 19 10:55:49 2024 +0200 chore(doc): kamelets reorganization --- docs/modules/ROOT/nav.adoc |6 +- docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 1747 .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 721 +--- docs/modules/ROOT/pages/kamelets/kamelets.adoc |4 +- docs/modules/ROOT/pages/kamelets/keda.adoc | 109 ++ .../error-handler.adoc}| 15 +- docs/modules/ROOT/pages/pipes/pipes.adoc | 375 - 7 files changed, 497 insertions(+), 2480 deletions(-) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 6b2093895..e54685ca8 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -22,6 +22,7 @@ ** xref:running/promoting.adoc[Promote an Integration] * xref:pipes/pipes.adoc[Run an Pipe] ** xref:pipes/bind-cli.adoc[kamel bind CLI] +** xref:pipes/error-handler.adoc[Error Handler] ** xref:pipes/promoting.adoc[Promote a Pipe] * xref:languages/languages.adoc[Languages] ** xref:languages/java.adoc[Java] @@ -84,9 +85,8 @@ // End of autogenerated code - DO NOT EDIT! (trait-nav) * xref:kamelets/kamelets.adoc[Kamelets] ** xref:kamelets/kamelets-distribution.adoc[Distribution] -** xref:kamelets/kamelets-user.adoc[User Guide] -** xref:kamelets/kamelets-dev.adoc[Developer Guide] -** xref:kamelets/kameletbindings-error-handler.adoc[Error Handling] +** xref:kamelets/kamelets-user.adoc[Configuration] +** xref:kamelets/keda.adoc[KEDA] * xref:pipeline/pipeline.adoc[Pipelines] ** xref:pipeline/external.adoc[External CICD] * Scaling diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc deleted file mode 100644 index c617c4780..0 --- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc +++ /dev/null @@ -1,1747 +0,0 @@ -[[kamelets-developer-guide]] -= Kamelets Developer Guide - -[[kamelets-dev-introduction]] -== Introduction - -This document guides you through the process of developing a new Kamelet that can be used by any Apache Camel subproject supporting the -Kamelet technology stack and shared with others via Kamelet catalogs, such as the official the Apache Camel xref:camel-kamelets::index.adoc[Kamelet Catalog]. - -We assume that the reader is familiar with the content of the xref:kamelets/kamelets-user.adoc[Kamelets User Guide] and with -Camel K xref:installation/installation.adoc[installation] and general usage. - -== Basics - -If you started to learn a bit about Kamelets, you've seen that they can be used to create two kinds of connectors: - -- *Sources*: they produce data that can be injected into a destination -- *Sinks*: they consume data and optionally produce a response - -When creating a new Kamelet, you should first decide first which kind of Kamelet you're going to create, which depends on the use case you've in mind. -A Kamelet does a **single thing**, so if you want to provide both a source and a sink for your system, they are two Kamelets. - -In its essence, a Kamelet consists of a *single YAML file* that contains information on two distinct aspects of the connector: - -- *User view*: this part contains general documentation about the Kamelet, covering also the parameters that need to be configured in order to use it -- *Runtime aspects*: this part tells the Camel runtime how to implement what the Kamelet promises to do. Most of the times it contains a Camel route template in YAML DSL - -NOTE: We're ignoring here the part around data types of a Kamelet, which is not fundamental for the Kamelet to work and it is still subject to change - -We'll guide you through the process of creating a simple Kamelet by remapping a Camel component, then we'll go through a much more complicated real-world example. - -== Creating a simple Kamelet - -Since Apache Camel provides more than 300 components out of the box, it's easy to create a Kamelet starting from one of the components already available. -Most of the Kamelets available in the official catalog, in fact, are simple ones that contain only a remapping of the Kamelet properties into Camel endpoint parameters. -We're going to show an example shortly. - -Suppose that you want to provide a Kamelet that allows users to search data on Twitter, providing a stream of information about a given keyword. -Creating such a Kamelet is a fairly easy task: we can use options of the "camel-twitter" component without adding much processing logic. - -S
(camel-k) branch main updated: fix: doc KEDA links
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 The following commit(s) were added to refs/heads/main by this push: new 7b9063940 fix: doc KEDA links 7b9063940 is described below commit 7b90639404ba02e8ac2e2db66b2c4e19aefe365a Author: Pasquale Congiusti AuthorDate: Thu Sep 19 14:37:39 2024 +0200 fix: doc KEDA links --- addons/keda/keda.go | 2 +- docs/modules/ROOT/pages/pipes/pipes.adoc | 2 +- docs/modules/traits/pages/keda.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/keda/keda.go b/addons/keda/keda.go index 531753827..d4fb3816a 100644 --- a/addons/keda/keda.go +++ b/addons/keda/keda.go @@ -68,7 +68,7 @@ const ( // For information on how to use KEDA enabled Kamelets with the KEDA trait, refer to // xref:ROOT:kamelets/kamelets-user.adoc#kamelet-keda-user[the KEDA section in the Kamelets user guide]. // If you want to create Kamelets that contain KEDA metadata, refer to -// xref:ROOT:kamelets/kamelets-dev.adoc#kamelet-keda-dev[the KEDA section in the Kamelets development guide]. +// xref:ROOT:kamelets/keda.adoc[the KEDA section in the Kamelets development guide]. // // The KEDA trait is disabled by default. // diff --git a/docs/modules/ROOT/pages/pipes/pipes.adoc b/docs/modules/ROOT/pages/pipes/pipes.adoc index 715fa113b..102dc7452 100644 --- a/docs/modules/ROOT/pages/pipes/pipes.adoc +++ b/docs/modules/ROOT/pages/pipes/pipes.adoc @@ -488,4 +488,4 @@ kamel run my-keda-integration.yaml -t keda.enabled=true NOTE: Make sure that the `my-keda-integration` uses at least one KEDA enabled Kamelet, otherwise enabling KEDA (without other options) will have no effect. -For information on how to create KEDA enabled Kamelets, see the xref:kamelets/kamelets-dev.adoc#kamelet-keda-dev[KEDA section in the development guide]. \ No newline at end of file +For information on how to create KEDA enabled Kamelets, see the xref:kamelets/keda.adoc[KEDA section in the development guide]. \ No newline at end of file diff --git a/docs/modules/traits/pages/keda.adoc b/docs/modules/traits/pages/keda.adoc index f5bf8ec4e..0ecaf9c93 100644 --- a/docs/modules/traits/pages/keda.adoc +++ b/docs/modules/traits/pages/keda.adoc @@ -10,7 +10,7 @@ via markers in the Kamelets. For information on how to use KEDA enabled Kamelets with the KEDA trait, refer to xref:ROOT:kamelets/kamelets-user.adoc#kamelet-keda-user[the KEDA section in the Kamelets user guide]. If you want to create Kamelets that contain KEDA metadata, refer to -xref:ROOT:kamelets/kamelets-dev.adoc#kamelet-keda-dev[the KEDA section in the Kamelets development guide]. +xref:ROOT:kamelets/keda.adoc[the KEDA section in the Kamelets development guide]. The KEDA trait is disabled by default.
(camel-k) branch dependabot/go_modules/github.com/prometheus/client_golang-1.20.4 deleted (was b77df0163)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus/client_golang-1.20.4 in repository https://gitbox.apache.org/repos/asf/camel-k.git was b77df0163 chore(deps): bump github.com/prometheus/client_golang The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: chore(deps): bump github.com/prometheus/client_golang
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 The following commit(s) were added to refs/heads/main by this push: new 7aa5b550e chore(deps): bump github.com/prometheus/client_golang 7aa5b550e is described below commit 7aa5b550e82d7ae27022a050d94ff3338872efc3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 18 00:55:27 2024 + chore(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.3 to 1.20.4. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.3...v1.20.4) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d78f926cb..6c43373ec 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/openshift/api v0.0.0-20240228005710-4511c790cc60 github.com/operator-framework/api v0.23.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 - github.com/prometheus/client_golang v1.20.3 + github.com/prometheus/client_golang v1.20.4 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.59.1 github.com/redhat-developer/service-binding-operator v1.4.0 diff --git a/go.sum b/go.sum index 76399f2e2..1f41de3ba 100644 --- a/go.sum +++ b/go.sum @@ -360,8 +360,8 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= -github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
(camel-k) branch main updated: chore(docs): kamelet reference cleaning
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 The following commit(s) were added to refs/heads/main by this push: new 834ac752e chore(docs): kamelet reference cleaning 834ac752e is described below commit 834ac752ef81d5dfc2ec50fc588b70f543b9f3ed Author: Pasquale Congiusti AuthorDate: Tue Sep 17 10:28:16 2024 +0200 chore(docs): kamelet reference cleaning --- docs/antora.yml| 2 -- docs/modules/ROOT/pages/index.adoc | 10 ++ script/Makefile| 5 --- script/release_kustomize.sh| 74 -- script/update_default_camel.sh | 18 +- script/update_docs.sh | 16 - 6 files changed, 3 insertions(+), 122 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index f647c8804..43b882629 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -28,8 +28,6 @@ asciidoc: attributes: requires: "'util=camel-website-util,ck=xref:js/ck.js'" prerelease: true -camel-kamelets-version: '4.4.1' -camel-kamelets-docs-version: 4.4.x camel-k-runtime-version: 3.8.1 camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from Makefile BUNDLE_CAMEL_APIS camel-version: 4.4.1 diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 48dde87fd..e66aebbc1 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -36,11 +36,7 @@ The integration code will immediately run in the cloud. Continue reading the doc == Camel dependencies matrix -- -ifdef::lts[This is a long term service release.] -ifndef::lts[] -ifdef::prerelease[This is a development version of {page-component-title}. It should not be used in production.] -ifndef::prerelease[This release will not be updated, but rather replaced by a new release.] -endif::[] +ifdef::prerelease[NOTE: This is a development version of {page-component-title}. It should not be used in production.] -- From Camel K version 2 onward you will be able to use any Camel K Runtime. Each runtime depends on a Camel Quarkus, Camel and Quarkus Platform version. Every Camel K has a default runtime used, but you can xref:configuration/runtime-version.adoc[pick any Camel K Runtime available] (backward and forward compatible). @@ -54,13 +50,11 @@ From Camel K version 2 onward you will be able to use any Camel K Runtime. Each |Camel Quarkus |Camel |Quarkus -|Kamelets -|LTS |Branch |=== //cannot use top level index.adoc as the page with the query is always omitted. -indexTable::[version="*",relative="running/running.adoc",cellformats="util.ckRef(pageComponentDisplayVersion, pageComponentVersion)|camelKRuntimeVersion|util.camelQuarkusRef(camelQuarkusVersion, camelQuarkusDocsVersion)|util.camelRef(camelVersion, camelDocsVersion)|util.quarkusRef(quarkusVersion)|util.kameletsRef(camelKameletsVersion, camelKameletsDocsVersion)|lts|ck.branch(pageComponentVersion)", requires={requires},transform=util.sortCompatibilityItems] +indexTable::[version="*",relative="running/running.adoc",cellformats="util.ckRef(pageComponentDisplayVersion, pageComponentVersion)|camelKRuntimeVersion|util.camelQuarkusRef(camelQuarkusVersion, camelQuarkusDocsVersion)|util.camelRef(camelVersion, camelDocsVersion)|util.quarkusRef(quarkusVersion)|ck.branch(pageComponentVersion)", requires={requires},transform=util.sortCompatibilityItems] == Other APIs version matrix diff --git a/script/Makefile b/script/Makefile index 3f6a8b1d1..f55b1b504 100644 --- a/script/Makefile +++ b/script/Makefile @@ -530,11 +530,6 @@ release-nightly: cross-compile images-push release-helm: ./script/release_helm.sh ${VERSION} -release-kustomize: - RELEASE_VERSION=$(CUSTOM_VERSION) \ - RELEASE_NAME=$(PACKAGE) \ - ./script/release_kustomize.sh - .PHONY: do-build build build-kamel build-kamel-platform build-resources dep codegen images images-push images-push-staging image-build test check clean release cross-compile package-examples set-version git-tag check-licenses build-resources release-helm release-staging release-nightly get-staging-repo get-version .PHONY: controller-gen kubectl kustomize operator-sdk opm diff --git a/script/release_kustomize.sh b/script/release_kustomize.sh deleted file mode 100755 index 7f842420e..0 --- a/script/release_kustomize.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -# 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 fi
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.6 deleted (was 4ef1c0d0)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-gpg-plugin-3.2.6 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 4ef1c0d0 build(deps): bump org.apache.maven.plugins:maven-gpg-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-gpg-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 6c567726 build(deps): bump org.apache.maven.plugins:maven-gpg-plugin 6c567726 is described below commit 6c567726b99c71fa6a8af2b95e9187d39b7956b7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Sep 16 19:15:37 2024 + build(deps): bump org.apache.maven.plugins:maven-gpg-plugin Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.5...maven-gpg-plugin-3.2.6) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- support/camel-k-runtime-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 76492f80..7f3bf7c4 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 4.5 3.5.0 8.44 -3.2.5 +3.2.6 3.1.3 3.10.0 3.2.1 diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 26ce8c8b..18369abd 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -266,7 +266,7 @@ org.apache.maven.plugins maven-gpg-plugin -3.2.5 +3.2.6 ${gpg.passphrase} ${gpg.useagent}
(camel-k-runtime) branch dependabot/maven/quarkus-platform-version-3.14.4 deleted (was b00de217)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/quarkus-platform-version-3.14.4 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was b00de217 build(deps): bump quarkus-platform-version from 3.13.0 to 3.14.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated (6dbded5ab -> fa10c8d30)
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 6dbded5ab feat(kamelets): bundling from jar new dcb7f36cf fix(ctrl): resume from unknown new fa10c8d30 fix(kamelets): don't fail on Kamelets recreation The 2 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: .../{reset_test.go => operator_restart_test.go}| 54 +- e2e/advanced/operator_resume_unknown_test.go | 93 e2e/support/test_support.go| 29 - pkg/controller/integration/monitor.go | 8 +- pkg/controller/integration/monitor_test.go | 120 + pkg/controller/integration/monitor_unknown.go | 6 ++ pkg/controller/integrationplatform/create.go | 21 ++-- pkg/controller/integrationplatform/create_test.go | 23 +++- pkg/controller/integrationplatform/kamelets.go | 15 ++- .../integrationplatform/kamelets_test.go | 3 +- 10 files changed, 326 insertions(+), 46 deletions(-) copy e2e/advanced/{reset_test.go => operator_restart_test.go} (52%) create mode 100644 e2e/advanced/operator_resume_unknown_test.go
(camel-k) 02/02: fix(kamelets): don't fail on Kamelets recreation
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 fa10c8d303ddbce697feab25c04f8fbece79c06e Author: Pasquale Congiusti AuthorDate: Fri Sep 13 16:37:03 2024 +0200 fix(kamelets): don't fail on Kamelets recreation --- pkg/controller/integrationplatform/create.go | 21 ++-- pkg/controller/integrationplatform/create_test.go | 23 +- pkg/controller/integrationplatform/kamelets.go | 15 ++ .../integrationplatform/kamelets_test.go | 3 ++- 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/pkg/controller/integrationplatform/create.go b/pkg/controller/integrationplatform/create.go index 85edbf94a..55e9ca3f3 100644 --- a/pkg/controller/integrationplatform/create.go +++ b/pkg/controller/integrationplatform/create.go @@ -167,23 +167,22 @@ func installKamelets(ctx context.Context, c client.Client, platform *v1.Integrat camelVersion := platform.Status.Build.RuntimeCoreVersion installedKam, erroredKam, err := installKameletCatalog(ctx, c, platform, camelVersion) if err != nil { - platform.Status.Phase = v1.IntegrationPlatformPhaseError + // An error here should not be disruptive, we just report it happened platform.Status.SetCondition( v1.IntegrationPlatformConditionKameletCatalogAvailable, corev1.ConditionFalse, "IntegrationPlatformKameletCatalogAvailable", - fmt.Sprintf("kamelet catalog %s not available, please review given camel version. Error: %s", camelVersion, err), + fmt.Sprintf("kamelet catalog %s not available. Error: %s", camelVersion, err), + ) + } else { + platform.Status.SetCondition( + v1.IntegrationPlatformConditionKameletCatalogAvailable, + corev1.ConditionTrue, + "IntegrationPlatformKameletCatalogAvailable", + fmt.Sprintf("successfully installed Kamelet catalog version %s: success %d Kamelets, failed %d Kamelets", + camelVersion, installedKam, erroredKam), ) - - return platform, nil } - platform.Status.SetCondition( - v1.IntegrationPlatformConditionKameletCatalogAvailable, - corev1.ConditionTrue, - "IntegrationPlatformKameletCatalogAvailable", - fmt.Sprintf("successfully installed Kamelet catalog version %s: success %d Kamelets, failed %d Kamelets", - camelVersion, installedKam, erroredKam), - ) } return platform, nil diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go index c47532070..0124a81db 100644 --- a/pkg/controller/integrationplatform/create_test.go +++ b/pkg/controller/integrationplatform/create_test.go @@ -159,10 +159,10 @@ func TestCreateNewCatalog(t *testing.T) { // Set the folder where to install testing kamelets tmpDir, err := os.MkdirTemp("/tmp", "kamelets*") + defer os.Unsetenv(kameletDirEnv) assert.NoError(t, err) os.Setenv(kameletDirEnv, tmpDir) answer, err := action.Handle(context.TODO(), &ip) - os.Unsetenv(kameletDirEnv) require.NoError(t, err) assert.NotNil(t, answer) @@ -180,6 +180,27 @@ func TestCreateNewCatalog(t *testing.T) { require.NoError(t, err) assert.NotEmpty(t, list.Items) + + // Creating again a platform should not cause problem because any existing Kamelets file leftover + ip.Status = v1.IntegrationPlatformStatus{ + IntegrationPlatformSpec: v1.IntegrationPlatformSpec{ + Build: v1.IntegrationPlatformBuildSpec{ + RuntimeProvider: v1.RuntimeProviderQuarkus, + RuntimeVersion: defaults.DefaultRuntimeVersion, + }, + }, + } + // Refresh client with changed IP + c, err = test.NewFakeClient(&ip) + require.NoError(t, err) + action.InjectClient(c) + answer, err = action.Handle(context.TODO(), &ip) + require.NoError(t, err) + assert.NotNil(t, answer) + + assert.Equal(t, v1.IntegrationPlatformPhaseReady, answer.Status.Phase) + assert.Equal(t, corev1.ConditionTrue, answer.Status.GetCondition
(camel-k) 01/02: fix(ctrl): resume from unknown
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 dcb7f36cff7f3cbc56b2b9ed7dc94df31600a65a Author: Pasquale Congiusti AuthorDate: Fri Sep 13 07:40:55 2024 +0200 fix(ctrl): resume from unknown If an IntegrationPlatform is deleted, when the Integration requires monitoring it fails --- e2e/advanced/operator_restart_test.go | 81 + e2e/advanced/operator_resume_unknown_test.go | 93 e2e/support/test_support.go | 29 ++- pkg/controller/integration/monitor.go | 8 +- pkg/controller/integration/monitor_test.go| 120 ++ pkg/controller/integration/monitor_unknown.go | 6 ++ 6 files changed, 335 insertions(+), 2 deletions(-) diff --git a/e2e/advanced/operator_restart_test.go b/e2e/advanced/operator_restart_test.go new file mode 100644 index 0..0f84972d5 --- /dev/null +++ b/e2e/advanced/operator_restart_test.go @@ -0,0 +1,81 @@ +//go:build integration +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration" + +/* +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 advanced + +import ( + "context" + "testing" + "time" + + . "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" +) + +func TestOperatorRestart(t *testing.T) { + t.Parallel() + + WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) { + name := RandomizedSuffixName("yaml") + + t.Run("Operator started", func(t *testing.T) { + InstallOperator(t, ctx, g, ns) + g.Eventually(OperatorPod(t, ctx, ns)).Should(Not(BeNil())) + g.Eventually(PlatformPhase(t, ctx, ns), TestTimeoutShort).Should(Equal(v1.IntegrationPlatformPhaseReady)) + g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed()) + g.Eventually(IntegrationPhase(t, ctx, ns, name), TestTimeoutMedium).Should(Equal(v1.IntegrationPhaseRunning)) + g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) + g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) + }) + + t.Run("Operator uninstalled", func(t *testing.T) { + UninstallOperator(t, ctx, g, ns, "../../") + g.Eventually(OperatorPod(t, ctx, ns)).Should(BeNil()) + g.Eventually(Platform(t, ctx, ns)).Should(BeNil()) + g.Eventually(IntegrationPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseRunning)) + g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) + g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) + g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Ev
(camel-k-runtime) branch dependabot/maven/org.jolokia-jolokia-agent-jvm-2.1.1 deleted (was 4b3d4de0)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.jolokia-jolokia-agent-jvm-2.1.1 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 4b3d4de0 build(deps): bump org.jolokia:jolokia-agent-jvm from 2.1.0 to 2.1.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.jolokia:jolokia-agent-jvm from 2.1.0 to 2.1.1
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new d83b38a8 build(deps): bump org.jolokia:jolokia-agent-jvm from 2.1.0 to 2.1.1 d83b38a8 is described below commit d83b38a862579368f7588b2946f132a045265592 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 12 19:14:04 2024 + build(deps): bump org.jolokia:jolokia-agent-jvm from 2.1.0 to 2.1.1 Bumps org.jolokia:jolokia-agent-jvm from 2.1.0 to 2.1.1. --- updated-dependencies: - dependency-name: org.jolokia:jolokia-agent-jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- support/camel-k-runtime-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 67d63bb1..26ce8c8b 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -35,7 +35,7 @@ 1722418838 -2.1.0 +2.1.1 3.5.0 3.8.6 io.quarkus.platform
(camel-k-runtime) branch dependabot/maven/groovy-version-4.0.23 deleted (was e9302f12)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/groovy-version-4.0.23 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was e9302f12 build(deps): bump groovy-version from 4.0.22 to 4.0.23 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump groovy-version from 4.0.22 to 4.0.23
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 814c617a build(deps): bump groovy-version from 4.0.22 to 4.0.23 814c617a is described below commit 814c617a81fd1cacd6b412bad9fe1c86f15065db Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 12 19:13:51 2024 + build(deps): bump groovy-version from 4.0.22 to 4.0.23 Bumps `groovy-version` from 4.0.22 to 4.0.23. Updates `org.apache.groovy:groovy` from 4.0.22 to 4.0.23 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-yaml` from 4.0.22 to 4.0.23 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-json` from 4.0.22 to 4.0.23 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-xml` from 4.0.22 to 4.0.23 - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.apache.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-yaml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-json dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-xml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 566abda9..76492f80 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21 -4.0.22 +4.0.23 2.10.1 4.4 3.26.3
(camel-k) branch main updated: feat(kamelets): bundling from jar
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 The following commit(s) were added to refs/heads/main by this push: new 6dbded5ab feat(kamelets): bundling from jar 6dbded5ab is described below commit 6dbded5abbda4d4edc1ce8a7bdca3ad37bacacce Author: Pasquale Congiusti AuthorDate: Thu Sep 12 17:34:03 2024 +0200 feat(kamelets): bundling from jar This is required to simplify the release process and leverage to distributed catalog as dependency --- build/Dockerfile | 5 +- pkg/apis/camel/v1/integrationplatform_types.go | 7 +- pkg/apis/camel/v1/kamelet_types_support.go | 5 + pkg/cmd/reset.go | 24 --- pkg/controller/catalog/initialize.go | 1 - pkg/controller/integrationplatform/catalog.go | 84 pkg/controller/integrationplatform/catalog_test.go | 235 - pkg/controller/integrationplatform/create.go | 150 +++-- pkg/controller/integrationplatform/create_test.go | 189 ++--- pkg/controller/integrationplatform/initialize.go | 17 +- .../integrationplatform/initialize_test.go | 81 --- .../integrationplatform_controller.go | 15 +- pkg/controller/integrationplatform/kamelets.go | 209 ++ .../integrationplatform/kamelets_test.go | 153 ++ pkg/controller/integrationplatform/monitor.go | 80 +++ pkg/controller/integrationplatform/monitor_test.go | 199 +++-- pkg/install/kamelets.go| 136 pkg/install/kamelets_test.go | 40 pkg/install/optional.go| 31 --- pkg/install/testdata/timer-source.kamelet.yaml | 57 - pkg/platform/defaults.go | 12 +- pkg/trait/kamelets.go | 28 ++- pkg/trait/kamelets_test.go | 1 - pkg/util/camel/camel_runtime.go| 3 +- release.adoc | 1 - script/Makefile| 19 +- script/bundle_kamelets.sh | 55 - 27 files changed, 935 insertions(+), 902 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 78ff6a3cd..f1523076c 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -43,20 +43,17 @@ ENV MAVEN_USER_HOME="${MAVEN_HOME}" RUN ${MVNW_DIR}/mvnw --version | grep "Maven home:" | sed 's/Maven home: //' >> ${MVNW_DIR}default \ && cp -r /usr/share/maven/lib/. $(cat ${MVNW_DIR}default)/lib \ && rm $(cat ${MVNW_DIR}default)/lib/maven-slf4j-provider* \ -&& rm $(cat ${MVNW_DIR}default)/lib/slf4j-api-1.* +&& rm $(cat ${MVNW_DIR}default)/lib/slf4j-api-1.* ENV MAVEN_OPTS="${MAVEN_OPTS} -Dlogback.configurationFile=${MAVEN_HOME}/conf/logback.xml" ADD build/_maven_output ${MVN_REPO} # Fix https://github.com/moby/moby/issues/37965 RUN true -ADD build/_kamelets /kamelets RUN chgrp -R 0 ${MVN_REPO} \ && chown -R 1001:0 ${MVN_REPO} \ && chmod -R 775 ${MVN_REPO} \ -&& chgrp -R 0 /kamelets \ -&& chmod -R g=u /kamelets \ && chgrp -R 0 ${MAVEN_HOME} \ && chown -R 1001:0 ${MAVEN_HOME} \ && chmod -R 775 ${MAVEN_HOME} diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index 3cc8e3a65..6c211996b 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -192,6 +192,7 @@ const ( // IntegrationPlatformPhaseError when the IntegrationPlatform had some error (see Conditions). IntegrationPlatformPhaseError IntegrationPlatformPhase = "Error" // IntegrationPlatformPhaseCreateCatalog when the IntegrationPlatform creates a new CamelCatalog. + // Deprecated no longer in use. IntegrationPlatformPhaseCreateCatalog IntegrationPlatformPhase = "CreateCatalog" // IntegrationPlatformConditionReady is the condition if the IntegrationPlatform is ready. @@ -199,12 +200,12 @@ const ( IntegrationPlatformConditionReady = "Ready" // IntegrationPlatformConditionTypeCreated is the condition if the IntegrationPlatform has been created. IntegrationPlatformConditionTypeCreated IntegrationPlatformConditionType = "Created" - // IntegrationPlatformConditionTypeRegistryAvailable is the condition for the availability of a container registry. IntegrationPlatformConditionTypeRegistryAvailable IntegrationPlatformConditionType = "RegistryAvailable" - - // IntegrationPlatf
(camel-k-runtime) branch dependabot/maven/quarkus-platform-version-3.14.3 deleted (was 5b402f02)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/quarkus-platform-version-3.14.3 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 5b402f02 build(deps): bump quarkus-platform-version from 3.13.0 to 3.14.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) 02/02: chore(e2e): prepare languages deprecation
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 66a346c337956698ef8f0c31e3f4c7b3837cf8cd Author: Pasquale Congiusti AuthorDate: Wed Sep 11 14:57:50 2024 +0200 chore(e2e): prepare languages deprecation It will be driven by the runtime setting though. --- docs/modules/ROOT/nav.adoc | 3 - docs/modules/ROOT/pages/languages/javascript.adoc | 38 --- docs/modules/ROOT/pages/languages/jsh.adoc | 25 - docs/modules/ROOT/pages/languages/kotlin.adoc | 124 - docs/modules/ROOT/pages/languages/languages.adoc | 3 - .../ROOT/pages/troubleshooting/debugging.adoc | 2 +- .../languages/files/PolyglotJava.java} | 15 ++- e2e/common/languages/files/js-polyglot.js | 21 e2e/common/languages/files/js.js | 21 e2e/common/languages/files/kotlin.kts | 23 e2e/common/languages/js_test.go| 47 e2e/common/languages/kotlin_test.go| 47 e2e/common/languages/polyglot_test.go | 4 +- e2e/native/files/JavaScript.js | 19 e2e/native/native_test.go | 7 -- e2e/native/native_with_sources_test.go | 12 -- 16 files changed, 14 insertions(+), 397 deletions(-) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 38eda62fe..6b2093895 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -28,9 +28,6 @@ ** xref:languages/yaml.adoc[YAML] ** xref:languages/xml.adoc[XML] ** xref:languages/groovy.adoc[Groovy] -** xref:languages/javascript.adoc[Javascript] -** xref:languages/jsh.adoc[JSheel] -** xref:languages/kotlin.adoc[Kotlin] * xref:configuration/configuration.adoc[Configuration] ** xref:configuration/dependencies.adoc[Dependencies] ** xref:configuration/build-time-properties.adoc[Build time properties] diff --git a/docs/modules/ROOT/pages/languages/javascript.adoc b/docs/modules/ROOT/pages/languages/javascript.adoc deleted file mode 100644 index 6ea5b8b70..0 --- a/docs/modules/ROOT/pages/languages/javascript.adoc +++ /dev/null @@ -1,38 +0,0 @@ -= Writing Integrations in JavaScript - -[WARNING] - -The JavaScript DSL is experimental. - - -An integration written in JavaScript looks very similar to a Java one: - -[source,js] -.hello.js - -function proc(e) { -e.getIn().setBody('Hello Camel K!') -} - -from('timer:tick') -.process(proc) -.to('log:info') - - -To run it, you need just to execute: - -``` -kamel run hello.js -``` - -For JavaScript integrations, Camel K does not yet provide an enhanced DSL, but you can access to some global bounded objects such as a writable registry and the camel context so to set the property _exchangeFormatter_ of the _LogComponent_ as done in previous example, you can do something like: - -[source,js] - - -l = context.getComponent('log', true, false) -l.exchangeFormatter = function(e) { -return "log - body=" + e.in.body + ", headers=" + e.in.headers -} - - diff --git a/docs/modules/ROOT/pages/languages/jsh.adoc b/docs/modules/ROOT/pages/languages/jsh.adoc deleted file mode 100644 index 1de6a1428..0 --- a/docs/modules/ROOT/pages/languages/jsh.adoc +++ /dev/null @@ -1,25 +0,0 @@ -= Writing Integrations in Java - -[WARNING] - -The JShell DSL is experimental. - - -Using Java and JShell to write an integration to be deployed using Camel K is no different from defining your routing rules in Camel with the only difference that you do not need to implement or extend a RouteBuilder but you can access the current builder thx to the built-in `builder` variable. - -[source,java] -.example.jsh - -builder.from("timer:tick") -.setBody() -.constant("Hello Camel K!") -.to("log:info");- - - -You can run it with the standard command: - -``` -kamel run example.jsh -``` - - diff --git a/docs/modules/ROOT/pages/languages/kotlin.adoc b/docs/modules/ROOT/pages/languages/kotlin.adoc deleted file mode 100644 index 697b68760..0 --- a/docs/modules/ROOT/pages/languages/kotlin.adoc +++ /dev/null @@ -1,124 +0,0 @@ -= Writing Integrations in Kotlin - -[WARNING] - -The Kotlin DSL is experimental. - - -An integration written in Kotlin looks very similar to a Java one except it can leverages Kotlin's language enhancements over Java: - -[source,kotlin] - -from("timer:tick") -.process { e -> e.getIn().body = "Hello Camel K!" } -.to("log:info") - - -You can run it with the standard command: - -``` -kamel run example.kts -``` - -Camel K extends the Camel Java DSL making it easier to configure the context in whi
(camel-k) branch main updated (194ad1ded -> 66a346c33)
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 194ad1ded chore(deps): bump github.com/container-tools/spectrum new 032aee7fa chore(trait): check for deprecate languages new 66a346c33 chore(e2e): prepare languages deprecation The 2 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: docs/modules/ROOT/nav.adoc | 3 - docs/modules/ROOT/pages/languages/javascript.adoc | 38 --- docs/modules/ROOT/pages/languages/jsh.adoc | 25 - docs/modules/ROOT/pages/languages/kotlin.adoc | 124 - docs/modules/ROOT/pages/languages/languages.adoc | 3 - .../ROOT/pages/troubleshooting/debugging.adoc | 2 +- .../files/{Java.java => PolyglotJava.java} | 6 +- e2e/common/languages/files/js-polyglot.js | 21 e2e/common/languages/files/js.js | 21 e2e/common/languages/files/kotlin.kts | 23 e2e/common/languages/js_test.go| 47 e2e/common/languages/kotlin_test.go| 47 e2e/common/languages/polyglot_test.go | 4 +- e2e/native/files/JavaScript.js | 19 e2e/native/files/Kotlin.kts| 21 e2e/native/native_test.go | 7 -- e2e/native/native_with_sources_test.go | 12 -- pkg/trait/quarkus.go | 33 +- pkg/trait/quarkus_test.go | 56 ++ 19 files changed, 91 insertions(+), 421 deletions(-) delete mode 100644 docs/modules/ROOT/pages/languages/javascript.adoc delete mode 100644 docs/modules/ROOT/pages/languages/jsh.adoc delete mode 100644 docs/modules/ROOT/pages/languages/kotlin.adoc copy e2e/common/languages/files/{Java.java => PolyglotJava.java} (87%) delete mode 100644 e2e/common/languages/files/js-polyglot.js delete mode 100644 e2e/common/languages/files/js.js delete mode 100644 e2e/common/languages/files/kotlin.kts delete mode 100644 e2e/common/languages/js_test.go delete mode 100644 e2e/common/languages/kotlin_test.go delete mode 100644 e2e/native/files/JavaScript.js delete mode 100644 e2e/native/files/Kotlin.kts
(camel-k) 01/02: chore(trait): check for deprecate languages
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 032aee7fa0fb4246fefbb0ccca3a3038143a1f0d Author: Pasquale Congiusti AuthorDate: Wed Sep 11 14:42:21 2024 +0200 chore(trait): check for deprecate languages Ref #5837 --- pkg/trait/quarkus.go | 33 pkg/trait/quarkus_test.go | 56 +++ 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go index b2193b1ec..50327b22c 100644 --- a/pkg/trait/quarkus.go +++ b/pkg/trait/quarkus.go @@ -57,6 +57,8 @@ type quarkusTrait struct { traitv1.QuarkusTrait `property:",squash"` } type languageSettings struct { + // indicates whether the language is supported + deprecated bool // indicates whether the native mode is supported native bool // indicates whether the sources are required at build time for native compilation @@ -65,9 +67,9 @@ type languageSettings struct { var ( // settings for an unknown language. - defaultSettings = languageSettings{false, false} + defaultSettings = languageSettings{false, false, false} // settings for languages supporting native mode for old catalogs. - nativeSupportSettings = languageSettings{true, false} + nativeSupportSettings = languageSettings{false, true, false} ) // Retrieves the settings of the given language from the Camel catalog. @@ -75,16 +77,16 @@ func getLanguageSettings(e *Environment, language v1.Language) languageSettings if loader, ok := e.CamelCatalog.Loaders[string(language)]; ok { native, nExists := loader.Metadata["native"] if !nExists { - log.Debug("The metadata 'native' is absent from the Camel catalog, the legacy language settings are applied") return getLegacyLanguageSettings(language) } sourcesRequiredAtBuildTime, sExists := loader.Metadata["sources-required-at-build-time"] + deprecated, dpExists := loader.Metadata["deprecated"] return languageSettings{ native: native == boolean.TrueString, sourcesRequiredAtBuildTime: sExists && sourcesRequiredAtBuildTime == boolean.TrueString, + deprecated: dpExists && deprecated == boolean.TrueString, } } - log.Debugf("No loader could be found for the language %q, the legacy language settings are applied", string(language)) return getLegacyLanguageSettings(language) } @@ -142,6 +144,16 @@ func (t *quarkusTrait) Matches(trait Trait) bool { func (t *quarkusTrait) Configure(e *Environment) (bool, *TraitCondition, error) { condition := t.adaptDeprecatedFields() + if t.languageSettingDeprecated(e) { + message := "The sources contains some language marked as deprecated. This Integration may not be supported in future release." + if condition == nil { + condition = NewIntegrationCondition( + "Quarkus", v1.IntegrationConditionTraitInfo, corev1.ConditionTrue, traitConfigurationReason, message) + } else { + condition.message += message + } + } + if t.containsMode(traitv1.NativeQuarkusMode) && e.IntegrationInPhase(v1.IntegrationPhaseBuildingKit) { // Native compilation is only supported for a subset of languages, // so let's check for compatibility, and fail-fast the Integration, @@ -176,6 +188,19 @@ func (t *quarkusTrait) adaptDeprecatedFields() *TraitCondition { return nil } +func (t *quarkusTrait) languageSettingDeprecated(e *Environment) bool { + if e.Integration == nil { + return false + } + for _, source := range e.Integration.AllSources() { + if language := source.InferLanguage(); getLanguageSettings(e, language).deprecated { + return true + } + } + + return false +} + func (t *quarkusTrait) validateNativeSupport(e *Environment) error { for _, source := range e.Integration.AllSources() { if language := source.InferLanguage(); !getLanguageSettings(e, language).native { diff --git a/pkg/trait/quarkus_test.go b/pkg/trait/quarkus_test.go index 107eecfaa..8092e3b79 100644 --- a/pkg/trait/quarkus_test.go +++ b/pkg/trait/quarkus_test.go @@ -256,3 +256,59 @@ func TestQuarkusMatches(t *testing.T) { qt2.NativeBaseImage = "docker.io/my-new-native-base" assert.False
(camel-k-runtime) branch main updated: feat: add a deprecation metadata to languages no longer supported
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 24dc85f3 feat: add a deprecation metadata to languages no longer supported 24dc85f3 is described below commit 24dc85f36d66856deaaac29862d53b045125a1ff Author: Pasquale Congiusti AuthorDate: Wed Sep 11 15:19:36 2024 +0200 feat: add a deprecation metadata to languages no longer supported --- .../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index 6f8c9a61..d087f359 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -305,6 +305,7 @@ public class GenerateCatalogMojo extends AbstractMojo { "kts", CamelLoader.fromArtifact("org.apache.camel.quarkus", "camel-quarkus-kotlin-dsl") .addLanguage("kts") +.putMetadata("deprecated", "true") .putMetadata("native", "true") .putMetadata("sources-required-at-build-time", "true") .build() @@ -315,6 +316,7 @@ public class GenerateCatalogMojo extends AbstractMojo { "js", CamelLoader.fromArtifact("org.apache.camel.quarkus", "camel-quarkus-js-dsl") .addLanguage("js") +.putMetadata("deprecated", "true") // Guest languages are not yet supported on Mandrel in native mode. .putMetadata("native", "false") .build() @@ -344,6 +346,7 @@ public class GenerateCatalogMojo extends AbstractMojo { "jsh", CamelLoader.fromArtifact("org.apache.camel.quarkus", "camel-quarkus-jsh-dsl") .addLanguages("jsh") +.putMetadata("deprecated", "true") // Native mode is not yet supported due to https://github.com/apache/camel-quarkus/issues/4458. .putMetadata("native", "false") .putMetadata("sources-required-at-build-time", "true")
(camel-website) branch new49 updated (873283f9 -> 0e9b59de)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch new49 in repository https://gitbox.apache.org/repos/asf/camel-website.git from 873283f9 Camel 4.8 whats new blog. WIP. add 0e9b59de chore: cloud configuration option No new revisions were added by this update. Summary of changes: content/blog/2024/09/camel48-whatsnew/index.md | 53 -- 1 file changed, 50 insertions(+), 3 deletions(-)
(camel-k) branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.76.2 deleted (was 42e9f5859)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.76.2 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 42e9f5859 chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: feat(deployer): deprecate client side apply enforcement
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 The following commit(s) were added to refs/heads/main by this push: new 36b2e679e feat(deployer): deprecate client side apply enforcement 36b2e679e is described below commit 36b2e679ecd8bd47d6553a41d6a7d91f2bb79689 Author: Pasquale Congiusti AuthorDate: Sat Sep 7 07:19:23 2024 +0200 feat(deployer): deprecate client side apply enforcement --- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 + docs/modules/traits/pages/deployer.adoc| 3 +- helm/camel-k/crds/camel-k-crds.yaml| 7 ++ pkg/apis/camel/v1/trait/deployer.go| 1 + pkg/client/apply.go| 22 - pkg/install/kamelets.go| 93 ++ .../camel.apache.org_integrationplatforms.yaml | 2 + .../camel.apache.org_integrationprofiles.yaml | 2 + .../crd/bases/camel.apache.org_integrations.yaml | 1 + .../bases/camel.apache.org_kameletbindings.yaml| 1 + .../config/crd/bases/camel.apache.org_pipes.yaml | 1 + pkg/trait/deployer.go | 88 +++- 12 files changed, 68 insertions(+), 154 deletions(-) diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 64e5125b5..77c844a21 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -6877,6 +6877,7 @@ bool | +Deprecated: won't be able to enforce client side update in the future. 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. diff --git a/docs/modules/traits/pages/deployer.adoc b/docs/modules/traits/pages/deployer.adoc index a220f1b3c..aa03c1034 100755 --- a/docs/modules/traits/pages/deployer.adoc +++ b/docs/modules/traits/pages/deployer.adoc @@ -36,7 +36,8 @@ The following configuration options are available: | deployer.use-ssa | bool -| Use server-side apply to update the owned resources (default `true`). +| Deprecated: won't be able to enforce client side update in the future. +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. |=== diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index cfdae68b1..449de8c30 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -4079,6 +4079,7 @@ spec: type: string useSSA: description: |- + Deprecated: won't be able to enforce client side update in the future. 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 @@ -6220,6 +6221,7 @@ spec: type: string useSSA: description: |- + Deprecated: won't be able to enforce client side update in the future. 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 @@ -8263,6 +8265,7 @@ spec: type: string useSSA: description: |- + Deprecated: won't be able to enforce client side update in the future. 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 @@ -10283,6 +10286,7 @@ spec: type: string useSSA: description: |- + Deprecated: won't be able to enforce client side update in the future. 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 @@ -18343,6 +18347,7 @@ spec: type: string
(camel-k) branch main updated: chore(doc): update Pipe spec
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 The following commit(s) were added to refs/heads/main by this push: new e5ff79837 chore(doc): update Pipe spec e5ff79837 is described below commit e5ff79837712f64456905f84cdf4d25e49e81aba Author: Pasquale Congiusti AuthorDate: Fri Sep 6 12:01:42 2024 +0200 chore(doc): update Pipe spec --- docs/modules/ROOT/pages/pipes/pipes.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/pipes/pipes.adoc b/docs/modules/ROOT/pages/pipes/pipes.adoc index c54f51094..1aeb14cc0 100644 --- a/docs/modules/ROOT/pages/pipes/pipes.adoc +++ b/docs/modules/ROOT/pages/pipes/pipes.adoc @@ -104,8 +104,8 @@ spec: Another typical use case is consume/produce events directly from a KafkaTopic custom resource (managed by Strimzi operator) or Knative resources: ```yaml -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: name: beer-event-source spec:
(camel-k) branch main updated: chore(deps): bump github.com/prometheus/common from 0.58.0 to 0.59.1
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 The following commit(s) were added to refs/heads/main by this push: new 284cced5f chore(deps): bump github.com/prometheus/common from 0.58.0 to 0.59.1 284cced5f is described below commit 284cced5f245426bd0ac5332259ed7a92fa7f49d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 6 06:03:07 2024 + chore(deps): bump github.com/prometheus/common from 0.58.0 to 0.59.1 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.58.0 to 0.59.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](https://github.com/prometheus/common/compare/v0.58.0...v0.59.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 61d9f17ef..56745bd1b 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 github.com/prometheus/client_golang v1.20.3 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.58.0 + github.com/prometheus/common v0.59.1 github.com/redhat-developer/service-binding-operator v1.4.0 github.com/rs/xid v1.6.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index c02145447..69bc3b318 100644 --- a/go.sum +++ b/go.sum @@ -374,8 +374,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.58.0 h1:N+N8vY4/23r6iYfD3UQZUoJPnUYAo7v6LG5XZxjZTXo= -github.com/prometheus/common v0.58.0/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= +github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= +github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
(camel-k-runtime) branch dependabot/github_actions/actions/download-artifact-4.1.8 deleted (was 7597cc7d)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/github_actions/actions/download-artifact-4.1.8 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 7597cc7d build(deps): bump actions/download-artifact from 4.1.7 to 4.1.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump actions/download-artifact from 4.1.7 to 4.1.8
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 0460bb03 build(deps): bump actions/download-artifact from 4.1.7 to 4.1.8 0460bb03 is described below commit 0460bb03e676f1758c4e5aaa6fa34692ad9b7f76 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 5 19:14:28 2024 + build(deps): bump actions/download-artifact from 4.1.7 to 4.1.8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.7 to 4.1.8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v4.1.7...v4.1.8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 77603928..6277997a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -107,7 +107,7 @@ jobs: with: version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v4.1.7 +uses: actions/download-artifact@v4.1.8 with: name: maven-repo-${{ github.run_id }}-${{ github.run_number }} path: . @@ -142,7 +142,7 @@ jobs: with: version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v4.1.7 +uses: actions/download-artifact@v4.1.8 with: name: maven-repo-${{ github.run_id }}-${{ github.run_number }} path: .
(camel-k) branch main updated: fix(trait): add size to emptydir
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 The following commit(s) were added to refs/heads/main by this push: new b6bcb2bc4 fix(trait): add size to emptydir b6bcb2bc4 is described below commit b6bcb2bc462f2b085bde00bf0ddb85d3a735a6a7 Author: Pasquale Congiusti AuthorDate: Thu Sep 5 17:30:42 2024 +0200 fix(trait): add size to emptydir It is good to have a limit for security reasons and it is also a workaround for #5752 Closes #5752 --- pkg/trait/trait_types.go | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go index 299b7f1c2..7a890af40 100644 --- a/pkg/trait/trait_types.go +++ b/pkg/trait/trait_types.go @@ -29,6 +29,7 @@ import ( appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" serving "knative.dev/serving/pkg/apis/serving/v1" @@ -595,7 +596,13 @@ func getVolume(volName, storageType, storageName, filterKey, filterValue string) ClaimName: storageName, } case emptyDirStorageType: - volume.VolumeSource.EmptyDir = &corev1.EmptyDirVolumeSource{} + size, err := resource.ParseQuantity("1Gi") + if err != nil { + log.WithValues("Function", "trait.getVolume").Errorf(err, "could not parse empty dir quantity, skipping") + } + volume.VolumeSource.EmptyDir = &corev1.EmptyDirVolumeSource{ + SizeLimit: &size, + } } return &volume
(camel-k) branch dependabot/go_modules/github.com/prometheus/client_golang-1.20.3 deleted (was d2183c53b)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus/client_golang-1.20.3 in repository https://gitbox.apache.org/repos/asf/camel-k.git was d2183c53b chore(deps): bump github.com/prometheus/client_golang The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: chore(deps): bump github.com/prometheus/client_golang
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 The following commit(s) were added to refs/heads/main by this push: new 9d18286e7 chore(deps): bump github.com/prometheus/client_golang 9d18286e7 is described below commit 9d18286e72f28c9b89b2921476ba5086712a44e0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Sep 6 00:50:42 2024 + chore(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.2 to 1.20.3. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.3/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.2...v1.20.3) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 58464b99e..1e09e5be6 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/openshift/api v0.0.0-20240228005710-4511c790cc60 github.com/operator-framework/api v0.23.0 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 - github.com/prometheus/client_golang v1.20.2 + github.com/prometheus/client_golang v1.20.3 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.58.0 github.com/redhat-developer/service-binding-operator v1.4.0 diff --git a/go.sum b/go.sum index 747fafcb7..26a443393 100644 --- a/go.sum +++ b/go.sum @@ -360,8 +360,8 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= -github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= +github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
(camel-k) branch main updated: feat(api): expose Camel core version
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 The following commit(s) were added to refs/heads/main by this push: new 80328ab14 feat(api): expose Camel core version 80328ab14 is described below commit 80328ab14b47ad761017a0e69db0bfbf6d8044b2 Author: Pasquale Congiusti AuthorDate: Thu Sep 5 12:08:24 2024 +0200 feat(api): expose Camel core version It is useful to know what core version of Camel the runtime is running --- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 7 +++ helm/camel-k/crds/camel-k-crds.yaml| 10 ++ pkg/apis/camel/v1/integrationplatform_types.go | 3 +++ .../camel/v1/integrationplatformbuildspec.go | 9 + pkg/controller/integrationplatform/catalog.go | 6 -- pkg/controller/integrationplatform/catalog_test.go | 6 ++ pkg/controller/integrationplatform/monitor.go | 1 + .../crd/bases/camel.apache.org_integrationplatforms.yaml | 10 ++ 8 files changed, 50 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index c7bfdb964..64e5125b5 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -2830,6 +2830,13 @@ the Camel K Runtime dependency version the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5) +|`runtimeCoreVersion` + +string +| + + +the Camel core version used by this IntegrationPlatform + |`baseImage` + string | diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index 06a215afc..cfdae68b1 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -3212,6 +3212,10 @@ spec: jsonPath: .status.build.runtimeVersion name: Default runtime type: string +- description: The default Camel core version + jsonPath: .status.build.runtimeCoreVersion + name: Camel version + type: string name: v1 schema: openAPIV3Schema: @@ -3571,6 +3575,9 @@ spec: description: the secret where credentials are stored type: string type: object + runtimeCoreVersion: +description: the Camel core version used by this IntegrationPlatform +type: string runtimeProvider: description: the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version @@ -5661,6 +5668,9 @@ spec: description: the secret where credentials are stored type: string type: object + runtimeCoreVersion: +description: the Camel core version used by this IntegrationPlatform +type: string runtimeProvider: description: the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version diff --git a/pkg/apis/camel/v1/integrationplatform_types.go b/pkg/apis/camel/v1/integrationplatform_types.go index 81ae587cd..3cc8e3a65 100644 --- a/pkg/apis/camel/v1/integrationplatform_types.go +++ b/pkg/apis/camel/v1/integrationplatform_types.go @@ -72,6 +72,7 @@ type IntegrationPlatformStatus struct { // +kubebuilder:printcolumn:name="Publish strategy",type=string,JSONPath=`.status.build.publishStrategy`,description="The default publish strategy" // +kubebuilder:printcolumn:name="Registry address",type=string,JSONPath=`.status.build.registry.address`,description="The container registry address" // +kubebuilder:printcolumn:name="Default runtime",type=string,JSONPath=`.status.build.runtimeVersion`,description="The default runtime version" +// +kubebuilder:printcolumn:name="Camel version",type=string,JSONPath=`.status.build.runtimeCoreVersion`,description="The default Camel core version" // IntegrationPlatform is the resource used to drive the Camel K operator behavior. // It defines the behavior of all Custom Resources (`IntegrationKit`, `Integration`, `Kamelet`) in the given namespace. @@ -119,6 +120,8 @@ type IntegrationPlatformBuildSpec struct { RuntimeVersion string `json:"runtimeVersion,omitempty"` // the runtime used. Likely Camel Quarkus (we used to have main runtime which has been discontinued since version 1.5) RuntimeProvider RuntimeProvider `json:"runtimeProvider,omitempty"` +
(camel-k-runtime) 01/02: build(deps): bump actions/download-artifact in /.github/workflows
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-runtime.git commit 8d48eb6b5efb91f96e2e31108df4a38e331dc796 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Sep 3 22:24:28 2024 + build(deps): bump actions/download-artifact in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 9ee879df..22ddde81 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -107,7 +107,7 @@ jobs: with: version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4.1.7 with: name: maven-repo-${{ github.run_id }}-${{ github.run_number }} path: . @@ -142,7 +142,7 @@ jobs: with: version: '17' - name: Download Maven Repo -uses: actions/download-artifact@v3 +uses: actions/download-artifact@v4.1.7 with: name: maven-repo-${{ github.run_id }}-${{ github.run_number }} path: .
(camel-k-runtime) branch main updated (4481fc90 -> 51d8a3dc)
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-runtime.git from 4481fc90 chore: update changelog new 8d48eb6b build(deps): bump actions/download-artifact in /.github/workflows new 51d8a3dc chore: upload artifact align The 2 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: .github/workflows/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(camel-k-runtime) 02/02: chore: upload artifact align
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-runtime.git commit 51d8a3dc79bd80bc6d7c5c618c4ae610992e0bf9 Author: Pasquale Congiusti AuthorDate: Thu Sep 5 09:31:12 2024 +0200 chore: upload artifact align --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 22ddde81..77603928 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -70,7 +70,7 @@ jobs: shell: bash run: tar -czf maven-repo-${{ github.run_id }}-${{ github.run_number }}.tgz -C ~ .m2/repository - name: Persist Maven Repo - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: maven-repo-${{ github.run_id }}-${{ github.run_number }} path: maven-repo-${{ github.run_id }}-${{ github.run_number }}.tgz
(camel-k) branch main updated: chore(helm): deprecate installation with platform
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 The following commit(s) were added to refs/heads/main by this push: new 10f03f21e chore(helm): deprecate installation with platform 10f03f21e is described below commit 10f03f21e46872acfb49a9715dd6c7cc4646576b Author: Pasquale Congiusti AuthorDate: Wed Sep 4 15:11:47 2024 +0200 chore(helm): deprecate installation with platform Required in order to provide a uniform user experience and make it explicit the role of the IntegrationPlatform --- helm/camel-k/README.md | 132 --- helm/camel-k/templates/NOTES.txt | 37 -- helm/camel-k/templates/platform.yaml | 4 +- helm/camel-k/values.yaml | 6 -- 4 files changed, 127 insertions(+), 52 deletions(-) diff --git a/helm/camel-k/README.md b/helm/camel-k/README.md index cfca2d345..da5789f32 100644 --- a/helm/camel-k/README.md +++ b/helm/camel-k/README.md @@ -1,15 +1,13 @@ # Camel K -Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers: the easiest way to build and manage your Camel applications on Kubernetes. - -This chart deploys the Camel K operator and all resources needed to natively run Apache Camel integrations on any Kubernetes cluster. +Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers: the easiest way to build and manage your Camel applications on Kubernetes. This chart deploys the Camel K operator and all resources needed to natively run Apache Camel Integrations on any Kubernetes cluster. ## Prerequisites - Kubernetes 1.11+ -- Container Image Registry installed and configured for pull (optional in Openshift or Minikube) +- Container Image Registry installed and configured for pull -## Installing the Chart +## Installation procedure To install the chart, first add the Camel K repository: @@ -17,55 +15,118 @@ To install the chart, first add the Camel K repository: $ helm repo add camel-k https://apache.github.io/camel-k/charts ``` -Depending on the cloud platform of choice, you will need to specify a container registry at installation time. +## Install the operator + +```bash +$ helm install camel-k camel-k/camel-k +``` + +## Set the container registry configuration + +A regular installation requires you to provide a registry used by Camel K to build application containers. See official [Camel K registry documentation](https://camel.apache.org/camel-k/next/installation/registry/registry.html) or move to next section to run on a local Minikube cluster. + +Create an `itp.yaml` file like: + +```yaml +apiVersion: camel.apache.org/v1 +kind: IntegrationPlatform +metadata: + labels: +app: camel-k + name: camel-k +spec: + build: +registry: + address: + organization: + secret: +``` + +and save the resource to the cluster with `kubectl apply -f itp.yaml`. -### Plain Kubernetes +### Minikube -A regular installation requires you to provide a registry, used by Camel K to build application containers. See official [Camel K registry documentation](https://camel.apache.org/camel-k/next/installation/registry/registry.html). +Minikube offers a container registry addon, which it makes very well suited for local Camel K development and testing purposes. You can see the cluster IP registry addon using the following script: ```bash -$ helm install camel-k \ - --set platform.build.registry.address= \ - camel-k/camel-k +$ minikube addons enable registry +$ kubectl -n kube-system get service registry -o jsonpath='{.spec.clusterIP}' +``` + +Then you can provide the IntegrationPlatform as `itp.yaml`: + +```yaml +apiVersion: camel.apache.org/v1 +kind: IntegrationPlatform +metadata: + labels: +app: camel-k + name: camel-k +spec: + build: +registry: + address: + insecure: true ``` -You may install Camel K and specify a container registry later. You may need to provide the `--force` option if the installation complains about an existing `IntegrationPlatform`. +and save the resource to the cluster with `kubectl apply -f itp.yaml`. -### Openshift +## Test your installation -If you are installing on OpenShift, Camel K can use the OpenShift internal registry to store and pull images: +Verify the IntegrationPlatform is in Ready status: ```bash -$ helm install camel-k \ - --set platform.cluster=OpenShift \ - camel-k/camel-k +kubectl get itp +NAME PHASE BUILD STRATEGY PUBLISH STRATEGY REGISTRY ADDRESS DEFAULT RUNTIME +camel-k Ready routine Jib10.100.107.57 3.8.1 ``` -### Minikube +Create a simple testing "Hello World" Integration as `test.yaml`: + +```yaml +apiVersion: camel.apache.org/v1 +kind: Integration +metadata: + name: test +spec:
(camel-k) branch main updated: chore(deps): bump golang.org/x/oauth2 from 0.22.0 to 0.23.0
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 The following commit(s) were added to refs/heads/main by this push: new d98019387 chore(deps): bump golang.org/x/oauth2 from 0.22.0 to 0.23.0 d98019387 is described below commit d98019387cf660ec4eba2a4c73ab37c1a306f1a1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 5 00:12:00 2024 + chore(deps): bump golang.org/x/oauth2 from 0.22.0 to 0.23.0 Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/oauth2/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/oauth2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b0686d2d5..b42c58147 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( go.uber.org/automaxprocs v1.5.3 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/oauth2 v0.22.0 + golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.8.0 golang.org/x/term v0.24.0 golang.org/x/text v0.17.0 diff --git a/go.sum b/go.sum index cb9832c82..fd82b3ffb 100644 --- a/go.sum +++ b/go.sum @@ -562,8 +562,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= -golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
(camel-k) branch dependabot/go_modules/golang.org/x/oauth2-0.23.0 deleted (was 6d5fed6ff)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/golang.org/x/oauth2-0.23.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 6d5fed6ff chore(deps): bump golang.org/x/oauth2 from 0.22.0 to 0.23.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: chore(deps): bump golang.org/x/term from 0.23.0 to 0.24.0
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 The following commit(s) were added to refs/heads/main by this push: new cc0981e2f chore(deps): bump golang.org/x/term from 0.23.0 to 0.24.0 cc0981e2f is described below commit cc0981e2f47e72cff9b47a951fa694bcb6171c0b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Sep 5 00:11:48 2024 + chore(deps): bump golang.org/x/term from 0.23.0 to 0.24.0 Bumps [golang.org/x/term](https://github.com/golang/term) from 0.23.0 to 0.24.0. - [Commits](https://github.com/golang/term/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 05b065596..b0686d2d5 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.8.0 - golang.org/x/term v0.23.0 + golang.org/x/term v0.24.0 golang.org/x/text v0.17.0 golang.org/x/time v0.6.0 gopkg.in/yaml.v2 v2.4.0 @@ -132,7 +132,7 @@ require ( golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.24.0 // indirect + golang.org/x/sys v0.25.0 // indirect golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.183.0 // indirect diff --git a/go.sum b/go.sum index 8595489a3..cb9832c82 100644 --- a/go.sum +++ b/go.sum @@ -625,12 +625,12 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
(camel-k) branch dependabot/go_modules/golang.org/x/term-0.24.0 deleted (was 698f93f4c)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/golang.org/x/term-0.24.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 698f93f4c chore(deps): bump golang.org/x/term from 0.23.0 to 0.24.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-website) branch main updated: fix: ck links cleaning
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-website.git The following commit(s) were added to refs/heads/main by this push: new 1bd9f6e7 fix: ck links cleaning 1bd9f6e7 is described below commit 1bd9f6e753307e474c1519133c9e52b1a56c693b Author: Pasquale Congiusti AuthorDate: Wed Sep 4 16:51:14 2024 +0200 fix: ck links cleaning --- content/blog/2021/04/camel-k-140-Whatsnew/index.md | 6 +++--- content/blog/2021/07/camel-k-properties-refactoring/index.md | 2 +- content/blog/2022/11/camel-k-jbang/index.md | 2 +- content/blog/2023/07/camel-k-2-0/index.md| 6 +++--- content/blog/2024/01/camel-k-2-2/index.md| 2 +- content/blog/2024/04/sourceless-ck-springboot/index.md | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/content/blog/2021/04/camel-k-140-Whatsnew/index.md b/content/blog/2021/04/camel-k-140-Whatsnew/index.md index e2d1cf1d..bf9c19b3 100644 --- a/content/blog/2021/04/camel-k-140-Whatsnew/index.md +++ b/content/blog/2021/04/camel-k-140-Whatsnew/index.md @@ -54,7 +54,7 @@ And the command will create a binding that just prints to the log the JSON data ## Kamel dump command -When users have issues understanding why Camel K is not behaving as expected, they often need to provide useful information +When users have issues understanding why Camel K is not behaving as expected, they often need to provide useful information about the current state of their cluster, to let Camel K developers investigate the issue and provide a solution or a quick workaround (e.g. in a Github issue, or in the Zulip chat). Usually, to identify the root cause of an issue, developers need to know things like: @@ -72,7 +72,7 @@ kamel dump status.log ``` This simple command will store in a text file all the information needed to investigate a possible issue in the cluster. -The user can now *edit the file to remove sensitive information* (which the command may not be able to tell apart), then +The user can now *edit the file to remove sensitive information* (which the command may not be able to tell apart), then share it with developers to have much better insights. ## Stability and compatibility @@ -84,7 +84,7 @@ to be present for the same service. We've also changed the way channels and brok to bind integrations to multiple channels and even create sequences of integrations attached to channels without any issue (e.g. [#2190](https://github.com/apache/camel-k/pull/2190), [#2115](https://github.com/apache/camel-k/pull/2115)). We've improved **installation options**, letting you configure things that may be important in a production environment, like [setting toleration](https://github.com/apache/camel-k/pull/2114) or using a [secured maven repository](https://github.com/apache/camel-k/pull/2180). -At the same time, we've fixed compatibility with recent dev environments, e.g. letting you [smoothly install Camel K in K3S](/camel-k/next/installation/registry/k3s.html). +At the same time, we've fixed compatibility with recent dev environments, e.g. letting you smoothly install Camel K in K3S. We also kept doing changes to continuously improve speed. On the runtime side of Camel K, we now use the [Quarkus fast-jar format](https://github.com/apache/camel-k/pull/1931) to reduce boot times. And last but not least on the operator side, it's possible to install Camel K globally in a cluster and have much faster build times by [sharing base images across the cluster](https://github.com/apache/camel-k/pull/2058). diff --git a/content/blog/2021/07/camel-k-properties-refactoring/index.md b/content/blog/2021/07/camel-k-properties-refactoring/index.md index 51ceeb2a..266f0537 100644 --- a/content/blog/2021/07/camel-k-properties-refactoring/index.md +++ b/content/blog/2021/07/camel-k-properties-refactoring/index.md @@ -25,7 +25,7 @@ Through this blog you will learn about: If you're an experienced Camel K developer, you are certainly familiar with the `--property` (abbreviated `--p`) and `--property-file` flags of the `kamel run` command. Through these flags you are instructing the runtime `Integration` to include properties configuration that will be used during the application execution. Within version 1.5 we made a slight change on how to provide a property file. We have deprecated the `--property-file` flag and favoured the new syntax `--property file: [...] Since this version we're also starting to distinguish between **runtime** properties and **build-time** properties. `--property` will be used to identify runtime properties. -Learn more in the [runtime properties documentation page](/camel-k/next/configuration/runtime-properties.html). +Learn more in the runtime properties documentation page. ## Build-tim
(camel-k) branch main updated: fix(ci): website build
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 The following commit(s) were added to refs/heads/main by this push: new 479ac1568 fix(ci): website build 479ac1568 is described below commit 479ac1568f66d835e736d3b5c73b7ab2b9f7e1a3 Author: Pasquale Congiusti AuthorDate: Wed Sep 4 15:35:28 2024 +0200 fix(ci): website build --- .../ROOT/{pages => images}/concepts/integrations.png| Bin docs/modules/ROOT/{pages => images}/concepts/pipes.png | Bin docs/modules/ROOT/nav.adoc | 2 +- docs/modules/ROOT/pages/configuration/dependencies.adoc | 6 ++ docs/modules/ROOT/pages/index.adoc | 2 +- docs/modules/ROOT/pages/installation/advanced/offline.adoc | 2 +- docs/modules/ROOT/pages/pipes/pipes.adoc| 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/modules/ROOT/pages/concepts/integrations.png b/docs/modules/ROOT/images/concepts/integrations.png similarity index 100% rename from docs/modules/ROOT/pages/concepts/integrations.png rename to docs/modules/ROOT/images/concepts/integrations.png diff --git a/docs/modules/ROOT/pages/concepts/pipes.png b/docs/modules/ROOT/images/concepts/pipes.png similarity index 100% rename from docs/modules/ROOT/pages/concepts/pipes.png rename to docs/modules/ROOT/images/concepts/pipes.png diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 475ba5190..38eda62fe 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -21,7 +21,7 @@ ** xref:running/synthetic.adoc[Synthetic Integrations] ** xref:running/promoting.adoc[Promote an Integration] * xref:pipes/pipes.adoc[Run an Pipe] -** xref:pipes/pipes-cli.adoc[kamel bind CLI] +** xref:pipes/bind-cli.adoc[kamel bind CLI] ** xref:pipes/promoting.adoc[Promote a Pipe] * xref:languages/languages.adoc[Languages] ** xref:languages/java.adoc[Java] diff --git a/docs/modules/ROOT/pages/configuration/dependencies.adoc b/docs/modules/ROOT/pages/configuration/dependencies.adoc index 039357788..56a002e27 100644 --- a/docs/modules/ROOT/pages/configuration/dependencies.adoc +++ b/docs/modules/ROOT/pages/configuration/dependencies.adoc @@ -9,11 +9,9 @@ from("imap://ad...@myserver.com") .to("seda:output") ``` -Since the integration has a endpoint starting with the **"imap:" prefix**, Camel K is able to **automatically add the "camel-mail" component** to the list of required dependencies. -The `seda:` endpoint belongs to `camel-core` that is automatically added to all integrations, so Camel K will not add additional dependencies for it. -This dependency resolution mechanism is transparent to the user, that will just see the integration running. +Since the integration has a endpoint starting with the **"imap:" prefix**, Camel K is able to **automatically add the "camel-mail" component** to the list of required dependencies. The `seda:` endpoint belongs to `camel-core` that is automatically added to all integrations, so Camel K will not add additional dependencies for it. This dependency resolution mechanism is transparent to the user, that will just see the integration running. -Automatic resolution is also a nice feature in xref:running/dev-mode.adoc[dev mode], because you are allowed to add all components you need *without exiting the dev loop*. +Automatic resolution is also a nice feature in _dev mode_, because you are allowed to add all components you need *without exiting the dev loop*. NOTE: Camel K won't be able to resolve automatically the dependencies when your routes specify dynamic URIs. diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index e9a59c394..48dde87fd 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -43,7 +43,7 @@ ifndef::prerelease[This release will not be updated, but rather replaced by a ne endif::[] -- -From Camel K version 2 onward you will be able to use any Camel K Runtime. Each runtime depends on a Camel Quarkus, Camel and Quarkus Platform version. Every Camel K has a default runtime used, but you can xref:running/runtime-version.adoc[pick any Camel K Runtime available] (backward and forward compatible). +From Camel K version 2 onward you will be able to use any Camel K Runtime. Each runtime depends on a Camel Quarkus, Camel and Quarkus Platform version. Every Camel K has a default runtime used, but you can xref:configuration/runtime-version.adoc[pick any Camel K Runtime available] (backward and forward compatible). [caption=] .Camel dependencies matrix diff --git a/docs/modules/ROOT/pages/installation/advanced/offline.adoc b/docs/modules/ROOT/pages/installation/advanced/offline.adoc index d8f7a9fa0..e6d32f6d4 100644 ---
(camel-k) branch main updated: chore(doc): minor adjustement
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 The following commit(s) were added to refs/heads/main by this push: new d80d86865 chore(doc): minor adjustement d80d86865 is described below commit d80d868656470557df970ea63b9c6291e92b1b0b Author: Pasquale Congiusti AuthorDate: Wed Sep 4 14:19:55 2024 +0200 chore(doc): minor adjustement --- docs/modules/ROOT/pages/contributing/local-execution.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/contributing/local-execution.adoc b/docs/modules/ROOT/pages/contributing/local-execution.adoc index 862013483..3ee259c8d 100644 --- a/docs/modules/ROOT/pages/contributing/local-execution.adoc +++ b/docs/modules/ROOT/pages/contributing/local-execution.adoc @@ -108,7 +108,7 @@ spec: The variable must be replaced with the version you are building. For example, `1.3.1-SNAPSHOT`. With these instructions, the operator will pick up and use the snapshot version you have released locally. In order to use the local maven repository, you will also need to edit your IntegrationPlatform as follow: -$ k edit ip -n operator-test +$ kubectl edit ip -n operator-test ... spec: @@ -122,4 +122,4 @@ $ k edit ip -n operator-test pointing the `localRepository` where your local maven is storing the artifacts (it will look for the camel-k-runtime dependencies there). -Alternatively, if no local registry is available, you can use another type of registry as explained in xref:installation/registry/registry.adoc[the Registry section]. \ No newline at end of file +Alternatively, if no local registry is available, you can use another type of registry as explained in xref:installation/registry/registry.adoc[the Registry section].
(camel-k) branch dependabot/go_modules/github.com/prometheus/common-0.58.0 deleted (was 1fe8423db)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus/common-0.58.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 1fe8423db chore(deps): bump github.com/prometheus/common from 0.57.0 to 0.58.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.76.1 deleted (was 0ff6224ba)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.76.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 0ff6224ba chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) 01/03: feat(api): Kamelet version parameter
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 fc91c3eda8fecb6b9eed1f744f1259c42452e624 Author: Pasquale Congiusti AuthorDate: Fri Aug 30 10:12:34 2024 +0200 feat(api): Kamelet version parameter --- addons/keda/keda_test.go | 56 +- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 41 +- e2e/support/test_support.go| 8 +- helm/camel-k/crds/camel-k-crds.yaml| 590 + pkg/apis/camel/v1/kamelet_types.go | 7 + pkg/apis/camel/v1/zz_generated.deepcopy.go | 29 +- .../applyconfiguration/camel/v1/kameletspec.go | 22 +- .../v1/{kameletspec.go => kameletspecbase.go} | 22 +- pkg/client/camel/applyconfiguration/utils.go | 2 + pkg/controller/pipe/initialize_test.go | 42 +- .../crd/bases/camel.apache.org_kamelets.yaml | 590 + pkg/trait/kamelets_support_test.go | 46 +- pkg/trait/kamelets_test.go | 202 +++ 13 files changed, 1473 insertions(+), 184 deletions(-) diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go index b017df262..4b4be7d7e 100644 --- a/addons/keda/keda_test.go +++ b/addons/keda/keda_test.go @@ -129,21 +129,23 @@ func TestKameletAutoDetection(t *testing.T) { }, }, Spec: camelv1.KameletSpec{ - Definition: &camelv1.JSONSchemaProps{ - Properties: map[string]camelv1.JSONSchemaProp{ - "a": { - XDescriptors: []string{ - "urn:keda:metadata:a", + KameletSpecBase: camelv1.KameletSpecBase{ + Definition: &camelv1.JSONSchemaProps{ + Properties: map[string]camelv1.JSONSchemaProp{ + "a": { + XDescriptors: []string{ + "urn:keda:metadata:a", + }, }, - }, - "b": { - XDescriptors: []string{ - "urn:keda:metadata:bb", + "b": { + XDescriptors: []string{ + "urn:keda:metadata:bb", + }, }, - }, - "c": { - XDescriptors: []string{ - "urn:keda:authentication:cc", + "c": { + XDescriptors: []string{ + "urn:keda:authentication:cc", + }, }, }, }, @@ -245,21 +247,23 @@ func TestPipeAutoDetection(t *testing.T) { }, }, Spec: camelv1.KameletSpec{ - Definition: &camelv1.JSONSchemaProps{ - Properties: map[string]camelv1.JSONSchemaProp{ - "a": { - XDescriptors: []string{ - "urn:keda:metadata:a", + KameletSpecBase: camelv1.KameletSpecBase{ + Definition: &camelv1.JSONSchemaProps{ + Properties: map[string]camelv1.JSONSch
(camel-k) 03/03: feat: support kamelet version in Pipe
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 8f9b49dc082207be8c1fa270c2f35a35b2a9b38d Author: Pasquale Congiusti AuthorDate: Mon Sep 2 16:37:19 2024 +0200 feat: support kamelet version in Pipe --- docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 4 +++- .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 2 +- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 4 +++- .../files/.camel-jbang/camel-jbang-run.properties | 25 + e2e/common/traits/files/kamelet-it-main.yaml | 19 e2e/common/traits/files/kamelet-it-v1.yaml | 21 - .../traits/files/my-timer-source.kamelet.yaml | 17 ++ helm/camel-k/crds/camel-k-crds.yaml| 5 - pkg/apis/camel/v1/kamelet_types.go | 6 - .../crd/bases/camel.apache.org_kamelets.yaml | 5 - pkg/trait/kamelets.go | 16 +++-- pkg/trait/kamelets_test.go | 6 ++--- pkg/util/bindings/bindings_test.go | 18 +++ pkg/util/bindings/kamelet.go | 26 +++--- pkg/util/source/kamelet.go | 4 +++- pkg/util/source/kamelet_test.go| 4 ++-- 16 files changed, 154 insertions(+), 28 deletions(-) diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc index da18d483f..c617c4780 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc @@ -373,7 +373,9 @@ spec: NOTE: make sure the overall content fits into 1 MiB, which is the storage limit for a Custom Resource. -This is a way to handle multiple version on Kubernetes and may not be supported out of the box by Camel core. If the Integration will require specifically to use `kamelet:my-timer-source?version=v2`, then, the operator will mount properly the specification on the running application. +This is a way to handle multiple version on Kubernetes and may not be supported out of the box by Camel core. If the Integration will require specifically to use `kamelet:my-timer-source?kameletVersion=v2`, then, the operator will mount properly the specification on the running application. + +The `.spec.versions` field may not be necessarily supported by the core as it's meant to provide a way to handle versioning on the cluster only. The runtime must be provided with a materialized Kamelet file with the chosen spec (the operator is in charge of that). == Kamelet data types diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc index 5c8414219..d39814ced 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc @@ -226,7 +226,7 @@ Kamelets provided in a catalog are generally meant to work with a given runtime .kamlet-namedconfig-route.yaml - from: -uri: "timer:tick?version=v2" +uri: "timer:tick?kameletVersion=v2" steps: - to: "log:info" diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index abf88aac5..4761b2747 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -4141,7 +4141,9 @@ KameletSpec specifies the configuration required to execute a Kamelet. | -the optional versions available for this Kamelet. +the optional versions available for this Kamelet. This field may not be taken in account by Camel core and is meant to support +any user defined versioning model on cluster only. If the user wants to use any given version, she must materialize a file with the given version spec +as the `main` Kamelet spec on the runtime. |=== diff --git a/e2e/common/traits/files/.camel-jbang/camel-jbang-run.properties b/e2e/common/traits/files/.camel-jbang/camel-jbang-run.properties new file mode 100644 index 0..8b86781dc --- /dev/null +++ b/e2e/common/traits/files/.camel-jbang/camel-jbang-run.properties @@ -0,0 +1,25 @@ +loggingLevel=info +loggingColor=true +loggingJson=false +camel.jbang.localKameletDir=file\:. +camel.main.modeline=true +camel.jbang.compileWorkDir=.camel-jbang/compile +camel.jbang.health=false +camel.jbang.metrics=false +camel.jbang.console=false +camel.jbang.verbose=false +camel.jbang.camel-version=4.7.0 +camel.jbang.springBootVersion=3.3.1 +camel.jbang.quarkusVersion=3.12.0 +camel.jbang.kameletsVersion=4.7.0 +camel.main.name=kamelet-it-v1 +camel.main.routesIncludePattern=file\:kamelet-it-v1.yaml +dependency=mvn\:org.apache.camel\:camel-kamelet\:4.7.0 +dependency=mvn\:org.apache.camel\:camel-yaml-dsl\:4.7.0 +depe
(camel-k) branch main updated (24b34b7d7 -> 8f9b49dc0)
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 24b34b7d7 fix(e2e): Get the most recent pod in e2e tests new fc91c3eda feat(api): Kamelet version parameter new b82257944 feat(trait): support kamelet versions in Integration new 8f9b49dc0 feat: support kamelet version in Pipe The 3 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: addons/keda/keda_test.go | 56 +- docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 46 ++ .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 15 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 43 +- .../files/.camel-jbang/camel-jbang-run.properties | 25 + .../traits/files/kamelet-it-main.yaml} | 5 +- .../traits/files/kamelet-it-v1.yaml} | 5 +- .../traits/files/my-timer-source.kamelet.yaml | 60 ++- e2e/common/traits/kamelet_test.go | 25 +- e2e/support/test_support.go| 8 +- helm/camel-k/crds/camel-k-crds.yaml| 593 + pkg/apis/camel/v1/kamelet_types.go | 11 + pkg/apis/camel/v1/kamelet_types_support.go | 28 +- pkg/apis/camel/v1/zz_generated.deepcopy.go | 29 +- pkg/apis/camel/v1alpha1/kamelet_types_support.go | 10 - .../applyconfiguration/camel/v1/kameletspec.go | 22 +- .../v1/{kameletspec.go => kameletspecbase.go} | 22 +- pkg/client/camel/applyconfiguration/utils.go | 2 + pkg/controller/pipe/initialize_test.go | 42 +- .../crd/bases/camel.apache.org_kamelets.yaml | 593 + pkg/trait/kamelets.go | 72 ++- pkg/trait/kamelets_support_test.go | 46 +- pkg/trait/kamelets_test.go | 302 ++- pkg/util/bindings/bindings_test.go | 18 + pkg/util/bindings/kamelet.go | 26 +- pkg/util/source/kamelet.go | 8 + .../util/source/kamelet_test.go| 19 +- 27 files changed, 1830 insertions(+), 301 deletions(-) create mode 100644 e2e/common/traits/files/.camel-jbang/camel-jbang-run.properties copy e2e/{knative/files/knativech2.yaml => common/traits/files/kamelet-it-main.yaml} (93%) copy e2e/{knative/files/knativegetpost2.yaml => common/traits/files/kamelet-it-v1.yaml} (92%) copy pkg/resources/config/samples/bases/camel_v1_kamelet.yaml => e2e/common/traits/files/my-timer-source.kamelet.yaml (51%) copy pkg/client/camel/applyconfiguration/camel/v1/{kameletspec.go => kameletspecbase.go} (77%) copy e2e/support/util/structured_log_test.go => pkg/util/source/kamelet_test.go (58%)
(camel-k) 02/03: feat(trait): support kamelet versions in Integration
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 b82257944a201a459535852f7deacb87cbcaa890 Author: Pasquale Congiusti AuthorDate: Mon Sep 2 16:00:33 2024 +0200 feat(trait): support kamelet versions in Integration --- docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 44 .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 15 +++ e2e/common/traits/files/kamelet-it-main.yaml | 4 + e2e/common/traits/files/kamelet-it-v1.yaml | 4 + .../traits/files/my-timer-source.kamelet.yaml | 49 + e2e/common/traits/kamelet_test.go | 25 - pkg/apis/camel/v1/kamelet_types_support.go | 28 +++-- pkg/apis/camel/v1alpha1/kamelet_types_support.go | 10 -- pkg/trait/kamelets.go | 74 + pkg/trait/kamelets_test.go | 122 ++--- pkg/util/source/kamelet.go | 6 + pkg/util/source/{kamelet.go => kamelet_test.go}| 37 ++- 12 files changed, 304 insertions(+), 114 deletions(-) diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc index ab5e533e6..da18d483f 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc @@ -331,6 +331,50 @@ If everything goes right, you should get some tweets in the logs after the integ Refer to the xref:kamelets/kamelets-user.adoc[Kamelets User Guide] for more information on how to use it in different contexts (like Knative, Kafka, etc.). +== Kamelet versions + +The catalog containing a set of Kamelets is generally developed in order to be used with a given Camel version (see the Apache Camel Kamelets catalog). However, when publishing the Kamelet to the cluster you may want to maintain more than one version for any reason (ie, to use a different dependency and be able to support multiple runtimes). You can therefore use the `.spec.versions` parameter to optionally maintain a set of alternative versions beside the main (and default) one. + +.my-timer-source.yaml +[source,yaml] + +apiVersion: camel.apache.org/v1 +kind: Kamelet +metadata: + name: my-timer-source +spec: + definition: +title: "Timer Example" + types: +out: + mediaType: text/plain + template: +from: + uri: timer:tick + steps: +- setBody: +constant: "Kamelet Main" +- to: "kamelet:sink" + versions: +v2: + definition: +title: "Timer Example 2" + types: +out: + mediaType: text/plain + template: +from: + uri: timer:tick + steps: +- setBody: +constant: "Kamelet V2" +- to: "kamelet:sink" + + +NOTE: make sure the overall content fits into 1 MiB, which is the storage limit for a Custom Resource. + +This is a way to handle multiple version on Kubernetes and may not be supported out of the box by Camel core. If the Integration will require specifically to use `kamelet:my-timer-source?version=v2`, then, the operator will mount properly the specification on the running application. + == Kamelet data types A Kamelet usually encapsulates a specific functionality and serves a very opinionated use case with well-defined input parameters and outcome. diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc index ae27db023..5c8414219 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc @@ -218,6 +218,21 @@ You can now write an integration that uses the Kamelet with the named configurat You can run this integration without specifying other parameters, the Kamelet endpoint will be implicitly configured by the Camel K operator that will automatically mount the secret into the integration Pod. +=== Kamelet versioning + +Kamelets provided in a catalog are generally meant to work with a given runtime version (the same for which they are released). However, when you create a Kamelet and publish to a cluster, you may want to store and use different versions. If the Kamelet is provided with more than the `main` version, then, you can specify which version to use in your Integration by adding the version parameter. For instance: + +[source,yaml] +.kamlet-namedconfig-route.yaml + +- from: +uri: "timer:tick?version=v2" +steps: + - to: "log:info" + + +The operator will be able to automatically pick the right version and use it at runtime. If no version is specified, then you will use the default one. + [[kamelets-usage-binding]] == Binding Kamelets in Pipes diff --git a/e2e/commo
(camel-k) 01/02: feat(api): Kit-less Integration
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 515c7629b3b39d724b00d7217bd6c6bd5682b647 Author: Pasquale Congiusti AuthorDate: Wed Aug 28 15:19:12 2024 +0200 feat(api): Kit-less Integration Closes #2365 --- addons/telemetry/telemetry.go | 4 - pkg/apis/camel/v1/integration_types_support.go| 5 + pkg/apis/camel/v1/integrationkit_types.go | 1 + pkg/apis/camel/v1/integrationkit_types_support.go | 1 + pkg/builder/image.go | 7 +- pkg/builder/image_test.go | 13 +- pkg/controller/integration/build_kit_test.go | 358 ++ pkg/controller/integration/initialize.go | 5 + pkg/controller/integration/kits.go| 16 +- pkg/controller/integration/monitor.go | 77 ++--- pkg/controller/integrationkit/monitor.go | 13 +- pkg/trait/camel.go| 28 +- pkg/trait/camel_test.go | 26 +- pkg/trait/container.go| 39 +-- pkg/trait/container_test.go | 20 +- pkg/trait/cron.go | 3 - pkg/trait/jvm.go | 55 ++-- pkg/trait/jvm_test.go | 31 +- pkg/trait/quarkus.go | 7 +- pkg/trait/trait_types_test.go | 29 +- pkg/util/camel/camel_runtime.go | 4 +- pkg/util/kubernetes/camel.go | 3 + 22 files changed, 550 insertions(+), 195 deletions(-) diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go index 07908c13f..5fae67232 100644 --- a/addons/telemetry/telemetry.go +++ b/addons/telemetry/telemetry.go @@ -177,10 +177,6 @@ func (t *telemetryTrait) setCatalogConfiguration(e *trait.Environment) { // Deprecated: to be removed in future release in favor of func setCatalogConfiguration(). func (t *telemetryTrait) setRuntimeProviderProperties(e *trait.Environment) { - if e.CamelCatalog == nil { - return - } - provider := e.CamelCatalog.CamelCatalogSpec.Runtime.Provider properties := telemetryProperties[provider] if appPropEnabled := properties[propEnabled]; appPropEnabled != "" { diff --git a/pkg/apis/camel/v1/integration_types_support.go b/pkg/apis/camel/v1/integration_types_support.go index ca0de0626..dec40102f 100644 --- a/pkg/apis/camel/v1/integration_types_support.go +++ b/pkg/apis/camel/v1/integration_types_support.go @@ -88,6 +88,11 @@ func (in *Integration) UserDefinedSources() []SourceSpec { return sources } +// IsManagedBuild returns true when the Integration requires to be built by the operator. +func (in *Integration) IsManagedBuild() bool { + return in.Spec.Traits.Container == nil || in.Spec.Traits.Container.Image == "" +} + func (in *IntegrationSpec) AddSource(name string, content string, language Language) { in.Sources = append(in.Sources, NewSourceSpec(name, content, language)) } diff --git a/pkg/apis/camel/v1/integrationkit_types.go b/pkg/apis/camel/v1/integrationkit_types.go index 3d2d70331..84f3b1fc8 100644 --- a/pkg/apis/camel/v1/integrationkit_types.go +++ b/pkg/apis/camel/v1/integrationkit_types.go @@ -155,6 +155,7 @@ const ( IntegrationKitTypeUser = "user" // IntegrationKitTypeExternal identifies a Kit created by any third party. IntegrationKitTypeExternal = "external" + // Deprecated: synthetic Integration Kits are replaced by non managed build Integrations. // IntegrationKitTypeSynthetic identifies a synthetic Kit (generated for any container image for which the operator cannot make any assumption). IntegrationKitTypeSynthetic = "synthetic" diff --git a/pkg/apis/camel/v1/integrationkit_types_support.go b/pkg/apis/camel/v1/integrationkit_types_support.go index b6b70624d..ed8595c3d 100644 --- a/pkg/apis/camel/v1/integrationkit_types_support.go +++ b/pkg/apis/camel/v1/integrationkit_types_support.go @@ -110,6 +110,7 @@ func (in *IntegrationKit) IsExternal() bool { return in.Labels[IntegrationKitTypeLabel] == IntegrationKitTypeExternal } +// Deprecated: synthetic Integration Kits are replaced by syntentic Integrations. // IsSynthetic returns true for synthetic IntegrationKits. func (in *IntegrationKit) IsSynthetic() bool { return in.Labels[IntegrationKitTypeLabel] == IntegrationKitTypeSynthetic diff --git a/pkg/builder/image.go b/pkg/builder/image.go index af79056ae..deaf0eaf3 100644 --- a/pkg/builder/image.go +++ b/pkg/builder/image.go @@ -24,6 +24,7 @@ import ( "strings" "github.com/apache/camel-k/v2/pkg/util/io" + "github.com/apach
(camel-k) branch main updated (8b9571f70 -> 422bba510)
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 8b9571f70 chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin new 515c7629b feat(api): Kit-less Integration new 422bba510 feat(cli): promote kitless The 2 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: addons/telemetry/telemetry.go | 4 - .../modules/ROOT/pages/running/camel-runtimes.adoc | 8 +- docs/modules/ROOT/pages/running/promoting.adoc | 10 +- e2e/advanced/tekton_test.go| 5 - e2e/install/upgrade/upgrade_test.go| 10 +- e2e/native/native_test.go | 3 - e2e/support/test_support.go| 22 +- pkg/apis/camel/v1/integration_types_support.go | 10 + .../camel/v1/integration_types_support_test.go | 24 ++ pkg/apis/camel/v1/integrationkit_types.go | 1 + pkg/apis/camel/v1/integrationkit_types_support.go | 8 +- .../camel/v1/integrationkit_types_support_test.go | 13 +- pkg/builder/image.go | 7 +- pkg/builder/image_test.go | 13 +- pkg/cmd/promote.go | 159 - pkg/cmd/promote_test.go| 221 ++--- pkg/cmd/run.go | 8 - pkg/controller/integration/build_kit.go| 30 +- pkg/controller/integration/build_kit_test.go | 358 + pkg/controller/integration/initialize.go | 5 + pkg/controller/integration/kits.go | 16 +- pkg/controller/integration/monitor.go | 78 ++--- pkg/controller/integrationkit/error.go | 1 + .../integrationkit/integrationkit_controller.go| 1 + pkg/controller/integrationkit/monitor.go | 14 +- pkg/trait/builder_test.go | 7 +- pkg/trait/camel.go | 30 +- pkg/trait/camel_test.go| 26 +- pkg/trait/container.go | 39 +-- pkg/trait/container_probes_test.go | 1 + pkg/trait/container_test.go| 47 ++- pkg/trait/cron.go | 3 - pkg/trait/istio_test.go| 7 +- pkg/trait/jvm.go | 129 +--- pkg/trait/jvm_test.go | 33 +- pkg/trait/quarkus.go | 56 ++-- pkg/trait/quarkus_test.go | 20 ++ pkg/trait/service_test.go | 21 +- pkg/trait/trait_types_test.go | 29 +- pkg/util/camel/camel_runtime.go| 4 +- pkg/util/kubernetes/camel.go | 3 + 41 files changed, 848 insertions(+), 636 deletions(-) create mode 100644 pkg/controller/integration/build_kit_test.go
(camel-k) 02/02: feat(cli): promote kitless
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 422bba510d133e4f18f1a9d5f923170ec708c95f Author: Pasquale Congiusti AuthorDate: Thu Aug 29 14:39:21 2024 +0200 feat(cli): promote kitless --- .../modules/ROOT/pages/running/camel-runtimes.adoc | 8 +- docs/modules/ROOT/pages/running/promoting.adoc | 10 +- e2e/advanced/tekton_test.go| 5 - e2e/install/upgrade/upgrade_test.go| 10 +- e2e/native/native_test.go | 3 - e2e/support/test_support.go| 22 +- pkg/apis/camel/v1/integration_types_support.go | 7 +- .../camel/v1/integration_types_support_test.go | 24 +++ pkg/apis/camel/v1/integrationkit_types_support.go | 7 +- .../camel/v1/integrationkit_types_support_test.go | 13 +- pkg/cmd/promote.go | 159 ++- pkg/cmd/promote_test.go| 221 +++-- pkg/cmd/run.go | 8 - pkg/controller/integration/build_kit.go| 30 +-- pkg/controller/integration/monitor.go | 1 + pkg/controller/integrationkit/error.go | 1 + .../integrationkit/integrationkit_controller.go| 1 + pkg/controller/integrationkit/monitor.go | 1 + pkg/trait/builder_test.go | 7 +- pkg/trait/camel.go | 2 + pkg/trait/container_probes_test.go | 1 + pkg/trait/container_test.go| 27 +-- pkg/trait/istio_test.go| 7 +- pkg/trait/jvm.go | 102 ++ pkg/trait/jvm_test.go | 2 +- pkg/trait/quarkus.go | 49 ++--- pkg/trait/quarkus_test.go | 20 ++ pkg/trait/service_test.go | 21 +- 28 files changed, 313 insertions(+), 456 deletions(-) diff --git a/docs/modules/ROOT/pages/running/camel-runtimes.adoc b/docs/modules/ROOT/pages/running/camel-runtimes.adoc index 34da12edf..ebe583472 100644 --- a/docs/modules/ROOT/pages/running/camel-runtimes.adoc +++ b/docs/modules/ROOT/pages/running/camel-runtimes.adoc @@ -1,6 +1,8 @@ = Camel Runtimes (aka "sourceless" Integrations) -Camel K can run any runtime available in Apache Camel. However, this is possible only when the Camel application was previously built and packaged into a container image. Also, if you run through this option, some of the features offered by the operator may not be available. For example, you won't be able to discover Camel capabilities because the source is not available to the operator but embedded in the container image. +Camel K operator is traditionally in charge to perform a build from a Camel DSL source. The resulting Integration depends directly on an IntegrationKit, which is a reusable custom resource backing the final container image that your application will run. In the last versions, the only runtime the operator can build is Camel Quarkus (via Camel K Runtime project). + +However Camel K can run any runtime available in Apache Camel. This is possible only when the Camel application was previously built and packaged into a container image externally. Mind that if you run through this option, some of the features offered by the operator may not be available. For example, you won't be able to discover Camel capabilities because the source is not available to the operator but embedded in the container image. This option is quite interesting if in general you're building your applications externally, ie, via a CICD technology, and you want to delegate the operator only the "operational" part, taking care on your own of the building and publishing part. @@ -15,7 +17,7 @@ You can have your own Camel application or just create a basic one for the purpo The step above is a very quick way to create a basic Camel application in any of the available runtime. Let's imagine we've done this for Camel Main or we have already a Camel application as a Maven project. As the build part is something we want to take care on our own, we create a pipeline to build, containerize and push the container to a registry (see as a reference https://github.com/tektoncd/catalog/blob/main/task/kamel-run/0.1/samples/run-external-build.yaml[Camel K Tekton example]). -At this stage we do have a container image with our Camel application. We can use the `kamel` CLI to run our Camel application via `kamel run --image docker.io/my-org/my-app:1.0.0` tuning, if it's the case, with any of the trait or configuration required. Mind that, when you run an Integration with this option, the operator will create a **synthetic** Int
(camel-k) branch release-2.5.0-nightly deleted (was ed1a95e16)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch release-2.5.0-nightly in repository https://gitbox.apache.org/repos/asf/camel-k.git was ed1a95e16 chore(ci): v2.5.0-nightly release updates This change permanently discards the following revisions: discard ed1a95e16 chore(ci): v2.5.0-nightly release updates
(camel-k) branch main updated: fix(ci): proper kamelet catalog
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 The following commit(s) were added to refs/heads/main by this push: new 396001970 fix(ci): proper kamelet catalog 396001970 is described below commit 3960019705168cbda54a0032fc1bc0a7f5b5d437 Author: Pasquale Congiusti AuthorDate: Fri Aug 30 09:00:05 2024 +0200 fix(ci): proper kamelet catalog --- script/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/Makefile b/script/Makefile index 68391a750..6a952deab 100644 --- a/script/Makefile +++ b/script/Makefile @@ -95,7 +95,7 @@ STAGING_IMAGE := docker.io/camelk/camel-k INSTALL_DEFAULT_KAMELETS ?= true KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Make sure to use a released tag or empty if you want to get the latest development bits -KAMELET_CATALOG_REPO_TAG := v4.0.1 +KAMELET_CATALOG_REPO_TAG := v4.4.1 # When performing integration tests, it is not necessary to always execute build, especially # in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
(camel-k) branch release-2.4.x updated: fix(ci): proper kamelet catalog
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.4.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.4.x by this push: new 84982eb74 fix(ci): proper kamelet catalog 84982eb74 is described below commit 84982eb74136000ee2dff1112322498797d37935 Author: Pasquale Congiusti AuthorDate: Fri Aug 30 09:00:37 2024 +0200 fix(ci): proper kamelet catalog --- script/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/Makefile b/script/Makefile index 36a4025db..449887043 100644 --- a/script/Makefile +++ b/script/Makefile @@ -96,7 +96,7 @@ STAGING_RUNTIME_REPO := INSTALL_DEFAULT_KAMELETS ?= true KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Make sure to use a released tag or empty if you want to get the latest development bits -KAMELET_CATALOG_REPO_TAG := v4.0.1 +KAMELET_CATALOG_REPO_TAG := v4.4.1 # When performing integration tests, it is not necessary to always execute build, especially # in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.10.0 deleted (was add89719)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.10.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was add89719 build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 26d7f063 build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin 26d7f063 is described below commit 26d7f063367bbbf9f09496443ddace1595fcfe36 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 29 19:36:35 2024 + build(deps): bump org.apache.maven.plugins:maven-javadoc-plugin Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- support/camel-k-runtime-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 766d0b1e..566abda9 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 8.44 3.2.5 3.1.3 -3.8.0 +3.10.0 3.2.1 3.6.0 3.4.2 diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index b66f2af7..67d63bb1 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -249,7 +249,7 @@ org.apache.maven.plugins maven-javadoc-plugin -3.8.0 +3.10.0 attach-javadocs
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.0 deleted (was c6e3c4c1)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.5.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was c6e3c4c1 build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 7de763e4 build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin 7de763e4 is described below commit 7de763e401389c4ba824ab42e816a44893f8d383 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Aug 28 19:26:50 2024 + build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7aaed64..766d0b1e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.8.0 3.5.0 3.2.0 -3.4.0 +3.5.0 2.17.1 1.0 3.4.1
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.15.0 deleted (was 0bf67117)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 0bf67117 build(deps): bump org.apache.maven.plugins:maven-plugin-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated (a1d6ba30 -> f793579d)
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-runtime.git from a1d6ba30 chore: update changelog add f793579d build(deps): bump org.apache.maven.plugins:maven-plugin-plugin No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-k-runtime) branch dependabot/maven/quarkus-platform-version-3.14.1 deleted (was 887faee2)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/quarkus-platform-version-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 887faee2 build(deps): bump quarkus-platform-version from 3.13.0 to 3.14.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch dependabot/go_modules/github.com/onsi/gomega-1.34.2 deleted (was 7d787388b)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/onsi/gomega-1.34.2 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 7d787388b chore(deps): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: chore(deps): bump github.com/onsi/gomega from 1.34.1 to 1.34.2
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 The following commit(s) were added to refs/heads/main by this push: new b408e56f4 chore(deps): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 b408e56f4 is described below commit b408e56f4cb6a0165b333edf79fc28c98d64e9b2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 29 00:34:06 2024 + chore(deps): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.1 to 1.34.2. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.1...v1.34.2) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 10 +- go.sum | 28 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 59f74eb50..85973bf0b 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/magiconair/properties v1.8.7 github.com/mattn/go-shellwords v1.0.12 github.com/mitchellh/mapstructure v1.5.0 - github.com/onsi/gomega v1.34.1 + github.com/onsi/gomega v1.34.2 // go get github.com/openshift/api@release-4.15 github.com/openshift/api v0.0.0-20240228005710-4511c790cc60 github.com/operator-framework/api v0.23.0 @@ -128,12 +128,12 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect github.com/vbatts/tar-split v0.11.3 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/mod v0.19.0 // indirect - golang.org/x/net v0.27.0 // indirect + golang.org/x/mod v0.20.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.24.0 // indirect - golang.org/x/tools v0.23.0 // indirect + golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.183.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect diff --git a/go.sum b/go.sum index 673b50def..29492543c 100644 --- a/go.sum +++ b/go.sum @@ -226,8 +226,8 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= +github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -326,12 +326,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo= +github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.3
(camel-k) branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.60 deleted (was ad2077e87)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.60 in repository https://gitbox.apache.org/repos/asf/camel-k.git was ad2077e87 chore(deps): bump github.com/container-tools/spectrum The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch dependabot/go_modules/github.com/prometheus/common-0.57.0 deleted (was ca1d52b74)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/github.com/prometheus/common-0.57.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was ca1d52b74 chore(deps): bump github.com/prometheus/common from 0.56.0 to 0.57.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k) branch main updated: chore(deps): bump github.com/prometheus/common from 0.56.0 to 0.57.0
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 The following commit(s) were added to refs/heads/main by this push: new 49c125d94 chore(deps): bump github.com/prometheus/common from 0.56.0 to 0.57.0 49c125d94 is described below commit 49c125d94aaf0c32cb50f7c895302047eb32c2fe Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 29 00:33:44 2024 + chore(deps): bump github.com/prometheus/common from 0.56.0 to 0.57.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.56.0 to 0.57.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](https://github.com/prometheus/common/compare/v0.56.0...v0.57.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d16d8a7d2..7d412fae7 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.73.2 github.com/prometheus/client_golang v1.20.2 github.com/prometheus/client_model v0.6.1 - github.com/prometheus/common v0.56.0 + github.com/prometheus/common v0.57.0 github.com/redhat-developer/service-binding-operator v1.4.0 github.com/rs/xid v1.6.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index e774d237e..2e26c3b6f 100644 --- a/go.sum +++ b/go.sum @@ -374,8 +374,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.56.0 h1:UffReloqkBtvtQEYDg2s+uDPGRrJyC6vZWPGXf6OhPY= -github.com/prometheus/common v0.56.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI= +github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY= +github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
(camel-k) branch main updated: chore(deps): bump github.com/container-tools/spectrum
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 The following commit(s) were added to refs/heads/main by this push: new 8e7d87518 chore(deps): bump github.com/container-tools/spectrum 8e7d87518 is described below commit 8e7d8751826c12ac78b897953e9c9aa4e1df41fd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 29 00:33:56 2024 + chore(deps): bump github.com/container-tools/spectrum Bumps [github.com/container-tools/spectrum](https://github.com/container-tools/spectrum) from 0.6.59 to 0.6.60. - [Release notes](https://github.com/container-tools/spectrum/releases) - [Changelog](https://github.com/container-tools/spectrum/blob/master/.goreleaser.yml) - [Commits](https://github.com/container-tools/spectrum/compare/v0.6.59...v0.6.60) --- updated-dependencies: - dependency-name: github.com/container-tools/spectrum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7d412fae7..59f74eb50 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22 require ( github.com/Masterminds/semver v1.5.0 - github.com/container-tools/spectrum v0.6.59 + github.com/container-tools/spectrum v0.6.60 github.com/evanphx/json-patch v5.9.0+incompatible github.com/fsnotify/fsnotify v1.7.0 github.com/gertd/go-pluralize v0.2.1 @@ -73,7 +73,7 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/docker/cli v27.1.2+incompatible // indirect + github.com/docker/cli v27.2.0+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/emicklei/go-restful/v3 v3.11.2 // indirect diff --git a/go.sum b/go.sum index 2e26c3b6f..673b50def 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtM github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/container-tools/spectrum v0.6.59 h1:kBRKSjOajWINf0vGOW0fI2kIAvW8ULxnibMEixmnp0I= -github.com/container-tools/spectrum v0.6.59/go.mod h1:3IU90ONh4JHKqfWMDzk3MHjk5PsP/96VorPPT0mH7CA= +github.com/container-tools/spectrum v0.6.60 h1:z/psz1UmUXjKRUDGaK9wcbUil0B9yFiFJoB9TvZfUfI= +github.com/container-tools/spectrum v0.6.60/go.mod h1:tWX+Mi4XGaFaJwRv9ebXnRkvtQ7CX8YmWZucF+rk6q8= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= @@ -97,8 +97,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= -github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= +github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
(camel-k) branch main updated: fix(ci): coverage badge script
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 The following commit(s) were added to refs/heads/main by this push: new 6d9bdaade fix(ci): coverage badge script 6d9bdaade is described below commit 6d9bdaadeef0090f8afcecffaa8ffc10c230ca17 Author: Pasquale Congiusti AuthorDate: Wed Aug 28 13:14:23 2024 +0200 fix(ci): coverage badge script --- .github/actions/automatic-updates/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml index a15368124..36117103f 100644 --- a/.github/actions/automatic-updates/action.yml +++ b/.github/actions/automatic-updates/action.yml @@ -76,7 +76,7 @@ runs: go tool cover -func=coverage.mod.out -o=coverage.mod.out grep -o -P '(?<=\(statements\))(.+)(?=%)' coverage.mod.out | xargs > coverage touch badge.out -wget https://gobinaries.com/github.com/AlexBeauchemin/gobadge@v0.2.0 -O gobadge +curl -sf https://gobinaries.com/github.com/AlexBeauchemin/gobadge@v0.2.0 | PREFIX=. sh chmod +x gobadge ./gobadge -filename=coverage -target=badge.out @@ -97,7 +97,7 @@ runs: run: | git config --local user.email "$CI_EMAIL" git config --local user.name "$CI_USER" -git add README.adoc && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" +git add README.adoc CHANGELOG.md && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" git push "https://$CI_USER:$ci_to...@github.com/$GITHUB_REPOSITORY.git"; HEAD:${{ inputs.branch-ref }} || echo "No nightly automatic updates changes to push" # Give it a rest to avoid hitting Github API rate limit
(camel-k) 04/04: chore(doc): camel runtimes adjustment
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 89cfeacb873aa16efef000f821ea7ba8cddcb1b1 Author: Pasquale Congiusti AuthorDate: Mon Aug 26 14:58:08 2024 +0200 chore(doc): camel runtimes adjustment --- .../modules/ROOT/pages/running/camel-runtimes.adoc | 260 + 1 file changed, 6 insertions(+), 254 deletions(-) diff --git a/docs/modules/ROOT/pages/running/camel-runtimes.adoc b/docs/modules/ROOT/pages/running/camel-runtimes.adoc index 3eacd7987..34da12edf 100644 --- a/docs/modules/ROOT/pages/running/camel-runtimes.adoc +++ b/docs/modules/ROOT/pages/running/camel-runtimes.adoc @@ -17,262 +17,14 @@ The step above is a very quick way to create a basic Camel application in any of At this stage we do have a container image with our Camel application. We can use the `kamel` CLI to run our Camel application via `kamel run --image docker.io/my-org/my-app:1.0.0` tuning, if it's the case, with any of the trait or configuration required. Mind that, when you run an Integration with this option, the operator will create a **synthetic** IntegrationKit. -NOTE: certain traits (ie, JVM) won't be available when running an application built externally. - If all is good, in a few seconds (there is no build involved) you should have your application up and running and you can monitor and operate with Camel K as usual. -[[traits-and-dependencies]] -== Traits and dependencies - -Certain Camel K operational aspect may be driven by traits. When you're building the application outside the operator, some of those traits may not be executed as they are executed during the building phase that we are skipping when running **sourceless Integrations**. Here we provided a list of those traits that may not work when building the application outside the Camel K operator. - -NOTE: this is a best effort analysis taking as reference the work available in version 2.3. - -* Build column show those traits that affects the build (will be skipped for sourceless Integrations). -* Dependencies column show those traits that will add some dependency (you may need to manually add those dependencies). -* Runtime column show those traits that will influence the runtime, mostly via properties (you may need to manually add those properties to the bundled `application.properties`). -* Deployment column show those traits that will be executed for the deployment (nothing should be required). - -[cols="1,1,1,1,1"] -|=== -|Trait -|Build -|Dependencies -|Runtime -|Deployment - -|Affinity -|x -|x -|x -|v - -|Builder -|v -|x -|x -|x - -|Camel -|x -|x -|v -|x - -|Container -|x -|x -|x -|v - -|Cron -|x -|v -|v -|x - -|Dependencies -|v -|v -|x -|x - -|Deployer -|x -|x -|x -|v - -|Deployment -|x -|x -|x -|v - -|Environment -|x -|x -|x -|v - -|Error Handler -|x -|v -|x -|x - -|GC (Garbage Collector) -|x -|x -|x -|v - -|Health -|x -|v -|v -|v - -|Ingress -|x -|x -|x -|v - -|Istio -|x -|x -|x -|v - -|Jolokia -|x -|v -|v -|v - -|JVM -|x -|x -|v -|v - -|Kamelets -|x -|x -|v -|x - -|Knative Service -|x -|x -|x -|v - -|Knative -|x -|v -|x -|x - -|Logging -|x -|x -|v -|v - -|Mount -|x -|x -|x -|v - -|Openapi -|x -|v -|v -|v - -|Owner -|x -|x -|x -|v - -|PDB -|x -|x -|x -|v - -|Platform -|x -|x -|x -|v - -|Pod -|x -|x -|x -|v - -|Prometheus -|v -|v -|x -|x - -|Pull Secret -|x -|x -|x -|v - -|Quarkus -|v -|x -|x -|x - -|Service -|x -|x -|x -|v - -|Service Binding -|x -|x -|v -|v - -|Toleration -|x -|x -|x -|v - -|Keda -|x -|x -|x -|v - -|Master -|v -|v -|v -|x - -|Resume -|v -|v -|x -|x - -|Strimzi -|x -|x -|x -|v - -|Telemetry -|x -|x -|v -|x +[[camel-runtime-discovery]] +== Camel Runtime version discovery -|Three Scale -|x -|x -|x -|v +Every Camel application requires a `CamelCatalog` object to know how to perform certain runtime configuration. When you run a **sourceless Integrations** there is no easy way to automatically discover for which runtime your application was built. In this case, we suggest you to specify the `camel.runtime-version` trait in order to improve the compatibility between the operator configuration and the specific runtime you're running. If no runtime version is specified, then, as default, the [...] -|Vaults -|x -|v -|v -|x +[[traits]] +== Trait configuration -|=== +Certain Camel K operational aspect may be driven by traits. When you're building the application outside the operator, some of those traits may not be executed as they are executed during the building phase that we are skipping when running **sourceless Integrations**. There is also no possible way to auto-tune certain traits that require the presence of the source. In this case, you should instead provide a trait configuration with the values that are required by your Integration (for e [...] \ No newline at end of file
(camel-k) 02/04: feat(trait): operate via default catalog
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 0dc8ee17994d5238ea96890dcf6b190a26de6d94 Author: Pasquale Congiusti AuthorDate: Wed Aug 21 11:35:54 2024 +0200 feat(trait): operate via default catalog With this refactoring, we allow any trait to be executed with at least a default CamelCatalog. This is useful when we run sourceless where, from now on, we can pick the catalog used to operate, regardless if it's a managed Integration or not. --- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 47 +++ helm/camel-k/crds/camel-k-crds.yaml| 22 +++ pkg/apis/camel/v1/common_types.go | 6 ++ pkg/apis/camel/v1/integration_types.go | 3 + pkg/apis/camel/v1/integrationkit_types.go | 2 + pkg/apis/camel/v1/zz_generated.deepcopy.go | 17 ++ .../camel/applyconfiguration/camel/v1/catalog.go | 53 + .../camel/v1/integrationkitstatus.go | 9 +++ .../camel/v1/integrationstatus.go | 9 +++ pkg/client/camel/applyconfiguration/utils.go | 2 + pkg/controller/integrationkit/initialize.go| 2 +- .../bases/camel.apache.org_integrationkits.yaml| 9 +++ .../crd/bases/camel.apache.org_integrations.yaml | 13 + pkg/trait/camel.go | 67 ++ pkg/trait/camel_test.go| 39 +++-- pkg/trait/logging_test.go | 8 +-- pkg/trait/trait_types.go | 5 +- pkg/trait/trait_types_test.go | 9 ++- 18 files changed, 281 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 2cd4b1420..3b4e6e41b 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -1476,6 +1476,38 @@ map[string]string Set of generic metadata +|=== + +[#_camel_apache_org_v1_Catalog] +=== Catalog + +*Appears on:* + +* <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>> +* <<#_camel_apache_org_v1_IntegrationStatus, IntegrationStatus>> + +Catalog represents the Camel Catalog runtime specification. + +[cols="2,2a",options="header"] +|=== +|Field +|Description + +|`version` + +string +| + + + + +|`provider` + +*xref:#_camel_apache_org_v1_RuntimeProvider[RuntimeProvider]* +| + + + + + |=== [#_camel_apache_org_v1_Configurable] @@ -2648,6 +2680,13 @@ the runtime version for which this kit was configured the runtime provider for which this kit was configured +|`catalog` + +*xref:#_camel_apache_org_v1_Catalog[Catalog]* +| + + +the catalog used to build/operate the IntegrationKit. + |`platform` + string | @@ -3522,6 +3561,13 @@ the runtime version targeted for this Integration the runtime provider targeted for this Integration +|`catalog` + +*xref:#_camel_apache_org_v1_Catalog[Catalog]* +| + + +the catalog used to build/operate the Integration. + |`configuration` + *xref:#_camel_apache_org_v1_ConfigurationSpec[[\]ConfigurationSpec]* | @@ -5259,6 +5305,7 @@ ResourceCondition is a common type for all conditions. *Appears on:* +* <<#_camel_apache_org_v1_Catalog, Catalog>> * <<#_camel_apache_org_v1_IntegrationKitStatus, IntegrationKitStatus>> * <<#_camel_apache_org_v1_IntegrationPlatformBuildSpec, IntegrationPlatformBuildSpec>> * <<#_camel_apache_org_v1_IntegrationProfileBuildSpec, IntegrationProfileBuildSpec>> diff --git a/helm/camel-k/crds/camel-k-crds.yaml b/helm/camel-k/crds/camel-k-crds.yaml index 3e409754f..51d4da8fc 100644 --- a/helm/camel-k/crds/camel-k-crds.yaml +++ b/helm/camel-k/crds/camel-k-crds.yaml @@ -3045,6 +3045,15 @@ spec: baseImage: description: base image used by the kit (could be another IntegrationKit) type: string + catalog: +description: the catalog used to build/operate the IntegrationKit. +properties: + provider: +description: RuntimeProvider is the provider chosen for the runtime. +type: string + version: +type: string +type: object conditions: description: a list of conditions which happened for the events related the kit @@ -11195,6 +11204,10 @@ spec: jsonPath: .status.runtimeVersion name: Runtime Version type: string +- description: The catalog version + jsonPath: .status.catalog.version + name: Catalog Version + type: string - description: The integration kit jsonPath: .
(camel-k) 03/04: chore(traits): removed camel catalog condition
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 eba01873efaf3303d2677f7c1b65fe61efbd5d85 Author: Pasquale Congiusti AuthorDate: Thu Aug 22 10:48:36 2024 +0200 chore(traits): removed camel catalog condition The default is to have a CamelCatalog, so, there is no need to skip traits any longer --- addons/keda/keda.go| 3 --- addons/master/master.go| 4 addons/resume/resume.go| 3 --- addons/telemetry/telemetry.go | 11 ++- addons/telemetry/telemetry_test.go | 3 --- pkg/trait/builder.go | 3 --- pkg/trait/cron.go | 3 --- pkg/trait/dependencies.go | 3 --- pkg/trait/error_handler.go | 4 pkg/trait/health.go| 6 +++--- pkg/trait/kamelets.go | 5 - pkg/trait/kamelets_test.go | 9 - pkg/trait/knative.go | 10 ++ pkg/trait/knative_test.go | 5 + pkg/trait/logging.go | 2 +- pkg/trait/openapi.go | 8 +--- pkg/trait/quarkus.go | 3 --- pkg/trait/service.go | 3 --- pkg/trait/service_binding.go | 3 --- pkg/trait/trait_condition_types.go | 15 --- 20 files changed, 14 insertions(+), 92 deletions(-) diff --git a/addons/keda/keda.go b/addons/keda/keda.go index 3060d48b3..531753827 100644 --- a/addons/keda/keda.go +++ b/addons/keda/keda.go @@ -119,9 +119,6 @@ func (t *kedaTrait) Configure(e *trait.Environment) (bool, *trait.TraitCondition if e.Integration == nil || !ptr.Deref(t.Enabled, false) { return false, nil, nil } - if e.CamelCatalog == nil { - return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil - } if !e.IntegrationInPhase(camelv1.IntegrationPhaseInitialization) && !e.IntegrationInRunningPhases() { return false, nil, nil } diff --git a/addons/master/master.go b/addons/master/master.go index 5ebc04c79..f893e19bc 100644 --- a/addons/master/master.go +++ b/addons/master/master.go @@ -88,13 +88,9 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool, *trait.TraitConditi if !ptr.Deref(t.Enabled, true) { return false, trait.NewIntegrationConditionUserDisabled(masterComponent), nil } - if e.CamelCatalog == nil { - return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil - } if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization, v1.IntegrationPhaseBuildingKit) && !e.IntegrationInRunningPhases() { return false, nil, nil } - if !ptr.Deref(t.Auto, true) { return ptr.Deref(t.Enabled, false), nil, nil } diff --git a/addons/resume/resume.go b/addons/resume/resume.go index 6fed7e3bf..45d56756c 100644 --- a/addons/resume/resume.go +++ b/addons/resume/resume.go @@ -78,9 +78,6 @@ func (r *resumeTrait) Configure(environment *trait.Environment) (bool, *trait.Tr if !ptr.Deref(r.Enabled, false) { return false, nil, nil } - if environment.CamelCatalog == nil { - return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil - } if !environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) && !environment.IntegrationInRunningPhases() { return false, nil, nil } diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go index 806bbd1b9..07908c13f 100644 --- a/addons/telemetry/telemetry.go +++ b/addons/telemetry/telemetry.go @@ -90,17 +90,10 @@ func NewTelemetryTrait() trait.Trait { } } -func (t *telemetryTrait) isForcefullyEnabled() bool { - return ptr.Deref(t.Enabled, false) && !ptr.Deref(t.Auto, true) -} - func (t *telemetryTrait) Configure(e *trait.Environment) (bool, *trait.TraitCondition, error) { if e.Integration == nil || !ptr.Deref(t.Enabled, false) { return false, nil, nil } - if e.CamelCatalog == nil && !t.isForcefullyEnabled() { - return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil - } if !ptr.Deref(t.Auto, true) { return true, nil, nil @@ -143,7 +136,7 @@ func (t *telemetryTrait) Configure(e *trait.Environment) (bool, *trait.TraitCond func (t *telemetryTrait) Apply(e *trait.Environment) error { util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities, v1.CapabilityTelemetry) - if t.isForcefullyEnabled() || e.CamelCatalog.Runtime.Capabilities["telemetry"].RuntimeProperties != nil { + if e.CamelCatalog.Runtime.Capabilities["telemetry"].RuntimeProperties != n
(camel-k) 01/04: chore: consume source code refactoring
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 ffe477831723d1519fabdc01c8b506bf66bb7ef1 Author: Pasquale Congiusti AuthorDate: Wed Aug 21 09:44:56 2024 +0200 chore: consume source code refactoring We should allow the consume of sources and meta from trait package only via consumer funcs. In this way we can control the logic for instance, allowing to consume only when sources or catalog are available. --- addons/keda/keda.go| 11 +- addons/master/master.go| 66 addons/resume/resume.go| 17 +- e2e/advanced/promote_test.go | 16 -- pkg/builder/quarkus.go | 25 +-- pkg/cmd/promote.go | 261 + pkg/metadata/metadata.go | 27 +-- pkg/metadata/metadata_capabilities_test.go | 2 +- pkg/metadata/metadata_dependencies_test.go | 44 ++--- pkg/metadata/metadata_http_test.go | 16 +- pkg/metadata/metadata_uri_test.go | 16 +- pkg/trait/container.go | 23 --- pkg/trait/container_test.go| 97 +-- pkg/trait/cron.go | 14 +- pkg/trait/dependencies.go | 36 ++-- pkg/trait/kamelets.go | 15 +- pkg/trait/knative.go | 115 ++--- pkg/trait/knative_service.go | 40 ++--- pkg/trait/knative_test.go | 105 pkg/{util/kubernetes => trait}/resolver.go | 23 +-- pkg/trait/security_context_test.go | 5 + pkg/trait/service.go | 17 +- pkg/trait/trait_types.go | 35 pkg/trait/util.go | 42 + pkg/util/kamelets/util.go | 59 --- 25 files changed, 363 insertions(+), 764 deletions(-) diff --git a/addons/keda/keda.go b/addons/keda/keda.go index 08b2fa832..3060d48b3 100644 --- a/addons/keda/keda.go +++ b/addons/keda/keda.go @@ -34,7 +34,6 @@ import ( "github.com/apache/camel-k/v2/pkg/platform" "github.com/apache/camel-k/v2/pkg/trait" "github.com/apache/camel-k/v2/pkg/util" - "github.com/apache/camel-k/v2/pkg/util/kubernetes" "github.com/apache/camel-k/v2/pkg/util/property" "github.com/apache/camel-k/v2/pkg/util/source" "github.com/apache/camel-k/v2/pkg/util/uri" @@ -315,12 +314,8 @@ func (t *kedaTrait) getTopControllerReference(e *trait.Environment) *v1.ObjectRe } func (t *kedaTrait) populateTriggersFromKamelets(e *trait.Environment) error { - sources, err := kubernetes.ResolveIntegrationSources(e.Ctx, e.Client, e.Integration, e.Resources) - if err != nil { - return err - } kameletURIs := make(map[string][]string) - if err := metadata.Each(e.CamelCatalog, sources, func(_ int, meta metadata.IntegrationMetadata) bool { + _, err := e.ConsumeMeta(func(meta metadata.IntegrationMetadata) bool { for _, kameletURI := range meta.FromURIs { if kameletStr := source.ExtractKamelet(kameletURI); kameletStr != "" && camelv1.ValidKameletName(kameletStr) { kamelet := kameletStr @@ -333,8 +328,10 @@ func (t *kedaTrait) populateTriggersFromKamelets(e *trait.Environment) error { kameletURIs[kamelet] = uriList } } + return true - }); err != nil { + }) + if err != nil { return err } diff --git a/addons/master/master.go b/addons/master/master.go index 7e3fbda0f..5ebc04c79 100644 --- a/addons/master/master.go +++ b/addons/master/master.go @@ -99,52 +99,50 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool, *trait.TraitConditi return ptr.Deref(t.Enabled, false), nil, nil } - // Check if the master component has been used - sources, err := kubernetes.ResolveIntegrationSources(e.Ctx, t.Client, e.Integration, e.Resources) - if err != nil { - return false, nil, err - } - - meta, err := metadata.ExtractAll(e.CamelCatalog, sources) - if err != nil { - return false, nil, err - } - - if t.Enabled == nil { + enabled, err := e.ConsumeMeta(func(meta metadata.IntegrationMetadata) bool { + found := false + loop: for _, endpoint := range meta.FromURIs { if uri.GetComponent(endpoint) == masterComponent { - enabled := true - t.Enabled = &
(camel-k) branch main updated (87d5ffb68 -> 89cfeacb8)
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 87d5ffb68 feat: adding ingressClassName field to the Ingress trait new ffe477831 chore: consume source code refactoring new 0dc8ee179 feat(trait): operate via default catalog new eba01873e chore(traits): removed camel catalog condition new 89cfeacb8 chore(doc): camel runtimes adjustment The 4 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: addons/keda/keda.go| 14 +- addons/master/master.go| 70 +++--- addons/resume/resume.go| 20 +- addons/telemetry/telemetry.go | 11 +- addons/telemetry/telemetry_test.go | 3 - .../modules/ROOT/pages/running/camel-runtimes.adoc | 260 +--- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 47 e2e/advanced/promote_test.go | 16 -- helm/camel-k/crds/camel-k-crds.yaml| 22 ++ pkg/apis/camel/v1/common_types.go | 6 + pkg/apis/camel/v1/integration_types.go | 3 + pkg/apis/camel/v1/integrationkit_types.go | 2 + pkg/apis/camel/v1/zz_generated.deepcopy.go | 17 ++ pkg/builder/quarkus.go | 25 +- .../camel/v1/{kameletproperty.go => catalog.go}| 34 +-- .../camel/v1/integrationkitstatus.go | 9 + .../camel/v1/integrationstatus.go | 9 + pkg/client/camel/applyconfiguration/utils.go | 2 + pkg/cmd/promote.go | 261 + pkg/controller/integrationkit/initialize.go| 2 +- pkg/metadata/metadata.go | 27 +-- pkg/metadata/metadata_capabilities_test.go | 2 +- pkg/metadata/metadata_dependencies_test.go | 44 ++-- pkg/metadata/metadata_http_test.go | 16 +- pkg/metadata/metadata_uri_test.go | 16 +- .../bases/camel.apache.org_integrationkits.yaml| 9 + .../crd/bases/camel.apache.org_integrations.yaml | 13 + pkg/trait/builder.go | 3 - pkg/trait/camel.go | 67 -- pkg/trait/camel_test.go| 39 ++- pkg/trait/container.go | 23 -- pkg/trait/container_test.go| 97 +--- pkg/trait/cron.go | 17 +- pkg/trait/dependencies.go | 39 ++- pkg/trait/error_handler.go | 4 - pkg/trait/health.go| 6 +- pkg/trait/kamelets.go | 20 +- pkg/trait/kamelets_test.go | 9 +- pkg/trait/knative.go | 123 -- pkg/trait/knative_service.go | 40 +--- pkg/trait/knative_test.go | 110 - pkg/trait/logging.go | 2 +- pkg/trait/logging_test.go | 8 +- pkg/trait/openapi.go | 8 +- pkg/trait/quarkus.go | 3 - pkg/{util/kubernetes => trait}/resolver.go | 23 +- pkg/trait/security_context_test.go | 5 + pkg/trait/service.go | 20 +- pkg/trait/service_binding.go | 3 - pkg/trait/trait_condition_types.go | 15 -- pkg/trait/trait_types.go | 40 +++- pkg/trait/trait_types_test.go | 9 +- pkg/trait/util.go | 42 +--- pkg/util/kamelets/util.go | 59 - 54 files changed, 629 insertions(+), 1165 deletions(-) copy pkg/client/camel/applyconfiguration/camel/v1/{kameletproperty.go => catalog.go} (52%) rename pkg/{util/kubernetes => trait}/resolver.go (81%) delete mode 100644 pkg/util/kamelets/util.go
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-surefire-plugin-3.5.0 deleted (was 0928bed8)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-surefire-plugin-3.5.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 0928bed8 build(deps): bump org.apache.maven.plugins:maven-surefire-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugin-tools-maven-plugin-annotations-3.15.0 deleted (was 6a52831f)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugin-tools-maven-plugin-annotations-3.15.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 6a52831f build(deps): bump org.apache.maven.plugin-tools:maven-plugin-annotations The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugin-tools:maven-plugin-annotations
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new dc4a0fa4 build(deps): bump org.apache.maven.plugin-tools:maven-plugin-annotations dc4a0fa4 is described below commit dc4a0fa4eaaa9e32166878222e3d65e2c423aba3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Aug 27 19:31:17 2024 + build(deps): bump org.apache.maven.plugin-tools:maven-plugin-annotations Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.14.0...maven-plugin-tools-3.15.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce7f191a..1cc7521e 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 3.4.2 3.14.0 3.6.3 -3.14.0 +3.15.0 3.4.0 2.8.1
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-surefire-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 61bbf9c0 build(deps): bump org.apache.maven.plugins:maven-surefire-plugin 61bbf9c0 is described below commit 61bbf9c0f4e0a1a992d5ad607556b1c0f6045fe6 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Aug 27 19:31:10 2024 + build(deps): bump org.apache.maven.plugins:maven-surefire-plugin Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c7dcd56..ce7f191a 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 3.13.0 3.7.1 3.8.0 -3.4.0 +3.5.0 3.2.0 3.4.0 2.17.1
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.25.0 deleted (was 8e663270)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.25.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 8e663270 build(deps): bump org.apache.maven.plugins:maven-pmd-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-pmd-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 64d459bb build(deps): bump org.apache.maven.plugins:maven-pmd-plugin 64d459bb is described below commit 64d459bb882e4aa0567a2857918d792e92d95a16 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Aug 27 19:31:03 2024 + build(deps): bump org.apache.maven.plugins:maven-pmd-plugin Bumps [org.apache.maven.plugins:maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin) from 3.24.0 to 3.25.0. - [Release notes](https://github.com/apache/maven-pmd-plugin/releases) - [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.24.0...maven-pmd-plugin-3.25.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-pmd-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c418e66a..0c7dcd56 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 3.5.0 3.3.1 3.20.0 -3.24.0 +3.25.0 9.7 3.4.2 3.14.0
(camel-k) branch main updated: chore(ci): only updates readme for badge value change
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 The following commit(s) were added to refs/heads/main by this push: new 1b3bc5356 chore(ci): only updates readme for badge value change 1b3bc5356 is described below commit 1b3bc535649723f10342d91cd212f70d3eb8998c Author: Pasquale Congiusti AuthorDate: Tue Aug 27 08:45:25 2024 +0200 chore(ci): only updates readme for badge value change --- .github/actions/automatic-updates/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml index 59e64b735..a15368124 100644 --- a/.github/actions/automatic-updates/action.yml +++ b/.github/actions/automatic-updates/action.yml @@ -97,7 +97,7 @@ runs: run: | git config --local user.email "$CI_EMAIL" git config --local user.name "$CI_USER" -git add -a -f && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" +git add README.adoc && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" git push "https://$CI_USER:$ci_to...@github.com/$GITHUB_REPOSITORY.git"; HEAD:${{ inputs.branch-ref }} || echo "No nightly automatic updates changes to push" # Give it a rest to avoid hitting Github API rate limit
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.14.0 deleted (was ca0ff34d)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-plugin-plugin-3.14.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was ca0ff34d build(deps): bump org.apache.maven.plugins:maven-plugin-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-plugin-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 31114336 build(deps): bump org.apache.maven.plugins:maven-plugin-plugin 31114336 is described below commit 31114336f7ce11e5584ce18f9eeaf9249bb32744 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Aug 26 19:06:31 2024 + build(deps): bump org.apache.maven.plugins:maven-plugin-plugin Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.13.1 to 3.14.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.14.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a325053..c418e66a 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.24.0 9.7 3.4.2 -3.13.1 +3.14.0 3.6.3 3.14.0 3.4.0
(camel-k) branch main updated: fix(ci): badge permission
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 The following commit(s) were added to refs/heads/main by this push: new 410d17b5a fix(ci): badge permission 410d17b5a is described below commit 410d17b5a9415f6962a378ee618e9048e846fb9c Author: Pasquale Congiusti AuthorDate: Mon Aug 26 09:47:44 2024 +0200 fix(ci): badge permission --- .github/actions/automatic-updates/action.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml index 6672b9a93..59e64b735 100644 --- a/.github/actions/automatic-updates/action.yml +++ b/.github/actions/automatic-updates/action.yml @@ -77,7 +77,8 @@ runs: grep -o -P '(?<=\(statements\))(.+)(?=%)' coverage.mod.out | xargs > coverage touch badge.out wget https://gobinaries.com/github.com/AlexBeauchemin/gobadge@v0.2.0 -O gobadge -gobadge -filename=coverage -target=badge.out +chmod +x gobadge +./gobadge -filename=coverage -target=badge.out - name: Convert badge to adoc shell: bash @@ -96,7 +97,7 @@ runs: run: | git config --local user.email "$CI_EMAIL" git config --local user.name "$CI_USER" -git add -A -f && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" +git add -a -f && git commit -m 'chore: nightly automatic updates' || echo "No nightly automatic updates changes to commit" git push "https://$CI_USER:$ci_to...@github.com/$GITHUB_REPOSITORY.git"; HEAD:${{ inputs.branch-ref }} || echo "No nightly automatic updates changes to push" # Give it a rest to avoid hitting Github API rate limit
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.4.0 deleted (was e30aeb82)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-failsafe-plugin-3.4.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was e30aeb82 build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 48fa6995 build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin 48fa6995 is described below commit 48fa699505d8d9c0670a27ba678567054d04d71f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 22 19:37:52 2024 + build(deps): bump org.apache.maven.plugins:maven-failsafe-plugin Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.3.1...surefire-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcdc768e..1a325053 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 3.8.0 3.4.0 3.2.0 -3.3.1 +3.4.0 2.17.1 1.0 3.4.1
(camel-k-runtime) branch dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.5.0 deleted (was 65eaf955)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-checkstyle-plugin-3.5.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 65eaf955 build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch dependabot/maven/org.apache-apache-33 deleted (was 7420c659)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/maven/org.apache-apache-33 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git was 7420c659 build(deps): bump org.apache:apache from 31 to 33 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-k-runtime) branch main updated: build(deps): bump org.apache:apache from 31 to 33
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 9642982b build(deps): bump org.apache:apache from 31 to 33 9642982b is described below commit 9642982b51e0ed2f2a86c2e56047e182c9bc579e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Aug 22 19:37:43 2024 + build(deps): bump org.apache:apache from 31 to 33 Bumps [org.apache:apache](https://github.com/apache/maven-apache-parent) from 31 to 33. - [Release notes](https://github.com/apache/maven-apache-parent/releases) - [Commits](https://github.com/apache/maven-apache-parent/commits) --- updated-dependencies: - dependency-name: org.apache:apache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- support/camel-k-runtime-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 3250543c..b66f2af7 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -22,7 +22,7 @@ org.apache apache -31 +33
(camel-k-runtime) branch main updated (9642982b -> 8f839e20)
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-runtime.git from 9642982b build(deps): bump org.apache:apache from 31 to 33 add 8f839e20 build(deps): bump org.apache.maven.plugins:maven-checkstyle-plugin No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-k) branch main updated: fix(ci): badge calculation
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 The following commit(s) were added to refs/heads/main by this push: new 0f4e5c899 fix(ci): badge calculation 0f4e5c899 is described below commit 0f4e5c899c69a7494d941814618538ad04b3a510 Author: Pasquale Congiusti AuthorDate: Thu Aug 22 09:57:59 2024 +0200 fix(ci): badge calculation --- .github/actions/automatic-updates/action.yml | 10 +++--- .github/actions/coverage-badge/action.yml| 48 2 files changed, 4 insertions(+), 54 deletions(-) diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml index 5adbb7bec..6672b9a93 100644 --- a/.github/actions/automatic-updates/action.yml +++ b/.github/actions/automatic-updates/action.yml @@ -63,7 +63,7 @@ runs: make generate codegen update-docs # Coverage badge -- name: Run Test +- name: Run Test and get coverage badge shell: bash run: | go test -v ./... -covermode=count -coverprofile=coverage.out @@ -76,11 +76,9 @@ runs: go tool cover -func=coverage.mod.out -o=coverage.mod.out grep -o -P '(?<=\(statements\))(.+)(?=%)' coverage.mod.out | xargs > coverage touch badge.out -- name: Go coverage badge - uses: ./.github/actions/coverage-badge - with: -filename: coverage.out -target: badge.out +wget https://gobinaries.com/github.com/AlexBeauchemin/gobadge@v0.2.0 -O gobadge +gobadge -filename=coverage -target=badge.out + - name: Convert badge to adoc shell: bash run: | diff --git a/.github/actions/coverage-badge/action.yml b/.github/actions/coverage-badge/action.yml deleted file mode 100644 index a2bc02168..0 --- a/.github/actions/coverage-badge/action.yml +++ /dev/null @@ -1,48 +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. -# --- - -name: Go Coverage Badge -description: Generate coverage badge for go projects -inputs: - filename: -description: 'File containing the tests output' -required: true -default: coverage.out - target: -description: 'Target file (default "README.md")' -required: false - -runs: - using: 'composite' - steps: -- run: | -EXTRA_ARGS="" - -if [[ -n '${{ inputs.target }}' ]]; then - EXTRA_ARGS+="-target=${{ inputs.target }}" -fi - -TEMP_DIR=$(mktemp -d) -curl -sf https://gobinaries.com/github.com/AlexBeauchemin/gobadge@v0.2.0 | PREFIX=$TEMP_DIR sh -$TEMP_DIR/gobadge -filename=${{ inputs.filename }} $EXTRA_ARGS -rm -rf $TEMP_DIR - id: coverage-badge-go - shell: bash - -branding: - icon: check-circle - color: white \ No newline at end of file
(camel-k) branch main updated: chore(ci): proper olm job name
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 The following commit(s) were added to refs/heads/main by this push: new 3b6a5b2b9 chore(ci): proper olm job name 3b6a5b2b9 is described below commit 3b6a5b2b958d352a207175fb6464bfdcaf7aac92 Author: Pasquale Congiusti AuthorDate: Thu Aug 22 09:26:35 2024 +0200 chore(ci): proper olm job name --- .github/workflows/nightly-install-olm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-install-olm.yml b/.github/workflows/nightly-install-olm.yml index e2ebca0c9..96fbee346 100644 --- a/.github/workflows/nightly-install-olm.yml +++ b/.github/workflows/nightly-install-olm.yml @@ -31,7 +31,7 @@ on: workflow_dispatch: jobs: - release: + install: strategy: fail-fast: false matrix: