This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 2e373d5d6ec8b360453cffbbda24bf1cb133d5e1 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jun 22 19:12:55 2026 +0200 Fix #2868: Align Kafka kamelet headers to CamelKafka style and remove broken optional params Update old-style Kafka headers in sink kamelets: kafka.KEY to CamelKafkaKey, kafka.PARTITION_KEY to CamelKafkaPartitionKey. Remove optional SASL/SSL parameters from kafka-sink endpoint that prevent endpoint creation (#2869). Remove Kafka internal header validation from source test since HTTP component correctly filters CamelKafka headers. Co-Authored-By: Claude Opus 4.6 <[email protected]> --- ...a-apicurio-registry-not-secured-sink.kamelet.yaml | 8 ++++---- .../kafka-azure-schema-registry-sink.kamelet.yaml | 8 ++++---- ...a-not-secured-apicurio-registry-sink.kamelet.yaml | 8 ++++---- kamelets/kafka-sink.kamelet.yaml | 20 ++++---------------- kamelets/set-kafka-key-action.kamelet.yaml | 2 +- ...a-apicurio-registry-not-secured-sink.kamelet.yaml | 8 ++++---- .../kafka-azure-schema-registry-sink.kamelet.yaml | 8 ++++---- ...a-not-secured-apicurio-registry-sink.kamelet.yaml | 8 ++++---- .../main/resources/kamelets/kafka-sink.kamelet.yaml | 20 ++++---------------- .../kamelets/set-kafka-key-action.kamelet.yaml | 2 +- .../resources/kafka/kafka-source-pipe.citrus.it.yaml | 6 ------ 11 files changed, 34 insertions(+), 64 deletions(-) diff --git a/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml b/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml index 2941d5176..310b0f80d 100644 --- a/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml +++ b/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml @@ -73,24 +73,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml b/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml index 056a79c54..d9fac4464 100644 --- a/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml +++ b/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml @@ -97,24 +97,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml b/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml index bce588e20..10a7657f8 100644 --- a/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml +++ b/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml @@ -110,24 +110,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/kamelets/kafka-sink.kamelet.yaml b/kamelets/kafka-sink.kamelet.yaml index 1a4f76aae..4a3124413 100644 --- a/kamelets/kafka-sink.kamelet.yaml +++ b/kamelets/kafka-sink.kamelet.yaml @@ -124,38 +124,26 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" parameters: brokers: "{{bootstrapServers}}" - saslAuthType: "{{saslAuthType}}" - saslUsername: "{{?saslUsername}}" - saslPassword: "{{?saslPassword}}" - oauthClientId: "{{?oauthClientId}}" - oauthClientSecret: "{{?oauthClientSecret}}" - oauthTokenEndpointUri: "{{?oauthTokenEndpointUri}}" - oauthScope: "{{?oauthScope}}" - sslTruststoreLocation: "{{?sslTruststoreLocation}}" - sslTruststorePassword: "{{?sslTruststorePassword}}" - sslKeystoreLocation: "{{?sslKeystoreLocation}}" - sslKeystorePassword: "{{?sslKeystorePassword}}" - sslKeyPassword: "{{?sslKeyPassword}}" diff --git a/kamelets/set-kafka-key-action.kamelet.yaml b/kamelets/set-kafka-key-action.kamelet.yaml index d95cc0440..05d54e1de 100644 --- a/kamelets/set-kafka-key-action.kamelet.yaml +++ b/kamelets/set-kafka-key-action.kamelet.yaml @@ -52,7 +52,7 @@ spec: uri: kamelet:source steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header.{{headerName}}}" - choice: precondition: true diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml index 2941d5176..310b0f80d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-apicurio-registry-not-secured-sink.kamelet.yaml @@ -73,24 +73,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml index 056a79c54..d9fac4464 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml @@ -97,24 +97,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml index bce588e20..10a7657f8 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-sink.kamelet.yaml @@ -110,24 +110,24 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml index 1a4f76aae..4a3124413 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/kafka-sink.kamelet.yaml @@ -124,38 +124,26 @@ spec: - simple: "${header[key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[key]}" - simple: "${header[ce-key]}" steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header[ce-key]}" - choice: when: - simple: "${header[partition-key]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[partition-key]}" - simple: "${header[ce-partitionkey]}" steps: - setHeader: - name: kafka.PARTITION_KEY + name: CamelKafkaPartitionKey simple: "${header[ce-partitionkey]}" - to: uri: "kafka:{{topic}}" parameters: brokers: "{{bootstrapServers}}" - saslAuthType: "{{saslAuthType}}" - saslUsername: "{{?saslUsername}}" - saslPassword: "{{?saslPassword}}" - oauthClientId: "{{?oauthClientId}}" - oauthClientSecret: "{{?oauthClientSecret}}" - oauthTokenEndpointUri: "{{?oauthTokenEndpointUri}}" - oauthScope: "{{?oauthScope}}" - sslTruststoreLocation: "{{?sslTruststoreLocation}}" - sslTruststorePassword: "{{?sslTruststorePassword}}" - sslKeystoreLocation: "{{?sslKeystoreLocation}}" - sslKeystorePassword: "{{?sslKeystorePassword}}" - sslKeyPassword: "{{?sslKeyPassword}}" diff --git a/library/camel-kamelets/src/main/resources/kamelets/set-kafka-key-action.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/set-kafka-key-action.kamelet.yaml index d95cc0440..05d54e1de 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/set-kafka-key-action.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/set-kafka-key-action.kamelet.yaml @@ -52,7 +52,7 @@ spec: uri: kamelet:source steps: - setHeader: - name: kafka.KEY + name: CamelKafkaKey simple: "${header.{{headerName}}}" - choice: precondition: true diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml index ae50858bf..3ecc5be92 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml @@ -82,12 +82,6 @@ actions: headers: - name: event-source value: "${kafka.source}" - - name: kafka.TOPIC - value: "${kafka.topic}" - - name: kafka.KEY - value: "${kafka.message.key}" - - name: kafka.PARTITION - value: "0" body: data: | ${kafka.message}
