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:31 UTC

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

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