fix: Remove excessive CLI arguments

Author: sbernauer

Cargo.lock

@@ -14,7 +14,6 @@ product-config = { git = "https://github.com/stackabletech/product-config.git",
 stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.95.0" }
 krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
 
-
 anyhow = "1.0"
 axum = "0.8"
 base64 = "0.22"
@@ -44,6 +43,6 @@ tracing = "0.1"
 url = "2.5"
 uuid = "1.10"
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+[patch."https://github.com/stackabletech/operator-rs.git"]
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "release/0.96.0" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

Cargo.nix

@@ -17,6 +17,7 @@ use futures::{
 };
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
+    cli::CommonOptions,
     k8s_openapi::api::core::v1::ConfigMap,
     kube::{
         api::ObjectMeta,
@@ -25,6 +26,7 @@ use stackable_operator::{
             watcher,
         },
     },
+    namespace::WatchNamespace,
     telemetry::Tracing,
 };
 use tokio::net::TcpListener;
@@ -39,7 +41,11 @@ pub const APP_NAME: &str = "opa-bundle-builder";
 #[derive(clap::Parser)]
 pub struct Args {
     #[clap(flatten)]
-    common: stackable_operator::cli::ProductOperatorRun,
+    pub common: CommonOptions,
+
+    /// Provides a specific namespace to watch (instead of watching all namespaces)
+    #[arg(long, env, default_value = "")]
+    pub watch_namespace: WatchNamespace,
 }
 
 type Bundle = Vec<u8>;
@@ -121,7 +127,7 @@ async fn main() -> Result<(), StartupError> {
     let reflector = std::pin::pin!(reflector::reflector(
         store_w,
         watcher(
-            args.common.watch_namespace.get_api::<ConfigMap>(&client),
+            args.watch_namespace.get_api::<ConfigMap>(&client),
             watcher::Config::default().labels(&format!("{OPERATOR_NAME}/bundle")),
         ),
     )

Cargo.toml

@@ -9,7 +9,7 @@ use product_config::ProductConfigManager;
 use stackable_opa_operator::crd::{OPERATOR_NAME, OpaCluster, OpaClusterVersion, v1alpha1};
 use stackable_operator::{
     YamlSchema,
-    cli::{Command, ProductOperatorRun},
+    cli::{Command, CommonOptions, ProductOperatorRun},
     client::{self, Client},
     k8s_openapi::api::{
         apps::v1::DaemonSet,
@@ -71,11 +71,14 @@ async fn main() -> anyhow::Result<()> {
             operator_image,
             common:
                 ProductOperatorRun {
+                    common:
+                        CommonOptions {
+                            telemetry,
+                            cluster_info,
+                        },
                     product_config,
                     watch_namespace,
                     operator_environment: _,
-                    telemetry,
-                    cluster_info,
                 },
         }) => {
             // NOTE (@NickLarsenNZ): Before stackable-telemetry was used:

crate-hashes.json

@@ -13,7 +13,9 @@ use reqwest::ClientBuilder;
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
 use stackable_opa_operator::crd::user_info_fetcher::v1alpha1;
-use stackable_operator::{commons::tls_verification::TlsClientDetails, telemetry::Tracing};
+use stackable_operator::{
+    cli::CommonOptions, commons::tls_verification::TlsClientDetails, telemetry::Tracing,
+};
 use tokio::net::TcpListener;
 
 mod backend;
@@ -28,12 +30,14 @@ pub const APP_NAME: &str = "opa-user-info-fetcher";
 
 #[derive(clap::Parser)]
 pub struct Args {
+    #[clap(flatten)]
+    common: CommonOptions,
+
     #[clap(long, env)]
     config: PathBuf,
+
     #[clap(long, env)]
     credentials_dir: PathBuf,
-    #[clap(flatten)]
-    common: stackable_operator::cli::ProductOperatorRun,
 }
 
 #[derive(Clone)]