Use new ProbeBuilder

Author: sbernauer

Cargo.lock

@@ -29,6 +29,6 @@ strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
 
-# [patch."https://github.com/stackabletech/operator-rs"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+[patch."https://github.com/stackabletech/operator-rs"]
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "fix/probe-builder-clone" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

Cargo.toml

@@ -22,6 +22,7 @@ use stackable_operator::{
         pod::{
             PodBuilder,
             container::ContainerBuilder,
+            probe::ProbeBuilder,
             resources::ResourceRequirementsBuilder,
             security::PodSecurityContextBuilder,
             volume::{
@@ -40,9 +41,9 @@ use stackable_operator::{
         DeepMerge,
         api::{
             apps::v1::{StatefulSet, StatefulSetSpec},
-            core::v1::{ConfigMap, EnvVar, HTTPGetAction, Probe},
+            core::v1::{ConfigMap, EnvVar},
         },
-        apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
+        apimachinery::pkg::apis::meta::v1::LabelSelector,
     },
     kube::{
         Resource, ResourceExt,
@@ -930,32 +931,33 @@ fn build_server_rolegroup_statefulset(
 }
 
 fn add_superset_container_probes(superset_cb: &mut ContainerBuilder) {
-    let probe_action = HTTPGetAction {
-        port: IntOrString::Int(APP_PORT.into()),
-        path: Some("/health".to_string()),
-        ..HTTPGetAction::default()
-    };
-    let common_probe = Probe {
-        http_get: Some(probe_action),
-        period_seconds: Some(5),
-        timeout_seconds: Some(5),
-        success_threshold: Some(1),
-        ..Probe::default()
-    };
-    superset_cb.startup_probe(Probe {
-        failure_threshold: Some(10 /* minutes */ * 60 / 5),
-        ..common_probe.clone()
-    });
+    let common =
+        ProbeBuilder::http_get_port_scheme_path(APP_PORT, None, Some("/health".to_owned()))
+            .with_period(Duration::from_secs(5));
+
+    superset_cb.startup_probe(
+        common
+            .clone()
+            .with_failure_threshold_duration(Duration::from_minutes_unchecked(10))
+            .expect("static period is always non-zero")
+            .build()
+            .expect("static durations are not too long"),
+    );
+
     // Remove it from the Service immediately
-    superset_cb.readiness_probe(Probe {
-        failure_threshold: Some(1),
-        ..common_probe.clone()
-    });
+    superset_cb.readiness_probe(
+        common
+            .clone()
+            .build()
+            .expect("static durations are not too long"),
+    );
     // But only restart it after 3 failures
-    superset_cb.readiness_probe(Probe {
-        failure_threshold: Some(3),
-        ..common_probe
-    });
+    superset_cb.liveness_probe(
+        common
+            .with_failure_threshold(3)
+            .build()
+            .expect("static durations are not too long"),
+    );
 }
 
 fn add_authentication_volumes_and_volume_mounts(