chore(bors): merge pull request #437

437: fix(kubectl/dump/etcd): use correct namespace r=tiagolobocastro a=tiagolobocastro <! Co-authored-by: Tiago Castro <[email protected]>
openebs · Mar 18, 2024 · c63fe2c · c63fe2c
2 parents ee21d5d + fdef22a
commit c63fe2c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/dependencies/control-plane b/dependencies/control-plane
diff --git a/k8s/supportability/src/collect/k8s_resources/client.rs b/k8s/supportability/src/collect/k8s_resources/client.rs
@@ -97,6 +97,10 @@ impl ClientSet {
     pub(crate) fn kube_client(&self) -> kube::Client {
         self.client.clone()
     }
+    /// Get a reference to the namespace.
+    pub(crate) fn namespace(&self) -> &str {
+        &self.namespace
+    }
 
     /// Get a new api for a `dynamic_object` for the provided GVK.
     pub(crate) async fn dynamic_object_api(

diff --git a/k8s/supportability/src/collect/persistent_store/etcd.rs b/k8s/supportability/src/collect/persistent_store/etcd.rs
@@ -21,9 +21,10 @@ impl EtcdStore {
         namespace: String,
     ) -> Result<Self, EtcdError> {
         let client_set = ClientSet::new(kube_config_path.clone(), namespace.clone()).await?;
-        let platform_info = platform::k8s::K8s::from(client_set.kube_client())
-            .await
-            .map_err(|e| EtcdError::Custom(format!("Failed to get k8s platform info: {e}")))?;
+        let platform_info =
+            platform::k8s::K8s::from_custom(client_set.kube_client(), client_set.namespace())
+                .await
+                .map_err(|e| EtcdError::Custom(format!("Failed to get k8s platform info: {e}")))?;
         let key_prefix = pstor::build_key_prefix(&platform_info, API_VERSION);
 
         // if an endpoint is provided it will be used, else the kubeconfig path will be used
+4 −5		control-plane/agents/src/bin/core/nexus/operations_helper.rs
+4 −10		control-plane/agents/src/bin/core/node/wrapper.rs
+6 −2		control-plane/agents/src/common/errors.rs
+6 −4		control-plane/plugin/src/lib.rs
+17 −0		control-plane/plugin/src/operations.rs
+2 −2		control-plane/plugin/src/resources/mod.rs
+111 −11		control-plane/plugin/src/resources/node.rs
+12 −0		utils/platform/src/k8s/mod.rs