NIFI-14225 Applied patch which updates the Kafka image version and co…

…nfigures the Kafka container to start with the additional needed listener configuration.
apache · Feb 5, 2025 · f1b3944 · f1b3944
1 parent 08ab893
commit f1b3944
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java b/...-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceBaseIT.java
@@ -92,7 +92,7 @@ public class Kafka3ConnectionServiceBaseIT {
     // This Base class executes its tests with Ssl off and Sasl off.
     // There are subclasses which execute these same tests and enable Ssl or Sasl
 
-    public static final String IMAGE_NAME = "confluentinc/cp-kafka:7.6.1";  // April 2024
+    public static final String IMAGE_NAME = "confluentinc/cp-kafka:7.8.0";  // December 2024
 
     private static final String GROUP_ID = Kafka3ConnectionService.class.getSimpleName();
 

diff --git a/...a-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java b/...a-3-service/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSSLIT.java
@@ -28,7 +28,7 @@ public class Kafka3ConnectionServiceSSLIT extends Kafka3ConnectionServiceBaseIT
 
     protected Map<String, String> getKafkaContainerConfigProperties() {
         final Map<String, String> properties = new LinkedHashMap<>(super.getKafkaContainerConfigProperties());
-        properties.put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:SSL,PLAINTEXT:SSL");
+        properties.put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:SSL,PLAINTEXT:SSL,CONTROLLER:SSL");
         properties.put("KAFKA_SSL_KEYSTORE_LOCATION", keyStorePath.toString());
         properties.put("KAFKA_SSL_KEYSTORE_TYPE", keyStoreType);
         properties.put("KAFKA_SSL_KEYSTORE_PASSWORD", KEY_STORE_PASSWORD);

diff --git a/...e/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java b/...e/src/test/java/org/apache/nifi/kafka/service/Kafka3ConnectionServiceSaslPlaintextIT.java
@@ -29,7 +29,7 @@ public class Kafka3ConnectionServiceSaslPlaintextIT extends Kafka3ConnectionServ
 
     protected Map<String, String> getKafkaContainerConfigProperties() {
         final Map<String, String> properties = new LinkedHashMap<>(super.getKafkaContainerConfigProperties());
-        properties.put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:SASL_PLAINTEXT");
+        properties.put("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:SASL_PLAINTEXT,CONTROLLER:PLAINTEXT");
         properties.put("KAFKA_LISTENER_NAME_PLAINTEXT_SASL_ENABLED_MECHANISMS", "PLAIN");
         properties.put("KAFKA_LISTENER_NAME_PLAINTEXT_PLAIN_SASL_JAAS_CONFIG",
                 getJaasConfigKafkaContainer(TEST_USERNAME, TEST_PASSWORD));