You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/17 11:00:30 UTC

[camel-kamelets] branch main updated (62e9e354 -> 66be8df2)

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

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


    from 62e9e354 Added a Catalog Method showing the supported headers (specific for consumer, producer and common) for a Kamelet - Github
     new 0373d4c7 Make two-way authentication optional
     new 66be8df2 Add JAAS config as optional

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:
 kamelets/kafka-ssl-source.kamelet.yaml                      | 13 ++++++++-----
 .../main/resources/kamelets/kafka-ssl-source.kamelet.yaml   | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)


[camel-kamelets] 01/02: Make two-way authentication optional

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

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

commit 0373d4c7103fb6603f90443114f74149a1270521
Author: Marco Martins <ma...@talkdesk.com>
AuthorDate: Mon Oct 17 09:27:44 2022 +0100

    Make two-way authentication optional
---
 kamelets/kafka-ssl-source.kamelet.yaml                             | 7 ++-----
 .../src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml      | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/kamelets/kafka-ssl-source.kamelet.yaml b/kamelets/kafka-ssl-source.kamelet.yaml
index d73c9907..adc87a3b 100644
--- a/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/kamelets/kafka-ssl-source.kamelet.yaml
@@ -34,8 +34,6 @@ spec:
     required:
       - topic
       - bootstrapServers
-      - sslKeystoreLocation
-      - sslKeystorePassword
       - sslTruststoreLocation
       - sslKeyPassword
     type: object
@@ -124,7 +122,6 @@ spec:
           - urn:alm:descriptor:com.tectonic.ui:password
           - urn:camel:group:credentials
           - urn:keda:authentication:password
-          - urn:keda:required
       sslProtocol:
         description: The SSL protocol used to generate the SSLContext. Default setting is TLS, which is fine for most cases. Allowed values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in older JVMs, but their usage is discouraged due to known security vulnerabilities.
         title: SSL Protocol
@@ -159,11 +156,11 @@ spec:
           - key: securityProtocol
             value: '{{securityProtocol}}'
           - key: sslKeystoreLocation
-            value: '{{sslKeystoreLocation}}'
+            value: '{{?sslKeystoreLocation}}'
           - key: sslKeyPassword
             value: '{{sslKeyPassword}}'
           - key: sslKeystorePassword
-            value: '{{sslKeystorePassword}}'
+            value: '{{?sslKeystorePassword}}'
           - key: sslTruststoreLocation
             value: '{{sslTruststoreLocation}}'
           - key: sslProtocol
diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
index d73c9907..adc87a3b 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
@@ -34,8 +34,6 @@ spec:
     required:
       - topic
       - bootstrapServers
-      - sslKeystoreLocation
-      - sslKeystorePassword
       - sslTruststoreLocation
       - sslKeyPassword
     type: object
@@ -124,7 +122,6 @@ spec:
           - urn:alm:descriptor:com.tectonic.ui:password
           - urn:camel:group:credentials
           - urn:keda:authentication:password
-          - urn:keda:required
       sslProtocol:
         description: The SSL protocol used to generate the SSLContext. Default setting is TLS, which is fine for most cases. Allowed values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in older JVMs, but their usage is discouraged due to known security vulnerabilities.
         title: SSL Protocol
@@ -159,11 +156,11 @@ spec:
           - key: securityProtocol
             value: '{{securityProtocol}}'
           - key: sslKeystoreLocation
-            value: '{{sslKeystoreLocation}}'
+            value: '{{?sslKeystoreLocation}}'
           - key: sslKeyPassword
             value: '{{sslKeyPassword}}'
           - key: sslKeystorePassword
-            value: '{{sslKeystorePassword}}'
+            value: '{{?sslKeystorePassword}}'
           - key: sslTruststoreLocation
             value: '{{sslTruststoreLocation}}'
           - key: sslProtocol


[camel-kamelets] 02/02: Add JAAS config as optional

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

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

commit 66be8df2322e69d2a09bcd1088cccff1200ef96a
Author: Marco Martins <ma...@talkdesk.com>
AuthorDate: Mon Oct 17 09:28:09 2022 +0100

    Add JAAS config as optional
---
 kamelets/kafka-ssl-source.kamelet.yaml                              | 6 ++++++
 .../src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml       | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/kamelets/kafka-ssl-source.kamelet.yaml b/kamelets/kafka-ssl-source.kamelet.yaml
index adc87a3b..56c3c4a0 100644
--- a/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/kamelets/kafka-ssl-source.kamelet.yaml
@@ -140,6 +140,10 @@ spec:
         title: SSL Enabled Protocols
         type: string
         default: TLSv1.2,TLSv1.1,TLSv1
+      saslJaasConfig:
+        description: Java Authentication and Authorization Service (JAAS) for Simple Authentication and Security Layer (SASL) configuration.
+        title: JAAS Configuration
+        type: string
   dependencies:
     - "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"
     - "camel:core"
@@ -179,6 +183,8 @@ spec:
             value: '{{allowManualCommit}}'
           - key: autoCommitEnable
             value: '{{autoCommitEnable}}'
+          - key: saslJaasConfig
+            value: '{{?saslJaasConfig}}'
         type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
       - name: kafkaHeaderDeserializer
         type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
index adc87a3b..56c3c4a0 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
@@ -140,6 +140,10 @@ spec:
         title: SSL Enabled Protocols
         type: string
         default: TLSv1.2,TLSv1.1,TLSv1
+      saslJaasConfig:
+        description: Java Authentication and Authorization Service (JAAS) for Simple Authentication and Security Layer (SASL) configuration.
+        title: JAAS Configuration
+        type: string
   dependencies:
     - "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"
     - "camel:core"
@@ -179,6 +183,8 @@ spec:
             value: '{{allowManualCommit}}'
           - key: autoCommitEnable
             value: '{{autoCommitEnable}}'
+          - key: saslJaasConfig
+            value: '{{?saslJaasConfig}}'
         type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
       - name: kafkaHeaderDeserializer
         type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"