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.

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

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop

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

1 change: 1 addition & 0 deletions k8s/plugin/Cargo.toml
View file
Open in desktop
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
20 changes: 15 additions & 5 deletions k8s/plugin/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use clap::Parser;
use plugin::ExecuteOperation;
use resources::{init_rest, Error, Operations};
pub mod resources;

use kube::Client;
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 @@ -20,12 +20,22 @@ struct CliArgs {

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

/// Use namespace from the current `kubeconfig` context,
/// Takes precedence over --namespace or -n flag.
#[clap(global = true, long, short = 'c', default_value = "false")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should hide this, since it's not meant to be used for now IIRC

Suggested change
#[clap(global = true, long, short = 'c', default_value = "false")]
#[clap(global = true, hide = true, long = "namespace-from-context", default_value = "false")]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also should make it conflict with --namespace? Both supplied at the same time doesn't make sense

ns_from_context: bool,
}

impl CliArgs {
fn args() -> Self {
async fn args() -> Self {
let mut args = CliArgs::parse();
args.args.namespace = args.namespace.clone();
args.args.namespace = if args.ns_from_context {
let client = Client::try_default().await.expect("Client init failed");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm this is not taking into account the kubeconfig path

client.default_namespace().to_string()
} else {
args.namespace.clone()
};
args
}
}
Expand All @@ -40,7 +50,7 @@ impl Deref for CliArgs {

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

if let Err(error) = cli_args.execute().await {
Expand Down
Loading