chore: Bump operator-rs to 0.67.0 (#183)

* chore: Bump operator-rs to 0.67.0

* bumps deps as much as possible

* Bump built to 0.7

* Use PKG_VERSION directly

Author: sbernauer

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/listener-operator"
 
 [workspace.dependencies]
 anyhow = "1.0"
-built = { version = "0.6", features = ["chrono", "git2"] }
+built = { version = "0.7", features = ["chrono", "git2"] }
 clap = "4.3"
 futures = { version = "0.3", features = ["compat"] }
 h2 = "=0.3.18" # We need to keep this in sync with our patched h2 build
@@ -20,11 +20,11 @@ pin-project = "1.1"
 prost = "0.11"
 prost-types = "0.11"
 serde = "1.0"
-snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.64.0" }
-strum = { version = "0.25", features = ["derive"] }
-socket2 = { version = "0.5.3", features = ["all"] }
-tokio = { version = "1.29", features = ["full"] }
+snafu = "0.8"
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.0" }
+strum = { version = "0.26", features = ["derive"] }
+socket2 = { version = "0.5", features = ["all"] }
+tokio = { version = "1.37", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tonic = "0.9"
 tonic-build = "0.9"

Cargo.nix

@@ -1,13 +1,3 @@
-use std::path::PathBuf;
-
 fn main() {
-    let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required"));
-    built::write_built_file_with_opts(
-        // built's env module depends on a whole bunch of variables that crate2nix doesn't provide
-        // so we grab the specific env variables that we care about out ourselves instead.
-        built::Options::default().set_env(false),
-        "Cargo.toml".as_ref(),
-        &out_dir.join("built.rs"),
-    )
-    .unwrap();
+    built::write_built_file().unwrap();
 }

Cargo.toml

@@ -31,7 +31,7 @@ enum CreateVolumeError {
     DecodeRequestParams { source: serde::de::value::Error },
     #[snafu(display("failed to get {obj}"))]
     GetObject {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         obj: Box<ObjectRef<DynamicObject>>,
     },
     #[snafu(display("failed to decode volume context"))]

crate-hashes.json

@@ -2,7 +2,7 @@ use csi_grpc::{self as csi, v1::Topology};
 use serde::{de::IntoDeserializer, Deserialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
-    builder::OwnerReferenceBuilder,
+    builder::meta::OwnerReferenceBuilder,
     commons::listener::{
         Listener, ListenerIngress, ListenerPort, ListenerSpec, PodListener, PodListenerScope,
         PodListeners, PodListenersSpec,
@@ -45,47 +45,58 @@ struct ListenerNodeVolumeContext {
 enum PublishVolumeError {
     #[snafu(display("failed to decode volume context"))]
     DecodeVolumeContext { source: serde::de::value::Error },
+
     #[snafu(display("failed to get {obj}"))]
     GetObject {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         obj: ObjectRef<DynamicObject>,
     },
+
     #[snafu(display("PersistentVolume has no corresponding PersistentVolumeClaim"))]
     UnclaimedPv,
+
     #[snafu(display("failed to generate {listener}'s pod selector"))]
     ListenerPodSelector {
         source: ListenerMountedPodLabelError,
         listener: ObjectRef<Listener>,
     },
+
     #[snafu(display("{pod} has not been scheduled to a node yet"))]
     PodHasNoNode { pod: ObjectRef<Pod> },
+
     #[snafu(display("failed to build Listener's owner reference"))]
     BuildListenerOwnerRef {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::builder::meta::Error,
     },
+
     #[snafu(display("failed to apply {listener}"))]
     ApplyListener {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         listener: ObjectRef<Listener>,
     },
+
     #[snafu(display("failed to add listener label to {pod}"))]
     AddListenerLabelToPod {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         pod: ObjectRef<Pod>,
     },
+
     #[snafu(display("listener has no addresses yet"))]
     NoAddresses,
+
     #[snafu(display("failed to prepare pod dir at {target_path:?}"))]
     PreparePodDir {
         source: pod_dir::Error,
         target_path: PathBuf,
     },
+
     #[snafu(display("failed to write {pod_listeners} (also tried to create: {create_error})"))]
     WritePodListeners {
-        source: stackable_operator::error::Error,
-        create_error: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
+        create_error: stackable_operator::client::Error,
         pod_listeners: ObjectRef<PodListeners>,
     },
+
     #[snafu(display("failed to find Pod volume corresponding for {pvc}"))]
     FindPodVolumeForPvc {
         pvc: ObjectRef<PersistentVolumeClaim>,

rust/operator-binary/build.rs

@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, sync::Arc};
 use futures::{future::try_join_all, StreamExt};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
-    builder::OwnerReferenceBuilder,
+    builder::meta::OwnerReferenceBuilder,
     commons::listener::{
         AddressType, Listener, ListenerClass, ListenerIngress, ListenerPort, ListenerSpec,
         ListenerStatus, ServiceType,
@@ -81,21 +81,21 @@ pub enum Error {
     },
     #[snafu(display("failed to get {obj}"))]
     GetObject {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         obj: ObjectRef<DynamicObject>,
     },
     #[snafu(display("failed to build owner reference to Listener"))]
     BuildListenerOwnerRef {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::builder::meta::Error,
     },
     #[snafu(display("failed to apply {svc}"))]
     ApplyService {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         svc: ObjectRef<Service>,
     },
     #[snafu(display("failed to apply status for Listener"))]
     ApplyStatus {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 }
 type Result<T, E = Error> = std::result::Result<T, E>;

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

@@ -54,18 +54,16 @@ enum RunMode {
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
-    pub const TARGET: Option<&str> = option_env!("TARGET");
-    pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         stackable_operator::cli::Command::Crd => {
-            ListenerClass::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
-            Listener::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
-            PodListeners::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
+            ListenerClass::print_yaml_schema(built_info::PKG_VERSION)?;
+            Listener::print_yaml_schema(built_info::PKG_VERSION)?;
+            PodListeners::print_yaml_schema(built_info::PKG_VERSION)?;
         }
         stackable_operator::cli::Command::Run(ListenerOperatorRun {
             tracing_target,
@@ -81,7 +79,7 @@ async fn main() -> anyhow::Result<()> {
                 &format!("{} ({})", crate_description!(), mode.as_ref()),
                 crate_version!(),
                 built_info::GIT_VERSION,
-                built_info::TARGET.unwrap_or("unknown target"),
+                built_info::TARGET,
                 built_info::BUILT_TIME_UTC,
                 built_info::RUSTC_VERSION,
             );