Skip to content

Commit

Permalink
Change Kubeconfig::merge fn to public. (#1100)
Browse files Browse the repository at this point in the history
make merge fn public

Signed-off-by: goenning <me@goenning.net>

Signed-off-by: goenning <me@goenning.net>
  • Loading branch information
goenning committed Dec 7, 2022
1 parent e8fdf08 commit edd1121
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kube-client/src/config/file_config.rs
Expand Up @@ -392,7 +392,7 @@ impl Kubeconfig {
/// > Example: Preserve the context of the first file to set `current-context`.
/// > Example: If two files specify a `red-user`, use only values from the first file's `red-user`.
/// > Even if the second file has non-conflicting entries under `red-user`, discard them.
fn merge(mut self, next: Kubeconfig) -> Result<Self, KubeconfigError> {
pub fn merge(mut self, next: Kubeconfig) -> Result<Self, KubeconfigError> {
if self.kind.is_some() && next.kind.is_some() && self.kind != next.kind {
return Err(KubeconfigError::KindMismatch);
}
Expand Down

0 comments on commit edd1121

Please sign in to comment.