Bump kafka to 3.0.x (#395)

* Bump kafka version * Fix export tests
peter-evans · Nov 23, 2023 · eb7be22 · eb7be22
1 parent ac33fc7
commit eb7be22
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 34 deletions.
diff --git a/core/test/fixtures/broker/core.operators.broker.exporter.1.json b/core/test/fixtures/broker/core.operators.broker.exporter.1.json
@@ -48,7 +48,7 @@
           "num.network.threads": "3",
           "num.recovery.threads.per.data.dir": "1",
           "num.replica.fetchers": "1",
-          "principal.builder.class": null,
+          "principal.builder.class": "org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder",
           "sasl.enabled.mechanisms": "GSSAPI",
           "sasl.kerberos.kinit.cmd": "/usr/bin/kinit",
           "sasl.kerberos.min.time.before.relogin": "60000",
@@ -130,7 +130,7 @@
           "num.network.threads": "3",
           "num.recovery.threads.per.data.dir": "1",
           "num.replica.fetchers": "1",
-          "principal.builder.class": null,
+          "principal.builder.class": "org.apache.kafka.common.security.authenticator.DefaultKafkaPrincipalBuilder",
           "sasl.enabled.mechanisms": "GSSAPI",
           "sasl.kerberos.kinit.cmd": "/usr/bin/kinit",
           "sasl.kerberos.min.time.before.relogin": "60000",

diff --git a/core/test/fixtures/compose/1-broker-plaintext-compose.yml b/core/test/fixtures/compose/1-broker-plaintext-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
+    image: confluentinc/cp-zookeeper:7.0.11
     ports:
       - "${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
     environment:
       ZOOKEEPER_CLIENT_PORT: ${ZOOKEEPER_PORT}
       ZOOKEEPER_TICK_TIME: 2000
 
   broker1:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:

diff --git a/core/test/fixtures/compose/1-broker-sasl-plain-compose.yml b/core/test/fixtures/compose/1-broker-sasl-plain-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
+    image: confluentinc/cp-zookeeper:7.0.11
     ports:
       - "${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
     environment:
       ZOOKEEPER_CLIENT_PORT: ${ZOOKEEPER_PORT}
       ZOOKEEPER_TICK_TIME: 2000
 
   broker1:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:

diff --git a/core/test/fixtures/compose/2-broker-plaintext-compose.yml b/core/test/fixtures/compose/2-broker-plaintext-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
+    image: confluentinc/cp-zookeeper:7.0.11
     ports:
       - "${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
     environment:
       ZOOKEEPER_CLIENT_PORT: ${ZOOKEEPER_PORT}
       ZOOKEEPER_TICK_TIME: 2000
 
   broker1:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -26,7 +26,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker2:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:

diff --git a/core/test/fixtures/compose/6-broker-plaintext-compose.yml b/core/test/fixtures/compose/6-broker-plaintext-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
+    image: confluentinc/cp-zookeeper:7.0.11
     ports:
       - "${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
     environment:
       ZOOKEEPER_CLIENT_PORT: ${ZOOKEEPER_PORT}
       ZOOKEEPER_TICK_TIME: 2000
 
   broker1:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -26,7 +26,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker2:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -43,7 +43,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker3:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -60,7 +60,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker4:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -77,7 +77,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker5:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -94,7 +94,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker6:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.1.json b/core/test/fixtures/topic/core.operators.topic.exporter.1.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -61,7 +61,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -103,7 +103,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -145,7 +145,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.2.json b/core/test/fixtures/topic/core.operators.topic.exporter.2.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -61,7 +61,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -103,7 +103,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -145,7 +145,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -187,7 +187,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.3.json b/core/test/fixtures/topic/core.operators.topic.exporter.3.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -61,7 +61,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.4.json b/core/test/fixtures/topic/core.operators.topic.exporter.4.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",
@@ -61,7 +61,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.5.json b/core/test/fixtures/topic/core.operators.topic.exporter.5.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/core/test/fixtures/topic/core.operators.topic.exporter.6.json b/core/test/fixtures/topic/core.operators.topic.exporter.6.json
@@ -19,7 +19,7 @@
           "max.compaction.lag.ms": "9223372036854775807",
           "max.message.bytes": "1048588",
           "message.downconversion.enable": "true",
-          "message.format.version": "2.8-IV1",
+          "message.format.version": "3.0-IV1",
           "message.timestamp.difference.max.ms": "9223372036854775807",
           "message.timestamp.type": "CreateTime",
           "min.cleanable.dirty.ratio": "0.5",

diff --git a/docs/tutorial/docker-compose.yml b/docs/tutorial/docker-compose.yml
@@ -1,15 +1,15 @@
 version: "3"
 services:
   zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
+    image: confluentinc/cp-zookeeper:7.0.11
     ports:
       - "${ZOOKEEPER_PORT}:${ZOOKEEPER_PORT}"
     environment:
       ZOOKEEPER_CLIENT_PORT: ${ZOOKEEPER_PORT}
       ZOOKEEPER_TICK_TIME: 2000
 
   broker1:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports:
@@ -26,7 +26,7 @@ services:
       KAFKA_PASSWORD_ENCODER_SECRET: 123foo
 
   broker2:
-    image: confluentinc/cp-kafka:6.2.0 # Kafka 2.8.0
+    image: confluentinc/cp-kafka:7.0.11 # Kafka 3.0.x
     depends_on:
       - zookeeper
     ports: