Bump to op-rs main

Author: sbernauer

Cargo.lock

@@ -31,8 +31,9 @@ tokio = { version = "1.40", features = ["full"] }
 tokio-zookeeper = "0.4"
 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 = "main" }
+# stackable-operator = { path = "/home/sbernauer/stackable/operator-rs/main/crates/stackable-operator" }
 
 [patch.crates-io]
 # tokio-zookeeper = { path = "../tokio-zookeeper" }

Cargo.toml

@@ -121,8 +121,10 @@ pub mod versioned {
         namespaced,
         crates(
             kube_core = "stackable_operator::kube::core",
+            kube_client = "stackable_operator::kube::client",
             k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
+            schemars = "stackable_operator::schemars",
+            versioned = "stackable_operator::versioned",
         )
     ))]
     #[serde(rename_all = "camelCase")]
@@ -301,8 +303,10 @@ pub mod versioned {
         namespaced,
         crates(
             kube_core = "stackable_operator::kube::core",
+            kube_client = "stackable_operator::kube::client",
             k8s_openapi = "stackable_operator::k8s_openapi",
-            schemars = "stackable_operator::schemars"
+            schemars = "stackable_operator::schemars",
+            versioned = "stackable_operator::versioned",
         )
     ))]
     #[serde(rename_all = "camelCase")]

rust/operator-binary/src/crd/mod.rs

@@ -1,7 +1,10 @@
 use std::sync::Arc;
 
 use clap::Parser;
-use crd::{APP_NAME, OPERATOR_NAME, ZookeeperCluster, ZookeeperZnode, v1alpha1};
+use crd::{
+    APP_NAME, OPERATOR_NAME, ZookeeperCluster, ZookeeperClusterVersion, ZookeeperZnode,
+    ZookeeperZnodeVersion, v1alpha1,
+};
 use futures::{StreamExt, pin_mut};
 use stackable_operator::{
     YamlSchema,
@@ -53,9 +56,9 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            ZookeeperCluster::merged_crd(ZookeeperCluster::V1Alpha1)?
+            ZookeeperCluster::merged_crd(ZookeeperClusterVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            ZookeeperZnode::merged_crd(ZookeeperZnode::V1Alpha1)?
+            ZookeeperZnode::merged_crd(ZookeeperZnodeVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {