chore: Upgrade dependencies (#37)

* chore: Upgrade all dependencies

* chore: Upgrade to stackable-operator 0.98.0

* test: Adapt a unit test name

* chore: Regenerate charts

* chore: Remove file generated by the merge with main

* chore: Regenerate charts

* chore: Reformat code

Author: siegfriedweber

Cargo.lock

@@ -10,18 +10,18 @@ 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.93.2" }
+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"
 strum = { version = "0.27", features = ["derive"] }
-tokio = { version = "1.45", features = ["full"] }
+tokio = { version = "1.47", features = ["full"] }
 tracing = "0.1"
 uuid = "1.18"
 

Cargo.nix

@@ -12,6 +12,13 @@ rules:
     verbs:
       - list
       - watch
+  # For automatic cluster domain detection
+  - apiGroups:
+      - ""
+    resources:
+      - nodes/proxy
+    verbs:
+      - get
   - apiGroups:
       - ""
     resources:

Cargo.toml

@@ -10,7 +10,7 @@ use build::build;
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     cluster_resources::ClusterResourceApplyStrategy,
-    commons::{affinity::StackableAffinity, product_image_selection::ProductImage},
+    commons::{affinity::StackableAffinity, product_image_selection::ResolvedProductImage},
     crd::listener::v1alpha1::Listener,
     k8s_openapi::api::{
         apps::v1::StatefulSet,
@@ -21,7 +21,7 @@ use stackable_operator::{
     kube::{Resource, api::ObjectMeta, core::DeserializeGuard, runtime::controller::Action},
     logging::controller::ReconcilerError,
     role_utils::GenericRoleConfig,
-    time::Duration,
+    shared::time::Duration,
 };
 use strum::{EnumDiscriminants, IntoStaticStr};
 use update_status::update_status;
@@ -144,7 +144,7 @@ pub struct ValidatedOpenSearchConfig {
 #[derive(Clone, Debug, PartialEq)]
 pub struct ValidatedCluster {
     metadata: ObjectMeta,
-    pub image: ProductImage,
+    pub image: ResolvedProductImage,
     pub product_version: ProductVersion,
     pub name: ClusterName,
     pub namespace: NamespaceName,
@@ -155,7 +155,7 @@ pub struct ValidatedCluster {
 
 impl ValidatedCluster {
     pub fn new(
-        image: ProductImage,
+        image: ResolvedProductImage,
         product_version: ProductVersion,
         name: ClusterName,
         namespace: NamespaceName,
@@ -346,10 +346,15 @@ struct KubernetesResources<T> {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::{BTreeMap, HashMap};
+    use std::{
+        collections::{BTreeMap, HashMap},
+        str::FromStr,
+    };
 
     use stackable_operator::{
-        commons::affinity::StackableAffinity, k8s_openapi::api::core::v1::PodTemplateSpec,
+        commons::{affinity::StackableAffinity, product_image_selection::ResolvedProductImage},
+        k8s_openapi::api::core::v1::PodTemplateSpec,
+        kvp::LabelValue,
         role_utils::GenericRoleConfig,
     };
     use uuid::uuid;
@@ -425,8 +430,14 @@ mod tests {
 
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
-            serde_json::from_str(r#"{"productVersion": "3.1.0"}"#)
-                .expect("should be a valid ProductImage structure"),
+            ResolvedProductImage {
+                product_version: "3.1.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.1.0-stackable0.0.0-dev")
+                    .expect("should be a valid label value"),
+                image: "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev".to_string(),
+                image_pull_policy: "Always".to_owned(),
+                pull_secrets: None,
+            },
             ProductVersion::from_str_unsafe("3.1.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),

crate-hashes.json

@@ -55,11 +55,17 @@ pub fn build(names: &ContextNames, cluster: ValidatedCluster) -> KubernetesResou
 
 #[cfg(test)]
 mod tests {
-    use std::collections::{BTreeMap, HashMap};
+    use std::{
+        collections::{BTreeMap, HashMap},
+        str::FromStr,
+    };
 
     use stackable_operator::{
-        commons::affinity::StackableAffinity, k8s_openapi::api::core::v1::PodTemplateSpec,
-        kube::Resource, role_utils::GenericRoleConfig,
+        commons::{affinity::StackableAffinity, product_image_selection::ResolvedProductImage},
+        k8s_openapi::api::core::v1::PodTemplateSpec,
+        kube::Resource,
+        kvp::LabelValue,
+        role_utils::GenericRoleConfig,
     };
     use uuid::uuid;
 
@@ -148,8 +154,14 @@ mod tests {
 
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
-            serde_json::from_str(r#"{"productVersion": "3.1.0"}"#)
-                .expect("should be a valid ProductImage structure"),
+            ResolvedProductImage {
+                product_version: "3.1.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.1.0-stackable0.0.0-dev")
+                    .expect("should be a valid label value"),
+                image: "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev".to_string(),
+                image_pull_policy: "Always".to_owned(),
+                pull_secrets: None,
+            },
             ProductVersion::from_str_unsafe("3.1.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),

deploy/helm/opensearch-operator/crds/crds.yaml

@@ -269,10 +269,12 @@ mod tests {
 
     use stackable_operator::{
         commons::{
-            affinity::StackableAffinity, product_image_selection::ProductImage,
+            affinity::StackableAffinity,
+            product_image_selection::{ProductImage, ResolvedProductImage},
             resources::Resources,
         },
         k8s_openapi::api::core::v1::PodTemplateSpec,
+        kvp::LabelValue,
         role_utils::GenericRoleConfig,
     };
     use uuid::uuid;
@@ -328,7 +330,14 @@ mod tests {
         };
 
         let cluster = ValidatedCluster::new(
-            image.clone(),
+            ResolvedProductImage {
+                product_version: "3.1.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.1.0-stackable0.0.0-dev")
+                    .expect("should be a valid label value"),
+                image: "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev".to_string(),
+                image_pull_policy: "Always".to_owned(),
+                pull_secrets: None,
+            },
             ProductVersion::from_str_unsafe(image.product_version()),
             ClusterName::from_str_unsafe("my-opensearch-cluster"),
             NamespaceName::from_str_unsafe("default"),

deploy/helm/opensearch-operator/templates/roles.yaml

@@ -213,15 +213,20 @@ impl<'a> RoleBuilder<'a> {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::{BTreeMap, HashMap};
+    use std::{
+        collections::{BTreeMap, HashMap},
+        str::FromStr,
+    };
 
     use serde_json::json;
     use stackable_operator::{
         commons::{
-            affinity::StackableAffinity, product_image_selection::ProductImage,
+            affinity::StackableAffinity,
+            product_image_selection::{ProductImage, ResolvedProductImage},
             resources::Resources,
         },
         k8s_openapi::api::core::v1::PodTemplateSpec,
+        kvp::LabelValue,
         role_utils::GenericRoleConfig,
     };
     use uuid::uuid;
@@ -273,7 +278,14 @@ mod tests {
         };
 
         let cluster = ValidatedCluster::new(
-            image.clone(),
+            ResolvedProductImage {
+                product_version: "3.1.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.1.0-stackable0.0.0-dev")
+                    .expect("should be a valid label value"),
+                image: "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev".to_string(),
+                image_pull_policy: "Always".to_owned(),
+                pull_secrets: None,
+            },
             ProductVersion::from_str_unsafe(image.product_version()),
             ClusterName::from_str_unsafe("my-opensearch-cluster"),
             NamespaceName::from_str_unsafe("default"),