ci(stability): merge the develop branch

Author: datacore-bolt-ci

dependencies/control-plane

@@ -18,6 +18,10 @@ struct CliArgs {
     #[clap(global = true, long, short = 'n')]
     namespace: Option<String>,
 
+    /// Kubernetes context to use.
+    #[clap(global = true, long)]
+    context: Option<String>,
+
     #[clap(flatten)]
     args: resources::CliArgs,
 
@@ -38,10 +42,15 @@ impl CliArgs {
         if let Operations::Dump(ref mut dump_args) = args.operations {
             dump_args.args.set_kube_config_path(path);
         }
+        args.args.context = args.context.clone();
         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.kube_config_path.clone()).await?;
+            let client = kube_proxy::client_from_kubeconfig(
+                args.kube_config_path.clone(),
+                args.context.clone(),
+            )
+            .await?;
             client.default_namespace().to_string()
         } else {
             constants::DEFAULT_PLUGIN_NAMESPACE.to_string()

k8s/plugin/src/main.rs

@@ -35,14 +35,19 @@ pub struct CliArgs {
     #[clap(skip)]
     pub namespace: String,
 
+    /// Kubernetes context in the kubeconfig file.
+    #[clap(skip)]
+    pub context: Option<String>,
+
     #[clap(flatten)]
     pub cli_args: plugin::CliArgs,
 }
 
 impl CliArgs {
     /// The kube client, with the correct install namespace.
     pub async fn client(&self) -> anyhow::Result<kube::Client> {
-        let mut config = kube_proxy::config_from_kubeconfig(self.kubeconfig.clone()).await?;
+        let opts = kube_proxy::kubeconfig_options_from_context(self.context.clone());
+        let mut config = kube_proxy::config_from_kubeconfig(self.kubeconfig.clone(), opts).await?;
         // If taking namespace from context, we already know self.namespace has been set
         // from the context.
         config.default_namespace = self.namespace.clone();
@@ -294,6 +299,7 @@ pub async fn init_rest(cli_args: &CliArgs) -> Result<(), Error> {
         None => {
             let config = kube_proxy::ConfigBuilder::default_api_rest()
                 .with_kube_config(cli_args.kubeconfig.clone())
+                .with_context(cli_args.context.clone())
                 .with_timeout(*cli_args.timeout)
                 .with_target_mod(|t| t.with_namespace(&cli_args.namespace))
                 .build()