chore: bump stackable-operator 0.112.0, tokio 1.52, clap 4.6

Author: maltesander

Cargo.lock

@@ -10,11 +10,11 @@ edition = "2021"
 repository = "https://github.com/stackabletech/nifi-operator"
 
 [workspace.dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.1", features = ["webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.112.0", features = ["webhook"] }
 
 anyhow = "1.0"
 built = { version = "0.8", features = ["chrono", "git2"] }
-clap = "4.5"
+clap = "4.6"
 const_format = "0.2"
 fnv = "1.0"
 futures = { version = "0.3", features = ["compat"] }
@@ -29,10 +29,10 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.9"
 strum = { version = "0.28", features = ["derive"] }
-tokio = { version = "1.40", features = ["full"] }
+tokio = { version = "1.52", features = ["full"] }
 tracing = "0.1"
 url = { version = "2.5.7" }
 
 [patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "smooth-operator"}
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main"}
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

Cargo.nix

@@ -1,7 +1,10 @@
 use stackable_operator::{
     k8s_openapi::api::core::v1::{Service, ServicePort, ServiceSpec},
-    kvp::{Annotations, Labels},
-    v2::types::operator::RoleGroupName,
+    kvp::Annotations,
+    v2::{
+        builder::service::{self, Scheme, Scraping},
+        types::operator::RoleGroupName,
+    },
 };
 
 use crate::controller::{
@@ -53,7 +56,7 @@ pub fn build_rolegroup_metrics_service(
                     .to_string(),
                 role_group_name,
             )
-            .with_labels(prometheus_labels())
+            .with_labels(service::prometheus_labels(&Scraping::Enabled))
             .with_annotations(prometheus_annotations(product_version))
             .build(),
         spec: Some(ServiceSpec {
@@ -100,30 +103,23 @@ pub fn metrics_service_port(product_version: &str) -> ServicePort {
     }
 }
 
-/// Common labels for Prometheus
-fn prometheus_labels() -> Labels {
-    Labels::try_from([("prometheus.io/scrape", "true")]).expect("should be a valid label")
-}
-
 /// Common annotations for Prometheus
 ///
 /// These annotations can be used in a ServiceMonitor.
-///
-/// see also <https://github.com/prometheus-community/helm-charts/blob/prometheus-27.32.0/charts/prometheus/values.yaml#L983-L1036>
 fn prometheus_annotations(product_version: &str) -> Annotations {
-    let (path, port, scheme) = if product_version.starts_with("1.") {
-        ("/metrics", METRICS_PORT, "http")
+    // NiFi 1.x exposes metrics via the JMX exporter over HTTP on a dedicated port; NiFi 2.x serves
+    // them over HTTPS on the NiFi API port.
+    let (scheme, path, port) = if product_version.starts_with("1.") {
+        (Scheme::Http, "/metrics", METRICS_PORT)
     } else {
-        ("/nifi-api/flow/metrics/prometheus", HTTPS_PORT, "https")
+        (
+            Scheme::Https,
+            "/nifi-api/flow/metrics/prometheus",
+            HTTPS_PORT,
+        )
     };
 
-    Annotations::try_from([
-        ("prometheus.io/path".to_owned(), path.to_owned()),
-        ("prometheus.io/port".to_owned(), port.to_string()),
-        ("prometheus.io/scheme".to_owned(), scheme.to_owned()),
-        ("prometheus.io/scrape".to_owned(), "true".to_owned()),
-    ])
-    .expect("should be valid annotations")
+    service::prometheus_annotations(&Scraping::Enabled, &scheme, path, &port)
 }
 
 #[cfg(test)]

Cargo.toml

@@ -14,7 +14,7 @@ use stackable_operator::{
     product_logging::spec::Logging,
     role_utils::CommonConfiguration,
     v2::{
-        builder::pod::container::{self, EnvVarName, EnvVarSet},
+        builder::pod::container::{EnvVarName, EnvVarSet},
         controller_utils::{self, get_cluster_name, get_uid},
         product_logging::framework::{
             VectorContainerLogConfig, validate_logging_configuration_for_container,
@@ -76,7 +76,7 @@ pub enum Error {
 
     #[snafu(display("environment variable name {name:?} is invalid"))]
     ParseEnvVarName {
-        source: container::Error,
+        source: stackable_operator::v2::macros::attributed_string_type::Error,
         name: String,
     },