[camel-website] 01/01: Blogpost about Keda
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch keda-blog in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 25c090aa5ac04dcf29ac71815b2fdfe86110fcd2 Author: nicolaferraro AuthorDate: Fri Jan 21 15:49:26 2022 +0100 Blogpost about Keda --- content/blog/2022/01/camel-keda/featured.png | Bin 0 -> 54313 bytes content/blog/2022/01/camel-keda/index.md | 69 +++ 2 files changed, 69 insertions(+) diff --git a/content/blog/2022/01/camel-keda/featured.png b/content/blog/2022/01/camel-keda/featured.png new file mode 100644 index 000..4992f1f Binary files /dev/null and b/content/blog/2022/01/camel-keda/featured.png differ diff --git a/content/blog/2022/01/camel-keda/index.md b/content/blog/2022/01/camel-keda/index.md new file mode 100644 index 000..efff5fd --- /dev/null +++ b/content/blog/2022/01/camel-keda/index.md @@ -0,0 +1,69 @@ +--- +title: "Camel meets KEDA" +date: 2022-01-21 +authors: [nicolaferraro] +categories: ["Camel K"] +preview: "Camel K integrations can leverage KEDA to scale based on the number of incoming events" +--- + +NOTE: this post has first appeared [in the author's blog](https://www.nicolaferraro.me/2022/01/21/camel-meets-keda/). + +[KEDA](https://keda.sh) (Kubernetes Event Driven Autoscalers) is a fantastic project (currently [CNCF](https://cncf.io) incubating) that provides Kubernetes-based autoscalers to help applications to scale out according to the number of incoming events when they are listening to several kinds of event sources. In Camel K we've long supported [Knative](https://knative.dev) for providing a similar functionality for integrations that are triggered by HTTP calls, so supporting KEDA was someth [...] + +## Why KEDA and Camel K? + +Users may want to set up integrations that automatically scale, e.g. depending on the **number of messages left in a Kafka topic** (for their consumer group). The integration code may do e.g. transformations, aggregations and send data do a destination and it would be great if the number of instances deployed to a Kubernetes cluster could increase when there's work left behind, or they can **scale to zero** when there's no more data in the topic. +This is what KEDA does by itself with scalers (Kafka is [one of the many scalers available in KEDA](https://keda.sh/docs/2.5/scalers/)). What you have now is that KEDA is now automatically configured by Camel K when you run integrations, so you get the autoscaling features out of the box (you just need to turn a flag on). + +## How does it work? + +In Camel K 1.8.0 a new [KEDA trait](/camel-k/next/traits/keda.html) has been introduced. +The trait allows to manually tweak the KEDA configuration to make sure that some *ScaledObjects* (KEDA concept) are generated as part of the *Integration* reconciliation, but this is mostly an internal detail. The interesting part about the KEDA trait is that it can recognize special KEDA markers in Kamelets and automatically create a KEDA valid configuration when those Kamelets are used as sources. So users can just use Kamelets to create bindings as usual and, if they **enable a KEDA f [...] + +The Kamelet catalog embedded in next release ([v0.7.0](https://github.com/apache/camel-kamelets/tree/v0.7.0)) contains two Kamelets enhanced with KEDA metadata: `aws-sqs-source` and `kafka-source`. These are just two examples of the many Kamelets that can be augmented in the future. The metadata configuration system is open and Kamelets can be marked at any time to work with KEDA: this means that you don't need to wait for a new Camel K release to enable KEDA on a different source and, m [...] + +The Kamelet developer guide contains a new section on [how to mark a Kamelet with KEDA metadata](/camel-k/next/kamelets/kamelets-dev.html#_keda_integration), but essentially markers are used to map Kamelet properties into KEDA configuration options, so that when you provide a Kamelet configuration, the corresponding KEDA options can be generated from it (all the work is done under the cover by the Camel K operator). + +## A binding example + +Before looking at the demo, here's an example of **autoscaling binding** that you can create with the latest Camel K: + +```yaml +apiVersion: camel.apache.org/v1alpha1 +kind: KameletBinding +metadata: + name: kafka-to-sink + annotations: +trait.camel.apache.org/keda.enabled: "true" +spec: + source: +ref: + apiVersion: camel.apache.org/v1alpha1 + kind: Kamelet + name: kafka-source +properties: + bootstrapServers: "<-- bootstrap servers -->" + consumerGroup: my-group + topic: "<-- the topic -->" + user: "<-- user -->" + password: "<-- pwd -->" + sink: +# ... +``` + +You can notice that the only difference from a s
[camel-website] branch keda-blog updated (dcdc847 -> 25c090a)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch keda-blog in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard dcdc847 Blogpost about Keda new 25c090a Blogpost about Keda This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (dcdc847) \ N -- N -- N refs/heads/keda-blog (25c090a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: content/blog/2022/01/camel-keda/index.md | 2 ++ 1 file changed, 2 insertions(+)
[camel-website] 01/01: Blogpost about Keda
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch keda-blog in repository https://gitbox.apache.org/repos/asf/camel-website.git commit dcdc847c8af6952f600f7d3c30277731732c7527 Author: nicolaferraro AuthorDate: Fri Jan 21 15:48:02 2022 +0100 Blogpost about Keda --- content/blog/2022/01/camel-keda/featured.png | Bin 0 -> 54313 bytes content/blog/2022/01/camel-keda/index.md | 67 +++ 2 files changed, 67 insertions(+) diff --git a/content/blog/2022/01/camel-keda/featured.png b/content/blog/2022/01/camel-keda/featured.png new file mode 100644 index 000..4992f1f Binary files /dev/null and b/content/blog/2022/01/camel-keda/featured.png differ diff --git a/content/blog/2022/01/camel-keda/index.md b/content/blog/2022/01/camel-keda/index.md new file mode 100644 index 000..f880d57 --- /dev/null +++ b/content/blog/2022/01/camel-keda/index.md @@ -0,0 +1,67 @@ +--- +title: "Camel meets KEDA" +date: 2022-01-21 +authors: [nicolaferraro] +categories: ["Camel K"] +preview: "Camel K integrations can leverage KEDA to scale based on the number of incoming events" +--- + +[KEDA](https://keda.sh) (Kubernetes Event Driven Autoscalers) is a fantastic project (currently [CNCF](https://cncf.io) incubating) that provides Kubernetes-based autoscalers to help applications to scale out according to the number of incoming events when they are listening to several kinds of event sources. In Camel K we've long supported [Knative](https://knative.dev) for providing a similar functionality for integrations that are triggered by HTTP calls, so supporting KEDA was someth [...] + +## Why KEDA and Camel K? + +Users may want to set up integrations that automatically scale, e.g. depending on the **number of messages left in a Kafka topic** (for their consumer group). The integration code may do e.g. transformations, aggregations and send data do a destination and it would be great if the number of instances deployed to a Kubernetes cluster could increase when there's work left behind, or they can **scale to zero** when there's no more data in the topic. +This is what KEDA does by itself with scalers (Kafka is [one of the many scalers available in KEDA](https://keda.sh/docs/2.5/scalers/)). What you have now is that KEDA is now automatically configured by Camel K when you run integrations, so you get the autoscaling features out of the box (you just need to turn a flag on). + +## How does it work? + +In Camel K 1.8.0 a new [KEDA trait](/camel-k/next/traits/keda.html) has been introduced. +The trait allows to manually tweak the KEDA configuration to make sure that some *ScaledObjects* (KEDA concept) are generated as part of the *Integration* reconciliation, but this is mostly an internal detail. The interesting part about the KEDA trait is that it can recognize special KEDA markers in Kamelets and automatically create a KEDA valid configuration when those Kamelets are used as sources. So users can just use Kamelets to create bindings as usual and, if they **enable a KEDA f [...] + +The Kamelet catalog embedded in next release ([v0.7.0](https://github.com/apache/camel-kamelets/tree/v0.7.0)) contains two Kamelets enhanced with KEDA metadata: `aws-sqs-source` and `kafka-source`. These are just two examples of the many Kamelets that can be augmented in the future. The metadata configuration system is open and Kamelets can be marked at any time to work with KEDA: this means that you don't need to wait for a new Camel K release to enable KEDA on a different source and, m [...] + +The Kamelet developer guide contains a new section on [how to mark a Kamelet with KEDA metadata](/camel-k/next/kamelets/kamelets-dev.html#_keda_integration), but essentially markers are used to map Kamelet properties into KEDA configuration options, so that when you provide a Kamelet configuration, the corresponding KEDA options can be generated from it (all the work is done under the cover by the Camel K operator). + +## A binding example + +Before looking at the demo, here's an example of **autoscaling binding** that you can create with the latest Camel K: + +```yaml +apiVersion: camel.apache.org/v1alpha1 +kind: KameletBinding +metadata: + name: kafka-to-sink + annotations: +trait.camel.apache.org/keda.enabled: "true" +spec: + source: +ref: + apiVersion: camel.apache.org/v1alpha1 + kind: Kamelet + name: kafka-source +properties: + bootstrapServers: "<-- bootstrap servers -->" + consumerGroup: my-group + topic: "<-- the topic -->" + user: "<-- user -->" + password: "<-- pwd -->" + sink: +# ... +``` + +You can notice that the only difference from a standard binding is the presence of the `trait.camel.apache.org/keda.enabled=true` annotation that enables the +KEDA trait i
[camel-website] branch keda-blog created (now dcdc847)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch keda-blog in repository https://gitbox.apache.org/repos/asf/camel-website.git. at dcdc847 Blogpost about Keda This branch includes the following new commits: new dcdc847 Blogpost about Keda The 1 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.
svn commit: r52132 - in /dev/camel/camel-kamelets/0.7.0: ./ camel-kamelets-0.7.0.tar.gz camel-kamelets-0.7.0.tar.gz.asc camel-kamelets-0.7.0.tar.gz.sha512
Author: nferraro Date: Tue Jan 18 15:55:09 2022 New Revision: 52132 Log: Camel Kamelets 0.7.0 Added: dev/camel/camel-kamelets/0.7.0/ dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz (with props) dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.asc (with props) dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.sha512 Added: dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.sha512 == --- dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.sha512 (added) +++ dev/camel/camel-kamelets/0.7.0/camel-kamelets-0.7.0.tar.gz.sha512 Tue Jan 18 15:55:09 2022 @@ -0,0 +1 @@ +5625b90514d32e2dcc76a1e1ac9cc7922c3d56d07e982254cdd13ae1aa406212d2e8a0d18e7623fbb8fcdbba3a125684f35ee1c498f0b303fa22bbff77314399 *camel-kamelets-0.7.0.tar.gz
[camel-kamelets] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit a51c5815847c61cd628a0cf353be9aa5f0285fa2 Author: nicolaferraro AuthorDate: Tue Jan 18 16:25:07 2022 +0100 [maven-release-plugin] prepare for next development iteration --- library/camel-kamelets-bom/pom.xml | 2 +- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- pom.xml| 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/camel-kamelets-bom/pom.xml b/library/camel-kamelets-bom/pom.xml index 611f4ed..145c376 100644 --- a/library/camel-kamelets-bom/pom.xml +++ b/library/camel-kamelets-bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.7.0 +main-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index d83d19d..a0ed86c 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.7.0 +main-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index d52891f..cb71d07 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.7.0 +main-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index 0221c73..483fc53 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.7.0 +main-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 86c2cc0..ed53de2 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -0.7.0 +main-SNAPSHOT Camel Kamelets Parent Camel Kamelets Library Parent
[camel-kamelets] branch main updated (03a7ab2 -> a51c581)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from 03a7ab2 Update Kamelets for release 0.7.0 add d5743eb [maven-release-plugin] prepare release v0.7.0 new a51c581 [maven-release-plugin] prepare for next development iteration The 1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-kamelets] annotated tag v0.7.0 created (now a44aa5a)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag v0.7.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. at a44aa5a (tag) tagging d5743eb112a621a1fc1db47785c70c886ba23aaa (commit) replaces v0.5.0 by nicolaferraro on Tue Jan 18 16:24:52 2022 +0100 - Log - [maven-release-plugin] copy for tag v0.7.0 --- This annotated tag includes the following new commits: new d5743eb [maven-release-plugin] prepare release v0.7.0 The 1 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.
[camel-kamelets] 01/01: [maven-release-plugin] prepare release v0.7.0
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to annotated tag v0.7.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit d5743eb112a621a1fc1db47785c70c886ba23aaa Author: nicolaferraro AuthorDate: Tue Jan 18 16:01:47 2022 +0100 [maven-release-plugin] prepare release v0.7.0 --- library/camel-kamelets-bom/pom.xml | 2 +- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- pom.xml| 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/camel-kamelets-bom/pom.xml b/library/camel-kamelets-bom/pom.xml index 145c376..611f4ed 100644 --- a/library/camel-kamelets-bom/pom.xml +++ b/library/camel-kamelets-bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.7.0 ../../pom.xml diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index a0ed86c..d83d19d 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.7.0 ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index cb71d07..d52891f 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.7.0 ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index 483fc53..0221c73 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.7.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index 18e3bdb..86c2cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -main-SNAPSHOT +0.7.0 Camel Kamelets Parent Camel Kamelets Library Parent @@ -113,7 +113,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-kamelets.git scm:git:https://gitbox.apache.org/repos/asf/camel-kamelets.git https://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary -v0.6.0 +v0.7.0
[camel-kamelets] 01/02: Add delay action
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit bf9c06ae3d3f3b7f49e9a93bc33a7846514754b7
Author: nicolaferraro
AuthorDate: Wed Jan 12 13:38:52 2022 +0100
Add delay action
---
.../ROOT/assets/images/kamelets/delay-action.svg | 1 +
docs/modules/ROOT/nav.adoc | 156
docs/modules/ROOT/pages/delay-action.adoc | 160 +
kamelets/delay-action.kamelet.yaml | 51 +++
.../resources/kamelets/delay-action.kamelet.yaml | 51 +++
.../bindings/camel-k/delay-action-binding.yaml | 24
templates/bindings/core/delay-action-binding.yaml | 13 ++
7 files changed, 456 insertions(+)
diff --git a/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
b/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
new file mode 100644
index 000..7888f41
--- /dev/null
+++ b/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;
x="0px" y="0px" viewBox="0 0 122.88 100.6" style="enable-background:new 0 0
122.88 100.6" xml:space="preserve">.st0{fill:#272727;}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D8453E;}https://strimzi.io/[Strimzi].
+* You've created a topic named `my-topic` in the current namespace.
+* You have
xref:{camel-k-version}@camel-k::installation/installation.adoc[Camel K
installed] on the cluster.
+
+ *Procedure for using the cluster CLI*
+
+. Save the `delay-action-binding.yaml` file to your local drive, and then edit
it as needed for your configuration.
+
+. Run the action by using the following command:
++
+[source,shell]
+
+kubectl apply -f delay-action-binding.yaml
+
+
+ *Procedure for using the Kamel CLI*
+
+Configure and run the action by using the following command:
+
+[source,shell]
+
+kamel bind timer-source?message=Hello --step delay-action -p
step-0.milliseconds=1000 kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
+
+
+This command creates the KameletBinding in the current namespace on the
cluster.
+
+== Kamelet source file
+
+https://github.com/apache/camel-kamelets/blob/main/kamelets/delay-action.kamelet.yaml
+
+// THIS FILE IS AUTOMATICALLY GENERATED: DO NOT EDIT
diff --git a/kamelets/delay-action.kamelet.yaml
b/kamelets/delay-action.kamelet.yaml
new file mode 100644
index 000..88c265c
--- /dev/null
+++ b/kamelets/delay-action.kamelet.yaml
@@ -0,0 +1,51 @@
+# ---
+# 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.
+# ---
+apiVersion: camel.apache.org/v1alpha1
+kind: Kamelet
+metadata:
+ name: delay-action
+ annotations:
+camel.apache.org/kamelet.support.level: "Preview"
+camel.apache.org/catalog.version: "main-SNAPSHOT"
+camel.apache.org/kamelet.icon:
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTIyLjg4IDEwMC42IiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAxMjIuODggMTAwLjYiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+LnN0MHtmaWxsOiMyNzI3Mjc7fSAuc3Qxe2ZpbGwtcnVsZTpldmVub2
[...]
+camel.apache.org/provider: "Apache Software Foundation"
+camel.apache.org/kamelet.group: "Delay"
+ labels:
+camel.apache.org/kamelet.type: "action"
+spec:
+ definition:
+title: "Delay Action"
+description: |-
+ Delay the processing using a specific amount of time
+required:
+ - milliseconds
+type: object
+properties:
+ milliseconds:
+title: Milliseconds
+description: The number of milliseconds of delay
+type: integer
+example: 1000
+ dependencies:
+ - "camel:core"
+ - "camel:kamelet&qu
[camel-kamelets] 02/02: Add KEDA markers to some Kamelets
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 8101887dc03352442f308358246409e425a9e441
Author: nicolaferraro
AuthorDate: Wed Jan 12 13:50:25 2022 +0100
Add KEDA markers to some Kamelets
---
.../ROOT/assets/images/kamelets/delay-action.svg | 1 -
docs/modules/ROOT/nav.adoc | 157 +---
docs/modules/ROOT/pages/delay-action.adoc | 160 -
docs/{modules/ROOT => }/pages/index.adoc | 0
kamelets/aws-sqs-source.kamelet.yaml | 15 ++
kamelets/kafka-not-secured-source.kamelet.yaml | 12 ++
kamelets/kafka-source.kamelet.yaml | 18 +++
.../kamelets/catalog/KameletsCatalogTest.java | 2 +-
.../resources/kamelets/aws-sqs-source.kamelet.yaml | 15 ++
.../kamelets/kafka-not-secured-source.kamelet.yaml | 12 ++
.../resources/kamelets/kafka-source.kamelet.yaml | 18 +++
script/validator/validator.go | 15 ++
12 files changed, 107 insertions(+), 318 deletions(-)
diff --git a/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
b/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
deleted file mode 100644
index 7888f41..000
--- a/docs/modules/ROOT/assets/images/kamelets/delay-action.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;
x="0px" y="0px" viewBox="0 0 122.88 100.6" style="enable-background:new 0 0
122.88 100.6" xml:space="preserve">.st0{fill:#272727;}
.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D8453E;}https://strimzi.io/[Strimzi].
-* You've created a topic named `my-topic` in the current namespace.
-* You have
xref:{camel-k-version}@camel-k::installation/installation.adoc[Camel K
installed] on the cluster.
-
- *Procedure for using the cluster CLI*
-
-. Save the `delay-action-binding.yaml` file to your local drive, and then edit
it as needed for your configuration.
-
-. Run the action by using the following command:
-+
-[source,shell]
-
-kubectl apply -f delay-action-binding.yaml
-
-
- *Procedure for using the Kamel CLI*
-
-Configure and run the action by using the following command:
-
-[source,shell]
-
-kamel bind timer-source?message=Hello --step delay-action -p
step-0.milliseconds=1000 kafka.strimzi.io/v1beta1:KafkaTopic:my-topic
-
-
-This command creates the KameletBinding in the current namespace on the
cluster.
-
-== Kamelet source file
-
-https://github.com/apache/camel-kamelets/blob/main/kamelets/delay-action.kamelet.yaml
-
-// THIS FILE IS AUTOMATICALLY GENERATED: DO NOT EDIT
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/pages/index.adoc
similarity index 100%
rename from docs/modules/ROOT/pages/index.adoc
rename to docs/pages/index.adoc
diff --git a/kamelets/aws-sqs-source.kamelet.yaml
b/kamelets/aws-sqs-source.kamelet.yaml
index 4122bb1..1f8c553 100644
--- a/kamelets/aws-sqs-source.kamelet.yaml
+++ b/kamelets/aws-sqs-source.kamelet.yaml
@@ -25,6 +25,7 @@ metadata:
camel.apache.org/kamelet.icon:
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG
[...]
camel.apache.org/provider: "Apache Software Foundation"
camel.apache.org/kamelet.group: "AWS SQS"
+camel.apache.org/keda.type: "aws-sqs-queue"
labels:
camel.apache.org/kamelet.type: "source"
spec:
@@ -58,6 +59,8 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:password
- urn:camel:group:credentials
+- urn:keda:authentication:awsAccessKeyID
+- urn:keda:required
secretKey:
title: Secret Key
description: The secret key obtained from AWS
@@ -66,11 +69,16 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:password
- urn:camel:group:credentials
+- urn:keda:authentication:awsSecretAccessKey
+- urn:keda:required
region:
title: AWS Region
description: The AWS region to connect to
type: string
example: eu-west-1
+x-descriptors:
+- urn:keda:metadata:awsRegion
+- urn:keda:required
autoCreateQueue:
title: Autocreate Queue
description: Setting the autocreation of the SQS queue.
@@ -88,6 +96,13 @@ spec:
type: string
example: http or https
default: https
+ queueURL:
+ti
[camel-kamelets] branch main updated (47a18c2 -> 8101887)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git.
from 47a18c2 Replace Field Action: disabled and enabled are mandatory
new bf9c06a Add delay action
new 8101887 Add KEDA markers to some Kamelets
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 | 1 +
docs/{modules/ROOT => }/pages/index.adoc | 0
kamelets/aws-sqs-source.kamelet.yaml | 15 +++
kamelets/delay-action.kamelet.yaml | 51 ++
kamelets/kafka-not-secured-source.kamelet.yaml | 12 +
kamelets/kafka-source.kamelet.yaml | 18
.../kamelets/catalog/KameletsCatalogTest.java | 2 +-
.../resources/kamelets/aws-sqs-source.kamelet.yaml | 15 +++
.../resources/kamelets/delay-action.kamelet.yaml | 51 ++
.../kamelets/kafka-not-secured-source.kamelet.yaml | 12 +
.../resources/kamelets/kafka-source.kamelet.yaml | 18
script/validator/validator.go | 15 +++
...tion-binding.yaml => delay-action-binding.yaml} | 6 +--
...tion-binding.yaml => delay-action-binding.yaml} | 4 +-
14 files changed, 214 insertions(+), 6 deletions(-)
rename docs/{modules/ROOT => }/pages/index.adoc (100%)
create mode 100644 kamelets/delay-action.kamelet.yaml
create mode 100644
library/camel-kamelets/src/main/resources/kamelets/delay-action.kamelet.yaml
copy templates/bindings/camel-k/{throttle-action-binding.yaml =>
delay-action-binding.yaml} (84%)
copy templates/bindings/core/{throttle-action-binding.yaml =>
delay-action-binding.yaml} (75%)
[camel-k] 21/22: Fix #1107: disable applier code to detect real CI errors
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 885d2bd99ca5ce46bad901df5082d6e424a1500b
Author: nicolaferraro
AuthorDate: Mon Jan 10 14:43:43 2022 +0100
Fix #1107: disable applier code to detect real CI errors
---
pkg/install/kamelets.go| 94 +--
pkg/resources/resources.go | 12 ++---
pkg/trait/deployer.go | 108 -
3 files changed, 203 insertions(+), 11 deletions(-)
diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go
index 4ff4572..82a818b 100644
--- a/pkg/install/kamelets.go
+++ b/pkg/install/kamelets.go
@@ -19,21 +19,33 @@ package install
import (
"context"
+ "errors"
"fmt"
"io/fs"
+ "net/http"
"os"
"path"
"path/filepath"
"strings"
+ "sync"
+ "sync/atomic"
"golang.org/x/sync/errgroup"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ "k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/types"
+
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ logf "sigs.k8s.io/controller-runtime/pkg/log"
+
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/defaults"
"github.com/apache/camel-k/pkg/util/kubernetes"
- "k8s.io/apimachinery/pkg/runtime"
+ "github.com/apache/camel-k/pkg/util/patch"
)
const (
@@ -41,6 +53,13 @@ const (
defaultKameletDir = "/kamelets/"
)
+var (
+ log = logf.Log
+
+ hasServerSideApply atomic.Value
+ tryServerSideApply sync.Once
+)
+
// KameletCatalog installs the bundled Kamelets into the specified namespace.
func KameletCatalog(ctx context.Context, c client.Client, namespace string)
error {
kameletDir := os.Getenv(kameletDirEnv)
@@ -58,7 +77,7 @@ func KameletCatalog(ctx context.Context, c client.Client,
namespace string) erro
}
g, gCtx := errgroup.WithContext(ctx)
- applier := c.ServerOrClientSideApplier()
+
err = filepath.WalkDir(kameletDir, func(p string, f fs.DirEntry, err
error) error {
if err != nil {
return err
@@ -75,9 +94,31 @@ func KameletCatalog(ctx context.Context, c client.Client,
namespace string) erro
if err != nil {
return err
}
- if err := applier.Apply(gCtx, kamelet); err != nil {
+ once := false
+ tryServerSideApply.Do(func() {
+ once = true
+ if err = serverSideApply(gCtx, c, kamelet); err
!= nil {
+ if isIncompatibleServerError(err) {
+ log.Info("Fallback to
client-side apply for installing bundled Kamelets")
+ hasServerSideApply.Store(false)
+ err = nil
+ } else {
+ tryServerSideApply = sync.Once{}
+ }
+ } else {
+ hasServerSideApply.Store(true)
+ }
+ })
+ if err != nil {
return err
}
+ if v := hasServerSideApply.Load(); v.(bool) {
+ if !once {
+ return serverSideApply(gCtx, c, kamelet)
+ }
+ } else {
+ return clientSideApply(gCtx, c, kamelet)
+ }
return nil
})
return nil
@@ -89,6 +130,53 @@ func KameletCatalog(ctx context.Context, c client.Client,
namespace string) erro
return g.Wait()
}
+func serverSideApply(ctx context.Context, c client.Client, resource
runtime.Object) error {
+ target, err := patch.PositiveApplyPatch(resource)
+ if err != nil {
+ return err
+ }
+ return c.Patch(ctx, target, ctrl.Apply, ctrl.ForceOwnership,
ctrl.FieldOwner("camel-k-operator"))
+}
+
+func clientSideApply(ctx c
[camel-k] 10/22: Fix #1107: add optional authentication secret
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1239743ea126e3898d0a77e74f89f41022b7bfe9
Author: nicolaferraro
AuthorDate: Mon Dec 20 12:01:07 2021 +0100
Fix #1107: add optional authentication secret
---
addons/keda/keda.go | 51 ++-
1 file changed, 46 insertions(+), 5 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 4911a76..3637153 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -93,14 +93,16 @@ type kedaTrait struct {
MaxReplicaCount *int32 `property:"max-replica-count"
json:"maxReplicaCount,omitempty"`
// Definition of triggers according to the KEDA format. Each trigger
must contain `type` field corresponding
// to the name of a KEDA autoscaler and a key/value map named
`metadata` containing specific trigger options.
+ // An optional `authentication-secret` can be declared per trigger and
the operator will link each entry of
+ // the secret to a KEDA authentication parameter.
Triggers []kedaTrigger `property:"triggers" json:"triggers,omitempty"`
}
type kedaTrigger struct {
- Type string`property:"type" json:"type,omitempty"`
- Metadata map[string]string `property:"metadata"
json:"metadata,omitempty"`
-
- authentication map[string]string
+ Type string`property:"type"
json:"type,omitempty"`
+ Metadata map[string]string `property:"metadata"
json:"metadata,omitempty"`
+ AuthenticationSecret string
`property:"authentication-secret" json:"authenticationSecret,omitempty"`
+ authentication map[string]string
}
// NewKedaTrait --.
@@ -177,9 +179,12 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
meta[kk] = v
}
var authenticationRef *kedav1alpha1.ScaledObjectAuthRef
+ if len(trigger.authentication) > 0 &&
trigger.AuthenticationSecret != "" {
+ return errors.New("an authentication secret cannot be
provided for auto-configured triggers")
+ }
+ extConfigName := fmt.Sprintf("%s-keda-%d", e.Integration.Name,
idx)
if len(trigger.authentication) > 0 {
// Save all authentication config in a secret
- extConfigName := fmt.Sprintf("%s-keda-%d",
e.Integration.Name, idx)
secret := v1.Secret{
TypeMeta: metav1.TypeMeta{
Kind: "Secret",
@@ -215,6 +220,42 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
authenticationRef = {
Name: extConfigName,
}
+ } else if trigger.AuthenticationSecret != "" {
+ s := v1.Secret{}
+ key := client.ObjectKey{
+ Namespace: e.Integration.Namespace,
+ Name: trigger.AuthenticationSecret,
+ }
+ if err := e.Client.Get(e.Ctx, key, ); err != nil {
+ return errors.Wrapf(err, "could not load secret
named %q in namespace %q", trigger.AuthenticationSecret,
e.Integration.Namespace)
+ }
+ // Fill a TriggerAuthentication from the secret
+ triggerAuth := kedav1alpha1.TriggerAuthentication{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "TriggerAuthentication",
+ APIVersion:
kedav1alpha1.SchemeGroupVersion.String(),
+ },
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: e.Integration.Namespace,
+ Name: extConfigName,
+ },
+ }
+ sortedKeys := make([]string, 0, len(s.Data))
+ for k := range s.Data {
+ sortedKeys = append(sortedKeys, k)
+ }
+ sort.Strings(sortedKeys)
+ for _, k := range sortedKeys {
+ triggerAuth.Spec.SecretTargetRef =
append(triggerAuth.Spec.SecretTargetRef, kedav1alpha1.AuthSecretTargetRef{
+
[camel-k] 19/22: Fix #1107: add missing operator role
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 01984610f86ab07631bb4f573be7ebbb95d19031
Author: nicolaferraro
AuthorDate: Wed Dec 22 12:39:47 2021 +0100
Fix #1107: add missing operator role
---
config/rbac/operator-role.yaml| 2 ++
helm/camel-k/templates/operator-role.yaml | 2 ++
pkg/resources/resources.go| 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index 613ac5e..0941d6e 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -52,8 +52,10 @@ rules:
- camelcatalogs/status
- integrationkits/status
- integrationplatforms/status
+ - integrations/scale
- integrations/status
- kameletbindings/status
+ - kameletbindings/scale
- kamelets/status
verbs:
- get
diff --git a/helm/camel-k/templates/operator-role.yaml
b/helm/camel-k/templates/operator-role.yaml
index 3f207fe..d30c8eb 100644
--- a/helm/camel-k/templates/operator-role.yaml
+++ b/helm/camel-k/templates/operator-role.yaml
@@ -53,8 +53,10 @@ rules:
- camelcatalogs/status
- integrationkits/status
- integrationplatforms/status
+ - integrations/scale
- integrations/status
- kameletbindings/status
+ - kameletbindings/scale
- kamelets/status
verbs:
- get
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 5d8301d..e64bea2 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -385,9 +385,9 @@ var assets = func() http.FileSystem {
"/rbac/operator-role.yaml": ۰CompressedFileInfo{
name: "operator-role.yaml",
modTime: time.Time{},
- uncompressedSize: 2879,
+ uncompressedSize: 2928,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\xc1\x6e\xdb\x46\x10\xbd\xf3\x2b\x06\xe2\x25\x01\x6c\xa9\xed\xa9\x50\x4f\x6a\x62\xb7\x42\x03\x09\x30\x95\x06\x39\x0e\x97\x23\x6a\xaa\xe5\xce\x76\x76\x69\x59\xfd\xfa\x62\x29\x2a\xa6\x4d\x2b\x28\x9a\xa0\x29\x2f\x5e\xee\x8e\xdf\xbc\xf7\xe6\xad\xcd\x1c\xae\xbf\xde\x93\xe5\xf0\x8e\x0d\xb9\x40\x15\x44\x81\xb8\x23\x58\x78\x34\x3b\x82\x42\xb6\xf1\x80\x4a\x70\x2b\xad\xab\x30\xb2\x38\x78\xb5\x28\x6e\x5f\x43\xeb\x2a\x52\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x06\xd6\x65\x17\x88\xed\xb6\xa7\xc2\x3d\xb9\xbb\x49\x6b\x74\x61\x03\x91\xb7\x8b\x3d\x8e\xc8\xb1\x3c\x35\xc5\x61\x49\x2a\x8e\xfb\xf5\x05\x65\x29\x76\x22\x3b\x28\xba\x8b\x6e\x7d\x09\x45\x4e\xde\xbc\x79\xef\x51\x50\x0e\xe3\xaf\xf7\xcb\x72\xf8\xc0\x8a\x6c\x20\x0d\x51\x20\x6e\x09\xe6\x0e\xd5\x96\xa0\x90\x4d\xdc\xa3\x27\xb8\x93\xc6\x6a\x8c\x2c\x16\xde\xcc\x8b\xbb\xb7\xd0\x58\x4d\x1e\x
[...]
},
"/rbac/patch-role-to-clusterrole.yaml":
۰CompressedFileInfo{
name: "patch-role-to-clusterrole.yaml",
[camel-k] 11/22: Fix #1107: added tests
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1fde2b53666f30414d0a79521d0206dc023b68fc
Author: nicolaferraro
AuthorDate: Mon Dec 20 16:35:39 2021 +0100
Fix #1107: added tests
---
addons/keda/keda.go | 6 +-
addons/keda/keda_test.go | 295 +++
2 files changed, 298 insertions(+), 3 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 3637153..3a54896 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -42,7 +42,7 @@ import (
scase "github.com/stoewer/go-strcase"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "sigs.k8s.io/controller-runtime/pkg/client"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
)
const (
@@ -222,7 +222,7 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
}
} else if trigger.AuthenticationSecret != "" {
s := v1.Secret{}
- key := client.ObjectKey{
+ key := ctrl.ObjectKey{
Namespace: e.Integration.Namespace,
Name: trigger.AuthenticationSecret,
}
@@ -273,7 +273,7 @@ func (t *kedaTrait) hackControllerReplicas(e
*trait.Environment) error {
ctrlRef := t.getTopControllerReference(e)
if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
// Update the KameletBinding directly (do not add it to env
resources, it's the integration parent)
- key := client.ObjectKey{
+ key := ctrl.ObjectKey{
Namespace: e.Integration.Namespace,
Name: ctrlRef.Name,
}
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
new file mode 100644
index 000..083a231
--- /dev/null
+++ b/addons/keda/keda_test.go
@@ -0,0 +1,295 @@
+/*
+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 keda
+
+import (
+ "context"
+ "testing"
+
+ "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
+ camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/pkg/util/camel"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/pkg/util/test"
+ "github.com/pkg/errors"
+ "github.com/stretchr/testify/assert"
+ corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime"
+)
+
+var (
+ testingTrue = true
+ testingFalse = false
+)
+
+func TestManualConfig(t *testing.T) {
+ keda, _ := NewKedaTrait().(*kedaTrait)
+ keda.Enabled =
+ keda.Auto =
+ meta := map[string]string{
+ "prop": "val",
+ "camelCase": "VAL",
+ }
+ keda.Triggers = append(keda.Triggers, kedaTrigger{
+ Type: "mytype",
+ Metadata: meta,
+ })
+ env := createBasicTestEnvironment()
+
+ res, err := keda.Configure(env)
+ assert.NoError(t, err)
+ assert.True(t, res)
+ assert.NoError(t, keda.Apply(env))
+ so := getScaledObject(env)
+ assert.NotNil(t, so)
+ assert.Len(t, so.Spec.Triggers, 1)
+ assert.Equal(t, "mytype", so.Spec.Triggers[0].Type)
+ assert.Equal(t, meta, so.Spec.Triggers[0].Metadata)
+ assert.Nil(t, so.Spec.Triggers[0].AuthenticationRef)
+ assert.Nil(t, getTriggerAuthentication(env))
+ assert.Nil(t, getSecret(env))
+}
+
+func TestConfigFromSecret(t *testing.T) {
+ keda, _ := NewKedaTrait().(*kedaTrait)
+ keda.Enabled =
+
[camel-k] 22/22: Fix #1107: fix expected roles in tests
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 590b23c15b2023dfc65f5500077e22d7981c7ffc Author: nicolaferraro AuthorDate: Mon Jan 10 22:52:43 2022 +0100 Fix #1107: fix expected roles in tests --- e2e/common/kustomize/common.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/common/kustomize/common.go b/e2e/common/kustomize/common.go index c5c483e..adbb2ff 100644 --- a/e2e/common/kustomize/common.go +++ b/e2e/common/kustomize/common.go @@ -40,8 +40,9 @@ const ( // camel-k-operator, camel-k-operator-events, // camel-k-operator-knative, camel-k-operator-leases, - // camel-k-operator-podmonitors, camel-k-operator-strimzi - ExpKubePromoteRoles = 6 + // camel-k-operator-podmonitors, camel-k-operator-strimzi, + // camel-k-operator-keda + ExpKubePromoteRoles = 7 // camel-k-edit // camel-k-operator-custom-resource-definitions
[camel-k] 09/22: Fix #1107: add documentation
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a0644223291e463c646b466f691a75c29eef43f4
Author: nicolaferraro
AuthorDate: Mon Dec 20 11:50:39 2021 +0100
Fix #1107: add documentation
---
addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 25 +
addons/keda/keda.go| 24 +++--
.../bases/camel.apache.org_kameletbindings.yaml| 15 +--
config/crd/bases/camel.apache.org_kamelets.yaml| 8 +-
docs/modules/ROOT/nav.adoc | 2 +-
docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 119 +
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 39 +++
docs/modules/ROOT/partials/apis/crds-html.adoc | 2 +-
docs/modules/traits/pages/keda.adoc| 42 +++-
helm/camel-k/crds/crd-kamelet-binding.yaml | 15 +--
helm/camel-k/crds/crd-kamelet.yaml | 8 +-
resources/traits.yaml | 42 ++--
12 files changed, 300 insertions(+), 41 deletions(-)
diff --git a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
index b551c7f..9762e39 100644
--- a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
+++ b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
@@ -137,6 +137,31 @@ func (in *ScaledObjectSpec) DeepCopyInto(out
*ScaledObjectSpec) {
*out = new(v1.ObjectReference)
**out = **in
}
+ if in.PollingInterval != nil {
+ in, out := ,
+ *out = new(int32)
+ **out = **in
+ }
+ if in.CooldownPeriod != nil {
+ in, out := ,
+ *out = new(int32)
+ **out = **in
+ }
+ if in.IdleReplicaCount != nil {
+ in, out := ,
+ *out = new(int32)
+ **out = **in
+ }
+ if in.MinReplicaCount != nil {
+ in, out := ,
+ *out = new(int32)
+ **out = **in
+ }
+ if in.MaxReplicaCount != nil {
+ in, out := ,
+ *out = new(int32)
+ **out = **in
+ }
if in.Triggers != nil {
in, out := ,
*out = make([]ScaleTriggers, len(*in))
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 90641e3..4911a76 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -62,27 +62,34 @@ const (
)
// The KEDA trait can be used for automatic integration with KEDA autoscalers.
+// The trait can be either manually configured using the `triggers` option or
automatically configured
+// via markers in the Kamelets.
+//
+// For information on how to use KEDA enabled Kamelets with the KEDA trait,
refer to
+// xref: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:kamelets/kamelets-dev.adoc#kamelet-keda-dev[the KEDA section in the
Kamelets development guide].
//
// The KEDA trait is disabled by default.
//
// +camel-k:trait=keda.
type kedaTrait struct {
trait.BaseTrait `property:",squash"`
- // Enables automatic configuration of the trait.
+ // Enables automatic configuration of the trait. Allows the trait to
infer KEDA triggers from the Kamelets.
Auto *bool `property:"auto" json:"auto,omitempty"`
- // Convert metadata properties to camelCase (needed because trait
properties use kebab-case). Disabled by default.
+ // Convert metadata properties to camelCase (needed because Camel K
trait properties use kebab-case from command line). Disabled by default.
CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
- // Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource
+ // Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource.
HackControllerReplicas *bool `property:"hack-controller-replicas"
json:"hackControllerReplicas,omitempty"`
- // Interval (seconds) to check each trigger on (minimum 10 seconds)
+ // Interval (seconds) to check each trigger on (minimum 10 seconds).
PollingInterval *int32 `property:"polling-interval"
json:"pollingInterval,omitempty"`
- // The wait period between the last active trigger reported and scaling
the resource back to 0
+ // The wait period between the last active trigger reported and scaling
the resource back to 0.
CooldownPeriod *int32 `property:"cooldown-period"
[camel-k] 18/22: Fix #1107: fix findings
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9d89922951da6dcfc258d7fad097e7e47b78a4dc
Author: nicolaferraro
AuthorDate: Wed Dec 22 00:54:16 2021 +0100
Fix #1107: fix findings
---
addons/keda/keda.go| 43 ++---
addons/keda/keda_test.go | 61 ---
docs/modules/traits/pages/keda.adoc| 4 --
e2e/common/scale_binding_test.go | 11 +---
e2e/common/scale_integration_test.go | 11 +---
pkg/client/{serverside.go => apply.go} | 0
pkg/client/client.go | 2 +
pkg/client/scale.go| 35 +++
pkg/cmd/run.go | 2 +-
pkg/resources/resources.go | 4 +-
pkg/trait/deployer.go | 108 +
pkg/util/test/client.go| 45 +-
resources/traits.yaml | 4 --
13 files changed, 157 insertions(+), 173 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index ad9f71d..e6e1d5e 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -38,7 +38,7 @@ import (
"github.com/apache/camel-k/pkg/util/source"
"github.com/apache/camel-k/pkg/util/uri"
"github.com/pkg/errors"
- scase "github.com/stoewer/go-strcase"
+ autoscalingv1 "k8s.io/api/autoscaling/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -76,8 +76,6 @@ type kedaTrait struct {
trait.BaseTrait `property:",squash"`
// Enables automatic configuration of the trait. Allows the trait to
infer KEDA triggers from the Kamelets.
Auto *bool `property:"auto" json:"auto,omitempty"`
- // Convert metadata properties to camelCase (needed because Camel K
trait properties use kebab-case from command line). Disabled by default.
- CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
// Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource.
HackControllerReplicas *bool `property:"hack-controller-replicas"
json:"hackControllerReplicas,omitempty"`
// Interval (seconds) to check each trigger on.
@@ -170,11 +168,7 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
for idx, trigger := range t.Triggers {
meta := make(map[string]string)
for k, v := range trigger.Metadata {
- kk := k
- if t.CamelCaseConversion != nil &&
*t.CamelCaseConversion {
- kk = scase.LowerCamelCase(k)
- }
- meta[kk] = v
+ meta[k] = v
}
var authenticationRef *kedav1alpha1.ScaledObjectAuthRef
if len(trigger.authentication) > 0 &&
trigger.AuthenticationSecret != "" {
@@ -269,28 +263,25 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
ctrlRef := t.getTopControllerReference(e)
+ scale := autoscalingv1.Scale{
+ Spec: autoscalingv1.ScaleSpec{
+ Replicas: int32(1),
+ },
+ }
+ scalesClient, err := e.Client.ScalesClient()
+ if err != nil {
+ return err
+ }
if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
- // Update the KameletBinding directly (do not add it to env
resources, it's the integration parent)
- key := ctrl.ObjectKey{
- Namespace: e.Integration.Namespace,
- Name: ctrlRef.Name,
- }
- klb := camelv1alpha1.KameletBinding{}
- if err := e.Client.Get(e.Ctx, key, ); err != nil {
+ scale.ObjectMeta.Name = ctrlRef.Name
+ _, err =
scalesClient.Scales(e.Integration.Namespace).Update(e.Ctx,
camelv1alpha1.SchemeGroupVersion.WithResource("kameletbindings").GroupResource(),
, metav1.UpdateOptions{})
+ if err != nil {
return err
}
- if klb.Spec.Replicas == nil {
- one := int32(1)
- klb.Spec.Replicas =
- if err := e.Client.Update(e.Ctx, ); err != nil {
- return err
- }
- }
} else if e.Integration.Spe
[camel-k] 03/22: Fix #1107: initial trait
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8ba04e79a203d8fe382731ab3d1e5d2db9ef45da
Author: nicolaferraro
AuthorDate: Wed Dec 15 10:36:40 2021 +0100
Fix #1107: initial trait
---
addons/keda/duck/v1alpha1/doc.go | 21 ++
addons/keda/duck/v1alpha1/duck_types.go| 108 ++
.../v1alpha1/duck_types_support.go}| 42 ++--
addons/keda/duck/v1alpha1/register.go | 57 +
addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 235 +
addons/keda/keda.go| 118 ++-
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/traits/pages/keda.adoc| 44
go.sum | 1 +
pkg/cmd/run.go | 7 +-
pkg/resources/resources.go | 4 +-
resources/traits.yaml | 23 ++
script/Makefile| 8 +-
script/{gen_doc.sh => gen_client_keda.sh} | 16 +-
script/gen_doc.sh | 2 +-
15 files changed, 645 insertions(+), 42 deletions(-)
diff --git a/addons/keda/duck/v1alpha1/doc.go b/addons/keda/duck/v1alpha1/doc.go
new file mode 100644
index 000..56d897a
--- /dev/null
+++ b/addons/keda/duck/v1alpha1/doc.go
@@ -0,0 +1,21 @@
+/*
+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 duck contains a partial schema of the Keda APIs
+// +kubebuilder:object:generate=true
+// +groupName=keda.sh
+package v1alpha1
diff --git a/addons/keda/duck/v1alpha1/duck_types.go
b/addons/keda/duck/v1alpha1/duck_types.go
new file mode 100644
index 000..8504b6c
--- /dev/null
+++ b/addons/keda/duck/v1alpha1/duck_types.go
@@ -0,0 +1,108 @@
+/*
+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 v1alpha1
+
+import (
+ v1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +genclient:onlyVerbs=get,list,watch
+// +genclient:noStatus
+// +kubebuilder:object:root=true
+
+// ScaledObject is a specification for a ScaledObject resource
+type ScaledObject struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ObjectMeta `json:"metadata,omitempty"`
+
+ Spec ScaledObjectSpec `json:"spec"`
+}
+
+// ScaledObjectSpec is the spec for a ScaledObject resource
+type ScaledObjectSpec struct {
+ ScaleTargetRef *v1.ObjectReference `json:"scaleTargetRef"`
+
+ Triggers []ScaleTriggers `json:"triggers"`
+}
+
+// ScaleTriggers reference the scaler that will be used
+type ScaleTriggers struct {
+ Type string `json:"type"`
+ // +optional
+ Name string`json:"name,omitempty"`
+ Metadata map[string]string `json:"metadata"`
+ // +optional
+ AuthenticationRef *ScaledObjectAuthRef
`json:"authenticationRef,omitempty"`
+ // +optional
+ FallbackReplicas *int32 `json:"fallback,omitempty"`
+}
+
+// ScaledObjectAuthRef points to the TriggerAuthentication or
ClusterTriggerAuthentication object that
+// is used to authenticate the scaler with the environment
+type ScaledObjectAuthRef struct {
+ Name string `json:"name"`
+ // K
[camel-k] 01/22: Fix #1107: keda scaffolding
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b170a7154c3b0cb3b52b4be959470b0cfcccee4d
Author: nicolaferraro
AuthorDate: Fri Dec 10 11:43:06 2021 +0100
Fix #1107: keda scaffolding
---
addons/keda/keda.go | 51 +
addons/register_keda.go | 27 ++
2 files changed, 78 insertions(+)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
new file mode 100644
index 000..c794249
--- /dev/null
+++ b/addons/keda/keda.go
@@ -0,0 +1,51 @@
+/*
+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 keda
+
+import (
+ "github.com/apache/camel-k/pkg/trait"
+)
+
+// The Keda trait can be used for automatic integration with Keda autoscalers.
+//
+// The Keda trait is disabled by default.
+//
+// +camel-k:trait=keda.
+type kedaTrait struct {
+ trait.BaseTrait `property:",squash"`
+ // Enables automatic configuration of the trait.
+ Auto *bool `property:"auto" json:"auto,omitempty"`
+ // Metadata
+ Metadata map[string]string `property:"metadata"
json:"metadata,omitempty"`
+}
+
+// NewKedaTrait --.
+func NewKedaTrait() trait.Trait {
+ return {
+ BaseTrait: trait.NewBaseTrait("keda",
trait.TraitOrderPostProcessResources),
+ }
+}
+
+func (t *kedaTrait) Configure(e *trait.Environment) (bool, error) {
+
+ return false, nil
+}
+
+func (t *kedaTrait) Apply(e *trait.Environment) error {
+ return nil
+}
diff --git a/addons/register_keda.go b/addons/register_keda.go
new file mode 100644
index 000..a8699cc
--- /dev/null
+++ b/addons/register_keda.go
@@ -0,0 +1,27 @@
+/*
+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 addons
+
+import (
+ "github.com/apache/camel-k/addons/keda"
+ "github.com/apache/camel-k/pkg/trait"
+)
+
+func init() {
+ trait.AddToTraits(keda.NewKedaTrait)
+}
[camel-k] 17/22: Fix #1107: remove limit from doc
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 567c2de448d9a90f299791d979dd6cf07c9f8797
Author: nicolaferraro
AuthorDate: Tue Dec 21 22:04:33 2021 +0100
Fix #1107: remove limit from doc
---
addons/keda/keda.go | 2 +-
docs/modules/traits/pages/keda.adoc | 2 +-
resources/traits.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 0c972ab..ad9f71d 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -80,7 +80,7 @@ type kedaTrait struct {
CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
// Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource.
HackControllerReplicas *bool `property:"hack-controller-replicas"
json:"hackControllerReplicas,omitempty"`
- // Interval (seconds) to check each trigger on (minimum 10 seconds).
+ // Interval (seconds) to check each trigger on.
PollingInterval *int32 `property:"polling-interval"
json:"pollingInterval,omitempty"`
// The wait period between the last active trigger reported and scaling
the resource back to 0.
CooldownPeriod *int32 `property:"cooldown-period"
json:"cooldownPeriod,omitempty"`
diff --git a/docs/modules/traits/pages/keda.adoc
b/docs/modules/traits/pages/keda.adoc
index 340e150..df6c8d9 100644
--- a/docs/modules/traits/pages/keda.adoc
+++ b/docs/modules/traits/pages/keda.adoc
@@ -48,7 +48,7 @@ The following configuration options are available:
| keda.polling-interval
| int32
-| Interval (seconds) to check each trigger on (minimum 10 seconds).
+| Interval (seconds) to check each trigger on.
| keda.cooldown-period
| int32
diff --git a/resources/traits.yaml b/resources/traits.yaml
index f1a813f..638418d 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -603,7 +603,7 @@ traits:
value if missing, to allow KEDA to recognize it as a scalable resource.
- name: polling-interval
type: int32
-description: Interval (seconds) to check each trigger on (minimum 10
seconds).
+description: Interval (seconds) to check each trigger on.
- name: cooldown-period
type: int32
description: The wait period between the last active trigger reported and
scaling
[camel-k] 04/22: Fix #1107: generalize server side apply code and reuse
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5a7e49cf585aa987549f76f9301c92b40323acba
Author: nicolaferraro
AuthorDate: Wed Dec 15 11:16:46 2021 +0100
Fix #1107: generalize server side apply code and reuse
---
addons/keda/keda.go | 6 +--
pkg/client/client.go | 1 +
pkg/client/serverside.go | 124 +++
pkg/install/kamelets.go | 86 +---
pkg/util/test/client.go | 6 +++
5 files changed, 136 insertions(+), 87 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 65a8bd4..f59edd9 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -117,7 +117,7 @@ func (t *kedaTrait) getScaledObject(e *trait.Environment)
(*kedav1alpha1.ScaledO
func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
ctrlRef := t.getTopControllerReference(e)
-
+ applier := e.Client.ServerOrClientSideApplier()
if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
// Update the KameletBinding directly (do not add it to env
resources, it's the integration parent)
key := client.ObjectKey{
@@ -131,7 +131,7 @@ func (t *kedaTrait) hackControllerReplicas(e
*trait.Environment) error {
if klb.Spec.Replicas == nil {
one := int32(1)
klb.Spec.Replicas =
- if err := e.Client.Update(e.Ctx, ); err != nil {
+ if err := applier.Apply(e.Ctx, ); err != nil {
return err
}
}
@@ -139,7 +139,7 @@ func (t *kedaTrait) hackControllerReplicas(e
*trait.Environment) error {
if e.Integration.Spec.Replicas == nil {
one := int32(1)
e.Integration.Spec.Replicas =
- if err := e.Client.Update(e.Ctx, e.Integration); err !=
nil {
+ if err := applier.Apply(e.Ctx, e.Integration); err !=
nil {
return err
}
}
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 3334e70..2cf73c2 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -63,6 +63,7 @@ type Client interface {
GetScheme() *runtime.Scheme
GetConfig() *rest.Config
GetCurrentNamespace(kubeConfig string) (string, error)
+ ServerOrClientSideApplier() ServerOrClientSideApplier
}
// Injectable identifies objects that can receive a Client.
diff --git a/pkg/client/serverside.go b/pkg/client/serverside.go
new file mode 100644
index 000..6efd758
--- /dev/null
+++ b/pkg/client/serverside.go
@@ -0,0 +1,124 @@
+/*
+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 client
+
+import (
+ "context"
+ "fmt"
+ "net/http"
+ "strings"
+ "sync"
+ "sync/atomic"
+
+ "github.com/apache/camel-k/pkg/util/log"
+ "github.com/apache/camel-k/pkg/util/patch"
+ "github.com/pkg/errors"
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ "k8s.io/apimachinery/pkg/types"
+ ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type ServerOrClientSideApplier struct {
+ Client ctrl.Client
+ hasServerSideApply atomic.Value
+ tryServerSideApply sync.Once
+}
+
+func (c *defaultClient) ServerOrClientSideApplier() ServerOrClientSideApplier {
+ return ServerOrClientSideApplier{
+ Client: c,
+ }
+}
+
+func (a *ServerOrClientSideApplier) Apply(ctx context.Context, object
ctrl.Object) error {
+ once := false
+ var err error
+ a.tryServerSideApply.Do(func() {
+ once = true
+ if err = a.serverSideApply(ctx, object); err != nil {
+ if isIncompatibleServerError(err) {
+
[camel-k] 14/22: Fix #1107: add tests for kamelet binding and replicas
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 29c883f97142293d6f50eb62100b4d3607ed398c
Author: nicolaferraro
AuthorDate: Mon Dec 20 18:18:37 2021 +0100
Fix #1107: add tests for kamelet binding and replicas
---
addons/keda/keda_test.go | 191 -
.../bases/camel-k.clusterserviceversion.yaml | 8 +-
pkg/controller/kameletbinding/common.go| 2 +-
pkg/controller/kameletbinding/initialize.go| 2 +-
pkg/controller/kameletbinding/monitor.go | 2 +-
pkg/resources/resources.go | 4 +-
pkg/trait/dependencies_test.go | 2 +-
pkg/trait/init.go | 2 +-
pkg/trait/trait_register.go| 2 +-
9 files changed, 196 insertions(+), 19 deletions(-)
diff --git a/addons/keda/keda_test.go b/addons/keda/keda_test.go
index 083a231..ae49b4a 100644
--- a/addons/keda/keda_test.go
+++ b/addons/keda/keda_test.go
@@ -19,11 +19,13 @@ package keda
import (
"context"
+ "encoding/json"
"testing"
"github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/controller/kameletbinding"
"github.com/apache/camel-k/pkg/trait"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/kubernetes"
@@ -33,6 +35,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
+ "sigs.k8s.io/controller-runtime/pkg/client"
)
var (
@@ -205,6 +208,156 @@ func TestKameletAutoDetection(t *testing.T) {
assert.Contains(t, secret.StringData, "cc")
}
+func TestKameletBindingAutoDetection(t *testing.T) {
+ keda, _ := NewKedaTrait().(*kedaTrait)
+ keda.Enabled =
+ logEndpoint := "log:info"
+ klb := camelv1alpha1.KameletBinding{
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "test",
+ Name: "my-binding",
+ },
+ Spec: camelv1alpha1.KameletBindingSpec{
+ Source: camelv1alpha1.Endpoint{
+ Ref: {
+ Kind: "Kamelet",
+ APIVersion:
camelv1alpha1.SchemeGroupVersion.String(),
+ Name: "my-kamelet",
+ },
+ Properties:
asEndpointProperties(map[string]string{
+ "a": "v1",
+ "b": "v2",
+ "c": "v3",
+ }),
+ },
+ Sink: camelv1alpha1.Endpoint{
+ URI: ,
+ },
+ },
+ }
+
+ env := createBasicTestEnvironment(
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: "test",
+ Name: "my-kamelet",
+ Annotations: map[string]string{
+ "camel.apache.org/keda.type":
"my-scaler",
+ },
+ },
+ Spec: camelv1alpha1.KameletSpec{
+ Definition: {
+ Properties:
map[string]camelv1alpha1.JSONSchemaProp{
+ "a":
camelv1alpha1.JSONSchemaProp{
+ XDescriptors: []string{
+
"urn:keda:metadata:a",
+ },
+ },
+ "b":
camelv1alpha1.JSONSchemaProp{
+ XDescriptors: []string{
+
"urn:keda:metadata:bb",
+
[camel-k] 16/22: Fix #1107: fix linter
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cdd75b2e53a337af2cbfc454676464ab3716a98b
Author: nicolaferraro
AuthorDate: Tue Dec 21 11:02:20 2021 +0100
Fix #1107: fix linter
---
addons/keda/duck/v1alpha1/duck_types.go | 16 +++---
addons/keda/keda.go | 37 +++--
addons/keda/keda_test.go| 12 +--
docs/modules/traits/pages/keda.adoc | 4 ++--
pkg/client/serverside.go| 4 +++-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/run.go | 6 +++---
pkg/install/kamelets.go | 8 +--
pkg/resources/resources.go | 4 ++--
pkg/util/uri/uri.go | 2 +-
pkg/util/util.go| 5 ++---
resources/traits.yaml | 4 ++--
12 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/addons/keda/duck/v1alpha1/duck_types.go
b/addons/keda/duck/v1alpha1/duck_types.go
index 90a20bf..a278ead 100644
--- a/addons/keda/duck/v1alpha1/duck_types.go
+++ b/addons/keda/duck/v1alpha1/duck_types.go
@@ -27,7 +27,7 @@ import (
// +genclient:noStatus
// +kubebuilder:object:root=true
-// ScaledObject is a specification for a ScaledObject resource
+// ScaledObject is a specification for a ScaledObject resource.
type ScaledObject struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -35,7 +35,7 @@ type ScaledObject struct {
Spec ScaledObjectSpec `json:"spec"`
}
-// ScaledObjectSpec is the spec for a ScaledObject resource
+// ScaledObjectSpec is the spec for a ScaledObject resource.
type ScaledObjectSpec struct {
ScaleTargetRef *v1.ObjectReference `json:"scaleTargetRef"`
// +optional
@@ -52,7 +52,7 @@ type ScaledObjectSpec struct {
Triggers []ScaleTriggers `json:"triggers"`
}
-// ScaleTriggers reference the scaler that will be used
+// ScaleTriggers reference the scaler that will be used.
type ScaleTriggers struct {
Type string `json:"type"`
// +optional
@@ -65,7 +65,7 @@ type ScaleTriggers struct {
}
// ScaledObjectAuthRef points to the TriggerAuthentication or
ClusterTriggerAuthentication object that
-// is used to authenticate the scaler with the environment
+// is used to authenticate the scaler with the environment.
type ScaledObjectAuthRef struct {
Name string `json:"name"`
// Kind of the resource being referred to. Defaults to
TriggerAuthentication.
@@ -87,7 +87,7 @@ type ScaledObjectList struct {
// +genclient:noStatus
// +kubebuilder:object:root=true
-// TriggerAuthentication defines how a trigger can authenticate
+// TriggerAuthentication defines how a trigger can authenticate.
type TriggerAuthentication struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -95,13 +95,13 @@ type TriggerAuthentication struct {
Spec TriggerAuthenticationSpec `json:"spec"`
}
-// TriggerAuthenticationSpec defines the various ways to authenticate
+// TriggerAuthenticationSpec defines the various ways to authenticate.
type TriggerAuthenticationSpec struct {
// +optional
SecretTargetRef []AuthSecretTargetRef `json:"secretTargetRef,omitempty"`
}
-// AuthSecretTargetRef is used to authenticate using a reference to a secret
+// AuthSecretTargetRef is used to authenticate using a reference to a secret.
type AuthSecretTargetRef struct {
Parameter string `json:"parameter"`
Name string `json:"name"`
@@ -110,7 +110,7 @@ type AuthSecretTargetRef struct {
// +kubebuilder:object:root=true
-// TriggerAuthenticationList contains a list of TriggerAuthentication
+// TriggerAuthenticationList contains a list of TriggerAuthentication.
type TriggerAuthenticationList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata"`
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index c446ea3..0c972ab 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -27,7 +27,6 @@ import (
kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/kamelet/repository"
"github.com/apache/camel-k/pkg/metadata"
@@ -46,18 +45,18 @@ import (
)
const (
- // kameletURNMetadataPrefix allows binding Kamelet properties to KEDA
metadata
+ // kameletURNMetadataPrefi
[camel-k] 15/22: Fix #1107: fix deepcopy gen
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit b7889523191cedf1c2cc14162c807795f7a0879d Author: nicolaferraro AuthorDate: Mon Dec 20 18:56:21 2021 +0100 Fix #1107: fix deepcopy gen --- script/Makefile | 1 - script/gen_client_keda.sh | 32 2 files changed, 33 deletions(-) diff --git a/script/Makefile b/script/Makefile index af03077..16c0198 100644 --- a/script/Makefile +++ b/script/Makefile @@ -175,7 +175,6 @@ generate-json-schema: generate-keda: cd addons/keda/duck && $(CONTROLLER_GEN) paths="./..." object - ./script/gen_client_keda.sh generate-strimzi: cd addons/strimzi/duck && $(CONTROLLER_GEN) paths="./..." object diff --git a/script/gen_client_keda.sh b/script/gen_client_keda.sh deleted file mode 100755 index e5dd2ca..000 --- a/script/gen_client_keda.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# 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. - -set -e - -location=$(dirname $0) -rootdir=$location/.. - -unset GOPATH -GO111MODULE=on - -echo "Generating boilerplate code for Keda addon..." - -cd $rootdir - -go run k8s.io/code-generator/cmd/deepcopy-gen \ - -h ./script/headers/default.txt \ - --input-dirs=github.com/apache/camel-k/addons/keda
[camel-k] 20/22: Fix #1107: simplify applier code
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5520b63a06413751a48692515bce3220d29488ad
Author: nicolaferraro
AuthorDate: Tue Jan 4 00:17:22 2022 +0100
Fix #1107: simplify applier code
---
pkg/client/apply.go | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/pkg/client/apply.go b/pkg/client/apply.go
index 50be4a7..cfcc2c6 100644
--- a/pkg/client/apply.go
+++ b/pkg/client/apply.go
@@ -50,8 +50,6 @@ func (c *defaultClient) ServerOrClientSideApplier()
ServerOrClientSideApplier {
func (a *ServerOrClientSideApplier) Apply(ctx context.Context, object
ctrl.Object) error {
once := false
var err error
- // nolint: ifshort
- needsRetry := false
a.tryServerSideApply.Do(func() {
once = true
if err = a.serverSideApply(ctx, object); err != nil {
@@ -59,17 +57,13 @@ func (a *ServerOrClientSideApplier) Apply(ctx
context.Context, object ctrl.Objec
log.Info("Fallback to client-side apply for
installing resources")
a.hasServerSideApply.Store(false)
err = nil
- } else {
- needsRetry = true
}
} else {
a.hasServerSideApply.Store(true)
}
})
- if needsRetry {
- a.tryServerSideApply = sync.Once{}
- }
if err != nil {
+ a.tryServerSideApply = sync.Once{}
return err
}
if v := a.hasServerSideApply.Load(); v.(bool) {
[camel-k] 05/22: Fix #1107: adding optional keda fields
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2fbfef6662e04330bbd181330fa3df29b2574dcb
Author: nicolaferraro
AuthorDate: Wed Dec 15 11:44:39 2021 +0100
Fix #1107: adding optional keda fields
---
addons/keda/duck/v1alpha1/duck_types.go | 10 ++
addons/keda/keda.go | 29 +++--
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/addons/keda/duck/v1alpha1/duck_types.go
b/addons/keda/duck/v1alpha1/duck_types.go
index 8504b6c..90a20bf 100644
--- a/addons/keda/duck/v1alpha1/duck_types.go
+++ b/addons/keda/duck/v1alpha1/duck_types.go
@@ -38,6 +38,16 @@ type ScaledObject struct {
// ScaledObjectSpec is the spec for a ScaledObject resource
type ScaledObjectSpec struct {
ScaleTargetRef *v1.ObjectReference `json:"scaleTargetRef"`
+ // +optional
+ PollingInterval *int32 `json:"pollingInterval,omitempty"`
+ // +optional
+ CooldownPeriod *int32 `json:"cooldownPeriod,omitempty"`
+ // +optional
+ IdleReplicaCount *int32 `json:"idleReplicaCount,omitempty"`
+ // +optional
+ MinReplicaCount *int32 `json:"minReplicaCount,omitempty"`
+ // +optional
+ MaxReplicaCount *int32 `json:"maxReplicaCount,omitempty"`
Triggers []ScaleTriggers `json:"triggers"`
}
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index f59edd9..834cea3 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -43,7 +43,18 @@ type kedaTrait struct {
CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
// Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow Keda to recognize it as a scalable resource
HackControllerReplicas *bool `property:"hack-controller-replicas"
json:"hackControllerReplicas,omitempty"`
- // Triggers
+ // Interval (seconds) to check each trigger on (minimum 10 seconds)
+ PollingInterval *int32 `property:"polling-interval"
json:"pollingInterval,omitempty"`
+ // The wait period between the last active trigger reported and scaling
the resource back to 0
+ CooldownPeriod *int32 `property:"cooldown-period"
json:"cooldownPeriod,omitempty"`
+ // Enabling this property allows KEDA to scale the resource down to the
specified number of replicas
+ IdleReplicaCount *int32 `property:"idle-replica-count"
json:"idleReplicaCount,omitempty"`
+ // Minimum number of replicas
+ MinReplicaCount *int32 `property:"min-replica-count"
json:"minReplicaCount,omitempty"`
+ // Maximum number of replicas
+ MaxReplicaCount *int32 `property:"max-replica-count"
json:"maxReplicaCount,omitempty"`
+ // Definition of triggers according to the Keda format. Each trigger
must contain `type` field corresponding
+ // to the name of a Keda autoscaler and a key/value map named
`metadata` containing specific trigger options.
Triggers []kedaTrigger `property:"triggers" json:"triggers,omitempty"`
}
@@ -95,7 +106,21 @@ func (t *kedaTrait) getScaledObject(e *trait.Environment)
(*kedav1alpha1.ScaledO
}
obj := kedav1alpha1.NewScaledObject(e.Integration.Namespace,
e.Integration.Name)
obj.Spec.ScaleTargetRef = t.getTopControllerReference(e)
-
+ if t.PollingInterval != nil {
+ obj.Spec.PollingInterval = t.PollingInterval
+ }
+ if t.CooldownPeriod != nil {
+ obj.Spec.CooldownPeriod = t.CooldownPeriod
+ }
+ if t.IdleReplicaCount != nil {
+ obj.Spec.IdleReplicaCount = t.IdleReplicaCount
+ }
+ if t.MinReplicaCount != nil {
+ obj.Spec.MinReplicaCount = t.MinReplicaCount
+ }
+ if t.MaxReplicaCount != nil {
+ obj.Spec.MaxReplicaCount = t.MaxReplicaCount
+ }
for _, trigger := range t.Triggers {
meta := make(map[string]string)
for k, v := range trigger.Metadata {
[camel-k] 07/22: Fix #1107: refactoring annotations and secret generation
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7c9596cdc44026723e0ef4498186a473c5de10c6
Author: nicolaferraro
AuthorDate: Fri Dec 17 15:09:15 2021 +0100
Fix #1107: refactoring annotations and secret generation
---
addons/keda/duck/v1alpha1/doc.go| 2 +-
addons/keda/duck/v1alpha1/register.go | 6 +-
addons/keda/keda.go | 260 +---
docs/modules/ROOT/nav.adoc | 2 +-
pkg/apis/camel/v1alpha1/jsonschema_types.go | 2 -
5 files changed, 201 insertions(+), 71 deletions(-)
diff --git a/addons/keda/duck/v1alpha1/doc.go b/addons/keda/duck/v1alpha1/doc.go
index 56d897a..0ce22d9 100644
--- a/addons/keda/duck/v1alpha1/doc.go
+++ b/addons/keda/duck/v1alpha1/doc.go
@@ -15,7 +15,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-// Package duck contains a partial schema of the Keda APIs
+// Package duck contains a partial schema of the KEDA APIs
// +kubebuilder:object:generate=true
// +groupName=keda.sh
package v1alpha1
diff --git a/addons/keda/duck/v1alpha1/register.go
b/addons/keda/duck/v1alpha1/register.go
index a3814da..8ed0791 100644
--- a/addons/keda/duck/v1alpha1/register.go
+++ b/addons/keda/duck/v1alpha1/register.go
@@ -24,13 +24,13 @@ import (
)
const (
- KedaGroup = "keda.sh"
- KedaVersion = "v1alpha1"
+ KEDAGroup = "keda.sh"
+ KEDAVersion = "v1alpha1"
)
var (
// SchemeGroupVersion is group version used to register these objects.
- SchemeGroupVersion = schema.GroupVersion{Group: KedaGroup, Version:
KedaVersion}
+ SchemeGroupVersion = schema.GroupVersion{Group: KEDAGroup, Version:
KEDAVersion}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 8396742..ffe637c 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -18,9 +18,12 @@ limitations under the License.
package keda
import (
+ "bytes"
+ "encoding/json"
"fmt"
"sort"
"strings"
+ "text/template"
kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
@@ -38,25 +41,29 @@ import (
"github.com/pkg/errors"
scase "github.com/stoewer/go-strcase"
v1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
const (
- // kameletURNTypePrefix indicates the scaler type associated to a
Kamelet
- kameletURNTypePrefix = "urn:keda:type:"
- // kameletURNMetadataPrefix allows binding Kamelet properties to Keda
metadata
+ // kameletURNMetadataPrefix allows binding Kamelet properties to KEDA
metadata
kameletURNMetadataPrefix = "urn:keda:metadata:"
- // kameletURNRequiredTag is used to mark properties required by Keda
+ // kameletURNAuthenticationPrefix allows binding Kamelet properties to
KEDA authentication options
+ kameletURNAuthenticationPrefix = "urn:keda:authentication:"
+ // kameletURNRequiredTag is used to mark properties required by KEDA
kameletURNRequiredTag = "urn:keda:required"
- // kameletAnnotationType is an alternative to kameletURNTypePrefix.
- // To be removed when the `spec -> definition -> x-descriptors` field
becomes stable.
+ // kameletAnnotationType indicates the scaler type associated to a
Kamelet
kameletAnnotationType = "camel.apache.org/keda.type"
+ // kameletAnnotationMetadataPrefix is used to define virtual metadata
fields computed from Kamelet properties
+ kameletAnnotationMetadataPrefix = "camel.apache.org/keda.metadata."
+ // kameletAnnotationAuthenticationPrefix is used to define virtual
authentication fields computed from Kamelet properties
+ kameletAnnotationAuthenticationPrefix =
"camel.apache.org/keda.authentication."
)
-// The Keda trait can be used for automatic integration with Keda autoscalers.
+// The KEDA trait can be used for automatic integration with KEDA autoscalers.
//
-// The Keda trait is disabled by default.
+// The KEDA trait is disabled by default.
//
// +camel-k:trait=keda.
type kedaTrait struct {
@@ -65,7 +72,7 @@ type kedaTrait struct {
Auto *bool `property:"auto" json:"auto,omitempty"`
// Convert metadata properties to camelCase (needed because trait
properties use ke
[camel-k] 13/22: Fix #1107: update helm roles
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 8a4f660781e3206f7d9fd4108dea17a70e356cb0 Author: nicolaferraro AuthorDate: Mon Dec 20 17:19:24 2021 +0100 Fix #1107: update helm roles --- helm/camel-k/templates/operator-role.yaml | 205 +- 1 file changed, 143 insertions(+), 62 deletions(-) diff --git a/helm/camel-k/templates/operator-role.yaml b/helm/camel-k/templates/operator-role.yaml index 3afbe47..3f207fe 100644 --- a/helm/camel-k/templates/operator-role.yaml +++ b/helm/camel-k/templates/operator-role.yaml @@ -26,9 +26,40 @@ rules: - apiGroups: - camel.apache.org resources: - - "*" + - builds + - camelcatalogs + - integrationkits + - integrationplatforms + - integrations + - kameletbindings + - kamelets + verbs: + - create + - get + - list + - patch + - update + - watch +- apiGroups: + - camel.apache.org + resources: + - builds + verbs: + - delete +- apiGroups: + - camel.apache.org + resources: + - builds/status + - camelcatalogs/status + - integrationkits/status + - integrationplatforms/status + - integrations/status + - kameletbindings/status + - kamelets/status verbs: - - "*" + - get + - patch + - update - apiGroups: - "" resources: @@ -87,21 +118,22 @@ rules: - update - watch - apiGroups: - - "" + - apps resources: - - events + - deployments verbs: - create - - patch + - delete + - deletecollection - get - list + - patch + - update - watch - apiGroups: - - apps + - batch resources: - - deployments - - replicasets - - statefulsets + - cronjobs verbs: - create - delete @@ -114,7 +146,15 @@ rules: - apiGroups: - batch resources: - - cronjobs + - jobs + verbs: + - get + - list + - watch +- apiGroups: + - networking.k8s.io + resources: + - ingresses verbs: - create - delete @@ -125,17 +165,20 @@ rules: - update - watch - apiGroups: - - apps + - "" resources: - - daemonsets + - events verbs: + - create + - patch - get - list - watch - apiGroups: - - extensions + - keda.sh resources: - - networking.k8s.io + - scaledobjects + - triggerauthentications verbs: - create - delete @@ -146,53 +189,67 @@ rules: - update - watch - apiGroups: - - "" - - "build.openshift.io" + - serving.knative.dev resources: - - buildconfigs - - buildconfigs/webhooks - - builds + - services verbs: - create - delete - - deletecollection - get - list - patch - update - watch - apiGroups: - - "" - - "image.openshift.io" + - eventing.knative.dev resources: - - imagestreamimages - - imagestreammappings - - imagestreams - - imagestreams/secrets - - imagestreamtags + - triggers verbs: - create - delete - - deletecollection - get - list - patch - update - - watch - apiGroups: - - "" - - build.openshift.io + - messaging.knative.dev resources: - - buildconfigs/instantiate - - buildconfigs/instantiatebinary - - builds/clone + - subscriptions verbs: - create + - delete + - get + - list + - patch + - update - apiGroups: - - "" - - "route.openshift.io" + - sources.knative.dev resources: - - routes + - sinkbindings + verbs: + - create + - delete + - get + - list + - patch + - update +- apiGroups: + - eventing.knative.dev + resources: + - brokers + verbs: + - get +- apiGroups: + - messaging.knative.dev + resources: + - channels + - inmemorychannels + verbs: + - get +- apiGroups: + - coordination.k8s.io + resources: + - leases verbs: - create - delete @@ -203,16 +260,22 @@ rules: - update - watch - apiGroups: - - "" - - route.openshift.io + - camel.apache.org resources: - - routes/custom-host + - builds/finalizers + - integrationkits/finalizers + - integrationplatforms/finalizers + - integrations/finalizers + - kameletbindings/finalizers verbs: - - create + - update - apiGroups: - - serving.knative.dev + - "" + - build.openshift.io resources: - - services + - buildconfigs + - buildconfigs/webhooks + - builds verbs: - create - delete @@ -223,11 +286,14 @@ rules: - update - watch - apiGroups: - - eventing.knative.dev - - messaging.knative.dev - - sources.knative.dev + - "" + - image.openshift.io resources: - - "*" + - imagestreamimages + - imagestreammappings + - imagestreams + - imagestreams/secrets + - imagestreamtags verbs: - create - delete @@ -238,17 +304,19 @@ rules: - update - watch - apiGroups: - - rbac.authorization.k8s.io + - "" + - build.openshift.io resources: - - clusterroles + - buildconfigs/instantiate
[camel-k] 08/22: Fix #1107: disable camel case conversion by default
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 371150fa8c931aa7e85e8fd38b744f19d3abbbc5
Author: nicolaferraro
AuthorDate: Mon Dec 20 10:08:01 2021 +0100
Fix #1107: disable camel case conversion by default
---
addons/keda/keda.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index ffe637c..90641e3 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -70,7 +70,7 @@ type kedaTrait struct {
trait.BaseTrait `property:",squash"`
// Enables automatic configuration of the trait.
Auto *bool `property:"auto" json:"auto,omitempty"`
- // Convert metadata properties to camelCase (needed because trait
properties use kebab-case). Enabled by default.
+ // Convert metadata properties to camelCase (needed because trait
properties use kebab-case). Disabled by default.
CamelCaseConversion *bool `property:"camel-case-conversion"
json:"camelCaseConversion,omitempty"`
// Set the spec->replicas field on the top level controller to an
explicit value if missing, to allow KEDA to recognize it as a scalable resource
HackControllerReplicas *bool `property:"hack-controller-replicas"
json:"hackControllerReplicas,omitempty"`
@@ -164,7 +164,7 @@ func (t *kedaTrait) addScalingResources(e
*trait.Environment) error {
meta := make(map[string]string)
for k, v := range trigger.Metadata {
kk := k
- if t.CamelCaseConversion == nil ||
*t.CamelCaseConversion {
+ if t.CamelCaseConversion != nil &&
*t.CamelCaseConversion {
kk = scase.LowerCamelCase(k)
}
meta[kk] = v
[camel-k] 12/22: Fix #1107: added roles and regen
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e5354e53e48b853718848daf382f1da898e94b60
Author: nicolaferraro
AuthorDate: Mon Dec 20 17:09:50 2021 +0100
Fix #1107: added roles and regen
---
addons/keda/keda.go| 1 -
config/rbac/kustomization.yaml | 2 +
...zation.yaml => operator-role-binding-keda.yaml} | 36 +++---
...{kustomization.yaml => operator-role-keda.yaml} | 44 +++---
docs/modules/traits/pages/keda.adoc| 2 +
pkg/install/operator.go| 14 +++
pkg/resources/resources.go | 28 +++---
resources/traits.yaml | 4 +-
8 files changed, 77 insertions(+), 54 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 3a54896..c446ea3 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -123,7 +123,6 @@ func (t *kedaTrait) Configure(e *trait.Environment) (bool,
error) {
if t.Auto == nil || *t.Auto {
if err := t.populateTriggersFromKamelets(e); err != nil {
- // TODO: set condition
return false, err
}
}
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
index 40d4d39..7f03ac1 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/kustomization.yaml
@@ -26,10 +26,12 @@ resources:
- operator-role-events.yaml
- operator-role-knative.yaml
- operator-role.yaml
+- operator-role-keda.yaml
- operator-role-leases.yaml
- operator-role-podmonitors.yaml
- operator-role-strimzi.yaml
- operator-role-binding-events.yaml
+- operator-role-binding-keda.yaml
- operator-role-binding-knative.yaml
- operator-role-binding-leases.yaml
- operator-role-binding-podmonitors.yaml
diff --git a/config/rbac/kustomization.yaml
b/config/rbac/operator-role-binding-keda.yaml
similarity index 58%
copy from config/rbac/kustomization.yaml
copy to config/rbac/operator-role-binding-keda.yaml
index 40d4d39..fd8c602 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/operator-role-binding-keda.yaml
@@ -15,26 +15,16 @@
# limitations under the License.
# ---
-#
-# rbac resources applicable for all kubernetes platforms
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- user-cluster-role.yaml
-- operator-role-events.yaml
-- operator-role-knative.yaml
-- operator-role.yaml
-- operator-role-leases.yaml
-- operator-role-podmonitors.yaml
-- operator-role-strimzi.yaml
-- operator-role-binding-events.yaml
-- operator-role-binding-knative.yaml
-- operator-role-binding-leases.yaml
-- operator-role-binding-podmonitors.yaml
-- operator-role-binding-strimzi.yaml
-- operator-role-binding.yaml
-- operator-cluster-role-custom-resource-definitions.yaml
-- operator-cluster-role-binding-custom-resource-definitions.yaml
-
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: camel-k-operator-keda
+ labels:
+app: "camel-k"
+subjects:
+- kind: ServiceAccount
+ name: camel-k-operator
+roleRef:
+ kind: Role
+ name: camel-k-operator-keda
+ apiGroup: rbac.authorization.k8s.io
diff --git a/config/rbac/kustomization.yaml
b/config/rbac/operator-role-keda.yaml
similarity index 60%
copy from config/rbac/kustomization.yaml
copy to config/rbac/operator-role-keda.yaml
index 40d4d39..22c026c 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/operator-role-keda.yaml
@@ -15,26 +15,24 @@
# limitations under the License.
# ---
-#
-# rbac resources applicable for all kubernetes platforms
-#
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-- user-cluster-role.yaml
-- operator-role-events.yaml
-- operator-role-knative.yaml
-- operator-role.yaml
-- operator-role-leases.yaml
-- operator-role-podmonitors.yaml
-- operator-role-strimzi.yaml
-- operator-role-binding-events.yaml
-- operator-role-binding-knative.yaml
-- operator-role-binding-leases.yaml
-- operator-role-binding-podmonitors.yaml
-- operator-role-binding-strimzi.yaml
-- operator-role-binding.yaml
-- operator-cluster-role-custom-resource-definitions.yaml
-- operator-cluster-role-binding-custom-resource-definitions.yaml
-
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: camel-k-operator-keda
+ labels:
+app: "camel-k"
+rules:
+- apiGroups:
+ - "keda.sh"
+ resources:
+ - scaledobjects
+ - triggerauthentications
+ verbs:
+ - create
+ - delete
+ - deletecollection
+ - get
+ - list
+ - patch
+ - update
+ - watch
diff --git a/docs/modules/traits/pages/keda.adoc
b/docs/modules/traits/pages/keda.adoc
inde
[camel-k] 02/22: Fix #1107: add support for nested trait configuration
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b848abaab2832e5a86429befae578a1bccd3365f
Author: nicolaferraro
AuthorDate: Mon Dec 13 16:40:08 2021 +0100
Fix #1107: add support for nested trait configuration
---
pkg/cmd/run.go | 30 +
pkg/cmd/run_test.go | 49
pkg/trait/trait_catalog.go | 6
pkg/trait/trait_configure.go | 26 ---
pkg/util/util.go | 77
5 files changed, 176 insertions(+), 12 deletions(-)
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 732e1da..5dfca09 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -54,7 +54,7 @@ import (
"github.com/apache/camel-k/pkg/util/watch"
)
-var traitConfigRegexp =
regexp.MustCompile(`^([a-z0-9-]+)((?:\.[a-z0-9-]+)+)=(.*)$`)
+var traitConfigRegexp =
regexp.MustCompile(`^([a-z0-9-]+)((?:\[[0-9]+\]|\.[a-z0-9-]+)+)=(.*)$`)
func newCmdRun(rootCmdOptions *RootCmdOptions) (*cobra.Command,
*runCmdOptions) {
options := runCmdOptions{
@@ -794,7 +794,7 @@ func resolvePodTemplate(ctx context.Context, templateSrc
string, spec *v1.Integr
return err
}
-func configureTraits(options []string, catalog *trait.Catalog)
(map[string]v1.TraitSpec, error) {
+func configureTraits(options []string, catalog trait.Finder)
(map[string]v1.TraitSpec, error) {
traits := make(map[string]map[string]interface{})
for _, option := range options {
@@ -803,23 +803,39 @@ func configureTraits(options []string, catalog
*trait.Catalog) (map[string]v1.Tr
return nil, errors.New("unrecognized config format
(expected \".=\"): " + option)
}
id := parts[1]
- prop := parts[2][1:]
+ fullProp := parts[2][1:]
value := parts[3]
if _, ok := traits[id]; !ok {
traits[id] = make(map[string]interface{})
}
- switch v := traits[id][prop].(type) {
+
+ propParts := util.ConfigTreePropertySplit(fullProp)
+ var current = traits[id]
+ if len(propParts) > 1 {
+ c, err := util.NavigateConfigTree(current,
propParts[0:len(propParts)-1])
+ if err != nil {
+ return nil, err
+ }
+ if cc, ok := c.(map[string]interface{}); ok {
+ current = cc
+ } else {
+ return nil, errors.New("trait configuration
cannot end with a slice")
+ }
+ }
+
+ prop := propParts[len(propParts)-1]
+ switch v := current[prop].(type) {
case []string:
- traits[id][prop] = append(v, value)
+ current[prop] = append(v, value)
case string:
// Aggregate multiple occurrences of the same option
into a string array, to emulate POSIX conventions.
// This enables executing:
// $ kamel run -t .= ... -t
.=
// Or:
// $ kamel run --trait
.=,...,.=
- traits[id][prop] = []string{v, value}
+ current[prop] = []string{v, value}
case nil:
- traits[id][prop] = value
+ current[prop] = value
}
}
diff --git a/pkg/cmd/run_test.go b/pkg/cmd/run_test.go
index aa25816..dc35ee4 100644
--- a/pkg/cmd/run_test.go
+++ b/pkg/cmd/run_test.go
@@ -387,6 +387,55 @@ func TestConfigureTraits(t *testing.T) {
assertTraitConfiguration(t, traits, "prometheus",
`{"podMonitor":false}`)
}
+type customTrait struct {
+ trait.BaseTrait `property:",squash"`
+ // SimpleMap
+ SimpleMap map[string]string`property:"simple-map"
json:"simpleMap,omitempty"`
+ DoubleMap map[string]map[string]string `property:"double-map"
json:"doubleMap,omitempty"`
+ SliceOfMap []map[string]string `property:"slice-of-map"
json:"sliceOfMap,omitempty"`
+}
+
+func (c customTrait) Configure(environment *trait.Environment) (bool, error) {
+ panic("implement me")
+}
+func (c customTrait) Apply(environment *trait.Environment) error {
+ panic("implement me")
+}
+
+var _ trait.Trait = {}
+
+type customTraitFinder struct {
+}
+
+func (finder customTraitFinder) GetTrait(id string) trait.Trait {
+ if id == "custom" {
+ return {}
+ }
+ return nil
+}
[camel-k] 06/22: Fix #1107: adding first support for Kamelets
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c0cc56005e0da9c27aece3c0a7a6428f6eba5948
Author: nicolaferraro
AuthorDate: Thu Dec 16 14:59:46 2021 +0100
Fix #1107: adding first support for Kamelets
---
addons/keda/keda.go | 192 +++-
pkg/apis/camel/v1alpha1/jsonschema_types.go | 4 +-
pkg/client/serverside.go| 6 +-
pkg/util/property/property.go | 11 ++
pkg/util/uri/uri.go | 15 ++-
pkg/util/uri/uri_test.go| 67 ++
6 files changed, 288 insertions(+), 7 deletions(-)
diff --git a/addons/keda/keda.go b/addons/keda/keda.go
index 834cea3..8396742 100644
--- a/addons/keda/keda.go
+++ b/addons/keda/keda.go
@@ -18,18 +18,42 @@ limitations under the License.
package keda
import (
+ "fmt"
+ "sort"
"strings"
kedav1alpha1 "github.com/apache/camel-k/addons/keda/duck/v1alpha1"
camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
camelv1alpha1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+ "github.com/apache/camel-k/pkg/kamelet/repository"
+ "github.com/apache/camel-k/pkg/metadata"
+ "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/trait"
+ "github.com/apache/camel-k/pkg/util"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/pkg/util/property"
+ "github.com/apache/camel-k/pkg/util/source"
+ "github.com/apache/camel-k/pkg/util/uri"
+ "github.com/pkg/errors"
scase "github.com/stoewer/go-strcase"
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
+const (
+ // kameletURNTypePrefix indicates the scaler type associated to a
Kamelet
+ kameletURNTypePrefix = "urn:keda:type:"
+ // kameletURNMetadataPrefix allows binding Kamelet properties to Keda
metadata
+ kameletURNMetadataPrefix = "urn:keda:metadata:"
+ // kameletURNRequiredTag is used to mark properties required by Keda
+ kameletURNRequiredTag = "urn:keda:required"
+
+ // kameletAnnotationType is an alternative to kameletURNTypePrefix.
+ // To be removed when the `spec -> definition -> x-descriptors` field
becomes stable.
+ kameletAnnotationType = "camel.apache.org/keda.type"
+)
+
// The Keda trait can be used for automatic integration with Keda autoscalers.
//
// The Keda trait is disabled by default.
@@ -79,7 +103,14 @@ func (t *kedaTrait) Configure(e *trait.Environment) (bool,
error) {
return false, nil
}
- return true, nil
+ if t.Auto == nil || *t.Auto {
+ if err := t.populateTriggersFromKamelets(e); err != nil {
+ // TODO: set condition
+ return false, err
+ }
+ }
+
+ return len(t.Triggers) > 0, nil
}
func (t *kedaTrait) Apply(e *trait.Environment) error {
@@ -142,7 +173,6 @@ func (t *kedaTrait) getScaledObject(e *trait.Environment)
(*kedav1alpha1.ScaledO
func (t *kedaTrait) hackControllerReplicas(e *trait.Environment) error {
ctrlRef := t.getTopControllerReference(e)
- applier := e.Client.ServerOrClientSideApplier()
if ctrlRef.Kind == camelv1alpha1.KameletBindingKind {
// Update the KameletBinding directly (do not add it to env
resources, it's the integration parent)
key := client.ObjectKey{
@@ -156,7 +186,7 @@ func (t *kedaTrait) hackControllerReplicas(e
*trait.Environment) error {
if klb.Spec.Replicas == nil {
one := int32(1)
klb.Spec.Replicas =
- if err := applier.Apply(e.Ctx, ); err != nil {
+ if err := e.Client.Update(e.Ctx, ); err != nil {
return err
}
}
@@ -164,7 +194,7 @@ func (t *kedaTrait) hackControllerReplicas(e
*trait.Environment) error {
if e.Integration.Spec.Replicas == nil {
one := int32(1)
e.Integration.Spec.Replicas =
- if err := applier.Apply(e.Ctx, e.Integration); err !=
nil {
+ if err := e.Client.Update(e.Ctx, e.Integration); err !=
nil {
return err
}
}
@@ -188,3 +218,157 @@ func (t *kedaTrait) getTopControllerReference(e
*trait.Environment)
[camel-k] branch main updated (27ea823 -> 590b23c)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 27ea823 Updated CHANGELOG.md
new b170a71 Fix #1107: keda scaffolding
new b848aba Fix #1107: add support for nested trait configuration
new 8ba04e7 Fix #1107: initial trait
new 5a7e49c Fix #1107: generalize server side apply code and reuse
new 2fbfef6 Fix #1107: adding optional keda fields
new c0cc560 Fix #1107: adding first support for Kamelets
new 7c9596c Fix #1107: refactoring annotations and secret generation
new 371150f Fix #1107: disable camel case conversion by default
new a064422 Fix #1107: add documentation
new 1239743 Fix #1107: add optional authentication secret
new 1fde2b5 Fix #1107: added tests
new e5354e5 Fix #1107: added roles and regen
new 8a4f660 Fix #1107: update helm roles
new 29c883f Fix #1107: add tests for kamelet binding and replicas
new b788952 Fix #1107: fix deepcopy gen
new cdd75b2 Fix #1107: fix linter
new 567c2de Fix #1107: remove limit from doc
new 9d89922 Fix #1107: fix findings
new 0198461 Fix #1107: add missing operator role
new 5520b63 Fix #1107: simplify applier code
new 885d2bd Fix #1107: disable applier code to detect real CI errors
new 590b23c Fix #1107: fix expected roles in tests
The 22 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:
.../duck/v1beta2 => keda/duck/v1alpha1}/doc.go | 6 +-
addons/keda/duck/v1alpha1/duck_types.go| 118 +
.../keda/duck/v1alpha1/duck_types_support.go | 23 +-
.../v1beta2 => keda/duck/v1alpha1}/register.go | 17 +-
addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 260 ++
addons/keda/keda.go| 542 +
addons/keda/keda_test.go | 513 +++
addons/{register_master.go => register_keda.go}| 4 +-
.../bases/camel.apache.org_kameletbindings.yaml| 15 +-
config/crd/bases/camel.apache.org_kamelets.yaml| 8 +-
.../bases/camel-k.clusterserviceversion.yaml | 8 +-
config/rbac/kustomization.yaml | 2 +
...inding.yaml => operator-role-binding-keda.yaml} | 4 +-
...le-podmonitors.yaml => operator-role-keda.yaml} | 7 +-
config/rbac/operator-role.yaml | 2 +
docs/modules/ROOT/nav.adoc | 1 +
docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 119 +
.../modules/ROOT/pages/kamelets/kamelets-user.adoc | 39 ++
docs/modules/ROOT/partials/apis/crds-html.adoc | 2 +-
docs/modules/traits/pages/keda.adoc| 74 +++
e2e/common/kustomize/common.go | 5 +-
e2e/common/scale_binding_test.go | 11 +-
e2e/common/scale_integration_test.go | 11 +-
go.sum | 1 +
helm/camel-k/crds/crd-kamelet-binding.yaml | 15 +-
helm/camel-k/crds/crd-kamelet.yaml | 8 +-
helm/camel-k/templates/operator-role.yaml | 207 +---
pkg/apis/camel/v1alpha1/jsonschema_types.go| 2 +-
pkg/client/apply.go| 124 +
pkg/client/client.go | 3 +
.../kubernetes/discovery.go => client/scale.go}| 28 +-
pkg/cmd/kit_create.go | 2 +-
pkg/cmd/run.go | 43 +-
pkg/cmd/run_test.go| 49 ++
pkg/controller/kameletbinding/common.go| 2 +-
pkg/controller/kameletbinding/initialize.go| 2 +-
pkg/controller/kameletbinding/monitor.go | 2 +-
pkg/install/operator.go| 14 +
pkg/resources/resources.go | 36 +-
pkg/trait/dependencies_test.go | 2 +-
pkg/trait/init.go | 2 +-
pkg/trait/trait_catalog.go | 6 +
pkg/trait/trait_configure.go | 26 +-
pkg/trait/trait_register.go| 2 +-
pkg/util/property/property.go | 11 +
pkg/util/test/client.go| 51 +-
pkg/util/uri/uri.go| 15 +-
pkg/util/uri/uri_test.go | 67 +++
pkg/util/util.go | 76 +++
resources/traits.yaml | 51 ++
script/Makefile| 7 +-
script/gen_doc.sh | 2 +-
52 files changed, 2462
[camel-k] branch main updated: chore(release): increase helm chart version for next release
This is an automated email from the ASF dual-hosted git repository. nferraro 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 96026ca chore(release): increase helm chart version for next release 96026ca is described below commit 96026cadf8687a4b0ed4d1c35cf0456a11404d98 Author: nicolaferraro AuthorDate: Tue Nov 30 16:57:43 2021 +0100 chore(release): increase helm chart version for next release --- helm/camel-k/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index f76955c..d3b8154 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -31,7 +31,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.8.0 +version: 0.9.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application.
[camel-k] branch main updated: chore(release): publish helm chart for 1.7.0
This is an automated email from the ASF dual-hosted git repository. nferraro 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 1a26ee9 chore(release): publish helm chart for 1.7.0 1a26ee9 is described below commit 1a26ee908c3f0663bc3e2fbffb93dd190f372a91 Author: nicolaferraro AuthorDate: Tue Nov 30 16:55:00 2021 +0100 chore(release): publish helm chart for 1.7.0 --- docs/charts/camel-k-0.8.0.tgz | Bin 0 -> 100379 bytes docs/charts/index.yaml| 27 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/charts/camel-k-0.8.0.tgz b/docs/charts/camel-k-0.8.0.tgz new file mode 100644 index 000..08c5ad2 Binary files /dev/null and b/docs/charts/camel-k-0.8.0.tgz differ diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index e8e63f6..a6e2ad0 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -2,6 +2,31 @@ apiVersion: v1 entries: camel-k: - apiVersion: v2 +appVersion: 1.7.0 +created: "2021-11-30T16:50:37.498843598+01:00" +description: A lightweight integration platform, born on Kubernetes, with serverless + superpowers +digest: efccc4fab8d7f8b4e5ad129d9117e8a8d8fb5f65c7c3141eb07a63481eb7a4a7 +home: https://camel.apache.org/camel-k/latest/ +icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png +keywords: +- serverless +- integration +- patterns +maintainers: +- email: nferr...@apache.org + name: nferraro +name: camel-k +sources: +- https://github.com/apache/camel-k +- https://github.com/apache/camel-k-runtime +- https://github.com/apache/camel-quarkus +- https://github.com/apache/camel +type: application +urls: +- https://apache.github.io/camel-k/charts/camel-k-0.8.0.tgz +version: 0.8.0 + - apiVersion: v2 appVersion: 1.6.1 created: "2021-10-27T15:57:59.557403729+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless @@ -351,4 +376,4 @@ entries: urls: - https://apache.github.io/camel-k/charts/camel-k-0.1.0.tgz version: 0.1.0 -generated: "2021-10-27T15:57:59.437141638+02:00" +generated: "2021-11-30T16:50:37.436704318+01:00"
[camel-k-runtime] branch release-1.10.x created (now d2de706)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at d2de706 Bump version to 1.10.1-SNAPSHOT This branch includes the following new commits: new d2de706 Bump version to 1.10.1-SNAPSHOT The 1 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.
[camel-k-runtime] 01/01: Bump version to 1.10.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit d2de706edf6cd5adbd477dfe16ce618f2efb760e Author: nicolaferraro AuthorDate: Wed Nov 17 13:45:19 2021 +0100 Bump version to 1.10.1-SNAPSHOT --- camel-k-cloudevents/deployment/pom.xml | 2 +- camel-k-cloudevents/pom.xml | 2 +- camel-k-cloudevents/runtime/pom.xml | 2 +- camel-k-core/api/pom.xml| 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml| 2 +- camel-k-core/runtime/pom.xml| 2 +- camel-k-core/support/pom.xml| 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml | 2 +- camel-k-cron/pom.xml| 2 +- camel-k-cron/runtime/pom.xml| 2 +- camel-k-kamelet-reify/deployment/pom.xml| 2 +- camel-k-kamelet-reify/pom.xml | 2 +- camel-k-kamelet-reify/runtime/pom.xml | 2 +- camel-k-knative/consumer/deployment/pom.xml | 2 +- camel-k-knative/consumer/pom.xml| 2 +- camel-k-knative/consumer/runtime/pom.xml| 2 +- camel-k-knative/deployment/pom.xml | 2 +- camel-k-knative/impl/pom.xml| 2 +- camel-k-knative/pom.xml | 2 +- camel-k-knative/producer/deployment/pom.xml | 2 +- camel-k-knative/producer/pom.xml| 2 +- camel-k-knative/producer/runtime/pom.xml| 2 +- camel-k-knative/runtime/pom.xml | 2 +- camel-k-loader-jsh/deployment/pom.xml | 2 +- camel-k-loader-jsh/impl/pom.xml | 2 +- camel-k-loader-jsh/pom.xml | 2 +- camel-k-loader-jsh/runtime/pom.xml | 2 +- camel-k-master/deployment/pom.xml | 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml | 2 +- camel-k-master/runtime/pom.xml | 2 +- camel-k-runtime/deployment/pom.xml | 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- camel-k-webhook/deployment/pom.xml | 2 +- camel-k-webhook/impl/pom.xml| 2 +- camel-k-webhook/pom.xml | 2 +- camel-k-webhook/runtime/pom.xml | 2 +- components/camel-cloudevents/pom.xml| 2 +- components/camel-knative/camel-knative-api/pom.xml | 2 +- components/camel-knative/camel-knative-http/pom.xml | 2 +- components/camel-knative/camel-knative-test/pom.xml | 2 +- components/camel-knative/camel-knative/pom.xml | 2 +- .../generated/resources/org/apache/camel/component/knative/knative.json | 2 +- components/camel-knative/pom.xml| 2 +- components/pom.xml | 2 +- distribution/pom.xml| 2 +- examples/cron/pom.xml | 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml | 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml| 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml | 2 +- examples/knative/pom.xml| 2 +- examples/kotlin/pom.xml | 2 +- examples
[camel-k] branch release-1.7.x created (now 087df76)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch release-1.7.x in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 087df76 Bump version to 1.7.1-SNAPSHOT This branch includes the following new commits: new 087df76 Bump version to 1.7.1-SNAPSHOT The 1 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.
[camel-k] 01/01: Bump version to 1.7.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch release-1.7.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 087df76bccac49d69dab9c68da395191fd53c357
Author: nicolaferraro
AuthorDate: Wed Nov 17 13:20:06 2021 +0100
Bump version to 1.7.1-SNAPSHOT
---
config/manager/operator-deployment.yaml | 2 +-
config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +-
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/resources/resources.go| 4 ++--
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 6 +++---
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config/manager/operator-deployment.yaml
b/config/manager/operator-deployment.yaml
index 6ade81b..5ff8bdc 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -39,7 +39,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.7.0
+ image: docker.io/apache/camel-k:1.7.1-SNAPSHOT
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 8bebab4..7598f6d 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
-containerImage: docker.io/apache/camel-k:1.7.0
+containerImage: docker.io/apache/camel-k:1.7.1-SNAPSHOT
createdAt: 2021-05-03T07:48:00Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes, with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.3.0
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index 628afb3..0724eb6 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.8.0
# This is the version number of the application being deployed. This version
number should be
# incremented each time you make changes to the application.
-appVersion: 1.7.0
+appVersion: 1.7.1-SNAPSHOT
icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index d28fd74..6bddb2a 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,7 +23,7 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.7.0
+ image: docker.io/apache/camel-k:1.7.1-SNAPSHOT
platform:
build:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 70db4f7..2c9419b 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -170,9 +170,9 @@ var assets = func() http.FileSystem {
"/manager/operator-deployment.yaml": ۰CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
- uncompressedSize: 2388,
+ uncompressedSize: 2397,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\x41\x73\xe2\x46\x13\xbd\xeb\x57\xbc\x42\x97\xdd\x2a\x1b\xec\xbd\x7c\x5b\xfa\x4e\x8a\x8d\xb3\x54\x1c\xa0\x10\x1b\xd7\x9e\x52\xc3\xa8\x41\x5d\x1e\x4d\x2b\x33\x03\x2c\xf9\xf5\xa9\x11\x08\x03\xeb\x38\x39\xb8\x2a\x73\x42\xea\xee\xd7\xef\x75\x3f\x0d\x29\xae\xdf\xef\x24\x29\x1e\x59\x93\xf5\x54\x22\x08\x42\x45\xc8\x1b\xa5\x2b\x42\x21\xcb\xb0\x55\x8e\xf0\x20\x6b\x5b\xaa\xc0\x62\xf1\x21\x2f\x1e\x3e\x62\x6d\x4b\x72\x10\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\x41\x73\xe2\x46\x13\xbd\xeb\x57\xbc\x42\x97\xdd\x2a\x03\x66\x2f\xdf\x96\xbe\x93\x62\xe3\x2c\x15\x07\x28\xc4\xc6\xb5\xa7\xd4\x30\x6a\xa4\x29\x8f\xa6\x95\x99\x11\xac\xf2\xeb\x53\x23\x10\x06\xd6\x71\x72\x70\x55\xe6\x84\xd4\xdd\xaf\xdf\xeb\x7e\x1a\x62\x0c\xdf\xef\x44\x31\x1e\x95\x24\xe3\x28\x87\x67\xf8\x92\x90\xd6\x42\x96\x84\x8c\xb7\x7e\x2f\x2c\xe1\x81\x1b\x93\x0b\xaf\xd8\xe0\x43\x9a\x3d\x7c\x44\x63\x72\xb2\x60\x
[...]
},
"/manager/operator-service-account.yaml":
۰CompressedFileInfo{
name: "operator-service-account.yaml",
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 90a3393..d87ff45 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -23,7
svn commit: r50943 - /release/camel/camel-k/1.7.0/
Author: nferraro Date: Mon Nov 15 13:10:07 2021 New Revision: 50943 Log: Release Camel K 1.7.0 Added: release/camel/camel-k/1.7.0/ release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.sha512 release/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz.sha512 release/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz.sha512 release/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz (with props) release/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz.asc (with props) release/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz.sha512 Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 Mon Nov 15 13:10:07 2021 @@ -0,0 +1 @@ +8aea8fa964b5904b41bb37561bad7b6c5bbaed5f7ea9ea3d2621c7f65936fd50fa49ba7e3d34e93f40153c7159feb52212861ad17d7c53a95038ee6716fc7d36 *camel-k-client-1.7.0-linux-64bit.tar.gz Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 Mon Nov 15 13:10:07 2021 @@ -0,0 +1 @@ +175fc8f41899be7d358fc09edaa4ab374dc08f4be65a71543d6ab7d7883b24357fe6a9122de8ffccfe9d08cfcd2a60f050d699cb88e7e55ddf3ae94d84c6aaea *camel-k-client-1.7.0-mac-64bit.tar.gz Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc
svn commit: r50942 - in /release/camel/camel-kamelets/0.5.0: ./ camel-kamelets-sources-0.5.0.tar.gz camel-kamelets-sources-0.5.0.tar.gz.asc camel-kamelets-sources-0.5.0.tar.gz.sha512
Author: nferraro Date: Mon Nov 15 13:08:36 2021 New Revision: 50942 Log: Release Camel Kamelets 0.5.0 Added: release/camel/camel-kamelets/0.5.0/ release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz (with props) release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc (with props) release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 Added: release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 == --- release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 (added) +++ release/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 Mon Nov 15 13:08:36 2021 @@ -0,0 +1 @@ +82481c896a10a11bd713d6f996291daa99771b0bbe0078ef3e95ff2f66768582c815c202cc039ebcf46f223f915c767f3a519454309d831cd90b001f2d2ffb31 *camel-kamelets-sources-0.5.0.tar.gz
svn commit: r50941 - in /release/camel/camel-k-runtime/1.10.0: ./ apache-camel-k-runtime-1.10.0-source-release.zip apache-camel-k-runtime-1.10.0-source-release.zip.asc apache-camel-k-runtime-1.10.0-so
Author: nferraro Date: Mon Nov 15 13:07:50 2021 New Revision: 50941 Log: Camel K Runtime 1.10.0 Added: release/camel/camel-k-runtime/1.10.0/ release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip (with props) release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc (with props) release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 Added: release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip == Binary file - no diff available. Propchange: release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip -- svn:mime-type = application/zip Added: release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc == Binary file - no diff available. Propchange: release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 == --- release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 (added) +++ release/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 Mon Nov 15 13:07:50 2021 @@ -0,0 +1 @@ +bf3b8434a60568d3346be104121863f7721da9da5f8531d9f08ff5f8f6c3e6df267e2c00d4e7bcff2ade26857a862ee3a4066b3f595348a7663120e8871b136d apache-camel-k-runtime-1.10.0-source-release.zip
[camel-k] branch main updated: Prepare for next development iteration 1.8.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
nferraro 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 5721c50 Prepare for next development iteration 1.8.0-SNAPSHOT
5721c50 is described below
commit 5721c5020c966cb33c42b48b42a6d050ad204a16
Author: nicolaferraro
AuthorDate: Wed Nov 10 15:27:04 2021 +0100
Prepare for next development iteration 1.8.0-SNAPSHOT
---
config/manager/operator-deployment.yaml | 2 +-
config/manifests/bases/camel-k.clusterserviceversion.yaml | 4 ++--
helm/camel-k/Chart.yaml | 2 +-
helm/camel-k/values.yaml | 2 +-
pkg/resources/resources.go| 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/manager/operator-deployment.yaml
b/config/manager/operator-deployment.yaml
index d64c2fa..f3e6302 100644
--- a/config/manager/operator-deployment.yaml
+++ b/config/manager/operator-deployment.yaml
@@ -39,7 +39,7 @@ spec:
serviceAccountName: camel-k-operator
containers:
- name: camel-k-operator
- image: docker.io/apache/camel-k:1.7.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.8.0-SNAPSHOT
imagePullPolicy: IfNotPresent
command:
- kamel
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml
b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index b14f98b..3e8dbc2 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -22,7 +22,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
certified: "false"
-containerImage: docker.io/apache/camel-k:1.7.0-SNAPSHOT
+containerImage: docker.io/apache/camel-k:1.8.0-SNAPSHOT
createdAt: 2021-05-03T07:48:00Z
description: Apache Camel K is a lightweight integration platform, born on
Kubernetes, with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.3.0
@@ -154,4 +154,4 @@ spec:
selector:
matchLabels:
name: camel-k-operator
- version: 1.7.0-snapshot
+ version: 1.8.0-snapshot
diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml
index c7acd4c..f76955c 100644
--- a/helm/camel-k/Chart.yaml
+++ b/helm/camel-k/Chart.yaml
@@ -35,7 +35,7 @@ version: 0.8.0
# This is the version number of the application being deployed. This version
number should be
# incremented each time you make changes to the application.
-appVersion: 1.7.0-SNAPSHOT
+appVersion: 1.8.0-SNAPSHOT
icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png
home: https://camel.apache.org/camel-k/latest/
diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml
index c14011a..3f62669 100644
--- a/helm/camel-k/values.yaml
+++ b/helm/camel-k/values.yaml
@@ -23,7 +23,7 @@ nameOverride: ""
fullnameOverride: ""
operator:
- image: docker.io/apache/camel-k:1.7.0-SNAPSHOT
+ image: docker.io/apache/camel-k:1.8.0-SNAPSHOT
platform:
build:
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index a2cfa3d..9189dc6 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -172,7 +172,7 @@ var assets = func() http.FileSystem {
modTime: time.Time{},
uncompressedSize: 2397,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x72\xe2\x46\x10\xbd\xeb\x2b\x5e\xa1\xcb\x6e\x95\x01\x7b\x2f\xd9\x52\x4e\x8a\x8d\x63\x2a\x0e\x50\x88\x8d\x6b\x4f\xa9\x61\xd4\x48\x53\x1e\x4d\x2b\x33\x23\x58\xe5\xeb\x53\x23\x10\x06\xd6\x71\x72\x70\xd5\xce\x09\xa9\xbb\x5f\xbf\xd7\xfd\x34\xc4\x18\xbe\xdf\x89\x62\x3c\x2a\x49\xc6\x51\x0e\xcf\xf0\x25\x21\xad\x85\x2c\x09\x19\x6f\xfc\x4e\x58\xc2\x3d\x37\x26\x17\x5e\xb1\xc1\x87\x34\xbb\xff\x88\xc6\xe4\x64\xc1\x86\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x72\xe2\x46\x10\xbd\xeb\x2b\x5e\xa1\xcb\x6e\x95\x01\x7b\x4f\x2e\xe5\xa4\xd8\x38\xa6\xe2\x00\x85\xd8\xb8\xf6\x94\x1a\x46\x8d\x34\xe5\xd1\xb4\x32\x33\x82\x55\xbe\x3e\x35\x02\x61\x60\x1d\x27\x07\x57\x65\x4e\x48\xdd\xfd\xfa\xbd\xee\xa7\x21\xc6\xf0\xe3\x4e\x14\xe3\x49\x49\x32\x8e\x72\x78\x86\x2f\x09\x69\x2d\x64\x49\xc8\x78\xe3\x77\xc2\x12\x1e\xb8\x31\xb9\xf0\x8a\x0d\x3e\xa5\xd9\xc3\x67\x34\x26\x27\x0b\x36\x04\x
[...]
},
"/manager/operator-service-account.yaml":
۰CompressedFileInfo{
name: "operator-service-account.yaml",
diff --git a/pkg/util/defaults/defaults.
svn commit: r50868 - /dev/camel/camel-k/1.7.0/
Author: nferraro Date: Wed Nov 10 11:49:14 2021 New Revision: 50868 Log: Camel K 1.7.0 Added: dev/camel/camel-k/1.7.0/ dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.sha512 dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-windows-64bit.tar.gz.sha512 dev/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-examples-1.7.0.tar.gz.sha512 dev/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz (with props) dev/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz.asc (with props) dev/camel/camel-k/1.7.0/camel-k-sources-1.7.0.tar.gz.sha512 Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 == --- dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 (added) +++ dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-linux-64bit.tar.gz.sha512 Wed Nov 10 11:49:14 2021 @@ -0,0 +1 @@ +8aea8fa964b5904b41bb37561bad7b6c5bbaed5f7ea9ea3d2621c7f65936fd50fa49ba7e3d34e93f40153c7159feb52212861ad17d7c53a95038ee6716fc7d36 *camel-k-client-1.7.0-linux-64bit.tar.gz Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 == --- dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 (added) +++ dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-64bit.tar.gz.sha512 Wed Nov 10 11:49:14 2021 @@ -0,0 +1 @@ +175fc8f41899be7d358fc09edaa4ab374dc08f4be65a71543d6ab7d7883b24357fe6a9122de8ffccfe9d08cfcd2a60f050d699cb88e7e55ddf3ae94d84c6aaea *camel-k-client-1.7.0-mac-64bit.tar.gz Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.7.0/camel-k-client-1.7.0-mac-arm64bit.tar.gz.sha512
[camel-k] tag pkg/kamelet/repository/v1.7.0 created (now 706c85d)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/kamelet/repository/v1.7.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 706c85d (commit) No new revisions were added by this update.
[camel-k] tag pkg/client/camel/v1.7.0 created (now 706c85d)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/client/camel/v1.7.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 706c85d (commit) No new revisions were added by this update.
[camel-k] tag pkg/apis/camel/v1.7.0 created (now 706c85d)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/apis/camel/v1.7.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 706c85d (commit) No new revisions were added by this update.
[camel-k] 01/01: Release 1.7.0
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to tag v1.7.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 706c85dc9e94f38a22c0d4f840ec3646ccb23c40 Author: nicolaferraro AuthorDate: Wed Nov 10 12:42:09 2021 +0100 Release 1.7.0 --- config/manager/operator-deployment.yaml | 2 +- config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +- go.mod| 6 +++--- helm/camel-k/Chart.yaml | 2 +- helm/camel-k/values.yaml | 2 +- pkg/client/camel/go.mod | 2 +- pkg/kamelet/repository/go.mod | 4 ++-- pkg/resources/resources.go| 4 ++-- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml index d64c2fa..6ade81b 100644 --- a/config/manager/operator-deployment.yaml +++ b/config/manager/operator-deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:1.7.0-SNAPSHOT + image: docker.io/apache/camel-k:1.7.0 imagePullPolicy: IfNotPresent command: - kamel diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml index b14f98b..8bebab4 100644 --- a/config/manifests/bases/camel-k.clusterserviceversion.yaml +++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml @@ -22,7 +22,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" -containerImage: docker.io/apache/camel-k:1.7.0-SNAPSHOT +containerImage: docker.io/apache/camel-k:1.7.0 createdAt: 2021-05-03T07:48:00Z description: Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. operators.operatorframework.io/builder: operator-sdk-v1.3.0 diff --git a/go.mod b/go.mod index e667828..65cfc11 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.16 require ( github.com/Masterminds/semver v1.5.0 github.com/Microsoft/hcsshim v0.8.15 // indirect - github.com/apache/camel-k/pkg/apis/camel v0.0.0 - github.com/apache/camel-k/pkg/client/camel v0.0.0 - github.com/apache/camel-k/pkg/kamelet/repository v0.0.0 + github.com/apache/camel-k/pkg/apis/camel v1.7.0 + github.com/apache/camel-k/pkg/client/camel v1.7.0 + github.com/apache/camel-k/pkg/kamelet/repository v1.7.0 github.com/container-tools/spectrum v0.3.4 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e // indirect github.com/evanphx/json-patch v4.11.0+incompatible diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index c7acd4c..628afb3 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -35,7 +35,7 @@ version: 0.8.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 1.7.0-SNAPSHOT +appVersion: 1.7.0 icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png home: https://camel.apache.org/camel-k/latest/ diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml index c14011a..d28fd74 100644 --- a/helm/camel-k/values.yaml +++ b/helm/camel-k/values.yaml @@ -23,7 +23,7 @@ nameOverride: "" fullnameOverride: "" operator: - image: docker.io/apache/camel-k:1.7.0-SNAPSHOT + image: docker.io/apache/camel-k:1.7.0 platform: build: diff --git a/pkg/client/camel/go.mod b/pkg/client/camel/go.mod index 32f8a7d..43f52d9 100644 --- a/pkg/client/camel/go.mod +++ b/pkg/client/camel/go.mod @@ -3,7 +3,7 @@ module github.com/apache/camel-k/pkg/client/camel go 1.15 require ( - github.com/apache/camel-k/pkg/apis/camel v0.0.0 + github.com/apache/camel-k/pkg/apis/camel v1.7.0 k8s.io/api v0.20.2 k8s.io/apimachinery v0.20.2 k8s.io/client-go v0.20.2 diff --git a/pkg/kamelet/repository/go.mod b/pkg/kamelet/repository/go.mod index 9137065..3e17ca3 100644 --- a/pkg/kamelet/repository/go.mod +++ b/pkg/kamelet/repository/go.mod @@ -3,8 +3,8 @@ module github.com/apache/camel-k/pkg/kamelet/repository go 1.15 require ( - github.com/apache/camel-k/pkg/apis/camel v0.0.0 - github.com/apache/camel-k/pkg/client/camel v0.0.0 + github.com/apache/camel-k/pkg/apis/camel v1.7.0 + github.com/apache/camel-k/pkg/client/camel v1.7.0 github.com/google/go-github/v32 v32.1.0 github.com/gregjon
[camel-k] tag v1.7.0 created (now 706c85d)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag v1.7.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 706c85d (commit) This tag includes the following new commits: new 706c85d Release 1.7.0 The 1 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.
svn commit: r50867 - in /dev/camel/camel-kamelets/0.5.0: ./ camel-kamelets-sources-0.5.0.tar.gz camel-kamelets-sources-0.5.0.tar.gz.asc camel-kamelets-sources-0.5.0.tar.gz.sha512
Author: nferraro Date: Wed Nov 10 11:29:50 2021 New Revision: 50867 Log: Camel Kamelets 0.5.0 Added: dev/camel/camel-kamelets/0.5.0/ dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz (with props) dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc (with props) dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 Added: dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 == --- dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 (added) +++ dev/camel/camel-kamelets/0.5.0/camel-kamelets-sources-0.5.0.tar.gz.sha512 Wed Nov 10 11:29:50 2021 @@ -0,0 +1 @@ +82481c896a10a11bd713d6f996291daa99771b0bbe0078ef3e95ff2f66768582c815c202cc039ebcf46f223f915c767f3a519454309d831cd90b001f2d2ffb31 *camel-kamelets-sources-0.5.0.tar.gz
svn commit: r50866 - in /dev/camel/camel-k-runtime/1.10.0: ./ apache-camel-k-runtime-1.10.0-source-release.zip apache-camel-k-runtime-1.10.0-source-release.zip.asc apache-camel-k-runtime-1.10.0-source
Author: nferraro Date: Wed Nov 10 11:24:32 2021 New Revision: 50866 Log: Camel K Runtime 1.10.0 Added: dev/camel/camel-k-runtime/1.10.0/ dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip (with props) dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc (with props) dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 Added: dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip == Binary file - no diff available. Propchange: dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip -- svn:mime-type = application/zip Added: dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 == --- dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 (added) +++ dev/camel/camel-k-runtime/1.10.0/apache-camel-k-runtime-1.10.0-source-release.zip.sha512 Wed Nov 10 11:24:32 2021 @@ -0,0 +1 @@ +bf3b8434a60568d3346be104121863f7721da9da5f8531d9f08ff5f8f6c3e6df267e2c00d4e7bcff2ade26857a862ee3a4066b3f595348a7663120e8871b136d apache-camel-k-runtime-1.10.0-source-release.zip
[camel-k] tag pkg/kamelet/repository/v1.7.0-SNAPSHOT created (now 313fbfa)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/kamelet/repository/v1.7.0-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 313fbfa (commit) No new revisions were added by this update.
[camel-k] tag pkg/client/camel/v1.7.0-SNAPSHOT created (now 313fbfa)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/client/camel/v1.7.0-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 313fbfa (commit) No new revisions were added by this update.
[camel-k] tag pkg/apis/camel/v1.7.0-SNAPSHOT created (now 313fbfa)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/apis/camel/v1.7.0-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 313fbfa (commit) No new revisions were added by this update.
[camel-k] tag v1.7.0-SNAPSHOT created (now 313fbfa)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag v1.7.0-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 313fbfa (commit) No new revisions were added by this update.
[camel-k] branch main updated: chore: add header
This is an automated email from the ASF dual-hosted git repository. nferraro 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 2ffdfc6 chore: add header 2ffdfc6 is described below commit 2ffdfc636e5bf92294ba893410222516cf0bc750 Author: nicolaferraro AuthorDate: Wed Nov 10 12:05:33 2021 +0100 chore: add header --- .github/dependabot.yml | 17 + 1 file changed, 17 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 24a6403..28af9d6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,20 @@ +# --- +# 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. +# --- + version: 2 updates: - directory: "/"
[camel-k] branch main updated: preparing for next release
This is an automated email from the ASF dual-hosted git repository. nferraro 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 3094a52 preparing for next release 3094a52 is described below commit 3094a522c167ee65d4bae50995ecca977a817cd9 Author: nicolaferraro AuthorDate: Wed Nov 10 12:05:04 2021 +0100 preparing for next release --- config/manager/patch-image-pull-policy-always.yaml | 17 ++ config/rbac/patch-role-to-clusterrole.yaml | 17 ++ .../patch-rolebinding-to-clusterrolebinding.yaml | 17 ++ config/scorecard/bases/config.yaml | 17 ++ config/scorecard/patches/basic.config.yaml | 17 ++ config/scorecard/patches/olm.config.yaml | 17 ++ docs/modules/ROOT/partials/apis/crds-html.adoc | 224 +++-- docs/modules/traits/pages/container.adoc | 2 + docs/modules/traits/pages/jolokia.adoc | 1 + docs/modules/traits/pages/route.adoc | 1 + pkg/resources/resources.go | 68 ++- pkg/util/defaults/defaults.go | 2 +- ...0.0-SNAPSHOT.yaml => camel-catalog-1.10.0.yaml} | 16 +- resources/traits.yaml | 10 +- script/Makefile| 6 +- 15 files changed, 259 insertions(+), 173 deletions(-) diff --git a/config/manager/patch-image-pull-policy-always.yaml b/config/manager/patch-image-pull-policy-always.yaml index 4ee2b00..e03b90d 100644 --- a/config/manager/patch-image-pull-policy-always.yaml +++ b/config/manager/patch-image-pull-policy-always.yaml @@ -1,3 +1,20 @@ +# --- +# 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. +# --- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/config/rbac/patch-role-to-clusterrole.yaml b/config/rbac/patch-role-to-clusterrole.yaml index c4e0064..24f6db0 100644 --- a/config/rbac/patch-role-to-clusterrole.yaml +++ b/config/rbac/patch-role-to-clusterrole.yaml @@ -1,3 +1,20 @@ +# --- +# 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. +# --- + - op: replace path: /kind value: ClusterRole diff --git a/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml b/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml index 830703b..d0d3001 100644 --- a/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml +++ b/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml @@ -1,3 +1,20 @@ +# --- +# 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
[camel-kamelets] branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. nferraro 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 ee2c8b3 [maven-release-plugin] prepare for next development iteration ee2c8b3 is described below commit ee2c8b39d9ebfe77cad3903d5a1cc99d97416002 Author: nicolaferraro AuthorDate: Tue Nov 9 16:54:33 2021 +0100 [maven-release-plugin] prepare for next development iteration --- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- pom.xml| 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index f80e32c..a0ed86c 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.5.0 +main-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index 65a5cb5..cb71d07 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.5.0 +main-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index 5e824f0..40c15aa 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -0.5.0 +main-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 47fb866..ec6c493 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -0.5.0 +main-SNAPSHOT Camel Kamelets Parent Camel Kamelets Library Parent @@ -103,7 +103,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-kamelets.git scm:git:https://gitbox.apache.org/repos/asf/camel-kamelets.git https://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary -v0.5.0 +v0.4.0
[camel-kamelets] annotated tag v0.5.0 created (now d184657)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag v0.5.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. at d184657 (tag) tagging 5104b038a34645776597478d92e7c74352299fc8 (commit) replaces v0.4.0 by nicolaferraro on Tue Nov 9 16:54:20 2021 +0100 - Log - [maven-release-plugin] copy for tag v0.5.0 --- No new revisions were added by this update.
[camel-kamelets] 02/02: [maven-release-plugin] prepare release v0.5.0
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 5104b038a34645776597478d92e7c74352299fc8 Author: nicolaferraro AuthorDate: Tue Nov 9 16:53:29 2021 +0100 [maven-release-plugin] prepare release v0.5.0 --- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- pom.xml| 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index a0ed86c..f80e32c 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.5.0 ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index cb71d07..65a5cb5 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.5.0 ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index 40c15aa..5e824f0 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -main-SNAPSHOT +0.5.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index ec6c493..47fb866 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -main-SNAPSHOT +0.5.0 Camel Kamelets Parent Camel Kamelets Library Parent @@ -103,7 +103,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-kamelets.git scm:git:https://gitbox.apache.org/repos/asf/camel-kamelets.git https://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary -v0.4.0 +v0.5.0
[camel-kamelets] branch main updated (16149a6 -> 5104b03)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from 16149a6 Upgrade Camel to 3.12.0 preparing for camel-k release 1.7.0 new 6442dfe Update Kamelets for release 0.5.0 new 5104b03 [maven-release-plugin] prepare release v0.5.0 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: avro-deserialize-action.kamelet.yaml | 4 ++-- avro-serialize-action.kamelet.yaml| 4 ++-- aws-cloudwatch-sink.kamelet.yaml | 2 +- aws-ddb-streams-source.kamelet.yaml | 2 +- aws-ec2-sink.kamelet.yaml | 2 +- aws-kinesis-firehose-sink.kamelet.yaml| 2 +- aws-kinesis-sink.kamelet.yaml | 2 +- aws-kinesis-source.kamelet.yaml | 2 +- aws-lambda-sink.kamelet.yaml | 2 +- aws-s3-sink.kamelet.yaml | 2 +- aws-s3-source.kamelet.yaml| 2 +- aws-s3-streaming-upload-sink.kamelet.yaml | 2 +- aws-sns-fifo-sink.kamelet.yaml| 2 +- aws-sns-sink.kamelet.yaml | 2 +- aws-sqs-batch-sink.kamelet.yaml | 2 +- aws-sqs-fifo-sink.kamelet.yaml| 2 +- aws-sqs-sink.kamelet.yaml | 2 +- aws-sqs-source.kamelet.yaml | 2 +- aws-translate-action.kamelet.yaml | 2 +- azure-cosmosdb-source.kamelet.yaml| 2 +- azure-eventhubs-sink.kamelet.yaml | 2 +- azure-eventhubs-source.kamelet.yaml | 2 +- azure-storage-blob-sink.kamelet.yaml | 2 +- azure-storage-blob-source.kamelet.yaml| 2 +- azure-storage-queue-sink.kamelet.yaml | 2 +- azure-storage-queue-source.kamelet.yaml | 2 +- bitcoin-source.kamelet.yaml | 2 +- caffeine-action.kamelet.yaml | 2 +- cassandra-sink.kamelet.yaml | 2 +- cassandra-source.kamelet.yaml | 2 +- chuck-norris-source.kamelet.yaml | 2 +- chunk-template-action.kamelet.yaml| 2 +- cron-source.kamelet.yaml | 2 +- dns-dig-action.kamelet.yaml | 2 +- dns-ip-action.kamelet.yaml| 2 +- dns-lookup-action.kamelet.yaml| 2 +- dropbox-sink.kamelet.yaml | 2 +- dropbox-source.kamelet.yaml | 2 +- earthquake-source.kamelet.yaml| 2 +- elasticsearch-index-sink.kamelet.yaml | 2 +- elasticsearch-search-source.kamelet.yaml | 2 +- exec-sink.kamelet.yaml| 2 +- extract-field-action.kamelet.yaml | 4 ++-- fhir-source.kamelet.yaml | 2 +- file-watch-source.kamelet.yaml| 2 +- freemarker-template-action.kamelet.yaml | 2 +- ftp-sink.kamelet.yaml | 2 +- ftp-source.kamelet.yaml | 2 +- ftps-sink.kamelet.yaml| 2 +- ftps-source.kamelet.yaml | 2 +- github-source.kamelet.yaml| 2 +- google-calendar-source.kamelet.yaml | 2 +- google-mail-source.kamelet.yaml | 2 +- google-pubsub-sink.kamelet.yaml | 2 +- google-pubsub-source.kamelet.yaml | 2 +- google-sheets-source.kamelet.yaml
[camel-k-runtime] branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. nferraro 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 ac9a697 [maven-release-plugin] prepare for next development iteration ac9a697 is described below commit ac9a6973ee27be9a40af313536b2f7f4ef84d9a8 Author: nicolaferraro AuthorDate: Tue Nov 9 13:25:23 2021 +0100 [maven-release-plugin] prepare for next development iteration --- camel-k-cloudevents/deployment/pom.xml| 2 +- camel-k-cloudevents/pom.xml | 2 +- camel-k-cloudevents/runtime/pom.xml | 2 +- camel-k-core/api/pom.xml | 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml | 2 +- camel-k-core/runtime/pom.xml | 2 +- camel-k-core/support/pom.xml | 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml | 2 +- camel-k-cron/pom.xml | 2 +- camel-k-cron/runtime/pom.xml | 2 +- camel-k-kamelet-reify/deployment/pom.xml | 2 +- camel-k-kamelet-reify/pom.xml | 2 +- camel-k-kamelet-reify/runtime/pom.xml | 2 +- camel-k-knative/consumer/deployment/pom.xml | 2 +- camel-k-knative/consumer/pom.xml | 2 +- camel-k-knative/consumer/runtime/pom.xml | 2 +- camel-k-knative/deployment/pom.xml| 2 +- camel-k-knative/impl/pom.xml | 2 +- camel-k-knative/pom.xml | 2 +- camel-k-knative/producer/deployment/pom.xml | 2 +- camel-k-knative/producer/pom.xml | 2 +- camel-k-knative/producer/runtime/pom.xml | 2 +- camel-k-knative/runtime/pom.xml | 2 +- camel-k-loader-jsh/deployment/pom.xml | 2 +- camel-k-loader-jsh/impl/pom.xml | 2 +- camel-k-loader-jsh/pom.xml| 2 +- camel-k-loader-jsh/runtime/pom.xml| 2 +- camel-k-master/deployment/pom.xml | 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml| 2 +- camel-k-master/runtime/pom.xml| 2 +- camel-k-runtime/deployment/pom.xml| 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- camel-k-webhook/deployment/pom.xml| 2 +- camel-k-webhook/impl/pom.xml | 2 +- camel-k-webhook/pom.xml | 2 +- camel-k-webhook/runtime/pom.xml | 2 +- components/camel-cloudevents/pom.xml | 2 +- components/camel-knative/camel-knative-api/pom.xml| 2 +- components/camel-knative/camel-knative-http/pom.xml | 2 +- components/camel-knative/camel-knative-test/pom.xml | 2 +- components/camel-knative/camel-knative/pom.xml| 2 +- components/camel-knative/pom.xml | 2 +- components/pom.xml| 2 +- distribution/pom.xml | 2 +- examples/cron/pom.xml | 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml | 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml | 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml | 2 +- examples/knative/pom.xml | 2 +- examples/kotlin/pom.xml | 2 +- examples
[camel-k-runtime] annotated tag camel-k-runtime-project-1.10.0 created (now fad6d7b)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag camel-k-runtime-project-1.10.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at fad6d7b (tag) tagging eddcc7fe708630cb1363615159f266f7a969a5b7 (commit) replaces camel-k-runtime-project-1.9.0 by nicolaferraro on Tue Nov 9 13:25:12 2021 +0100 - Log - [maven-release-plugin] copy for tag camel-k-runtime-project-1.10.0 --- No new revisions were added by this update.
[camel-k-runtime] branch main updated: [maven-release-plugin] prepare release camel-k-runtime-project-1.10.0
This is an automated email from the ASF dual-hosted git repository. nferraro 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 eddcc7f [maven-release-plugin] prepare release camel-k-runtime-project-1.10.0 eddcc7f is described below commit eddcc7fe708630cb1363615159f266f7a969a5b7 Author: nicolaferraro AuthorDate: Tue Nov 9 13:24:08 2021 +0100 [maven-release-plugin] prepare release camel-k-runtime-project-1.10.0 --- camel-k-cloudevents/deployment/pom.xml| 2 +- camel-k-cloudevents/pom.xml | 2 +- camel-k-cloudevents/runtime/pom.xml | 2 +- camel-k-core/api/pom.xml | 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml | 2 +- camel-k-core/runtime/pom.xml | 2 +- camel-k-core/support/pom.xml | 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml | 2 +- camel-k-cron/pom.xml | 2 +- camel-k-cron/runtime/pom.xml | 2 +- camel-k-kamelet-reify/deployment/pom.xml | 2 +- camel-k-kamelet-reify/pom.xml | 2 +- camel-k-kamelet-reify/runtime/pom.xml | 2 +- camel-k-knative/consumer/deployment/pom.xml | 2 +- camel-k-knative/consumer/pom.xml | 2 +- camel-k-knative/consumer/runtime/pom.xml | 2 +- camel-k-knative/deployment/pom.xml| 2 +- camel-k-knative/impl/pom.xml | 2 +- camel-k-knative/pom.xml | 2 +- camel-k-knative/producer/deployment/pom.xml | 2 +- camel-k-knative/producer/pom.xml | 2 +- camel-k-knative/producer/runtime/pom.xml | 2 +- camel-k-knative/runtime/pom.xml | 2 +- camel-k-loader-jsh/deployment/pom.xml | 2 +- camel-k-loader-jsh/impl/pom.xml | 2 +- camel-k-loader-jsh/pom.xml| 2 +- camel-k-loader-jsh/runtime/pom.xml| 2 +- camel-k-master/deployment/pom.xml | 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml| 2 +- camel-k-master/runtime/pom.xml| 2 +- camel-k-runtime/deployment/pom.xml| 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- camel-k-webhook/deployment/pom.xml| 2 +- camel-k-webhook/impl/pom.xml | 2 +- camel-k-webhook/pom.xml | 2 +- camel-k-webhook/runtime/pom.xml | 2 +- components/camel-cloudevents/pom.xml | 2 +- components/camel-knative/camel-knative-api/pom.xml| 2 +- components/camel-knative/camel-knative-http/pom.xml | 2 +- components/camel-knative/camel-knative-test/pom.xml | 2 +- components/camel-knative/camel-knative/pom.xml| 2 +- components/camel-knative/pom.xml | 2 +- components/pom.xml| 2 +- distribution/pom.xml | 2 +- examples/cron/pom.xml | 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml | 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml | 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml | 2 +- examples/knative/pom.xml | 2 +- examples/kotlin/pom.xml
[camel-k] 02/02: chore: fix test definition
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1e0cdb8aaf668de55e11c1365ea732f6257e1ff8
Author: nicolaferraro
AuthorDate: Fri Nov 5 11:22:51 2021 +0100
chore: fix test definition
---
e2e/common/integration_fail_test.go | 1 +
e2e/common/kamelet_binding_test.go | 2 ++
2 files changed, 3 insertions(+)
diff --git a/e2e/common/integration_fail_test.go
b/e2e/common/integration_fail_test.go
index ee454bc..4d4942c 100644
--- a/e2e/common/integration_fail_test.go
+++ b/e2e/common/integration_fail_test.go
@@ -39,6 +39,7 @@ func TestBadRouteIntegration(t *testing.T) {
Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
t.Run("run bad java route", func(t *testing.T) {
+ RegisterTestingT(t)
name := "bad-route"
Expect(Kamel("run", "-n", ns, "files/BadRoute.java",
"--name", name).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutMedium).Should(Equal(corev1.PodRunning))
diff --git a/e2e/common/kamelet_binding_test.go
b/e2e/common/kamelet_binding_test.go
index 511b251..f8519d1 100644
--- a/e2e/common/kamelet_binding_test.go
+++ b/e2e/common/kamelet_binding_test.go
@@ -65,6 +65,7 @@ func TestErrorHandler(t *testing.T) {
}}}
t.Run("throw error test", func(t *testing.T) {
+ RegisterTestingT(t)
Expect(BindKameletToWithErrorHandler(ns,
"throw-error-binding", from, to, map[string]string{"message": "throw Error"},
map[string]string{"loggerName": "integrationLogger"},
errorHandler)()).To(Succeed())
@@ -75,6 +76,7 @@ func TestErrorHandler(t *testing.T) {
})
t.Run("don't throw error test", func(t *testing.T) {
+ RegisterTestingT(t)
Expect(BindKameletToWithErrorHandler(ns,
"no-error-binding", from, to, map[string]string{"message": "true"},
map[string]string{"loggerName": "integrationLogger"},
errorHandler)()).To(Succeed())
[camel-k] 01/02: Fix #2724: assign an ID to the binding main route
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2888b0a166ab931ae2c6ef7deea811108555f490
Author: nicolaferraro
AuthorDate: Tue Nov 2 12:19:12 2021 +0100
Fix #2724: assign an ID to the binding main route
---
pkg/controller/kameletbinding/common.go | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/pkg/controller/kameletbinding/common.go
b/pkg/controller/kameletbinding/common.go
index 5fd8edb..ea7e3d0 100644
--- a/pkg/controller/kameletbinding/common.go
+++ b/pkg/controller/kameletbinding/common.go
@@ -185,17 +185,22 @@ func createIntegrationFor(ctx context.Context, c
client.Client, kameletbinding *
dslSteps = append(dslSteps, s)
- flowFrom := map[string]interface{}{
- "from": map[string]interface{}{
- "uri": from.URI,
+ fromWrapper := map[string]interface{}{
+ "uri": from.URI,
+ }
+
+ flowRoute := map[string]interface{}{
+ "route": map[string]interface{}{
+ "id":"binding",
+ "from": fromWrapper,
"steps": dslSteps,
},
}
- encodedFrom, err := json.Marshal(flowFrom)
+ encodedRoute, err := json.Marshal(flowRoute)
if err != nil {
return nil, err
}
- it.Spec.Flows = append(it.Spec.Flows, v1.Flow{RawMessage: encodedFrom})
+ it.Spec.Flows = append(it.Spec.Flows, v1.Flow{RawMessage: encodedRoute})
return , nil
}
[camel-k] branch main updated: chore(sbo): upgrade Servce Binding Operator to 1.0.0 GA
This is an automated email from the ASF dual-hosted git repository.
nferraro 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 bba539c chore(sbo): upgrade Servce Binding Operator to 1.0.0 GA
bba539c is described below
commit bba539cf7db43e86e2644732717dfec7d02e771a
Author: John Poth
AuthorDate: Thu Nov 4 11:04:28 2021 +0100
chore(sbo): upgrade Servce Binding Operator to 1.0.0 GA
---
go.mod | 2 +-
go.sum | 4 ++--
pkg/trait/service_binding.go | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/go.mod b/go.mod
index f7cd794..7ecf1de 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,7 @@ require (
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.30.0
github.com/radovskyb/watcher v1.0.6
- github.com/redhat-developer/service-binding-operator v0.9.1
+ github.com/redhat-developer/service-binding-operator v1.0.0
github.com/rs/xid v1.2.1
github.com/scylladb/go-set v1.0.2
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
diff --git a/go.sum b/go.sum
index ea7c021..522bdca 100644
--- a/go.sum
+++ b/go.sum
@@ -884,8 +884,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod
h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
github.com/radovskyb/watcher v1.0.6
h1:8WIQ9UxEYMZjem1OwU7dVH94DXXk9mAIE1i8eqHD+IY=
github.com/radovskyb/watcher v1.0.6/go.mod
h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod
h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redhat-developer/service-binding-operator v0.9.1
h1:mZ4gp6v5lXWHmoznXtKDSuSh8q/KK7MDZODbHfkSNoY=
-github.com/redhat-developer/service-binding-operator v0.9.1/go.mod
h1:D415gZQiz5Q8zyRbmrNrlieb6Xp73oFtCb+nCuTL6GA=
+github.com/redhat-developer/service-binding-operator v1.0.0
h1:scogXBufgdNcavyqUKThhpgp0HKmm01Xt6YEV1viE18=
+github.com/redhat-developer/service-binding-operator v1.0.0/go.mod
h1:pODWh91lgIyjf2n9ZqWYb1EBrLTmvKnjusKw0eG4vcE=
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod
h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
github.com/rickb777/date v1.13.0
h1:+8AmwLuY1d/rldzdqvqTEg7107bZ8clW37x4nsdG3Hs=
github.com/rickb777/date v1.13.0/go.mod
h1:GZf3LoGnxPWjX+/1TXOuzHefZFDovTyNLHDMd3qH70k=
diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go
index c770e1f..19a4e29 100644
--- a/pkg/trait/service_binding.go
+++ b/pkg/trait/service_binding.go
@@ -24,6 +24,7 @@ import (
"k8s.io/client-go/dynamic"
sb
"github.com/redhat-developer/service-binding-operator/apis/binding/v1alpha1"
+
"github.com/redhat-developer/service-binding-operator/pkg/client/kubernetes"
"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline"
"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/context"
"github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/collect"
@@ -92,7 +93,7 @@ func (t *serviceBindingTrait) getContext(e *Environment)
(pipeline.Context, erro
if err != nil {
return nil, err
}
- ctxProvider := context.Provider(dyn,
context.ResourceLookup(e.Client.RESTMapper()))
+ ctxProvider := context.Provider(dyn,
e.Client.AuthorizationV1().SubjectAccessReviews(),
kubernetes.ResourceLookup(e.Client.RESTMapper()))
ctx, err := ctxProvider.Get(serviceBinding)
if err != nil {
return nil, err
[camel-k] branch main updated (bba539c -> 1e0cdb8)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git. from bba539c chore(sbo): upgrade Servce Binding Operator to 1.0.0 GA new 2888b0a Fix #2724: assign an ID to the binding main route new 1e0cdb8 chore: fix test definition 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: e2e/common/integration_fail_test.go | 1 + e2e/common/kamelet_binding_test.go | 2 ++ pkg/controller/kameletbinding/common.go | 15 ++- 3 files changed, 13 insertions(+), 5 deletions(-)
[camel-k] branch main updated: chore(release): release helm chart for 1.6.1
This is an automated email from the ASF dual-hosted git repository. nferraro 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 8befcb0 chore(release): release helm chart for 1.6.1 8befcb0 is described below commit 8befcb0dd7210bfc6f0eb7f7d8be275e634b716f Author: nicolaferraro AuthorDate: Wed Oct 27 22:33:35 2021 +0200 chore(release): release helm chart for 1.6.1 --- docs/charts/camel-k-0.7.1.tgz | Bin 0 -> 100379 bytes docs/charts/index.yaml| 29 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/docs/charts/camel-k-0.7.1.tgz b/docs/charts/camel-k-0.7.1.tgz new file mode 100644 index 000..b43c138 Binary files /dev/null and b/docs/charts/camel-k-0.7.1.tgz differ diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index 3f18684..e8e63f6 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -2,6 +2,31 @@ apiVersion: v1 entries: camel-k: - apiVersion: v2 +appVersion: 1.6.1 +created: "2021-10-27T15:57:59.557403729+02:00" +description: A lightweight integration platform, born on Kubernetes, with serverless + superpowers +digest: 949d4e2d12f3a7667ec5dcd924788ba38b955b75cdcf2b9c9fd8bda30d491b20 +home: https://camel.apache.org/camel-k/latest/ +icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png +keywords: +- serverless +- integration +- patterns +maintainers: +- email: nferr...@apache.org + name: nferraro +name: camel-k +sources: +- https://github.com/apache/camel-k +- https://github.com/apache/camel-k-runtime +- https://github.com/apache/camel-quarkus +- https://github.com/apache/camel +type: application +urls: +- https://apache.github.io/camel-k/charts/camel-k-0.7.1.tgz +version: 0.7.1 + - apiVersion: v2 appVersion: 1.5.0 created: "2021-07-12T18:15:50.205251143+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless @@ -33,7 +58,7 @@ entries: superpowers digest: a3f32e2e2d73361b9d4cda028c9c549ba5dfd5cbf1f0224a1badcff295292818 home: https://camel.apache.org/camel-k/latest/ -icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png +icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -326,4 +351,4 @@ entries: urls: - https://apache.github.io/camel-k/charts/camel-k-0.1.0.tgz version: 0.1.0 -generated: "2021-07-12T18:15:50.168288325+02:00" +generated: "2021-10-27T15:57:59.437141638+02:00"
[camel-k] branch release-1.6.x updated: chore(release): sync helm chart for 1.6.1
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.6.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.6.x by this push: new d2039f6 chore(release): sync helm chart for 1.6.1 d2039f6 is described below commit d2039f615bc2d6de1e2f036195ed9b3819fdafc5 Author: nicolaferraro AuthorDate: Wed Oct 27 16:03:48 2021 +0200 chore(release): sync helm chart for 1.6.1 --- docs/charts/camel-k-0.7.1.tgz | Bin 0 -> 100379 bytes docs/charts/index.yaml| 29 +++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/docs/charts/camel-k-0.7.1.tgz b/docs/charts/camel-k-0.7.1.tgz new file mode 100644 index 000..b43c138 Binary files /dev/null and b/docs/charts/camel-k-0.7.1.tgz differ diff --git a/docs/charts/index.yaml b/docs/charts/index.yaml index 3f18684..e8e63f6 100644 --- a/docs/charts/index.yaml +++ b/docs/charts/index.yaml @@ -2,6 +2,31 @@ apiVersion: v1 entries: camel-k: - apiVersion: v2 +appVersion: 1.6.1 +created: "2021-10-27T15:57:59.557403729+02:00" +description: A lightweight integration platform, born on Kubernetes, with serverless + superpowers +digest: 949d4e2d12f3a7667ec5dcd924788ba38b955b75cdcf2b9c9fd8bda30d491b20 +home: https://camel.apache.org/camel-k/latest/ +icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png +keywords: +- serverless +- integration +- patterns +maintainers: +- email: nferr...@apache.org + name: nferraro +name: camel-k +sources: +- https://github.com/apache/camel-k +- https://github.com/apache/camel-k-runtime +- https://github.com/apache/camel-quarkus +- https://github.com/apache/camel +type: application +urls: +- https://apache.github.io/camel-k/charts/camel-k-0.7.1.tgz +version: 0.7.1 + - apiVersion: v2 appVersion: 1.5.0 created: "2021-07-12T18:15:50.205251143+02:00" description: A lightweight integration platform, born on Kubernetes, with serverless @@ -33,7 +58,7 @@ entries: superpowers digest: a3f32e2e2d73361b9d4cda028c9c549ba5dfd5cbf1f0224a1badcff295292818 home: https://camel.apache.org/camel-k/latest/ -icon: https://github.com/apache/camel/raw/master/docs/img/logo64-d.png +icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png keywords: - serverless - integration @@ -326,4 +351,4 @@ entries: urls: - https://apache.github.io/camel-k/charts/camel-k-0.1.0.tgz version: 0.1.0 -generated: "2021-07-12T18:15:50.168288325+02:00" +generated: "2021-10-27T15:57:59.437141638+02:00"
svn commit: r50649 - /release/camel/camel-k/1.6.1/
Author: nferraro Date: Wed Oct 27 13:23:48 2021 New Revision: 50649 Log: Release Camel K 1.6.1 Added: release/camel/camel-k/1.6.1/ release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.sha512 release/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz.sha512 release/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz.sha512 release/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz (with props) release/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz.asc (with props) release/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz.sha512 Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 Wed Oct 27 13:23:48 2021 @@ -0,0 +1 @@ +6d2f88135484fc16f180118842067b454c6b820634e992498a8dc908016c42151d2fe7a64d2bb3fb8f40b101720fc17ede62592f26605053b76407122ed49d91 *camel-k-client-1.6.1-linux-64bit.tar.gz Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 == --- release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 (added) +++ release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 Wed Oct 27 13:23:48 2021 @@ -0,0 +1 @@ +53f1be7fffa62457d0a1251fa0b4f0e55fded5ba454e827d138393196675f235804f8659001bb45edd155c22657685ae037e80489c723856bf49b5f97dc608a7 *camel-k-client-1.6.1-mac-64bit.tar.gz Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz -- svn:mime-type = application/gzip Added: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc == Binary file - no diff available. Propchange: release/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc
svn commit: r50648 - in /release/camel/camel-k-runtime: ./ 1.9.1/ 1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip 1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc 1.9.1/apache-camel-k-r
Author: nferraro Date: Wed Oct 27 13:22:04 2021 New Revision: 50648 Log: Camel K Runtime 1.9.1 Added: release/camel/camel-k-runtime/1.9.1/ release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip (with props) release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc (with props) release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 Modified: release/camel/camel-k-runtime/ (props changed) Propchange: release/camel/camel-k-runtime/ -- --- svn:ignore (added) +++ svn:ignore Wed Oct 27 13:22:04 2021 @@ -0,0 +1 @@ +.idea Added: release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip == Binary file - no diff available. Propchange: release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip -- svn:mime-type = application/zip Added: release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc == Binary file - no diff available. Propchange: release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 == --- release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 (added) +++ release/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 Wed Oct 27 13:22:04 2021 @@ -0,0 +1 @@ +9b965d59933dad83d2260401e45e9a15a6b79333e46327ed36ea142a09cf6fc3cdeb53f49780c9c2b001b540ad05c00eb00461f1429f9000bb6ed4fbf16c5c64 apache-camel-k-runtime-1.9.1-source-release.zip
svn commit: r50582 - in /dev/camel/camel-k-runtime/1.9.1: ./ apache-camel-k-runtime-1.9.1-source-release.zip apache-camel-k-runtime-1.9.1-source-release.zip.asc apache-camel-k-runtime-1.9.1-source-rel
Author: nferraro Date: Sat Oct 23 17:02:59 2021 New Revision: 50582 Log: Camel K Runtime 1.9.1 Added: dev/camel/camel-k-runtime/1.9.1/ dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip (with props) dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc (with props) dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 Added: dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip == Binary file - no diff available. Propchange: dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip -- svn:mime-type = application/zip Added: dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 == --- dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 (added) +++ dev/camel/camel-k-runtime/1.9.1/apache-camel-k-runtime-1.9.1-source-release.zip.sha512 Sat Oct 23 17:02:59 2021 @@ -0,0 +1 @@ +9b965d59933dad83d2260401e45e9a15a6b79333e46327ed36ea142a09cf6fc3cdeb53f49780c9c2b001b540ad05c00eb00461f1429f9000bb6ed4fbf16c5c64 apache-camel-k-runtime-1.9.1-source-release.zip
svn commit: r50581 - /dev/camel/camel-k/1.6.1/
Author: nferraro Date: Sat Oct 23 16:58:58 2021 New Revision: 50581 Log: Camel K 1.6.1 Added: dev/camel/camel-k/1.6.1/ dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.sha512 dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-windows-64bit.tar.gz.sha512 dev/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-examples-1.6.1.tar.gz.sha512 dev/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz (with props) dev/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz.asc (with props) dev/camel/camel-k/1.6.1/camel-k-sources-1.6.1.tar.gz.sha512 Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 == --- dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 (added) +++ dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-linux-64bit.tar.gz.sha512 Sat Oct 23 16:58:58 2021 @@ -0,0 +1 @@ +6d2f88135484fc16f180118842067b454c6b820634e992498a8dc908016c42151d2fe7a64d2bb3fb8f40b101720fc17ede62592f26605053b76407122ed49d91 *camel-k-client-1.6.1-linux-64bit.tar.gz Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 == --- dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 (added) +++ dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-64bit.tar.gz.sha512 Sat Oct 23 16:58:58 2021 @@ -0,0 +1 @@ +53f1be7fffa62457d0a1251fa0b4f0e55fded5ba454e827d138393196675f235804f8659001bb45edd155c22657685ae037e80489c723856bf49b5f97dc608a7 *camel-k-client-1.6.1-mac-64bit.tar.gz Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-k/1.6.1/camel-k-client-1.6.1-mac-arm64bit.tar.gz.sha512
[camel-k] tag pkg/kamelet/repository/v1.6.1 created (now 7f1a34f)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/kamelet/repository/v1.6.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 7f1a34f (commit) No new revisions were added by this update.
[camel-k] tag pkg/client/camel/v1.6.1 created (now 7f1a34f)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/client/camel/v1.6.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 7f1a34f (commit) No new revisions were added by this update.
[camel-k] tag pkg/apis/camel/v1.6.1 created (now 7f1a34f)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag pkg/apis/camel/v1.6.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 7f1a34f (commit) No new revisions were added by this update.
[camel-k] tag v1.6.1 created (now 7f1a34f)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to tag v1.6.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 7f1a34f (commit) No new revisions were added by this update.
[camel-k] branch release-1.6.x updated: preparing for next release
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.6.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.6.x by this push: new 63578bf preparing for next release 63578bf is described below commit 63578bf1ac4a1b8b9742f4968ed6398e043d790e Author: nicolaferraro AuthorDate: Sat Oct 23 09:46:52 2021 +0200 preparing for next release --- deploy/traits.yaml | 2 +- docs/modules/ROOT/partials/apis/crds-html.adoc | 224 + docs/modules/traits/pages/istio.adoc | 2 +- pkg/resources/resources.go | 4 +- 4 files changed, 123 insertions(+), 109 deletions(-) diff --git a/deploy/traits.yaml b/deploy/traits.yaml index e1ce66d..92500da 100755 --- a/deploy/traits.yaml +++ b/deploy/traits.yaml @@ -346,7 +346,7 @@ traits: - Kubernetes - Knative - OpenShift - description: The Istio trait allows to configure properties related to the Istio + description: The Istio trait allows configuring properties related to the Istio service mesh, such as sidecar injection and outbound IP ranges. properties: - name: enabled diff --git a/docs/modules/ROOT/partials/apis/crds-html.adoc b/docs/modules/ROOT/partials/apis/crds-html.adoc index fe51e82..4adc586 100644 --- a/docs/modules/ROOT/partials/apis/crds-html.adoc +++ b/docs/modules/ROOT/partials/apis/crds-html.adoc @@ -90,6 +90,20 @@ BuildSpec +The sequence of Build tasks to be performed as part of the Build execution. + + + + +strategy + + +BuildStrategy + + + + +The strategy that should be used to perform the Build. @@ -935,7 +949,7 @@ string -A human readable message indicating details about the transition. +A human-readable message indicating details about the transition. @@ -985,6 +999,20 @@ string +The sequence of Build tasks to be performed as part of the Build execution. + + + + +strategy + + +BuildStrategy + + + + +The strategy that should be used to perform the Build. @@ -1112,16 +1140,6 @@ Kubernetes meta/v1.Time -platform - -string - - - - - - - conditions @@ -1146,6 +1164,16 @@ string +BuildStrategy +(string alias) + +(Appears on: +BuildSpec, +IntegrationPlatformBuildSpec) + + +BuildStrategy specifies how the Build should be executed + BuildahTask @@ -2195,7 +2223,7 @@ string -A human readable message indicating details about the transition. +A human-readable message indicating details about the transition. @@ -2297,7 +2325,7 @@ string -A human readable message indicating details about the transition. +A human-readable message indicating details about the transition. @@ -2583,8 +2611,8 @@ string buildStrategy - -IntegrationPlatformBuildStrategy + +BuildStrategy @@ -2639,8 +2667,8 @@ string registry - -IntegrationPlatformRegistrySpec + +RegistrySpec @@ -2703,15 +2731,6 @@ bool -IntegrationPlatformBuildStrategy -(string alias) - -(Appears on: -IntegrationPlatformBuildSpec) - - -IntegrationPlatformBuildStrategy enumerates all implemented build strategies - IntegrationPlatformCluster (string alias) @@ -2809,7 +2828,7 @@ string -A human readable message indicating details about the transition. +A human-readable message indicating details about the transition. @@ -2892,76 +2911,6 @@ string IntegrationPlatformPhase -IntegrationPlatformRegistrySpec - - -(Appears on: -IntegrationPlatformBuildSpec, -PublishTask) - - -IntegrationPlatformRegistrySpec - - - - -Field -Description - - - - - -insecure - -bool - - - - - - - -address - -string - - - - - - - -secret - -string - - - - - - - -ca - -string - - - - - - - -organization - -string - - - - - - - IntegrationPlatformResourcesSpec @@ -3833,11 +3782,6 @@ Kubernetes meta/v1.Duration -PlatformInjectable - - -PlatformInjectable - PodSpec @@ -4171,8 +4115,8 @@ string registry - -IntegrationPlatformRegistrySpec + +RegistrySpec @@ -4199,6 +4143,76 @@ IntegrationPlatformRegistrySpec It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding. +RegistrySpec + + +(Appears on: +IntegrationPlatformBuildSpec, +PublishTask) + + +RegistrySpec provides the configuration for the container registry + + + + +Field +Description + + + + + +insecure + +bool + + + + + + + +address + +string + + + + + + + +secret + +string + + + + + + + +ca + +string + + + + + + + +organization + +string + + + + + + + Repository @@ -6540,7 +6554,7 @@ string -A human readable message indicating details about the transition. +A human-readable message indicating details about the transition. diff --git a/docs/modules/traits/pages/istio.adoc b/docs/modules/traits/pages/istio.adoc index b8fdef0..7fda913 100755 --- a/docs/modules/traits/pages/istio.adoc +++ b/docs/modules/traits/pages/istio.adoc
[camel-k] branch release-1.6.x updated: chore(release): upgrade runtime to 1.9.1
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch release-1.6.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.6.x by this push:
new 097e67d chore(release): upgrade runtime to 1.9.1
097e67d is described below
commit 097e67dad87d69dc8b02c2331e5413bb17e8a922
Author: nicolaferraro
AuthorDate: Thu Oct 21 19:58:23 2021 +0200
chore(release): upgrade runtime to 1.9.1
---
...camel-catalog-1.9.0.yaml => camel-catalog-1.9.1.yaml} | 16
pkg/resources/resources.go | 8
pkg/util/defaults/defaults.go| 2 +-
script/Makefile | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/deploy/camel-catalog-1.9.0.yaml b/deploy/camel-catalog-1.9.1.yaml
similarity index 99%
rename from deploy/camel-catalog-1.9.0.yaml
rename to deploy/camel-catalog-1.9.1.yaml
index 29b24ee..6aff356 100644
--- a/deploy/camel-catalog-1.9.0.yaml
+++ b/deploy/camel-catalog-1.9.1.yaml
@@ -18,21 +18,21 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-1.9.0
+ name: camel-catalog-1.9.1
labels:
app: camel-k
-camel.apache.org/catalog.loader.version: 3.11.1
-camel.apache.org/catalog.version: 3.11.1
-camel.apache.org/runtime.version: 1.9.0
+camel.apache.org/catalog.loader.version: 3.11.2
+camel.apache.org/catalog.version: 3.11.2
+camel.apache.org/runtime.version: 1.9.1
spec:
runtime:
-version: 1.9.0
+version: 1.9.1
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 2.2.0
- camel.version: 3.11.1
- quarkus.version: 2.2.0.Final
+ camel-quarkus.version: 2.3.0
+ camel.version: 3.11.2
+ quarkus.version: 2.3.0.Final
dependencies:
- groupId: io.quarkus
artifactId: quarkus-logging-json
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 11827f0..dc9c85f 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -457,12 +457,12 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\x8e\x31\x4e\x04\x31\x0c\x45\xfb\x9c\xe2\x2b\xdb\x32\xd2\xd0\x5a\xa2\xa2\x41\xe2\x00\xd4\x66\xd7\x33\x44\x24\x71\xe4\x38\x12\x73\x7b\x94\x1d\xc1\xba\xfc\x7e\xf6\x7f\x17\x5c\xb9\x48\x5e\xbe\x09\x99\xeb\x3e\x78\x97\x97\x83\x4b\x0e\xe1\x82\x0f\x4b\x2e\x38\x74\x18\x4c\x87\x4b\xc7\x97\x98\x3c\x61\x53\x83\xfc\x70\x69\x59\x28\x2c\xd8\x4c\x0b\x05\x00\x18\x96\x08\xd1\x53\x11\xa3\xf9\x24\xde\xd3\xc6\xc6\x45\x5c\xac\x9f\x14\x
[...]
},
- "/camel-catalog-1.9.0.yaml": ۰CompressedFileInfo{
- name: "camel-catalog-1.9.0.yaml",
+ "/camel-catalog-1.9.1.yaml": ۰CompressedFileInfo{
+ name: "camel-catalog-1.9.1.yaml",
modTime: time.Time{},
uncompressedSize: 89676,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdb\x38\xb6\xe6\x7b\x7e\x05\x57\xe5\xe5\x9c\x35\x2d\x74\x55\xaa\xe7\xd4\x4c\xcd\x93\x23\xc7\x89\x1d\xcb\x71\x22\x77\x92\xee\x97\x5a\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x9f\x05\x10\xbc\x4a\xd9\xbc\x78\xc3\xed\x07\x93\x22\x36\xbe\x8d\xef\x03\x08\x12\x17\x02\xaf\x83\x19\xde\xdf\xab\xd7\xc1\x35\x0f\x59\xaa\x58\x14\x68\x11\xe8\x2d\x0b\xce\x32\x1a\x6e\x59\xb0\x14\x6b\xfd\x48\x25\x0b\x2e\x44\x9e\x46\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x3a\xb6\xe6\x3c\xbf\x82\xeb\x64\x72\xef\xea\x12\xaa\x4e\x72\xfb\x9e\xee\xd3\x23\x47\x8e\x13\x3b\x96\xe3\x44\xae\x24\x55\x93\xb3\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\xdf\x0b\x20\xf8\x94\xb2\xf9\xf0\x86\xaf\x07\x26\x45\x6c\x7c\x1b\xdf\x07\x10\x24\x1e\x04\x5e\x07\x33\xbc\xbf\x57\xaf\x83\x6b\x1e\xb2\x54\xb1\x28\xd0\x22\xd0\x5b\x16\x9c\x65\x34\xdc\xb2\x60\x29\xd6\xfa\x91\x4a\x16\x5c\x88\x3c\x8d\x
[...]
},
"/traits.yaml": ۰CompressedFileInfo{
name: "traits.yaml",
@@ -474,7 +474,7 @@ var assets = func() http.FileSystem {
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/addons"].(os.FileInfo),
- fs["/camel-catalog-1.9.0.yaml"].(os.FileInfo),
+ fs["/camel-catalog-1.9.1.yaml"].(os.FileInfo),
fs["/crd"].(os.FileInfo),
fs["/default"].(os.FileInfo),
fs["/manager"].(os.FileInfo),
diff --git a/pkg/util/defaults/defaults.go
[camel-k-runtime] branch release-1.9.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.9.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/release-1.9.x by this push: new c833ba2 [maven-release-plugin] prepare for next development iteration c833ba2 is described below commit c833ba29221c689b50015ea866fbf56b963673b2 Author: nicolaferraro AuthorDate: Thu Oct 21 18:58:20 2021 +0200 [maven-release-plugin] prepare for next development iteration --- camel-k-cloudevents/deployment/pom.xml| 2 +- camel-k-cloudevents/pom.xml | 2 +- camel-k-cloudevents/runtime/pom.xml | 2 +- camel-k-core/api/pom.xml | 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml | 2 +- camel-k-core/runtime/pom.xml | 2 +- camel-k-core/support/pom.xml | 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml | 2 +- camel-k-cron/pom.xml | 2 +- camel-k-cron/runtime/pom.xml | 2 +- camel-k-kamelet-reify/deployment/pom.xml | 2 +- camel-k-kamelet-reify/pom.xml | 2 +- camel-k-kamelet-reify/runtime/pom.xml | 2 +- camel-k-knative/consumer/deployment/pom.xml | 2 +- camel-k-knative/consumer/pom.xml | 2 +- camel-k-knative/consumer/runtime/pom.xml | 2 +- camel-k-knative/deployment/pom.xml| 2 +- camel-k-knative/impl/pom.xml | 2 +- camel-k-knative/pom.xml | 2 +- camel-k-knative/producer/deployment/pom.xml | 2 +- camel-k-knative/producer/pom.xml | 2 +- camel-k-knative/producer/runtime/pom.xml | 2 +- camel-k-knative/runtime/pom.xml | 2 +- camel-k-loader-jsh/deployment/pom.xml | 2 +- camel-k-loader-jsh/impl/pom.xml | 2 +- camel-k-loader-jsh/pom.xml| 2 +- camel-k-loader-jsh/runtime/pom.xml| 2 +- camel-k-master/deployment/pom.xml | 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml| 2 +- camel-k-master/runtime/pom.xml| 2 +- camel-k-runtime/deployment/pom.xml| 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- camel-k-webhook/deployment/pom.xml| 2 +- camel-k-webhook/impl/pom.xml | 2 +- camel-k-webhook/pom.xml | 2 +- camel-k-webhook/runtime/pom.xml | 2 +- components/camel-cloudevents/pom.xml | 2 +- components/camel-knative/camel-knative-api/pom.xml| 2 +- components/camel-knative/camel-knative-http/pom.xml | 2 +- components/camel-knative/camel-knative-test/pom.xml | 2 +- components/camel-knative/camel-knative/pom.xml| 2 +- components/camel-knative/pom.xml | 2 +- components/pom.xml| 2 +- distribution/pom.xml | 2 +- examples/cron/pom.xml | 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml | 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml | 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml | 2 +- examples/knative/pom.xml | 2 +- examples/kotlin/pom.xml
[camel-k-runtime] annotated tag camel-k-runtime-project-1.9.1 created (now d6db765)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to annotated tag camel-k-runtime-project-1.9.1 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at d6db765 (tag) tagging 6d7ea22bdaa445d1101db622705ad55be06e7cd9 (commit) replaces camel-k-runtime-project-1.9.0 by nicolaferraro on Thu Oct 21 18:58:08 2021 +0200 - Log - [maven-release-plugin] copy for tag camel-k-runtime-project-1.9.1 --- No new revisions were added by this update.
[camel-k-runtime] branch release-1.9.x updated: [maven-release-plugin] prepare release camel-k-runtime-project-1.9.1
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch release-1.9.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/release-1.9.x by this push: new 6d7ea22 [maven-release-plugin] prepare release camel-k-runtime-project-1.9.1 6d7ea22 is described below commit 6d7ea22bdaa445d1101db622705ad55be06e7cd9 Author: nicolaferraro AuthorDate: Thu Oct 21 18:41:07 2021 +0200 [maven-release-plugin] prepare release camel-k-runtime-project-1.9.1 --- camel-k-cloudevents/deployment/pom.xml| 2 +- camel-k-cloudevents/pom.xml | 2 +- camel-k-cloudevents/runtime/pom.xml | 2 +- camel-k-core/api/pom.xml | 2 +- camel-k-core/deployment/pom.xml | 2 +- camel-k-core/pom.xml | 2 +- camel-k-core/runtime/pom.xml | 2 +- camel-k-core/support/pom.xml | 2 +- camel-k-cron/deployment/pom.xml | 2 +- camel-k-cron/impl/pom.xml | 2 +- camel-k-cron/pom.xml | 2 +- camel-k-cron/runtime/pom.xml | 2 +- camel-k-kamelet-reify/deployment/pom.xml | 2 +- camel-k-kamelet-reify/pom.xml | 2 +- camel-k-kamelet-reify/runtime/pom.xml | 2 +- camel-k-knative/consumer/deployment/pom.xml | 2 +- camel-k-knative/consumer/pom.xml | 2 +- camel-k-knative/consumer/runtime/pom.xml | 2 +- camel-k-knative/deployment/pom.xml| 2 +- camel-k-knative/impl/pom.xml | 2 +- camel-k-knative/pom.xml | 2 +- camel-k-knative/producer/deployment/pom.xml | 2 +- camel-k-knative/producer/pom.xml | 2 +- camel-k-knative/producer/runtime/pom.xml | 2 +- camel-k-knative/runtime/pom.xml | 2 +- camel-k-loader-jsh/deployment/pom.xml | 2 +- camel-k-loader-jsh/impl/pom.xml | 2 +- camel-k-loader-jsh/pom.xml| 2 +- camel-k-loader-jsh/runtime/pom.xml| 2 +- camel-k-master/deployment/pom.xml | 2 +- camel-k-master/impl/pom.xml | 2 +- camel-k-master/pom.xml| 2 +- camel-k-master/runtime/pom.xml| 2 +- camel-k-runtime/deployment/pom.xml| 2 +- camel-k-runtime/pom.xml | 2 +- camel-k-runtime/runtime/pom.xml | 2 +- camel-k-webhook/deployment/pom.xml| 2 +- camel-k-webhook/impl/pom.xml | 2 +- camel-k-webhook/pom.xml | 2 +- camel-k-webhook/runtime/pom.xml | 2 +- components/camel-cloudevents/pom.xml | 2 +- components/camel-knative/camel-knative-api/pom.xml| 2 +- components/camel-knative/camel-knative-http/pom.xml | 2 +- components/camel-knative/camel-knative-test/pom.xml | 2 +- components/camel-knative/camel-knative/pom.xml| 2 +- components/camel-knative/pom.xml | 2 +- components/pom.xml| 2 +- distribution/pom.xml | 2 +- examples/cron/pom.xml | 2 +- examples/groovy/pom.xml | 2 +- examples/java/pom.xml | 2 +- examples/js/pom.xml | 2 +- examples/kafka-source-s3/pom.xml | 2 +- examples/kamelets-discovery/pom.xml | 2 +- examples/kamelets/pom.xml | 2 +- examples/knative/pom.xml | 2 +- examples/kotlin/pom.xml
[camel-k] 09/09: Fix #2687: fix profile on slow platform reconciliation
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit eb4e32e6d1e10018416d7ba7f53563ff638527f3
Author: nicolaferraro
AuthorDate: Thu Oct 21 15:19:14 2021 +0200
Fix #2687: fix profile on slow platform reconciliation
---
pkg/controller/integration/platform_setup.go | 4
pkg/platform/platform.go | 2 ++
2 files changed, 6 insertions(+)
diff --git a/pkg/controller/integration/platform_setup.go
b/pkg/controller/integration/platform_setup.go
index de6ac1f..8d01324 100644
--- a/pkg/controller/integration/platform_setup.go
+++ b/pkg/controller/integration/platform_setup.go
@@ -78,6 +78,10 @@ func determineBestProfile(ctx context.Context, c
client.Client, integration *v1.
// Use platform profile if set
return p.Status.Profile
}
+ if p.Spec.Profile != "" {
+ // Use platform spec profile if set
+ return p.Spec.Profile
+ }
if knative.IsEnabledInNamespace(ctx, c, integration.Namespace) {
return v1.TraitProfileKnative
}
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 8bb2a46..f0abb99 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -176,6 +176,8 @@ func IsSecondary(p *v1.IntegrationPlatform) bool {
func GetProfile(p *v1.IntegrationPlatform) v1.TraitProfile {
if p.Status.Profile != "" {
return p.Status.Profile
+ } else if p.Spec.Profile != "" {
+ return p.Spec.Profile
}
switch p.Status.Cluster {
[camel-k] 02/09: Fix #2687: select platform based on annotations
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ba9623bd8d5f5808e7715a4170eaac0fe2a130bf
Author: nicolaferraro
AuthorDate: Wed Oct 13 17:54:24 2021 +0200
Fix #2687: select platform based on annotations
---
docs/modules/traits/pages/cron.adoc | 11
pkg/apis/camel/v1/common_types.go| 7 ++---
pkg/builder/builder.go | 2 +-
pkg/builder/image.go | 8 +++---
pkg/controller/integration/initialize.go | 2 +-
pkg/controller/integration/kits.go | 2 +-
pkg/controller/integration/platform_setup.go | 2 +-
pkg/controller/kameletbinding/common.go | 2 +-
pkg/platform/platform.go | 38 ++--
pkg/trait/builder.go | 1 +
pkg/trait/trait.go | 9 ---
11 files changed, 65 insertions(+), 19 deletions(-)
diff --git a/docs/modules/traits/pages/cron.adoc
b/docs/modules/traits/pages/cron.adoc
index 7e67e51..8708acf 100755
--- a/docs/modules/traits/pages/cron.adoc
+++ b/docs/modules/traits/pages/cron.adoc
@@ -76,6 +76,17 @@ while `35m` or `50s` cannot).
| Optional deadline in seconds for starting the job if it misses scheduled
time for any reason. Missed jobs executions will be counted as failed ones.
+| cron.active-deadline-seconds
+| int64
+| Specifies the duration in seconds, relative to the start time, that the job
+may be continuously active before it is considered to be failed.
+It defaults to 60s.
+
+| cron.backoff-limit
+| int32
+| Specifies the number of retries before marking the job failed.
+It defaults to 2.
+
|===
// End of autogenerated code - DO NOT EDIT! (configuration)
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 649ce6e..571f547 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -23,9 +23,10 @@ import (
)
const (
- TraitAnnotationPrefix = "trait.camel.apache.org/"
- OperatorIDLabel= "camel.apache.org/operator.id"
- SecondaryPlatformLabel = "camel.apache.org/secondary.platform"
+ TraitAnnotationPrefix = "trait.camel.apache.org/"
+ OperatorIDLabel= "camel.apache.org/operator.id"
+ SecondaryPlatformLabel = "camel.apache.org/secondary.platform"
+ PlatformSelectorAnnotation = "camel.apache.org/platform.id"
)
// BuildStrategy specifies how the Build should be executed
diff --git a/pkg/builder/builder.go b/pkg/builder/builder.go
index 5668119..fea59f7 100644
--- a/pkg/builder/builder.go
+++ b/pkg/builder/builder.go
@@ -88,7 +88,7 @@ func (t *builderTask) Do(ctx context.Context) v1.BuildStatus {
steps, err := StepsFrom(t.task.Steps...)
if err != nil {
- t.log.Errorf(err,"invalid builder steps: %s", t.task.Steps)
+ t.log.Errorf(err, "invalid builder steps: %s", t.task.Steps)
result.Failed(err)
return result
}
diff --git a/pkg/builder/image.go b/pkg/builder/image.go
index 637ca97..9d1835e 100644
--- a/pkg/builder/image.go
+++ b/pkg/builder/image.go
@@ -28,7 +28,6 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/defaults"
)
@@ -146,11 +145,10 @@ func incrementalImageContext(ctx *builderContext) error {
}
}
} else {
- pl, err := platform.GetCurrent(ctx.C, ctx,
ctx.Namespace)
- if err != nil {
- return err
+ if ctx.BaseImage == "" {
+ // TODO: transient workaround to be removed in
1.8.x
+ ctx.BaseImage = defaults.BaseImage()
}
- ctx.BaseImage = pl.Status.Build.BaseImage
}
return nil
diff --git a/pkg/controller/integration/initialize.go
b/pkg/controller/integration/initialize.go
index 8f72899..c168fa7 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -68,7 +68,7 @@ func (action *initializeAction) Handle(ctx context.Context,
integration *v1.Inte
kitName := integration.Spec.IntegrationKit.Name
if kitNamespace == "" {
- pl, err := platform.GetCurrent(ctx,
action.client, integration.Namespace)
+
[camel-k] 05/09: Fix #2687: disallow namespaced names for platform
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 5927f5408b0ec64139d16ef6a85be55091af2b21
Author: nicolaferraro
AuthorDate: Thu Oct 14 13:26:44 2021 +0200
Fix #2687: disallow namespaced names for platform
---
pkg/platform/platform.go | 31 ++-
1 file changed, 2 insertions(+), 29 deletions(-)
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 73b365f..78873de 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -19,12 +19,9 @@ package platform
import (
"context"
- "fmt"
- "strings"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
- corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -47,12 +44,8 @@ func GetOrFindLocalForResource(ctx context.Context, c
k8sclient.Reader, o k8scli
}
func getOrFindForResource(ctx context.Context, c k8sclient.Reader, o
k8sclient.Object, active bool, local bool) (*v1.IntegrationPlatform, error) {
- ref, err := extractPlatformSelector(o)
- if err != nil {
- return nil, err
- }
- if ref != nil {
- return get(ctx, c, ref.Namespace, ref.Name)
+ if selectedPlatform, ok :=
o.GetAnnotations()[v1.PlatformSelectorAnnotation]; ok {
+ return get(ctx, c, o.GetNamespace(), selectedPlatform)
}
if it, ok := o.(*v1.Integration); ok {
return getOrFind(ctx, c, it.Namespace, it.Status.Platform,
active, local)
@@ -64,26 +57,6 @@ func getOrFindForResource(ctx context.Context, c
k8sclient.Reader, o k8sclient.O
return find(ctx, c, o.GetNamespace(), active, local)
}
-func extractPlatformSelector(o k8sclient.Object) (*corev1.ObjectReference,
error) {
- selectedPlatform := o.GetAnnotations()[v1.PlatformSelectorAnnotation]
- if selectedPlatform == "" {
- return nil, nil
- }
- parts := strings.Split(selectedPlatform, "/")
- if len(parts) == 0 || len(parts) > 2 {
- return nil, fmt.Errorf("Invalid platform selector: expected
\"[namespace/]name\", got %q", selectedPlatform)
- }
- namespace := o.GetNamespace()
- if len(parts) == 2 {
- namespace = parts[0]
- }
- name := parts[len(parts)-1]
- return {
- Namespace: namespace,
- Name: name,
- }, nil
-}
-
func getOrFind(ctx context.Context, c k8sclient.Reader, namespace string, name
string, active bool, local bool) (*v1.IntegrationPlatform, error) {
if local {
return getOrFindLocal(ctx, c, namespace, name, active)
[camel-k] 08/09: Fix #2687: add documentation for multiple operators and platforms
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 64345485e2d2a266b6e858929b7ae417168e375b
Author: nicolaferraro
AuthorDate: Mon Oct 18 18:08:42 2021 +0200
Fix #2687: add documentation for multiple operators and platforms
---
docs/modules/ROOT/nav-end.adoc | 1 +
docs/modules/ROOT/pages/architecture/advanced.adoc | 76 ++
2 files changed, 77 insertions(+)
diff --git a/docs/modules/ROOT/nav-end.adoc b/docs/modules/ROOT/nav-end.adoc
index e49c4d3..2eeda4a 100644
--- a/docs/modules/ROOT/nav-end.adoc
+++ b/docs/modules/ROOT/nav-end.adoc
@@ -14,6 +14,7 @@
*** xref:architecture/cr/camel-catalog.adoc[CamelCatalog]
** xref:architecture/runtime.adoc[Runtime]
** xref:architecture/traits.adoc[Traits]
+** xref:architecture/advanced.adoc[Advanced Installation]
* xref:apis/camel.adoc[API]
* xref:uninstalling.adoc[Uninstalling]
* xref:contributing/developers.adoc[Contributing]
diff --git a/docs/modules/ROOT/pages/architecture/advanced.adoc
b/docs/modules/ROOT/pages/architecture/advanced.adoc
new file mode 100644
index 000..8734675
--- /dev/null
+++ b/docs/modules/ROOT/pages/architecture/advanced.adoc
@@ -0,0 +1,76 @@
+[[advanced-installation]]
+= Advanced Installation
+
+This section provides information about special installation modes for the
Camel K operator.
+These are advanced configuration options that normally are not needed by Camel
K users,
+ but they may be useful for particular use cases.
+
+[[advanced-installation-multiple-operators]]
+== Multiple Operators and Selective Upgrades
+
+It's possible to setup multiple Camel K operators in a cluster to watch the
same namespaces. It's not
+possible to configure Camel K this way using OLM (Operator Hub), since OLM
prevents two operators from watching the same namespaces,
+but it's technically possible to achieve this setup manually.
+
+A typical example is when you install two global operators in different
namespaces (e.g. `kamel install --global --olm=false -n camel-ns-1` and `kamel
install --global --olm=false -n camel-ns-2`).
+In this situation, both operators will watch the same resources in the
cluster, so that if a user creates an integration in any namespace,
+both operators will contend the integration and the reconciliation will most
probably result in an error (actual behavior is undefined).
+
+To avoid contention, it's possible to specify for each operator an ID and then
assign any custom resource (CR) to a specific operator using an annotation.
+The assigned operator will be responsible for the reconciliation of the
annotated CR.
+
+In detail, the Camel K operator supports the environment variable
`KAMEL_OPERATOR_ID`. The value is an identifier that can be equal to any string
(e.g. `KAMEL_OPERATOR_ID=operator-1`).
+Once the operator is assigned an ID, it will *only reconcile* Camel custom
resources that are assigned to that ID (unannotated resources will be ignored
as well).
+
+To assign a resource to a specific operator, the user can annotate it with
`camel.apache.org/operator.id`. For example:
+
+[source,yaml]
+
+kind: Integration
+apiVersion: camel.apache.org/v1
+metadata:
+ annotations:
+camel.apache.org/operator.id: operator-1
+# ...
+
+
+The annotation can be put on any resource belonging to the "camel.apache.org"
group.
+
+NOTE: When a resource creates additional resources in order to proceed with
the reconciliation (for example
+an Integration may create an IntegrationKit, which in turn creates a Build
resource), the annotation will be propagated to
+all resources created in the process, so they'll be all reconciled by the same
operator.
+
+By using the `camel.apache.org/operator.id` annotation, it's possible to move
integrations between two or more operators running different
+versions of the Camel K platform, i.e. *selectively upgrading or downgrading*
them.
+
+[[advanced-installation-multiple-platforms]]
+== Configuring Multiple Integration Platforms
+
+Any running Camel K integration is associated to a shared IntegrationPlatform
resource that contains general configuration options.
+The integration platform is located in the integration namespace (or also in
the operator namespace, in case of global installation)
+and typically only one ("primary", see later) integration platform is allowed
to obtain a "Ready" state in a namespace, while others get the "Duplicate"
state (i.e. IntegrationPlatform resources
+are somewhat "singleton" in a namespace).
+
+There's a way to allow two or more integration platforms to get a "Ready"
state in a namespace and for them to be used by integrations:
+platforms can be marked with the annotation
`camel.apache.org/secondary.platform=true`.
+That annotation marks the platform as *secondary* so that it will never be
used as
[camel-k] branch main updated (5964887 -> eb4e32e)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git. from 5964887 chore(dev): add .editorconfig new 05fb571 Fix #2687: allow multiple secondary platforms on the same namespace new ba9623b Fix #2687: select platform based on annotations new 23f92a0 Fix #2687: cascade platform to resources new 59466e1 Fix #2687: use annotations for both operator and platform new 5927f54 Fix #2687: disallow namespaced names for platform new 977081a Fix #2687: align with latest main new 3a50603 Fix #2687: add e2e tests new 6434548 Fix #2687: add documentation for multiple operators and platforms new eb4e32e Fix #2687: fix profile on slow platform reconciliation The 9 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-end.adoc | 1 + docs/modules/ROOT/pages/architecture/advanced.adoc | 76 +++ docs/modules/traits/pages/cron.adoc| 11 +++ e2e/common/secondary_platform_test.go | 74 +++ e2e/support/test_support.go| 71 +++--- pkg/apis/camel/v1/common_types.go | 5 +- pkg/builder/builder.go | 2 +- pkg/builder/image.go | 8 +- pkg/cmd/run.go | 19 + pkg/controller/integration/initialize.go | 2 +- .../integration/integration_controller.go | 3 +- pkg/controller/integration/kits.go | 2 +- pkg/controller/integration/platform_setup.go | 6 +- pkg/controller/integrationkit/build.go | 15 +++- .../integrationkit/integrationkit_controller.go| 2 +- pkg/controller/integrationplatform/create.go | 3 +- pkg/controller/integrationplatform/initialize.go | 10 ++- pkg/controller/kameletbinding/common.go| 2 +- pkg/platform/operator.go | 4 +- pkg/platform/platform.go | 85 ++ pkg/trait/builder.go | 1 + pkg/trait/container.go | 8 +- pkg/trait/platform.go | 2 +- pkg/trait/quarkus.go | 8 +- pkg/trait/trait.go | 9 ++- 25 files changed, 376 insertions(+), 53 deletions(-) create mode 100644 docs/modules/ROOT/pages/architecture/advanced.adoc create mode 100644 e2e/common/secondary_platform_test.go
[camel-k] 03/09: Fix #2687: cascade platform to resources
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 23f92a039a391dec8b8788605bc2f990c262b969
Author: nicolaferraro
AuthorDate: Thu Oct 14 10:50:46 2021 +0200
Fix #2687: cascade platform to resources
---
pkg/controller/integrationkit/build.go | 14 +++--
.../integrationkit/integrationkit_controller.go| 2 +-
pkg/platform/platform.go | 59 ++
pkg/trait/container.go | 5 ++
pkg/trait/platform.go | 2 +-
pkg/trait/quarkus.go | 5 ++
6 files changed, 62 insertions(+), 25 deletions(-)
diff --git a/pkg/controller/integrationkit/build.go
b/pkg/controller/integrationkit/build.go
index 9f1c0ca..cb74cd0 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -90,6 +90,13 @@ func (action *buildAction) handleBuildSubmitted(ctx
context.Context, kit *v1.Int
if operatorID != "" {
labels[v1.OperatorIDLabel] = operatorID
}
+ var annotations map[string]string
+ if v, ok := kit.Annotations[v1.PlatformSelectorAnnotation]; ok {
+ annotations = map[string]string{
+ v1.PlatformSelectorAnnotation: v,
+ }
+ }
+
timeout := env.Platform.Status.Build.GetTimeout()
if layout := labels[v1.IntegrationKitLayoutLabel];
env.Platform.Spec.Build.Timeout == nil && layout ==
v1.IntegrationKitLayoutNative {
// Increase the timeout to a sensible default
@@ -103,9 +110,10 @@ func (action *buildAction) handleBuildSubmitted(ctx
context.Context, kit *v1.Int
Kind: v1.BuildKind,
},
ObjectMeta: metav1.ObjectMeta{
- Namespace: kit.Namespace,
- Name: kit.Name,
- Labels:labels,
+ Namespace: kit.Namespace,
+ Name:kit.Name,
+ Labels: labels,
+ Annotations: annotations,
},
Spec: v1.BuildSpec{
Strategy:
env.Platform.Status.Build.BuildStrategy,
diff --git a/pkg/controller/integrationkit/integrationkit_controller.go
b/pkg/controller/integrationkit/integrationkit_controller.go
index 1eebefa..b82d354 100644
--- a/pkg/controller/integrationkit/integrationkit_controller.go
+++ b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -216,7 +216,7 @@ func (r *reconcileIntegrationKit) Reconcile(ctx
context.Context, request reconci
return r.update(ctx, , target)
} else {
// Platform is always local to the kit
- pl, err := platform.GetOrFindLocal(ctx, r.client,
target.Namespace, target.Status.Platform, true)
+ pl, err := platform.GetOrFindLocalForResource(ctx,
r.client, target, true)
if err != nil || pl.Status.Phase !=
v1.IntegrationPlatformPhaseReady {
target.Status.Phase =
v1.IntegrationKitPhaseWaitingForPlatform
} else {
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 8cd6466..e7e0774 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -37,6 +37,18 @@ const (
)
func GetForResource(ctx context.Context, c k8sclient.Reader, o
k8sclient.Object) (*v1.IntegrationPlatform, error) {
+ return GetOrFindForResource(ctx, c, o, true)
+}
+
+func GetOrFindForResource(ctx context.Context, c k8sclient.Reader, o
k8sclient.Object, active bool) (*v1.IntegrationPlatform, error) {
+ return getOrFindForResource(ctx, c, o, active, false)
+}
+
+func GetOrFindLocalForResource(ctx context.Context, c k8sclient.Reader, o
k8sclient.Object, active bool) (*v1.IntegrationPlatform, error) {
+ return getOrFindForResource(ctx, c, o, active, true)
+}
+
+func getOrFindForResource(ctx context.Context, c k8sclient.Reader, o
k8sclient.Object, active bool, local bool) (*v1.IntegrationPlatform, error) {
ref, err := extractPlatformSelector(o)
if err != nil {
return nil, err
@@ -44,7 +56,14 @@ func GetForResource(ctx context.Context, c k8sclient.Reader,
o k8sclient.Object)
if ref != nil {
return get(ctx, c, ref.Namespace, ref.Name)
}
- return getCurrent(ctx, c, o.GetNamespace())
+ if it, ok := o.(*v1.Integration); ok {
+ return getOrFind(ctx, c, it.Namespace, it.Status.Platform,
active, loc
[camel-k] 06/09: Fix #2687: align with latest main
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 977081a80a386cf0b810d73848ef603b2a7f8449
Author: nicolaferraro
AuthorDate: Fri Oct 15 11:32:18 2021 +0200
Fix #2687: align with latest main
---
pkg/controller/integration/integration_controller.go | 3 ++-
pkg/platform/platform.go | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index 239cbba..a4d6dfa 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -87,7 +87,8 @@ func add(mgr manager.Manager, c client.Client, r
reconcile.Reconciler) error {
// Observe the time to first readiness
metric
previous :=
old.Status.GetCondition(v1.IntegrationConditionReady)
if next :=
it.Status.GetCondition(v1.IntegrationConditionReady); (previous == nil ||
previous.Status != corev1.ConditionTrue && (previous.FirstTruthyTime == nil ||
previous.FirstTruthyTime.IsZero())) &&
- next != nil && next.Status ==
corev1.ConditionTrue && next.FirstTruthyTime != nil &&
!next.FirstTruthyTime.IsZero() {
+ next != nil && next.Status ==
corev1.ConditionTrue && next.FirstTruthyTime != nil &&
!next.FirstTruthyTime.IsZero() &&
+
it.Status.InitializationTimestamp != nil {
duration :=
next.FirstTruthyTime.Time.Sub(it.Status.InitializationTimestamp.Time)
Log.WithValues("request-namespace", it.Namespace, "request-name", it.Name).
ForIntegration(it).Infof("First readiness after %s", duration)
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index 78873de..8bb2a46 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -51,8 +51,6 @@ func getOrFindForResource(ctx context.Context, c
k8sclient.Reader, o k8sclient.O
return getOrFind(ctx, c, it.Namespace, it.Status.Platform,
active, local)
} else if ik, ok := o.(*v1.IntegrationKit); ok {
return getOrFind(ctx, c, ik.Namespace, ik.Status.Platform,
active, local)
- } else if b, ok := o.(*v1.Build); ok {
- return getOrFind(ctx, c, b.Namespace, b.Status.Platform,
active, local)
}
return find(ctx, c, o.GetNamespace(), active, local)
}
[camel-k] 01/09: Fix #2687: allow multiple secondary platforms on the same namespace
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 05fb571f3e6fdbb36fb70581085b00327f80e35d
Author: nicolaferraro
AuthorDate: Tue Oct 12 17:29:03 2021 +0200
Fix #2687: allow multiple secondary platforms on the same namespace
---
pkg/apis/camel/v1/common_types.go| 5 ++--
pkg/controller/integrationplatform/create.go | 3 ++-
pkg/controller/integrationplatform/initialize.go | 10 +---
pkg/platform/platform.go | 32 +---
4 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 78aa968..649ce6e 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -23,8 +23,9 @@ import (
)
const (
- TraitAnnotationPrefix = "trait.camel.apache.org/"
- OperatorIDLabel = "camel.apache.org/operator.id"
+ TraitAnnotationPrefix = "trait.camel.apache.org/"
+ OperatorIDLabel= "camel.apache.org/operator.id"
+ SecondaryPlatformLabel = "camel.apache.org/secondary.platform"
)
// BuildStrategy specifies how the Build should be executed
diff --git a/pkg/controller/integrationplatform/create.go
b/pkg/controller/integrationplatform/create.go
index 6835ee5..2b4a071 100644
--- a/pkg/controller/integrationplatform/create.go
+++ b/pkg/controller/integrationplatform/create.go
@@ -20,6 +20,7 @@ package integrationplatform
import (
"context"
+ platformutil "github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/resources"
"github.com/apache/camel-k/pkg/util/defaults"
@@ -53,7 +54,7 @@ func (action *createAction) Handle(ctx context.Context,
platform *v1.Integration
}
}
- if defaults.InstallDefaultKamelets() {
+ if !platformutil.IsSecondary(platform) &&
defaults.InstallDefaultKamelets() {
// Kamelet Catalog installed on platform reconciliation for
cases where users install a global operator
if err := install.KameletCatalog(ctx, action.client,
platform.Namespace); err != nil {
return nil, err
diff --git a/pkg/controller/integrationplatform/initialize.go
b/pkg/controller/integrationplatform/initialize.go
index ccedcb5..eea1a50 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -49,7 +49,7 @@ func (action *initializeAction) CanHandle(platform
*v1.IntegrationPlatform) bool
}
func (action *initializeAction) Handle(ctx context.Context, platform
*v1.IntegrationPlatform) (*v1.IntegrationPlatform, error) {
- duplicate, err := action.isDuplicate(ctx, platform)
+ duplicate, err := action.isPrimaryDuplicate(ctx, platform)
if err != nil {
return nil, err
}
@@ -96,8 +96,12 @@ func (action *initializeAction) Handle(ctx context.Context,
platform *v1.Integra
return platform, nil
}
-func (action *initializeAction) isDuplicate(ctx context.Context, thisPlatform
*v1.IntegrationPlatform) (bool, error) {
- platforms, err := platformutil.ListPlatforms(ctx, action.client,
thisPlatform.Namespace)
+func (action *initializeAction) isPrimaryDuplicate(ctx context.Context,
thisPlatform *v1.IntegrationPlatform) (bool, error) {
+ if platformutil.IsSecondary(thisPlatform) {
+ // Always reconcile secondary platforms
+ return false, nil
+ }
+ platforms, err := platformutil.ListPrimaryPlatforms(ctx, action.client,
thisPlatform.Namespace)
if err != nil {
return false, err
}
diff --git a/pkg/platform/platform.go b/pkg/platform/platform.go
index d566b5e..d273f3d 100644
--- a/pkg/platform/platform.go
+++ b/pkg/platform/platform.go
@@ -23,6 +23,8 @@ import (
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/kubernetes"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ "k8s.io/apimachinery/pkg/labels"
+ "k8s.io/apimachinery/pkg/selection"
k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -80,7 +82,7 @@ func find(ctx context.Context, c k8sclient.Reader, namespace
string, active bool
// findLocal returns the currently installed platform or any platform existing
in local namespace
func findLocal(ctx context.Context, c k8sclient.Reader, namespace string,
active bool) (*v1.IntegrationPlatform, error) {
- lst, err := ListPlatforms(ctx, c, namespace)
+ lst, err := ListPrimaryPlatforms(ctx, c, namespace)
if err != nil {
return nil, err
}
@@ -101,8 +103,24 @
[camel-k] 04/09: Fix #2687: use annotations for both operator and platform
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 59466e182d2e56fd3bf02861d79dd0b2dfec8d48
Author: nicolaferraro
AuthorDate: Thu Oct 14 13:24:07 2021 +0200
Fix #2687: use annotations for both operator and platform
---
e2e/support/test_support.go| 18 +-
pkg/apis/camel/v1/common_types.go | 9 +
pkg/controller/integrationkit/build.go | 13 ++---
pkg/platform/operator.go | 4 ++--
pkg/platform/platform.go | 23 +++
pkg/trait/container.go | 13 +++--
pkg/trait/quarkus.go | 13 +++--
7 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 60fce20..64dbf5c 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -428,10 +428,10 @@ func AssignIntegrationToOperator(ns, name, operator
string) error {
if it == nil {
return fmt.Errorf("cannot assign integration %q to operator:
integration not found", name)
}
- if it.Labels == nil {
- it.Labels = make(map[string]string)
+ if it.Annotations == nil {
+ it.Annotations = make(map[string]string)
}
- it.Labels[v1.OperatorIDLabel] = operator
+ it.Annotations[v1.OperatorIDAnnotation] = operator
return TestClient().Update(TestContext, it)
}
@@ -745,10 +745,10 @@ func AssignKameletBindingToOperator(ns, name, operator
string) error {
if klb == nil {
return fmt.Errorf("cannot assign kamelet binding %q to
operator: kamelet binding not found", name)
}
- if klb.Labels == nil {
- klb.Labels = make(map[string]string)
+ if klb.Annotations == nil {
+ klb.Annotations = make(map[string]string)
}
- klb.Labels[v1.OperatorIDLabel] = operator
+ klb.Annotations[v1.OperatorIDAnnotation] = operator
return TestClient().Update(TestContext, klb)
}
@@ -1073,10 +1073,10 @@ func AssignPlatformToOperator(ns, operator string)
error {
if pl == nil {
return errors.New("cannot assign platform to operator: no
platform found")
}
- if pl.Labels == nil {
- pl.Labels = make(map[string]string)
+ if pl.Annotations == nil {
+ pl.Annotations = make(map[string]string)
}
- pl.Labels[v1.OperatorIDLabel] = operator
+ pl.Annotations[v1.OperatorIDAnnotation] = operator
return TestClient().Update(TestContext, pl)
}
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index 571f547..45e9f91 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -23,10 +23,11 @@ import (
)
const (
- TraitAnnotationPrefix = "trait.camel.apache.org/"
- OperatorIDLabel= "camel.apache.org/operator.id"
- SecondaryPlatformLabel = "camel.apache.org/secondary.platform"
- PlatformSelectorAnnotation = "camel.apache.org/platform.id"
+ TraitAnnotationPrefix = "trait.camel.apache.org/"
+
+ OperatorIDAnnotation= "camel.apache.org/operator.id"
+ SecondaryPlatformAnnotation = "camel.apache.org/secondary.platform"
+ PlatformSelectorAnnotation = "camel.apache.org/platform.id"
)
// BuildStrategy specifies how the Build should be executed
diff --git a/pkg/controller/integrationkit/build.go
b/pkg/controller/integrationkit/build.go
index cb74cd0..47fa5c6 100644
--- a/pkg/controller/integrationkit/build.go
+++ b/pkg/controller/integrationkit/build.go
@@ -86,15 +86,14 @@ func (action *buildAction) handleBuildSubmitted(ctx
context.Context, kit *v1.Int
labels := kubernetes.FilterCamelCreatorLabels(kit.Labels)
labels[v1.IntegrationKitLayoutLabel] =
kit.Labels[v1.IntegrationKitLayoutLabel]
+
+ var annotations = make(map[string]string)
+ if v, ok := kit.Annotations[v1.PlatformSelectorAnnotation]; ok {
+ annotations[v1.PlatformSelectorAnnotation] = v
+ }
operatorID := defaults.OperatorID()
if operatorID != "" {
- labels[v1.OperatorIDLabel] = operatorID
- }
- var annotations map[string]string
- if v, ok := kit.Annotations[v1.PlatformSelectorAnnotation]; ok {
- annotations = map[string]string{
- v1.PlatformSelectorAnnotation: v,
- }
+ annotations[v1.OperatorIDAnnotation] = operatorID
}
timeout := env.Pl
[camel-k] 07/09: Fix #2687: add e2e tests
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3a5060398e58114bade7febbc6661e98e13fa327
Author: nicolaferraro
AuthorDate: Mon Oct 18 15:50:35 2021 +0200
Fix #2687: add e2e tests
---
e2e/common/secondary_platform_test.go | 74 +++
e2e/support/test_support.go | 53 -
pkg/cmd/run.go| 19 +
3 files changed, 145 insertions(+), 1 deletion(-)
diff --git a/e2e/common/secondary_platform_test.go
b/e2e/common/secondary_platform_test.go
new file mode 100644
index 000..55ef6c4
--- /dev/null
+++ b/e2e/common/secondary_platform_test.go
@@ -0,0 +1,74 @@
+//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 common
+
+import (
+ "testing"
+
+ . "github.com/apache/camel-k/e2e/support"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ . "github.com/onsi/gomega"
+ corev1 "k8s.io/api/core/v1"
+)
+
+func TestSecondaryPlatform(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+ Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
+ Expect(ConfigureSecondayPlatfromWith(ns, func(p
*v1.IntegrationPlatform) {
+ p.Name = "secondary"
+ if p.Spec.Traits == nil {
+ p.Spec.Traits = make(map[string]v1.TraitSpec)
+ }
+ p.Spec.Traits["container"] = v1.TraitSpec{
+ Configuration:
AsTraitConfiguration(map[string]string{
+ "limitCPU": "0.1",
+ }),
+ }
+ })).To(Succeed())
+
+ Expect(Kamel("run", "-n", ns, "--name", "limited",
"--annotation", "camel.apache.org/platform.id=secondary",
"files/yaml.yaml").Execute()).To(Succeed())
+
+ Eventually(IntegrationPod(ns, "limited"),
TestTimeoutMedium).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(ns, "limited", func(pod
*corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ cpuLimits :=
pod.Spec.Containers[0].Resources.Limits.Cpu()
+ return cpuLimits != nil &&
cpuLimits.AsApproximateFloat64() > 0
+ }), TestTimeoutShort).Should(BeTrue())
+ Expect(Kamel("delete", "limited", "-n",
ns).Execute()).To(Succeed())
+
+ Expect(Kamel("run", "-n", ns, "--name", "normal",
"files/yaml.yaml").Execute()).To(Succeed())
+ Eventually(IntegrationPod(ns, "normal"),
TestTimeoutShort).Should(Not(BeNil()))
+ Eventually(IntegrationPodHas(ns, "normal", func(pod
*corev1.Pod) bool {
+ if len(pod.Spec.Containers) != 1 {
+ return false
+ }
+ cpuLimits :=
pod.Spec.Containers[0].Resources.Limits.Cpu()
+ return cpuLimits == nil || cpuLimits.IsZero()
+ }), TestTimeoutShort).Should(BeTrue())
+
+ // Clean up
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).To(Succeed())
+ })
+}
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 64dbf5c..13fbd02 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -37,6 +37,7 @@ import (
"testing"
"time"
+ &qu
[camel-k] branch main updated: chore(dev): add .editorconfig
This is an automated email from the ASF dual-hosted git repository. nferraro 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 5964887 chore(dev): add .editorconfig 5964887 is described below commit 596488748fce15a16b348ab1a0f28027a5f23107 Author: Tadayoshi Sato AuthorDate: Wed Oct 20 13:56:00 2021 +0900 chore(dev): add .editorconfig --- .editorconfig | 20 1 file changed, 20 insertions(+) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000..1618d30 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# http://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 + +[*.go] +indent_style = tab + +[Makefile] +indent_style = tab + +[*.java] +indent_size = 4
[camel-k-runtime] branch release-1.9.x updated: Upgrade branch 1.9.x to camel-quarkus 2.3.0 and camel.3.11.2 (#745)
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch release-1.9.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.9.x by this push:
new 5065699 Upgrade branch 1.9.x to camel-quarkus 2.3.0 and camel.3.11.2
(#745)
5065699 is described below
commit 5065699eccc63106b0a90d163e26897eb07a6f30
Author: Nicola Ferraro
AuthorDate: Wed Oct 20 16:23:07 2021 +0200
Upgrade branch 1.9.x to camel-quarkus 2.3.0 and camel.3.11.2 (#745)
---
camel-k-knative/producer/deployment/pom.xml | 2 +-
camel-k-knative/producer/runtime/pom.xml| 2 +-
pom.xml | 24
support/camel-k-runtime-bom/pom.xml | 2 +-
4 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/camel-k-knative/producer/deployment/pom.xml
b/camel-k-knative/producer/deployment/pom.xml
index b528abb..0e38364 100644
--- a/camel-k-knative/producer/deployment/pom.xml
+++ b/camel-k-knative/producer/deployment/pom.xml
@@ -42,7 +42,7 @@
io.quarkus
-quarkus-vertx-core-deployment
+quarkus-vertx-deployment
diff --git a/camel-k-knative/producer/runtime/pom.xml
b/camel-k-knative/producer/runtime/pom.xml
index fe6c480..581dc61 100644
--- a/camel-k-knative/producer/runtime/pom.xml
+++ b/camel-k-knative/producer/runtime/pom.xml
@@ -30,7 +30,7 @@
io.quarkus
-quarkus-vertx-core
+quarkus-vertx
org.apache.camel.quarkus
diff --git a/pom.xml b/pom.xml
index db0ba07..be844a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
org.apache.camel
camel-dependencies
-3.11.1
+3.11.2
4.0.0
@@ -38,12 +38,12 @@
11
11
-3.11.1
+3.11.2
-2.2.0
+2.3.0
21.2.0
-2.2.0.Final
+2.3.0.Final
3.0.8
@@ -52,8 +52,10 @@
3.1.0
+2.4.0.Final
1.13.0
2.2.14
+4.1.4
1.12.1
@@ -263,11 +265,25 @@
org.apache.camel
camel-component-maven-plugin
${camel-version}
+
+
+org.jboss
+jandex
+${jandex-version}
+
+
org.apache.camel
camel-package-maven-plugin
${camel-version}
+
+
+org.jboss
+jandex
+${jandex-version}
+
+
org.codehaus.gmavenplus
diff --git a/support/camel-k-runtime-bom/pom.xml
b/support/camel-k-runtime-bom/pom.xml
index e3e8fd4..45112d1 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -32,7 +32,7 @@
pom
-3.11.0
+3.11.2
1
[camel-kamelets] 01/02: Fix #548: Add credentials group to properties
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 743b7b3e6fcd29f6dcaaa438af2fc589c9b1dcb3 Author: nicolaferraro AuthorDate: Wed Oct 20 15:27:49 2021 +0200 Fix #548: Add credentials group to properties --- aws-cloudwatch-sink.kamelet.yaml | 2 ++ aws-ddb-streams-source.kamelet.yaml | 2 ++ aws-ec2-sink.kamelet.yaml | 2 ++ aws-kinesis-firehose-sink.kamelet.yaml| 2 ++ aws-kinesis-sink.kamelet.yaml | 2 ++ aws-kinesis-source.kamelet.yaml | 2 ++ aws-lambda-sink.kamelet.yaml | 2 ++ aws-s3-sink.kamelet.yaml | 2 ++ aws-s3-source.kamelet.yaml| 2 ++ aws-s3-streaming-upload-sink.kamelet.yaml | 2 ++ aws-sns-fifo-sink.kamelet.yaml| 2 ++ aws-sns-sink.kamelet.yaml | 2 ++ aws-sqs-batch-sink.kamelet.yaml | 2 ++ aws-sqs-fifo-sink.kamelet.yaml| 2 ++ aws-sqs-sink.kamelet.yaml | 2 ++ aws-sqs-source.kamelet.yaml | 2 ++ aws-translate-action.kamelet.yaml | 2 ++ azure-cosmosdb-source.kamelet.yaml| 1 + azure-eventhubs-sink.kamelet.yaml | 3 +++ azure-eventhubs-source.kamelet.yaml | 4 azure-storage-blob-sink.kamelet.yaml | 3 +++ azure-storage-blob-source.kamelet.yaml| 3 +++ azure-storage-queue-sink.kamelet.yaml | 3 +++ azure-storage-queue-source.kamelet.yaml | 5 - cassandra-sink.kamelet.yaml | 3 +++ cassandra-source.kamelet.yaml | 3 +++ dropbox-sink.kamelet.yaml | 3 +++ dropbox-source.kamelet.yaml | 3 +++ elasticsearch-index-sink.kamelet.yaml | 3 +++ elasticsearch-search-source.kamelet.yaml | 3 +++ fhir-source.kamelet.yaml | 4 ++-- ftp-sink.kamelet.yaml | 3 +++ ftp-source.kamelet.yaml | 3 +++ ftps-sink.kamelet.yaml| 3 +++ ftps-source.kamelet.yaml | 3 +++ github-source.kamelet.yaml| 1 + google-calendar-source.kamelet.yaml | 4 google-mail-source.kamelet.yaml | 4 google-pubsub-sink.kamelet.yaml | 4 +++- google-pubsub-source.kamelet.yaml | 2 ++ google-sheets-source.kamelet.yaml | 4 http-secured-sink.kamelet.yaml| 6 ++ http-secured-source.kamelet.yaml | 6 ++ infinispan-source.kamelet.yaml| 6 ++ jira-source.kamelet.yaml | 3 +++ kafka-sink.kamelet.yaml | 3 +++ kafka-source.kamelet.yaml | 3 +++ kubernetes-namespaces-source.kamelet.yaml | 7 --- kubernetes-nodes-source.kamelet.yaml | 7 --- kubernetes-pods-source.kamelet.yaml | 7 --- mail-imap-source.kamelet.yaml | 3 +++ mariadb-sink.kamelet.yaml | 3 +++ mariadb-source.kamelet.yaml | 3 +++ minio-sink.kamelet.yaml | 2 ++ minio-source.kamelet.yaml | 2 ++ mongodb-sink.kamelet.yaml | 5 - mongodb-source.kamelet.yaml | 5 - mqtt-sink.kamelet.yaml| 3 +++ mqtt-source.kamelet.yaml | 3 +++ mysql-sink.kamelet.yaml | 3 +++ mysql-source.kamelet.yaml | 3 +++ openai-classification-action.kamelet.yaml | 4 openai-completion-action.kamelet.yaml | 4 postgresql-sink.kamelet.yaml | 3 +++ postgresql-source.kamelet.yaml| 3 +++ rabbitmq-source.kamelet.yaml | 3 +++ salesforce-source.kamelet.yaml| 6 ++ script/validator/validator.go | 6 ++ sftp-sink.kamelet.yaml| 3 +++ sftp-source.kamelet.yaml | 3 +++ slack-sink.kamelet.yaml | 1 + slack-source.kamelet.yaml | 1 + sqlserver-sink.kamelet.yaml | 3 +++ sqlserver-source.kamelet.yaml | 3 +++ ssh-source.kamelet.yaml | 4 ++-- telegram-sink.kamelet.yaml| 1 + telegram-source.kamelet.yaml | 1 + twitter-directmessage-source.kamelet.yaml | 4 twitter-search-source.kamelet.yaml| 4 twitter-timeline-source.kamelet.yaml | 4 80 files changed, 236 insertions(+), 17 deletions(-) diff --git a/aws-cloudwatch-sink.kamelet.yaml b/aws-cloudwatch-sink.kamelet.yaml index 62dc7f1..cdbae46 100644 --- a/aws-cloudwatch-sink.kamelet.yaml +++ b/aws-cloudwatch-sink.kamelet.yaml @@ -42,6 +42,7 @@ spec: format: password x-descriptors: - urn:alm:descriptor:com.tectonic.ui:password +- urn:camel:group:credentials secretKey: title: Secret Key description: The secret key obtained from AWS. @@ -49,6 +50,7 @@ spec: format
[camel-kamelets] branch main updated (12e33f8 -> d7d860e)
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from 12e33f8 chore: regen docs new 743b7b3 Fix #548: Add credentials group to properties new d7d860e Fix #548: regen 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: aws-cloudwatch-sink.kamelet.yaml | 2 ++ aws-ddb-streams-source.kamelet.yaml| 2 ++ aws-ec2-sink.kamelet.yaml | 2 ++ aws-kinesis-firehose-sink.kamelet.yaml | 2 ++ aws-kinesis-sink.kamelet.yaml | 2 ++ aws-kinesis-source.kamelet.yaml| 2 ++ aws-lambda-sink.kamelet.yaml | 2 ++ aws-s3-sink.kamelet.yaml | 2 ++ aws-s3-source.kamelet.yaml | 2 ++ aws-s3-streaming-upload-sink.kamelet.yaml | 2 ++ aws-sns-fifo-sink.kamelet.yaml | 2 ++ aws-sns-sink.kamelet.yaml | 2 ++ aws-sqs-batch-sink.kamelet.yaml| 2 ++ aws-sqs-fifo-sink.kamelet.yaml | 2 ++ aws-sqs-sink.kamelet.yaml | 2 ++ aws-sqs-source.kamelet.yaml| 2 ++ aws-translate-action.kamelet.yaml | 2 ++ azure-cosmosdb-source.kamelet.yaml | 1 + azure-eventhubs-sink.kamelet.yaml | 3 +++ azure-eventhubs-source.kamelet.yaml| 4 azure-storage-blob-sink.kamelet.yaml | 3 +++ azure-storage-blob-source.kamelet.yaml | 3 +++ azure-storage-queue-sink.kamelet.yaml | 3 +++ azure-storage-queue-source.kamelet.yaml| 5 - cassandra-sink.kamelet.yaml| 3 +++ cassandra-source.kamelet.yaml | 3 +++ dropbox-sink.kamelet.yaml | 3 +++ dropbox-source.kamelet.yaml| 3 +++ elasticsearch-index-sink.kamelet.yaml | 3 +++ elasticsearch-search-source.kamelet.yaml | 3 +++ fhir-source.kamelet.yaml | 4 ++-- ftp-sink.kamelet.yaml | 3 +++ ftp-source.kamelet.yaml| 3 +++ ftps-sink.kamelet.yaml | 3 +++ ftps-source.kamelet.yaml | 3 +++ github-source.kamelet.yaml | 1 + google-calendar-source.kamelet.yaml| 4 google-mail-source.kamelet.yaml| 4 google-pubsub-sink.kamelet.yaml| 4 +++- google-pubsub-source.kamelet.yaml | 2 ++ google-sheets-source.kamelet.yaml | 4 http-secured-sink.kamelet.yaml | 6 ++ http-secured-source.kamelet.yaml | 6 ++ infinispan-source.kamelet.yaml | 6 ++ jira-source.kamelet.yaml | 3 +++ kafka-sink.kamelet.yaml| 3 +++ kafka-source.kamelet.yaml | 3 +++ kubernetes-namespaces-source.kamelet.yaml | 7 --- kubernetes-nodes-source.kamelet.yaml | 7 --- kubernetes-pods-source.kamelet.yaml| 7 --- .../src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml | 2 ++ .../main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml | 2 ++ .../main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 2 ++ ..
[camel-kamelets] 02/02: Fix #548: regen
This is an automated email from the ASF dual-hosted git repository. nferraro pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit d7d860e43c0c02c4b82f5a82241ffbd4dde0e0ab Author: nicolaferraro AuthorDate: Wed Oct 20 15:29:34 2021 +0200 Fix #548: regen --- .../src/main/resources/kamelets/aws-cloudwatch-sink.kamelet.yaml | 2 ++ .../main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-ec2-sink.kamelet.yaml | 2 ++ .../main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-s3-source.kamelet.yaml | 2 ++ .../resources/kamelets/aws-s3-streaming-upload-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-sns-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/aws-sqs-source.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/aws-translate-action.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/azure-cosmosdb-source.kamelet.yaml | 1 + .../src/main/resources/kamelets/azure-eventhubs-sink.kamelet.yaml | 3 +++ .../main/resources/kamelets/azure-eventhubs-source.kamelet.yaml| 4 .../main/resources/kamelets/azure-storage-blob-sink.kamelet.yaml | 3 +++ .../main/resources/kamelets/azure-storage-blob-source.kamelet.yaml | 3 +++ .../main/resources/kamelets/azure-storage-queue-sink.kamelet.yaml | 3 +++ .../resources/kamelets/azure-storage-queue-source.kamelet.yaml | 5 - .../src/main/resources/kamelets/cassandra-sink.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/cassandra-source.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/dropbox-sink.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/dropbox-source.kamelet.yaml| 3 +++ .../main/resources/kamelets/elasticsearch-index-sink.kamelet.yaml | 3 +++ .../resources/kamelets/elasticsearch-search-source.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/fhir-source.kamelet.yaml | 4 ++-- .../src/main/resources/kamelets/ftp-sink.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/ftp-source.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/ftps-sink.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/ftps-source.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/github-source.kamelet.yaml | 1 + .../main/resources/kamelets/google-calendar-source.kamelet.yaml| 4 .../src/main/resources/kamelets/google-mail-source.kamelet.yaml| 4 .../src/main/resources/kamelets/google-pubsub-sink.kamelet.yaml| 4 +++- .../src/main/resources/kamelets/google-pubsub-source.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/google-sheets-source.kamelet.yaml | 4 .../src/main/resources/kamelets/http-secured-sink.kamelet.yaml | 6 ++ .../src/main/resources/kamelets/http-secured-source.kamelet.yaml | 6 ++ .../src/main/resources/kamelets/infinispan-source.kamelet.yaml | 6 ++ .../src/main/resources/kamelets/jira-source.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/kafka-sink.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/kafka-source.kamelet.yaml | 3 +++ .../resources/kamelets/kubernetes-namespaces-source.kamelet.yaml | 7 --- .../main/resources/kamelets/kubernetes-nodes-source.kamelet.yaml | 7 --- .../main/resources/kamelets/kubernetes-pods-source.kamelet.yaml| 7 --- .../src/main/resources/kamelets/mail-imap-source.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/mariadb-sink.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/mariadb-source.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/minio-sink.kamelet.yaml| 2 ++ .../src/main/resources/kamelets/minio-source.kamelet.yaml | 2 ++ .../src/main/resources/kamelets/mongodb-sink.kamelet.yaml | 5 - .../src/main/resources/kamelets/mongodb-source.kamelet.yaml| 5 - .../src/main/resources/kamelets/mqtt-sink.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/mqtt-source.kamelet.yaml | 3 +++ .../src/main/resources/kamelets/mysql-sink.kamelet.yaml| 3 +++ .../src/main/resources/kamelets/mysql-source.kamelet.yaml | 3 +++ .../resources/kamelets/openai
