Skip to content

fix: pod spec doesn't match sts spec #856

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

Closed
razvan wants to merge 2 commits into from
Closed

fix: pod spec doesn't match sts spec #856

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4e844
fix: pod spec doesn't match sts spec
razvan Mar 4, 2026
a3dc76c
Merge branch 'main' into fix/854
razvan Mar 4, 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
67 changes: 41 additions & 26 deletions rust/operator-binary/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,32 +429,6 @@ pub async fn reconcile_trino(
)
.context(InvalidAuthenticationConfigSnafu)?;

let catalog_definitions = client
.list_with_label_selector::<catalog::v1alpha1::TrinoCatalog>(
trino
.metadata
.namespace
.as_deref()
.context(ObjectHasNoNamespaceSnafu)?,
&trino.spec.cluster_config.catalog_label_selector,
)
.await
.context(GetCatalogsSnafu)?;
let mut catalogs = vec![];
let product_version = trino.spec.image.product_version();
let product_version =
u16::from_str(product_version).context(ParseTrinoVersionSnafu { product_version })?;
for catalog in &catalog_definitions {
let catalog_ref = ObjectRef::from_obj(catalog);
let catalog_config = CatalogConfig::from_catalog(catalog, client, product_version)
.await
.context(ParseCatalogSnafu {
catalog: catalog_ref,
})?;

catalogs.push(catalog_config);
}

// Resolve fault tolerant execution configuration with S3 connections if needed
let resolved_fte_config = match trino.spec.cluster_config.fault_tolerant_execution.as_ref() {
Some(fte_config) => Some(
Expand Down Expand Up @@ -557,6 +531,31 @@ pub async fn reconcile_trino(
)
.await?;

let catalog_definitions = client
.list_with_label_selector::<catalog::v1alpha1::TrinoCatalog>(
trino
.metadata
.namespace
.as_deref()
.context(ObjectHasNoNamespaceSnafu)?,
&trino.spec.cluster_config.catalog_label_selector,
)
.await
.context(GetCatalogsSnafu)?;
let mut catalogs = vec![];
let product_version = trino.spec.image.product_version();
let product_version =
u16::from_str(product_version).context(ParseTrinoVersionSnafu { product_version })?;
for catalog in &catalog_definitions {
let catalog_ref = ObjectRef::from_obj(catalog);
let catalog_config = CatalogConfig::from_catalog(catalog, client, product_version)
.await
.context(ParseCatalogSnafu {
catalog: catalog_ref,
})?;

catalogs.push(catalog_config);
}
let mut sts_cond_builder = StatefulSetConditionBuilder::default();

for (trino_role_str, role_config) in validated_config {
Expand Down Expand Up @@ -663,6 +662,22 @@ pub async fn reconcile_trino(
rolegroup: role_group_ref.clone(),
})?;

tracing::info!(
"reconciling sts [{sts_name}], trino args [{trino_args}]",
sts_name = rg_stateful_set.name_any(),
trino_args = rg_stateful_set
.spec
.as_ref()
.and_then(|spec| spec.template.spec.as_ref())
.and_then(|pod_spec| pod_spec.containers.iter().find_map(|container| {
if container.name == "trino" {
container.args.as_ref().map(|args| args.join(" "))
} else {
None
}
}))
.unwrap_or_else(|| "not found".to_string())
);
// Note: The StatefulSet needs to be applied after all ConfigMaps and Secrets it mounts
// to prevent unnecessary Pod restarts.
// See https://github.com/stackabletech/commons-operator/issues/111 for details.
Expand Down