33using System . Linq ;
44using System . Runtime . InteropServices ;
55using System . Security . Cryptography . X509Certificates ;
6+ using System . Threading . Tasks ;
67using k8s . Exceptions ;
78using k8s . KubeConfigModels ;
8- using YamlDotNet . Serialization ;
9-
9+
1010namespace k8s
1111{
1212 public partial class KubernetesClientConfiguration
@@ -28,9 +28,9 @@ public partial class KubernetesClientConfiguration
2828 /// Initializes a new instance of the <see cref="KubernetesClientConfiguration" /> from config file
2929 /// </summary>
3030 /// <param name="masterUrl">kube api server endpoint</param>
31- /// <param name="kubeconfigPath">kubeconfig filepath </param>
32- public static KubernetesClientConfiguration BuildConfigFromConfigFile ( string masterUrl = null ,
33- string kubeconfigPath = null )
31+ /// <param name="kubeconfigPath">Explicit file path to kubeconfig. Set to null to use the default file path </param>
32+ public static KubernetesClientConfiguration BuildConfigFromConfigFile ( string kubeconfigPath ,
33+ string currentContext = null , string masterUrl = null )
3434 {
3535 return BuildConfigFromConfigFile ( new FileInfo ( kubeconfigPath ?? KubeConfigDefaultLocation ) , null ,
3636 masterUrl ) ;
@@ -55,25 +55,6 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(FileInfo k
5555 return k8SConfiguration ;
5656 }
5757
58- /// <summary>
59- /// </summary>
60- /// <param name="kubeconfig">Fileinfo of the kubeconfig, cannot be null, whitespaced or empty</param>
61- /// <param name="currentContext">override the context in config file, set null if do not want to override</param>
62- /// <param name="masterUrl">overrider kube api server endpoint, set null if do not want to override</param>
63- public static KubernetesClientConfiguration BuildConfigFromConfigFile ( string kubeconfig ,
64- string currentContext = null , string masterUrl = null )
65- {
66- if ( string . IsNullOrWhiteSpace ( kubeconfig ) )
67- {
68- throw new NullReferenceException ( nameof ( kubeconfig ) ) ;
69- }
70-
71- var k8SConfig = LoadKubeConfig ( kubeconfig ) ;
72- var k8SConfiguration = GetKubernetesClientConfiguration ( currentContext , masterUrl , k8SConfig ) ;
73-
74- return k8SConfiguration ;
75- }
76-
7758 /// <summary>
7859 /// </summary>
7960 /// <param name="kubeconfig">Fileinfo of the kubeconfig, cannot be null, whitespaced or empty</param>
@@ -94,7 +75,7 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(Stream kub
9475
9576 kubeconfig . Position = 0 ;
9677
97- var k8SConfig = LoadKubeConfig ( kubeconfig ) ;
78+ var k8SConfig = Yaml . LoadFromStreamAsync < K8SConfiguration > ( kubeconfig ) . GetAwaiter ( ) . GetResult ( ) ;
9879 var k8SConfiguration = GetKubernetesClientConfiguration ( currentContext , masterUrl , k8SConfig ) ;
9980
10081 return k8SConfiguration ;
@@ -259,53 +240,76 @@ private void SetUserDetails(K8SConfiguration k8SConfig, Context activeContext)
259240 throw new KubeConfigException (
260241 $ "User: { userDetails . Name } does not have appropriate auth credentials in kubeconfig") ;
261242 }
262- }
263-
243+ }
244+
264245 /// <summary>
246+ /// Loads entire Kube Config from default or explicit file path
247+ /// </summary>
248+ /// <param name="kubeconfigPath">Explicit file path to kubeconfig. Set to null to use the default file path</param>
249+ /// <returns></returns>
250+ public static async Task < K8SConfiguration > LoadKubeConfigAsync ( string kubeconfigPath = null )
251+ {
252+ var fileInfo = new FileInfo ( kubeconfigPath ?? KubeConfigDefaultLocation ) ;
253+
254+ return await LoadKubeConfigAsync ( fileInfo ) ;
255+ }
256+
257+ /// <summary>
258+ /// Loads entire Kube Config from default or explicit file path
259+ /// </summary>
260+ /// <param name="kubeconfigPath">Explicit file path to kubeconfig. Set to null to use the default file path</param>
261+ /// <returns></returns>
262+ public static K8SConfiguration LoadKubeConfig ( string kubeconfigPath = null )
263+ {
264+ return LoadKubeConfigAsync ( kubeconfigPath ) . GetAwaiter ( ) . GetResult ( ) ;
265+ }
266+
267+ // <summary>
265268 /// Loads Kube Config
266269 /// </summary>
267270 /// <param name="kubeconfig">Kube config file contents</param>
268271 /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
269- private static K8SConfiguration LoadKubeConfig ( FileInfo kubeconfig )
272+ public static async Task < K8SConfiguration > LoadKubeConfigAsync ( FileInfo kubeconfig )
270273 {
271274 if ( ! kubeconfig . Exists )
272275 {
273276 throw new KubeConfigException ( $ "kubeconfig file not found at { kubeconfig . FullName } ") ;
274- }
275-
276- var deserializeBuilder = new DeserializerBuilder ( ) ;
277- var deserializer = deserializeBuilder . Build ( ) ;
278- using ( var kubeConfigTextStream = kubeconfig . OpenText ( ) )
279- {
280- return deserializer . Deserialize < K8SConfiguration > ( kubeConfigTextStream ) ;
277+ }
278+
279+ using ( var stream = kubeconfig . OpenRead ( ) )
280+ {
281+ return await Yaml . LoadFromStreamAsync < K8SConfiguration > ( stream ) ;
281282 }
282283 }
283284
284285 /// <summary>
285- /// Loads Kube Config from string
286+ /// Loads Kube Config
286287 /// </summary>
287288 /// <param name="kubeconfig">Kube config file contents</param>
288289 /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
289- private static K8SConfiguration LoadKubeConfig ( string kubeconfig )
290- {
291-
292- var deserializeBuilder = new DeserializerBuilder ( ) ;
293- var deserializer = deserializeBuilder . Build ( ) ;
294- return deserializer . Deserialize < K8SConfiguration > ( kubeconfig ) ;
290+ public static K8SConfiguration LoadKubeConfig ( FileInfo kubeconfig )
291+ {
292+ return LoadKubeConfigAsync ( kubeconfig ) . GetAwaiter ( ) . GetResult ( ) ;
293+ }
294+
295+ // <summary>
296+ /// Loads Kube Config
297+ /// </summary>
298+ /// <param name="kubeconfigStream">Kube config file contents stream</param>
299+ /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
300+ public static async Task < K8SConfiguration > LoadKubeConfigAsync ( Stream kubeconfigStream )
301+ {
302+ return await Yaml . LoadFromStreamAsync < K8SConfiguration > ( kubeconfigStream ) ;
295303 }
296304
297305 /// <summary>
298- /// Loads Kube Config from stream.
306+ /// Loads Kube Config
299307 /// </summary>
300- /// <param name="kubeconfig">Kube config file contents</param>
308+ /// <param name="kubeconfig">Kube config file contents stream </param>
301309 /// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
302- private static K8SConfiguration LoadKubeConfig ( Stream kubeconfig )
310+ public static K8SConfiguration LoadKubeConfig ( Stream kubeconfigStream )
303311 {
304- using ( var sr = new StreamReader ( kubeconfig ) )
305- {
306- var strKubeConfig = sr . ReadToEnd ( ) ;
307- return LoadKubeConfig ( strKubeConfig ) ;
308- }
312+ return LoadKubeConfigAsync ( kubeconfigStream ) . GetAwaiter ( ) . GetResult ( ) ;
309313 }
310314 }
311315}
0 commit comments