bump: operator-rs to 0.56.1 (#309)

* bump: operator-rs to 0.56.1

* fix: external product-config crate

* fix: renamed create_vector_shutdown_file_command function

Author: NickLarsenNZ

Cargo.lock

@@ -1,7 +1,5 @@
 [workspace]
-members = [
-    "rust/crd", "rust/operator-binary"
-]
+members = ["rust/crd", "rust/operator-binary"]
 
 [workspace.package]
 version = "0.0.0-dev"
@@ -12,16 +10,17 @@ repository = "https://github.com/stackabletech/spark-k8s-operator"
 
 [workspace.dependencies]
 anyhow = "1.0"
-built = { version =  "0.6", features = ["chrono", "git2"] }
+built = { version = "0.6", features = ["chrono", "git2"] }
 clap = "4.3"
 futures = { version = "0.3", features = ["compat"] }
+product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.6.0" }
 rstest = "0.18"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.56.1" }
 strum = { version = "0.25", features = ["derive"] }
 tokio = { version = "1.29", features = ["full"] }
 tracing = "0.1"

Cargo.toml

@@ -9,6 +9,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
+product-config.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true

rust/crd/Cargo.toml

@@ -1,5 +1,6 @@
 use crate::{affinity::history_affinity, constants::*};
 
+use product_config::{types::PropertyNameKind, ProductConfigManager};
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::role_utils::RoleGroup;
@@ -21,7 +22,6 @@ use stackable_operator::{
     k8s_openapi::apimachinery::pkg::api::resource::Quantity,
     kube::CustomResource,
     kube::{runtime::reflector::ObjectRef, ResourceExt},
-    product_config::{types::PropertyNameKind, ProductConfigManager},
     product_config_utils::{
         transform_all_roles_to_config, validate_all_roles_and_groups_config, Configuration,
         ValidatedRoleConfigByPropertyKind,

rust/crd/src/history.rs

@@ -10,11 +10,11 @@ pub mod tlscerts;
 pub use crate::roles::*;
 use constants::*;
 use history::LogFileDirectorySpec;
+use product_config::{types::PropertyNameKind, ProductConfigManager};
 use s3logdir::S3LogDir;
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::builder::SecretFormat;
-use stackable_operator::product_config::ProductConfigManager;
 use stackable_operator::product_config_utils::{
     transform_all_roles_to_config, validate_all_roles_and_groups_config,
     ValidatedRoleConfigByPropertyKind,
@@ -35,7 +35,6 @@ use stackable_operator::{
     kube::{CustomResource, ResourceExt},
     labels::ObjectLabels,
     memory::{BinaryMultiple, MemoryQuantity},
-    product_config::types::PropertyNameKind,
     product_logging,
     role_utils::{CommonConfiguration, Role, RoleGroup},
     schemars::{self, JsonSchema},
@@ -892,11 +891,11 @@ mod tests {
     use crate::{cores_from_quantity, resources_to_executor_props, RoleConfig};
     use crate::{resources_to_driver_props, SparkApplication};
     use crate::{Quantity, SparkStorageConfig};
+    use product_config::{types::PropertyNameKind, ProductConfigManager};
     use stackable_operator::commons::affinity::StackableAffinity;
     use stackable_operator::commons::resources::{
         CpuLimits, MemoryLimits, NoRuntimeLimits, Resources,
     };
-    use stackable_operator::product_config::{types::PropertyNameKind, ProductConfigManager};
     use stackable_operator::product_config_utils::ValidatedRoleConfigByPropertyKind;
     use stackable_operator::product_logging::spec::Logging;
 

rust/crd/src/lib.rs

@@ -12,6 +12,7 @@ publish = false
 stackable-spark-k8s-crd = { path = "../crd" }
 
 anyhow.workspace = true
+product-config.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true

rust/operator-binary/Cargo.toml

@@ -1,6 +1,7 @@
 use crate::history::operations::pdb::add_pdbs;
 use crate::product_logging::{self, resolve_vector_aggregator_address};
 use crate::Ctx;
+use product_config::{types::PropertyNameKind, writer::to_java_properties_string};
 use stackable_operator::{
     builder::{ConfigMapBuilder, ContainerBuilder, ObjectMetaBuilder, PodBuilder, VolumeBuilder},
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
@@ -21,7 +22,6 @@ use stackable_operator::{
         Resource, ResourceExt,
     },
     labels::{role_group_selector_labels, role_selector_labels, ObjectLabels},
-    product_config::{types::PropertyNameKind, writer::to_java_properties_string},
     product_logging::{
         framework::{calculate_log_volume_size_limit, vector_container},
         spec::{
@@ -134,7 +134,7 @@ pub enum Error {
         rolegroup
     ))]
     JvmSecurityProperties {
-        source: stackable_operator::product_config::writer::PropertiesWriterError,
+        source: product_config::writer::PropertiesWriterError,
         rolegroup: String,
     },
     #[snafu(display("failed to create PodDisruptionBudget"))]

rust/operator-binary/src/history/history_controller.rs

@@ -8,13 +8,13 @@ use std::sync::Arc;
 use clap::{crate_description, crate_version, Parser};
 use futures::StreamExt;
 use history::history_controller;
+use product_config::ProductConfigManager;
 use stackable_operator::cli::{Command, ProductOperatorRun};
 use stackable_operator::k8s_openapi::api::apps::v1::StatefulSet;
 use stackable_operator::k8s_openapi::api::core::v1::Pod;
 use stackable_operator::k8s_openapi::api::core::v1::{ConfigMap, Service};
 use stackable_operator::kube::runtime::{controller::Controller, watcher};
 use stackable_operator::logging::controller::report_controller_reconciled;
-use stackable_operator::product_config::ProductConfigManager;
 use stackable_operator::CustomResourceExt;
 use stackable_spark_k8s_crd::constants::{
     CONTROLLER_NAME, HISTORY_CONTROLLER_NAME, OPERATOR_NAME, POD_DRIVER_CONTROLLER_NAME,

rust/operator-binary/src/main.rs

@@ -6,13 +6,15 @@ use std::{
     vec,
 };
 
-use stackable_operator::{product_config::writer::to_java_properties_string, time::Duration};
+use product_config::writer::to_java_properties_string;
+use stackable_operator::time::Duration;
 use stackable_spark_k8s_crd::{
     constants::*, s3logdir::S3LogDir, tlscerts, RoleConfig, SparkApplication, SparkApplicationRole,
     SparkContainer, SubmitConfig,
 };
 
 use crate::product_logging::{self, resolve_vector_aggregator_address};
+use product_config::types::PropertyNameKind;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::builder::resources::ResourceRequirementsBuilder;
 use stackable_operator::k8s_openapi::DeepMerge;
@@ -39,10 +41,9 @@ use stackable_operator::{
         ResourceExt,
     },
     logging::controller::ReconcilerError,
-    product_config::types::PropertyNameKind,
     product_config_utils::ValidatedRoleConfigByPropertyKind,
     product_logging::{
-        framework::{capture_shell_output, shutdown_vector_command, vector_container},
+        framework::{capture_shell_output, create_vector_shutdown_file_command, vector_container},
         spec::{
             ConfigMapLogConfig, ContainerLogConfig, ContainerLogConfigChoice,
             CustomContainerLogConfig, Logging,
@@ -116,7 +117,7 @@ pub enum Error {
     },
     #[snafu(display("failed to serialize [{JVM_SECURITY_PROPERTIES_FILE}] for {}", role))]
     JvmSecurityProperties {
-        source: stackable_operator::product_config::writer::PropertiesWriterError,
+        source: product_config::writer::PropertiesWriterError,
         role: SparkApplicationRole,
     },
     #[snafu(display("failed to generate product config"))]
@@ -467,7 +468,7 @@ fn pod_template(
             [
                 // Wait for Vector to gather the logs.
                 "sleep 10",
-                &shutdown_vector_command(VOLUME_MOUNT_PATH_LOG),
+                &create_vector_shutdown_file_command(VOLUME_MOUNT_PATH_LOG),
             ]
             .join("; "),
         );
@@ -713,7 +714,7 @@ fn spark_job(
     if job_config.logging.enable_vector_agent {
         // Wait for Vector to gather the logs.
         args.push("sleep 10".into());
-        args.push(shutdown_vector_command(VOLUME_MOUNT_PATH_LOG));
+        args.push(create_vector_shutdown_file_command(VOLUME_MOUNT_PATH_LOG));
     }
 
     cb.image_from_product_image(spark_image)