You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/01/11 00:14:32 UTC

[camel-karavan] branch main updated (9601184 -> b8d0d29)

This is an automated email from the ASF dual-hosted git repository.

marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


    from 9601184  RouteConfiguration in Route tab UI #596
     new dd4db2f  Changelog
     new 0f0f5d7  catalog.yaml to install operators from operatorhub
     new b8d0d29  Fix #597

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 karavan-cloud/openshift/catalog.yaml               | 10 ++++++++++
 karavan-core/src/core/api/CamelDefinitionApiExt.ts |  8 +++++---
 karavan-vscode/CHANGELOG.md                        |  6 ++++--
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 karavan-cloud/openshift/catalog.yaml


[camel-karavan] 02/03: catalog.yaml to install operators from operatorhub

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git

commit 0f0f5d761b1fdb38ef8c511f73998bd0fbec33bc
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Jan 10 19:04:20 2023 -0500

    catalog.yaml to install operators from operatorhub
---
 karavan-cloud/openshift/catalog.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/karavan-cloud/openshift/catalog.yaml b/karavan-cloud/openshift/catalog.yaml
new file mode 100644
index 0000000..2e5f6de
--- /dev/null
+++ b/karavan-cloud/openshift/catalog.yaml
@@ -0,0 +1,10 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: operatorhubio-catalog
+  namespace: openshift-operators
+spec:
+  sourceType: grpc
+  image: quay.io/operatorhubio/catalog:latest
+  displayName: Community Operators
+  publisher: OperatorHub.io
\ No newline at end of file


[camel-karavan] 01/03: Changelog

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git

commit dd4db2f1abc6e3835a3980675d3ebdfbfa40ff2c
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Mon Jan 9 20:33:18 2023 -0500

    Changelog
---
 karavan-vscode/CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index c92d0e7..99cd77a 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -2,9 +2,11 @@
 
 ## 3.18.6
 0. Camel 3.20.1
-1. Export to Quarkus and Springboot application in VS Code
+1. Export to Quarkus and Spring Boot application in VS Code
 2. Deploy to Kubernetes and Openshift from VS Code
-3. Kamelets 3.20.0
+3. Quarkus and Spring Boot in cloud-native mode
+4. Kamelets 3.20.0
+5. Route Configuration DSL
 
 ## 3.18.5
 1. First preview of Karavan Operator 


[camel-karavan] 03/03: Fix #597

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git

commit b8d0d29031af7bb0175d70c6870f84946426d598
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Jan 10 19:14:23 2023 -0500

    Fix #597
---
 karavan-core/src/core/api/CamelDefinitionApiExt.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/karavan-core/src/core/api/CamelDefinitionApiExt.ts b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
index f1f6458..111847b 100644
--- a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
@@ -251,9 +251,11 @@ export class CamelDefinitionApiExt {
         const flows: any[] = [];
         integration.spec.flows?.forEach(flow => {
             if (flow.dslName === 'Beans') {
-                const beans = (flow as Beans).beans.filter(b => !(b.uuid === bean?.uuid && b.type === bean?.type));
-                const newBeans = new Beans({beans: beans});
-                flows.push(newBeans);
+                const beans: NamedBeanDefinition[] = (flow as Beans).beans.filter(b => !(b.uuid === bean?.uuid && b.type === bean?.type));
+                if (beans.length > 0) {
+                    const newBeans = new Beans({beans: beans});
+                    flows.push(newBeans);
+                }
             } else {
                 flows.push(flow);
             }