From d4952745cc8969c397955540259a44b2fe5f4a2f Mon Sep 17 00:00:00 2001 From: kazk Date: Wed, 10 Feb 2021 12:36:01 -0800 Subject: [PATCH] Don't merge NamedExtensions for now --- kube/src/config/file_config.rs | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/kube/src/config/file_config.rs b/kube/src/config/file_config.rs index 6bbb3dbdc..636257af6 100644 --- a/kube/src/config/file_config.rs +++ b/kube/src/config/file_config.rs @@ -238,16 +238,8 @@ impl Kubeconfig { Some(base_prefs) => { if let Some(mut next_prefs) = next.preferences.take() { base_prefs.colors = base_prefs.colors.or(next_prefs.colors); - - match base_prefs.extensions.as_mut() { - Some(mut base_exts) => { - if let Some(next_exts) = next_prefs.extensions { - append_new_named(&mut base_exts, next_exts, |x| &x.name); - } - } - None => { - base_prefs.extensions = next_prefs.extensions.take(); - } + if base_prefs.extensions.is_none() { + base_prefs.extensions = next_prefs.extensions.take(); } } } @@ -261,16 +253,7 @@ impl Kubeconfig { append_new_named(&mut self.auth_infos, next.auth_infos, |x| &x.name); append_new_named(&mut self.contexts, next.contexts, |x| &x.name); self.current_context = self.current_context.or(next.current_context); - match self.extensions.as_mut() { - Some(mut base_exts) => { - if let Some(next_exts) = next.extensions.take() { - append_new_named(&mut base_exts, next_exts, |x| &x.name); - } - } - None => { - self.extensions = next.extensions.take(); - } - } + self.extensions = self.extensions.or(next.extensions); Ok(self) } }