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

Author: sbernauer

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/nifi-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"
 built = { version = "0.8", features = ["chrono", "git2"] }
@@ -22,7 +22,7 @@ futures = { version = "0.3", features = ["compat"] }
 indoc = "2.0"
 pin-project = "1.1"
 rand = "0.9"
-rstest = "0.25"
+rstest = "0.26"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

Cargo.nix

@@ -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,
+    },
     crd::{authentication::oidc::v1alpha1::AuthenticationProvider, git_sync},
     k8s_openapi::{
         DeepMerge,
@@ -63,11 +66,11 @@ use stackable_operator::{
         },
     },
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroupRef},
+    shared::time::Duration,
     status::condition::{
         compute_conditions, operations::ClusterOperationsConditionBuilder,
         statefulset::StatefulSetConditionBuilder,
     },
-    time::Duration,
     utils::{COMMON_BASH_TRAP_FUNCTIONS, cluster_info::KubernetesClusterInfo},
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
@@ -353,6 +356,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>;
@@ -376,10 +384,11 @@ pub async fn reconcile_nifi(
 
     let client = &ctx.client;
 
-    let resolved_product_image: ResolvedProductImage = nifi
+    let resolved_product_image = nifi
         .spec
         .image
-        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION);
+        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION)
+        .context(ResolveProductImageSnafu)?;
 
     tracing::info!("Checking for sensitive key configuration");
     check_or_generate_sensitive_key(client, nifi)
@@ -497,7 +506,7 @@ pub async fn reconcile_nifi(
 
             let role_group_service_recommended_labels = build_recommended_labels(
                 nifi,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 &rolegroup.role,
                 &rolegroup.role_group,
             );
@@ -624,7 +633,7 @@ pub async fn reconcile_nifi(
             nifi,
             build_recommended_labels(
                 nifi,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 &nifi_role.to_string(),
                 "none",
             ),
@@ -747,7 +756,7 @@ async fn build_node_rolegroup_config_map(
                 .context(ObjectMissingMetadataForOwnerRefSnafu)?
                 .with_recommended_labels(build_recommended_labels(
                     nifi,
-                    &resolved_product_image.app_version_label,
+                    &resolved_product_image.app_version_label_value,
                     &rolegroup.role,
                     &rolegroup.role_group,
                 ))
@@ -1156,7 +1165,7 @@ async fn build_node_rolegroup_statefulset(
 
     let recommended_object_labels = build_recommended_labels(
         nifi,
-        &resolved_product_image.app_version_label,
+        &resolved_product_image.app_version_label_value,
         &rolegroup_ref.role,
         &rolegroup_ref.role_group,
     );
@@ -1294,7 +1303,7 @@ async fn build_node_rolegroup_statefulset(
     let metadata = ObjectMetaBuilder::new()
         .with_recommended_labels(build_recommended_labels(
             nifi,
-            &resolved_product_image.app_version_label,
+            &resolved_product_image.app_version_label_value,
             &rolegroup_ref.role,
             &rolegroup_ref.role_group,
         ))

Cargo.toml

@@ -36,8 +36,8 @@ use stackable_operator::{
     product_logging::{self, spec::Logging},
     role_utils::{GenericRoleConfig, JavaCommonConfig, Role, RoleGroupRef},
     schemars::{self, JsonSchema},
+    shared::time::Duration,
     status::condition::{ClusterCondition, HasStatusCondition},
-    time::Duration,
     utils::crds::{raw_object_list_schema, raw_object_schema},
     versioned::versioned,
 };

crate-hashes.json

@@ -66,15 +66,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 `NIFI_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
             // - The file log level was set by `NIFI_OPERATOR_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured).
             // - The file log directory was set by `NIFI_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,
@@ -93,7 +93,7 @@ async fn main() -> anyhow::Result<()> {
 
             let client = stackable_operator::client::initialize_operator(
                 Some(OPERATOR_NAME.to_string()),
-                &cluster_info_opts,
+                &cluster_info,
             )
             .await?;
 

rust/operator-binary/src/controller.rs

@@ -44,7 +44,7 @@ use stackable_operator::{
     },
     kube::ResourceExt,
     kvp::Labels,
-    time::Duration,
+    shared::time::Duration,
     utils::cluster_info::KubernetesClusterInfo,
 };
 
@@ -230,7 +230,7 @@ fn build_reporting_task_service(
             .context(ObjectMissingMetadataForOwnerRefSnafu)?
             .with_recommended_labels(build_recommended_labels(
                 nifi,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 &role_name,
                 "global",
             ))
@@ -380,7 +380,7 @@ fn build_reporting_task_job(
             .context(ObjectMissingMetadataForOwnerRefSnafu)?
             .with_recommended_labels(build_recommended_labels(
                 nifi,
-                &resolved_product_image.app_version_label,
+                &resolved_product_image.app_version_label_value,
                 "global",
                 "global",
             ))

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

@@ -1,7 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::pod::volume::SecretFormat, client::Client, k8s_openapi::api::core::v1::Volume,
-    time::Duration,
+    shared::time::Duration,
 };
 
 use crate::crd::v1alpha1;

rust/operator-binary/src/main.rs

@@ -2,7 +2,7 @@ use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::pod::volume::{SecretFormat, SecretOperatorVolumeSourceBuilder, VolumeBuilder},
     k8s_openapi::api::core::v1::Volume,
-    time::Duration,
+    shared::time::Duration,
 };
 
 use crate::{crd::v1alpha1, security::authentication::STACKABLE_TLS_STORE_PASSWORD};