Skip to content

fix: Remove excessive CLI arguments #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2025
Merged

fix: Remove excessive CLI arguments #760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e5fe71
fix: Remove excessive CLI arguments
sbernauer Aug 25, 2025
51a2f1c
cargo update
sbernauer Aug 25, 2025
4d8a454
Use op-rs 0.96.0
sbernauer Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions Cargo.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }
14 changes: 7 additions & 7 deletions crate-hashes.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions rust/bundle-builder/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use futures::{
};
use snafu::{ResultExt, Snafu};
use stackable_operator::{
cli::CommonOptions,
k8s_openapi::api::core::v1::ConfigMap,
kube::{
api::ObjectMeta,
Expand All @@ -25,6 +26,7 @@ use stackable_operator::{
watcher,
},
},
namespace::WatchNamespace,
telemetry::Tracing,
};
use tokio::net::TcpListener;
Expand All @@ -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>;
Expand Down Expand Up @@ -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")),
),
)
Expand Down
9 changes: 6 additions & 3 deletions rust/operator-binary/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down
10 changes: 7 additions & 3 deletions rust/user-info-fetcher/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)]
Expand Down
Loading