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

Jump to bottom

chore(ci): Switch to Confluent docker images since wurstmeister ones disappeared #20465

Merged
merged 9 commits into from
May 9, 2024
Merged

chore(ci): Switch to Confluent docker images since wurstmeister ones disappeared #20465

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0fc5cc5
chore(ci): Switch to Confluent docker images since wurstmeister ones …
jszwedko May 8, 2024
3b1dd54
Remove client auth
jszwedko May 8, 2024
e3a006c
Remove more unneeded options
jszwedko May 8, 2024
4de1a5c
Remove unused file
jszwedko May 8, 2024
7620478
Spelling
jszwedko May 8, 2024
ee5e58b
set replication factor
jszwedko May 8, 2024
af65d47
Comment out some assertions for now
jszwedko May 8, 2024
bdce2da
reenable balance assertions
jszwedko May 8, 2024
9357094
Update shutdown tests too
jszwedko May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/spelling/excludes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
^\Qlib/value/tests/data/fixtures/value/boolean/false.json\E$
^\Qlib/vector-core/tests/data/fixtures/lookup/quoted\E$
^\Qlib/vector-lookup/tests/fixtures/lookup/quoted\E$
^\Qlib/vector-vrl/tests/resources/protobuf_descriptor_set.desc\E$
^\Qlib/vrl/lookup/tests/fixtures/lookup/quoted\E$
^\Qlib/vrl/stdlib/benches/benches.rs\E$
^\Qlib/vrl/stdlib/src/encode_percent.rs\E$
Expand All @@ -104,6 +105,7 @@
^\Qscripts/integration/invalidchronicleauth.json\E$
^\Qsrc/sources/dnstap/parser.rs\E$
^\Qtests/data/ca/intermediate_client/index.txt.old\E$
^\Qtests/data/ca/intermediate_server/private/kafka.pass\E$
^\Qtests/data/databend/miniodat/databend/.keep\E$
^\Qtests/data/gzipped.log\E$
^\Qtests/data/nats/nats-bad.creds\E$
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ conffiles
configkey
configmap
confl
confluentinc
confy
consigliere
CONTEUDO
Expand Down
25 changes: 13 additions & 12 deletions scripts/integration/kafka/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,35 @@ version: '3'

services:
zookeeper:
image: docker.io/wurstmeister/zookeeper:${CONFIG_VERSION}
image: docker.io/confluentinc/cp-zookeeper:${CONFIG_VERSION}
Fixed Show fixed Hide fixed
ports:
- 2181:2181
environment:
- ZOOKEEPER_CLIENT_PORT=2181
kafka:
image: docker.io/wurstmeister/kafka:2.13-2.6.0
image: docker.io/confluentinc/cp-kafka:7.6.1
Fixed Show fixed Hide fixed
depends_on:
- zookeeper
environment:
- KAFKA_BROKER_ID=1
- KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- ZOOKEEPER_SASL_ENABLED=false
- KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
- KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS=0
- KAFKA_LISTENERS=PLAINTEXT://:9091,SSL://:9092,SASL_PLAINTEXT://:9093
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9091,SSL://kafka:9092,SASL_PLAINTEXT://kafka:9093
- KAFKA_SSL_KEYSTORE_TYPE=PKCS12
- KAFKA_SSL_KEYSTORE_LOCATION=/certs/kafka.p12
- KAFKA_SSL_KEYSTORE_PASSWORD=NOPASS
- KAFKA_SSL_TRUSTSTORE_TYPE=PKCS12
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests aren't actually providing a valid client certificate so I removed the truststore bits and set KAFKA_SSL_CLIENT_AUTH=none.

- KAFKA_SSL_TRUSTSTORE_LOCATION=/certs/kafka.p12
- KAFKA_SSL_TRUSTSTORE_PASSWORD=NOPASS
- KAFKA_SSL_KEY_PASSWORD=NOPASS
- KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM=none
- KAFKA_SSL_KEY_CREDENTIALS=kafka.pass
- KAFKA_SSL_KEYSTORE_CREDENTIALS=kafka.pass
- KAFKA_SSL_KEYSTORE_FILENAME=kafka.p12
- KAFKA_SSL_CLIENT_AUTH=none
- KAFKA_OPTS=-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf
- KAFKA_INTER_BROKER_LISTENER_NAME=SASL_PLAINTEXT
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed these seemingly unneeded options.

- KAFKA_SASL_ENABLED_MECHANISMS=PLAIN
- KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL=PLAIN
ports:
- 9091:9091
- 9092:9092
- 9093:9093
volumes:
- ../../../tests/data/ca/intermediate_server/private/kafka.p12:/certs/kafka.p12:ro
- ../../../tests/data/ca/intermediate_server/private/kafka.pass:/etc/kafka/secrets/kafka.pass:ro
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confluent images require a file to supply the password.

- ../../../tests/data/ca/intermediate_server/private/kafka.p12:/etc/kafka/secrets/kafka.p12:ro
- ../../../tests/data/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
1 change: 1 addition & 0 deletions tests/data/ca/intermediate_server/private/kafka.pass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NOPASS
Fixed Show fixed Hide fixed
1 change: 1 addition & 0 deletions tests/data/kafka_server_jaas.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
KafkaServer {
org.apache.kafka.common.security.plain.PlainLoginModule required
serviceName="kafka"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was complaining this was missing now.

username="admin"
password="admin"
user_admin="admin";
Expand Down