chore: Update to stackable-operator 0.95.0 (#791)

* chore: Update to stackable-operator 0.95.0

* use upstream tag

Author: sbernauer

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/trino-operator"
 
 [workspace.dependencies]
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.94.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.95.0" }
 
 anyhow = "1.0"
 async-trait = "0.1"
@@ -21,7 +21,7 @@ const_format = "0.2"
 futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
 openssl = "0.10"
-rstest = "0.25"
+rstest = "0.26"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"

Cargo.nix

@@ -670,7 +670,7 @@ mod tests {
     fn resolved_product_image() -> ResolvedProductImage {
         ResolvedProductImage {
             product_version: "".to_string(),
-            app_version_label: "".to_string(),
+            app_version_label_value: "470".parse().expect("static label value is always valid"),
             image: "".to_string(),
             image_pull_policy: "".to_string(),
             pull_secrets: None,

Cargo.toml

@@ -251,7 +251,7 @@ mod tests {
         TrinoPasswordAuthentication::new(authenticators)
             .password_authentication_config(&ResolvedProductImage {
                 product_version: "".to_string(),
-                app_version_label: "".to_string(),
+                app_version_label_value: "470".parse().expect("static label value is always valid"),
                 image: "".to_string(),
                 image_pull_policy: "".to_string(),
                 pull_secrets: None,

crate-hashes.json

@@ -29,7 +29,10 @@ use stackable_operator::{
     },
     client::Client,
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
-    commons::{product_image_selection::ResolvedProductImage, rbac::build_rbac_resources},
+    commons::{
+        product_image_selection::{self, ResolvedProductImage},
+        rbac::build_rbac_resources,
+    },
     k8s_openapi::{
         DeepMerge,
         api::{
@@ -62,11 +65,11 @@ use stackable_operator::{
         },
     },
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroupRef},
+    shared::time::Duration,
     status::condition::{
         compute_conditions, operations::ClusterOperationsConditionBuilder,
         statefulset::StatefulSetConditionBuilder,
     },
-    time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
@@ -366,6 +369,11 @@ pub enum Error {
 
     #[snafu(display("failed to configure service"))]
     ServiceConfiguration { source: crate::service::Error },
+
+    #[snafu(display("failed to resolve product image"))]
+    ResolveProductImage {
+        source: product_image_selection::Error,
+    },
 }
 
 type Result<T, E = Error> = std::result::Result<T, E>;
@@ -389,10 +397,11 @@ pub async fn reconcile_trino(
         .context(InvalidTrinoClusterSnafu)?;
     let client = &ctx.client;
 
-    let resolved_product_image: ResolvedProductImage = trino
+    let resolved_product_image = trino
         .spec
         .image
-        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION);
+        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION)
+        .context(ResolveProductImageSnafu)?;
 
     let resolved_authentication_classes =
         resolve_authentication_classes(client, trino.get_authentication())
@@ -507,7 +516,7 @@ pub async fn reconcile_trino(
 
             let role_group_service_recommended_labels = build_recommended_labels(
                 trino,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 &role_group_ref.role,
                 &role_group_ref.role_group,
             );
@@ -612,7 +621,7 @@ pub async fn reconcile_trino(
                     trino,
                     build_recommended_labels(
                         trino,
-                        &resolved_product_image.app_version_label,
+                        &resolved_product_image.app_version_label_value,
                         &trino_role_str,
                         "none",
                     ),
@@ -852,7 +861,7 @@ fn build_rolegroup_config_map(
                 .context(ObjectMissingMetadataForOwnerRefSnafu)?
                 .with_recommended_labels(build_recommended_labels(
                     trino,
-                    &resolved_product_image.app_version_label,
+                    &resolved_product_image.app_version_label_value,
                     &rolegroup_ref.role,
                     &rolegroup_ref.role_group,
                 ))
@@ -883,7 +892,7 @@ fn build_rolegroup_catalog_config_map(
                 .context(ObjectMissingMetadataForOwnerRefSnafu)?
                 .with_recommended_labels(build_recommended_labels(
                     trino,
-                    &resolved_product_image.app_version_label,
+                    &resolved_product_image.app_version_label_value,
                     &rolegroup_ref.role,
                     &rolegroup_ref.role_group,
                 ))
@@ -1198,7 +1207,7 @@ fn build_rolegroup_statefulset(
     let metadata = ObjectMetaBuilder::new()
         .with_recommended_labels(build_recommended_labels(
             trino,
-            &resolved_product_image.app_version_label,
+            &resolved_product_image.app_version_label_value,
             &role_group_ref.role,
             &role_group_ref.role_group,
         ))
@@ -1257,7 +1266,7 @@ fn build_rolegroup_statefulset(
             .context(ObjectMissingMetadataForOwnerRefSnafu)?
             .with_recommended_labels(build_recommended_labels(
                 trino,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 &role_group_ref.role,
                 &role_group_ref.role_group,
             ))
@@ -1762,7 +1771,8 @@ mod tests {
         let resolved_product_image = trino
             .spec
             .image
-            .resolve(DOCKER_IMAGE_BASE_NAME, "0.0.0-dev");
+            .resolve(DOCKER_IMAGE_BASE_NAME, "0.0.0-dev")
+            .expect("test resolved product image is always valid");
 
         let config_files = vec![
             PropertyNameKind::File(CONFIG_PROPERTIES.to_string()),

rust/operator-binary/src/authentication/mod.rs

@@ -19,7 +19,7 @@ use stackable_operator::{
         apimachinery::pkg::api::resource::Quantity,
     },
     schemars::{self, JsonSchema},
-    time::Duration,
+    shared::time::Duration,
 };
 
 use super::catalog::commons::HdfsConnection;
@@ -575,8 +575,6 @@ impl ResolvedFaultTolerantExecutionConfig {
 
 #[cfg(test)]
 mod tests {
-    use stackable_operator::time::Duration;
-
     use super::*;
 
     #[tokio::test]

rust/operator-binary/src/authentication/password/mod.rs

@@ -34,8 +34,8 @@ use stackable_operator::{
         CommonConfiguration, GenericRoleConfig, JavaCommonConfig, Role, RoleGroup, RoleGroupRef,
     },
     schemars::{self, JsonSchema},
+    shared::time::Duration,
     status::condition::{ClusterCondition, HasStatusCondition},
-    time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
     versioned::versioned,
 };

rust/operator-binary/src/controller.rs

@@ -73,15 +73,15 @@ async fn main() -> anyhow::Result<()> {
         Command::Run(ProductOperatorRun {
             product_config,
             watch_namespace,
-            telemetry_arguments,
-            cluster_info_opts,
+            operator_environment: _,
+            telemetry,
+            cluster_info,
         }) => {
             // NOTE (@NickLarsenNZ): Before stackable-telemetry was used:
             // - The console log level was set by `TRINO_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
             // - The file log level was set by `TRINO_OPERATOR_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured).
             // - The file log directory was set by `TRINO_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
-            let _tracing_guard =
-                Tracing::pre_configured(built_info::PKG_NAME, telemetry_arguments).init()?;
+            let _tracing_guard = Tracing::pre_configured(built_info::PKG_NAME, telemetry).init()?;
 
             tracing::info!(
                 built_info.pkg_version = built_info::PKG_VERSION,
@@ -99,7 +99,7 @@ async fn main() -> anyhow::Result<()> {
 
             let client = stackable_operator::client::initialize_operator(
                 Some(OPERATOR_NAME.to_string()),
-                &cluster_info_opts,
+                &cluster_info,
             )
             .await?;
             let event_recorder = Arc::new(Recorder::new(