Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Kafka to 3.9.0-debian-12-r6 #1866

Merged
merged 5 commits into from
Jan 31, 2025
Merged

Updated Kafka to 3.9.0-debian-12-r6 #1866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f51f1f
Updated Kafka to 3.9.0-debian-12-r6
ronycsdu Jan 30, 2025
335f5ec
Remove duplicate test
ronycsdu Jan 30, 2025
333a2d0
Update test case for produce_consume_partitions_new_consumer_group_pr…
ronycsdu Jan 30, 2025
2016094
Format update
ronycsdu Jan 30, 2025
5f03bba
Added back deleted test
ronycsdu Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shotover-proxy/benches/windsock/kafka/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl KafkaBench {

tasks.push(tokio::spawn(async move {
node.run_container(
"bitnami/kafka:3.8.1-debian-12-r1",
"bitnami/kafka:3.9.0-debian-12-r6",
&[
("ALLOW_PLAINTEXT_LISTENER".to_owned(), "yes".to_owned()),
(
Expand Down
7 changes: 4 additions & 3 deletions shotover-proxy/tests/kafka_int_tests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,9 +606,10 @@ async fn cluster_2_racks_multi_shotover(#[case] driver: KafkaDriver) {
#[cfg_attr(feature = "kafka-cpp-driver-tests", case::cpp(KafkaDriver::Cpp))]
#[case::java(KafkaDriver::Java)]
#[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
async fn cluster_2_racks_multi_shotover_kafka_3_9(#[case] driver: KafkaDriver) {
let _docker_compose =
docker_compose("tests/test-configs/kafka/cluster-2-racks/docker-compose-kafka-3.9.yaml");
async fn cluster_2_racks_multi_shotover_rebalance_protocol(#[case] driver: KafkaDriver) {
let _docker_compose = docker_compose(
"tests/test-configs/kafka/cluster-2-racks/docker-compose-rebalance-protocol.yaml",
);

// One shotover instance per rack
let mut shotovers = vec![];
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka0:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9192:9192'
environment:
Expand Down
2 changes: 1 addition & 1 deletion ...over-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose-short-idle-timeout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
4 changes: 2 additions & 2 deletions ...ter-2-racks/docker-compose-kafka-3.9.yaml → ...ks/docker-compose-rebalance-protocol.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.9.0-debian-12-r3'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down Expand Up @@ -95,4 +95,4 @@ services:
KAFKA_CFG_ADVERTISED_LISTENERS: "BROKER://172.16.1.7:9092"
KAFKA_CFG_NODE_ID: 5
KAFKA_CFG_BROKER_RACK: "rack2"
volumes: *volumes
volumes: *volumes
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-3-racks/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-mtls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-sasl-plain/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ networks:

services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram-over-mtls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ networks:

services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ networks:

services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ networks:
gateway: 172.16.1.1
services:
kafka0:
image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
networks:
cluster_subnet:
ipv4_address: 172.16.1.2
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/passthrough-mtls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka0:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
environment:
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/passthrough-sasl-plain/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
- '9093:9093'
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/passthrough-sasl-scram/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
environment:
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka0:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
environment:
Expand Down
2 changes: 1 addition & 1 deletion shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka0:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
environment:
Expand Down
2 changes: 1 addition & 1 deletion .../tests/test-configs/kafka/single-sasl-scram-plaintext-source-tls-sink/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka:
image: 'bitnami/kafka:3.8.1-debian-12-r1'
image: 'bitnami/kafka:3.9.0-debian-12-r6'
ports:
- '9092:9092'
environment:
Expand Down
9 changes: 2 additions & 7 deletions test-helpers/src/docker_compose.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub fn new_moto() -> DockerCompose {
docker_compose("tests/transforms/docker-compose-moto.yaml")
}

pub static IMAGE_WAITERS: [Image; 11] = [
pub static IMAGE_WAITERS: [Image; 10] = [
Image {
name: "motoserver/moto",
log_regex_to_wait_for: r"Press CTRL\+C to quit",
Expand Down Expand Up @@ -59,12 +59,7 @@ pub static IMAGE_WAITERS: [Image; 11] = [
timeout: Duration::from_secs(120),
},
Image {
name: "bitnami/kafka:3.8.1-debian-12-r1",
log_regex_to_wait_for: r"Kafka Server started",
timeout: Duration::from_secs(120),
},
Image {
name: "bitnami/kafka:3.9.0-debian-12-r3",
name: "bitnami/kafka:3.9.0-debian-12-r6",
log_regex_to_wait_for: r"Kafka Server started",
timeout: Duration::from_secs(120),
},
Expand Down
Loading