Skip to content

Iceberg other creds #30284

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

Merged
wdberkeley merged 2 commits into from
May 12, 2026
Merged

Iceberg other creds #30284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
429145d
datalake: use iceberg credentials source for bg refresh op
wdberkeley Apr 23, 2026
b49b35a
datalake: add iceberg_rest_catalog_credentials_host config
wdberkeley Apr 24, 2026
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: 3 additions & 0 deletions src/v/cloud_roles/auth_refresh_bg_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ void auth_refresh_bg_op::do_start_auth_refresh_op(
try {
cloud_roles::aws_service_name service_name;
cloud_roles::aws_region_name region_name;
std::optional<ss::sstring> host_override;

ss::visit(
_source_config,
Expand All @@ -69,6 +70,7 @@ void auth_refresh_bg_op::do_start_auth_refresh_op(
s3_cfg) {
service_name = s3_cfg.service;
region_name = s3_cfg.region;
host_override = s3_cfg.host;
},
[&](const cloud_roles::auth_refresh_bg_op::abs_config&) {});

Expand All @@ -80,6 +82,7 @@ void auth_refresh_bg_op::do_start_auth_refresh_op(
service_name,
region_name,
std::nullopt,
std::move(host_override),
cloud_roles::default_retry_params,
std::move(metrics_tag)));

Expand Down
1 change: 1 addition & 0 deletions src/v/cloud_roles/auth_refresh_bg_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class auth_refresh_bg_op {
struct s3_compat_config {
cloud_roles::aws_service_name service;
cloud_roles::aws_region_name region;
std::optional<ss::sstring> host;
};
struct abs_config {};

Expand Down
6 changes: 6 additions & 0 deletions src/v/cloud_roles/refresh_credentials.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ refresh_credentials make_refresh_credentials(
aws_service_name service,
aws_region_name region,
std::optional<net::unresolved_address> endpoint,
std::optional<ss::sstring> host_override,
retry_params retry_params,
ss::sstring metrics_tag) {
switch (cloud_credentials_source) {
Expand All @@ -423,6 +424,7 @@ refresh_credentials make_refresh_credentials(
std::move(service),
std::move(region),
std::move(endpoint),
std::move(host_override),
retry_params,
std::move(metrics_tag));
case model::cloud_credentials_source::sts:
Expand All @@ -432,6 +434,7 @@ refresh_credentials make_refresh_credentials(
std::move(service),
std::move(region),
std::move(endpoint),
std::move(host_override),
retry_params,
std::move(metrics_tag));
case model::cloud_credentials_source::gcp_instance_metadata:
Expand All @@ -441,6 +444,7 @@ refresh_credentials make_refresh_credentials(
std::move(service),
std::move(region),
std::move(endpoint),
std::move(host_override),
retry_params,
std::move(metrics_tag));
case model::cloud_credentials_source::azure_aks_oidc_federation:
Expand All @@ -450,6 +454,7 @@ refresh_credentials make_refresh_credentials(
std::move(service),
std::move(region),
std::move(endpoint),
std::move(host_override),
retry_params,
std::move(metrics_tag));
case model::cloud_credentials_source::azure_vm_instance_metadata:
Expand All @@ -459,6 +464,7 @@ refresh_credentials make_refresh_credentials(
std::move(service),
std::move(region),
std::move(endpoint),
std::move(host_override),
retry_params,
std::move(metrics_tag));
}
Expand Down
14 changes: 6 additions & 8 deletions src/v/cloud_roles/refresh_credentials.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ refresh_credentials make_refresh_credentials(
aws_service_name service,
aws_region_name region,
std::optional<net::unresolved_address> endpoint = std::nullopt,
std::optional<ss::sstring> host_override = std::nullopt,
retry_params retry_params = default_retry_params,
ss::sstring metrics_tag = "") {
ss::sstring host = {
Expand All @@ -196,17 +197,13 @@ refresh_credentials make_refresh_credentials(
if (endpoint) {
host = endpoint->host();
}
if (
auto cfg_host
= config::shard_local_cfg().cloud_storage_credentials_host();
cfg_host.has_value()) {
if (host_override.has_value()) {
vlog(
clrl_log.info,
"overriding default cloud roles credentials host {} with {} set "
"in configuration.",
"applying cloud roles credentials host override: {} -> {}.",
host,
cfg_host.value());
host = cfg_host.value();
host_override.value());
host = host_override.value();
}
auto port = endpoint ? endpoint->port() : CredentialsProvider::default_port;
auto impl = std::make_unique<CredentialsProvider>(
Expand All @@ -232,6 +229,7 @@ refresh_credentials make_refresh_credentials(
aws_service_name service,
aws_region_name region,
std::optional<net::unresolved_address> endpoint = std::nullopt,
std::optional<ss::sstring> host_override = std::nullopt,
retry_params retry_params = default_retry_params,
ss::sstring metrics_tag = "");

Expand Down
9 changes: 6 additions & 3 deletions src/v/cloud_storage_clients/configuration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ std::ostream& operator<<(std::ostream& o, const client_configuration& c) {
cloud_roles::auth_refresh_bg_op::credentials_source_config
build_refresh_credentials_source(
const client_configuration& config,
model::cloud_credentials_source cloud_credentials_source) {
model::cloud_credentials_source cloud_credentials_source,
std::optional<ss::sstring> host_override) {
if (
cloud_credentials_source
== model::cloud_credentials_source::config_file) {
Expand All @@ -366,10 +367,12 @@ build_refresh_credentials_source(
} else {
return ss::visit(
config,
[](const cloud_storage_clients::s3_configuration& s3_cfg)
[&](const cloud_storage_clients::s3_configuration& s3_cfg)
-> cloud_roles::auth_refresh_bg_op::credentials_source_config {
return cloud_roles::auth_refresh_bg_op::s3_compat_config{
.service = s3_cfg.service, .region = s3_cfg.region};
.service = s3_cfg.service,
.region = s3_cfg.region,
.host = host_override};
},
[](const cloud_storage_clients::abs_configuration&)
-> cloud_roles::auth_refresh_bg_op::credentials_source_config {
Expand Down
3 changes: 2 additions & 1 deletion src/v/cloud_storage_clients/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ model::cloud_storage_backend infer_backend_from_configuration(
cloud_roles::auth_refresh_bg_op::credentials_source_config
build_refresh_credentials_source(
const client_configuration& config,
model::cloud_credentials_source cloud_credentials_source);
model::cloud_credentials_source cloud_credentials_source,
std::optional<ss::sstring> host_override = std::nullopt);

ss::future<ss::shared_ptr<ss::tls::certificate_credentials>>
build_tls_credentials(const client_configuration& config);
Expand Down
10 changes: 9 additions & 1 deletion src/v/cloud_storage_clients/credential_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@ credential_manager::credential_manager(
model::cloud_credentials_source cloud_credentials_source)
: _upstream(upstream)
, _client_conf(std::move(conf))
, _auth_refresh_bg_op{pool_log, _gate, _as, cloud_credentials_source, cloud_storage_clients::build_refresh_credentials_source(_client_conf, cloud_credentials_source)}
, _auth_refresh_bg_op{
pool_log,
_gate,
_as,
cloud_credentials_source,
cloud_storage_clients::build_refresh_credentials_source(
_client_conf,
cloud_credentials_source,
config::shard_local_cfg().cloud_storage_credentials_host())}
, _azure_shared_key_binding(
config::shard_local_cfg().cloud_storage_azure_shared_key.bind()) {}

Expand Down
12 changes: 12 additions & 0 deletions src/v/config/configuration.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4316,6 +4316,18 @@ configuration::configuration()
{.needs_restart = needs_restart::yes, .visibility = visibility::user},
std::nullopt,
&validate_non_empty_string_opt)
, iceberg_rest_catalog_credentials_host(

@nvartolomei nvartolomei May 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

a bit worried this will be confused with iceberg_rest_catalog_oauth2_server_uri. consider copying the help text from the cloud storage config

Only required when using IAM role based access

and maybe also specifying that this does not apply to oauth schemes / applies only to aws

@wdberkeley wdberkeley May 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done.

*this,
"iceberg_rest_catalog_credentials_host",
"The hostname to connect to for retrieving role based credentials for "
"the Iceberg REST catalog. Derived from "
"iceberg_rest_catalog_credentials_source if not set. Only required "
"when using IAM role based access on AWS; does not apply to "
"OAuth-based authentication schemes. Independent of "
"cloud_storage_credentials_host.",
{.needs_restart = needs_restart::yes, .visibility = visibility::user},
std::nullopt,
&validate_non_empty_string_opt)
, iceberg_backlog_controller_p_coeff(
*this,
"iceberg_backlog_controller_p_coeff",
Expand Down
1 change: 1 addition & 0 deletions src/v/config/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@ struct configuration final : public config_store {
enum_property<std::optional<model::cloud_credentials_source>>
iceberg_rest_catalog_aws_credentials_source;
property<std::optional<ss::sstring>> iceberg_rest_catalog_gcp_user_project;
property<std::optional<ss::sstring>> iceberg_rest_catalog_credentials_host;
property<double> iceberg_backlog_controller_p_coeff;
property<double> iceberg_backlog_controller_i_coeff;
bounded_property<uint32_t> iceberg_target_backlog_size;
Expand Down
4 changes: 3 additions & 1 deletion src/v/datalake/credential_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ void credential_manager::start_auth_refresh_if_needed() {

auto config_source
= cloud_storage_clients::build_refresh_credentials_source(
*client_config, cfg.cloud_storage_credentials_source);
*client_config,
get_credentials_source(cfg),
cfg.iceberg_rest_catalog_credentials_host());

auth_refresh_bg_op_.emplace(
datalake_log,
Expand Down
Loading