Skip to content
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.

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

feat(plugin): add support to fetch ns from kubeconfig context #608

Merged
merged 1 commit into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions constants/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pub fn upgrade_job_container_name() -> String {
pub fn upgrade_event_reason() -> String {
format!("{}Upgrade", product_train())
}
/// Default namespace for plugin.
pub const DEFAULT_PLUGIN_NAMESPACE: &str = "mayastor";
/// Upgrade job container image repository.
pub const UPGRADE_JOB_IMAGE_REPO: &str = "openebs";
/// This is the user docs URL for the Umbrella chart.
Expand Down
1 change: 1 addition & 0 deletions k8s/plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ rest-plugin = { path = "../../dependencies/control-plane/control-plane/plugin",
console-logger = { path = "../../console-logger" }
supportability = { path = "../supportability" }
upgrade = { path = "../upgrade" }
kube = { version = "0.94.2", features = ["derive", "runtime"] }
kube-proxy = { path = "../../dependencies/control-plane/k8s/proxy" }
kube-forward = { path = "../../dependencies/control-plane/k8s/forward" }
tokio = { version = "1.41.0" }
Expand Down
64 changes: 41 additions & 23 deletions k8s/plugin/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
use clap::Parser;
use plugin::ExecuteOperation;
use resources::{init_rest, Error, Operations};
pub mod resources;

use std::{env, ops::Deref};

pub mod resources;

#[derive(Parser, Debug)]
#[clap(name = utils::package_description!(), version = utils::version_info_str!())]
#[group(skip)]
Expand All @@ -14,19 +13,32 @@ struct CliArgs {
#[clap(subcommand)]
operations: Operations,

/// Kubernetes namespace of mayastor service
#[clap(global = true, long, short = 'n', default_value = "mayastor")]
namespace: String,
/// Kubernetes namespace of mayastor service [default: mayastor].
#[clap(global = true, long, short = 'n')]
namespace: Option<String>,
tiagolobocastro marked this conversation as resolved.
Show resolved Hide resolved

#[clap(flatten)]
args: resources::CliArgs,

/// Use namespace from the current `kubeconfig` context.
#[clap(global = true, long, hide = true, default_value = "false")]
namespace_from_context: bool,
}

impl CliArgs {
fn args() -> Self {
async fn args() -> Result<Self, anyhow::Error> {
let mut args = CliArgs::parse();
args.args.namespace = args.namespace.clone();
args
args.args.namespace = if let Some(namespace) = &args.namespace {
namespace.to_string()
} else if args.namespace_from_context {
let client = kube_proxy::client_from_kubeconfig(args.args.kube_config_path.clone())
.await
.map_err(|err| anyhow::anyhow!("{err}"))?;
client.default_namespace().to_string()
} else {
constants::DEFAULT_PLUGIN_NAMESPACE.to_string()
};
Ok(args)
}
}

Expand All @@ -40,23 +52,29 @@ impl Deref for CliArgs {

#[tokio::main]
async fn main() {
let cli_args = CliArgs::args();
let _tracer_flusher = cli_args.init_tracing();

if let Err(error) = cli_args.execute().await {
let mut exit_code = 1;
match error {
Error::RestPlugin(error) => eprintln!("{error}"),
Error::RestClient(error) => {
eprintln!("Failed to initialise the REST client. Error {error}")
}
Error::Upgrade(error) => {
eprintln!("{error}");
exit_code = error.into();
let mut exit_code = 1;
match CliArgs::args().await {
Ok(cli_args) => {
let _tracer_flusher = cli_args.init_tracing();
if let Err(error) = cli_args.execute().await {
match error {
Error::RestPlugin(error) => eprintln!("{error}"),
Error::RestClient(error) => {
eprintln!("Failed to initialise the REST client. Error {error}")
}
Error::Upgrade(error) => {
eprintln!("{error}");
exit_code = error.into();
}
Error::Generic(error) => eprintln!("{error}"),
}
std::process::exit(exit_code);
}
Error::Generic(error) => eprintln!("{error}"),
}
std::process::exit(exit_code);
Err(e) => {
eprintln!("{e}");
std::process::exit(exit_code)
}
}
}

Expand Down
Loading