Merge pull request #721 from kazk/fix-empty-kubeconfig-defaulting

kube-rs · Nov 19, 2021 · 9ac2db8 · 9ac2db8
2 parents 6bd7e05 + 0bf551f
commit 9ac2db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/kube-client/src/config/file_config.rs b/kube-client/src/config/file_config.rs
@@ -258,8 +258,8 @@ impl Kubeconfig {
                 merged_docs = Some(config);
             }
         }
-        let config = merged_docs.ok_or_else(|| KubeconfigError::EmptyConfig(path.as_ref().to_path_buf()))?;
-        Ok(config)
+        // Empty file defaults to an empty Kubeconfig
+        Ok(merged_docs.unwrap_or_default())
     }
 
     /// Read a Config from `KUBECONFIG` or the the default location.

diff --git a/kube-client/src/config/mod.rs b/kube-client/src/config/mod.rs
@@ -69,10 +69,6 @@ pub enum KubeconfigError {
     #[error("the structure of the parsed kubeconfig is invalid: {0}")]
     InvalidStructure(#[source] serde_yaml::Error),
 
-    /// Failed to find a single YAML document in kubeconfig
-    #[error("failed to find a single YAML document in kubeconfig: {0}")]
-    EmptyConfig(PathBuf),
-
     /// Failed to parse cluster url
     #[error("failed to parse cluster url: {0}")]
     ParseClusterUrl(#[source] http::uri::InvalidUri),