Skip to content

MINOR: add SCRAM for security_rolling_upgrade #18368

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

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

MINOR: add SCRAM for security_rolling_upgrade #18368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21be23c
test
TaiJuWu Jan 1, 2025
d204d3b
add more test
TaiJuWu Jan 1, 2025
b3ea21f
revert some change
TaiJuWu Jan 1, 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
3 changes: 1 addition & 2 deletions tests/kafkatest/services/kafka/kafka.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,8 +842,7 @@ def start_node(self, node, timeout_sec=60, **kwargs):
self.close_port(controller_listener)

self.security_config.setup_node(node)
if self.quorum_info.using_zk or self.quorum_info.has_brokers: # TODO: SCRAM currently unsupported for controller quorum
self.maybe_setup_broker_scram_credentials(node)
self.maybe_setup_broker_scram_credentials(node)
Copy link
Member

Choose a reason for hiding this comment

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

this method will call maybe_setup_broker_scram_credentials to use zk connection. Is it safe if the e2e is under kraft?


if self.quorum_info.using_kraft:
# define controller.quorum.bootstrap.servers or controller.quorum.voters text
Expand Down
4 changes: 3 additions & 1 deletion tests/kafkatest/tests/core/security_rolling_upgrade_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ def test_rolling_upgrade_phase_one(self, client_protocol, metadata_quorum):
self.run_produce_consume_validate(lambda: time.sleep(1))

@cluster(num_nodes=9)
@matrix(new_client_sasl_mechanism=[SecurityConfig.SASL_MECHANISM_PLAIN], metadata_quorum=[quorum.isolated_kraft])
@matrix(new_client_sasl_mechanism=[SecurityConfig.SASL_MECHANISM_PLAIN, SecurityConfig.SASL_MECHANISM_SCRAM_SHA_256,
SecurityConfig.SASL_MECHANISM_SCRAM_SHA_512],
metadata_quorum=[quorum.isolated_kraft])
def test_rolling_upgrade_sasl_mechanism_phase_one(self, new_client_sasl_mechanism, metadata_quorum):
"""
Start with a SASL/GSSAPI cluster, add new SASL mechanism, via a rolling upgrade, ensuring we could produce
Expand Down
Loading