chore: Upgrade to stackable-operator 0.98.0

Author: siegfriedweber

Cargo.lock

@@ -10,13 +10,13 @@ edition = "2024"
 repository = "https://github.com/stackabletech/opensearch-operator"
 
 [workspace.dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.97.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.98.0" }
 
 built = { version = "0.8.0", features = ["chrono", "git2"] }
 clap = "4.5"
 futures = { version = "0.3", features = ["compat"] }
 rstest = "0.26"
-schemars = { version = "0.8.21" } # same as in operator-rs
+schemars = { version = "1.0.0", features = ["url2"] } # same as in operator-rs
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 snafu = "0.8"

Cargo.nix

@@ -86,6 +86,8 @@ pub fn validate(
         .resolve(DEFAULT_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION)
         .context(ResolveProductImageSnafu)?;
 
+    // Cannot fail because `ProductImage::resolve` already validated it and would have thrown a
+    // `ResolveProductImage` error if it were not valid.
     let product_version = ProductVersion::from_str(&product_image.product_version)
         .context(ParseProductVersionSnafu)?;
 
@@ -403,7 +405,7 @@ mod tests {
                     serde_json::from_str(r#"{"productVersion": "invalid product version"}"#)
                         .expect("should be a valid ProductImage structure")
             },
-            ErrorDiscriminants::ParseProductVersion,
+            ErrorDiscriminants::ResolveProductImage,
         );
     }
 

Cargo.toml

@@ -33,12 +33,6 @@ pub enum Error {
     },
 }
 
-/// Maximum length of a DNS subdomain name as defined in RFC 1123.
-/// The object names of most types, e.g. ConfigMap and StatefulSet, must not exceed this limit.
-/// However, there are kinds that allow longer object names, e.g. ClusterRole.
-#[allow(dead_code)]
-pub const MAX_OBJECT_NAME_LENGTH: usize = 253;
-
 /// Has a name that can be used as a DNS subdomain name as defined in RFC 1123.
 /// Most resource types, e.g. a Pod, require such a compliant name.
 pub trait HasObjectName {
@@ -110,7 +104,7 @@ macro_rules! attributed_string_type {
         );
     };
     (@from_str $name:ident, $s:expr, is_object_name) => {
-        stackable_operator::validation::is_rfc_1123_subdomain($s).context(InvalidObjectNameSnafu)?;
+        stackable_operator::validation::is_lowercase_rfc_1123_subdomain($s).context(InvalidObjectNameSnafu)?;
     };
     (@from_str $name:ident, $s:expr, is_valid_label_value) => {
         LabelValue::from_str($s).context(InvalidLabelValueSnafu)?;

crate-hashes.json

@@ -1,5 +1,7 @@
+use stackable_operator::validation::RFC_1123_SUBDOMAIN_MAX_LENGTH;
+
 use super::{ClusterName, RoleGroupName, RoleName};
-use crate::framework::{HasObjectName, MAX_OBJECT_NAME_LENGTH, kvp::label::MAX_LABEL_VALUE_LENGTH};
+use crate::framework::{HasObjectName, kvp::label::MAX_LABEL_VALUE_LENGTH};
 
 pub struct ResourceNames {
     pub cluster_name: ClusterName,
@@ -32,7 +34,7 @@ impl ResourceNames {
     pub fn role_group_config_map(&self) -> String {
         // Compile-time check
         const _: () = assert!(
-            ResourceNames::MAX_QUALIFIED_ROLE_GROUP_NAME_LENGTH <= MAX_OBJECT_NAME_LENGTH,
+            ResourceNames::MAX_QUALIFIED_ROLE_GROUP_NAME_LENGTH <= RFC_1123_SUBDOMAIN_MAX_LENGTH,
             "The ConfigMap name `<cluster_name>-<role_name>-<role_group_name>` must not exceed 253 characters."
         );
 
@@ -69,7 +71,7 @@ impl ResourceNames {
     pub fn listener_service_name(&self) -> String {
         // Compile-time check
         const _: () = assert!(
-            ResourceNames::MAX_QUALIFIED_ROLE_GROUP_NAME_LENGTH <= MAX_OBJECT_NAME_LENGTH,
+            ResourceNames::MAX_QUALIFIED_ROLE_GROUP_NAME_LENGTH <= RFC_1123_SUBDOMAIN_MAX_LENGTH,
             "The listener name `<cluster_name>-<role_name>-<role_group_name>` must not exceed 253 characters."
         );
 

rust/operator-binary/src/controller/validate.rs

@@ -9,10 +9,11 @@ use stackable_operator::{
     k8s_openapi::{DeepMerge, api::core::v1::PodTemplateSpec},
     role_utils::{CommonConfiguration, Role, RoleGroup},
     schemars::JsonSchema,
+    validation::RFC_1123_SUBDOMAIN_MAX_LENGTH,
 };
 
 use super::{ProductName, builder::pod::container::EnvVarSet};
-use crate::framework::{ClusterName, MAX_OBJECT_NAME_LENGTH, kvp::label::MAX_LABEL_VALUE_LENGTH};
+use crate::framework::{ClusterName, kvp::label::MAX_LABEL_VALUE_LENGTH};
 
 #[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
 pub struct GenericProductSpecificCommonConfig {}
@@ -166,7 +167,7 @@ impl ResourceNames {
 
         // Compile-time check
         const _: () = assert!(
-            ClusterName::MAX_LENGTH + SUFFIX.len() <= MAX_OBJECT_NAME_LENGTH,
+            ClusterName::MAX_LENGTH + SUFFIX.len() <= RFC_1123_SUBDOMAIN_MAX_LENGTH,
             "The ServiceAccount name `<cluster_name>-serviceaccount` must not exceed 253 characters."
         );