@@ -420,14 +420,14 @@ public static string RenewAzureToken(string tenantId, string clientId, string ap
420
420
/// https://github.com/kubernetes-client/python-base/blob/master/config/exec_provider.py
421
421
/// </summary>
422
422
/// <param name="config">The external command execution configuration</param>
423
- /// <returns>The token received from the external commmand execution</returns>
423
+ /// <returns>The token received from the external command execution</returns>
424
424
public static string ExecuteExternalCommand ( ExternalExecution config )
425
425
{
426
426
var execInfo = new Dictionary < string , dynamic >
427
427
{
428
428
{ "apiVersion" , config . ApiVersion } ,
429
429
{ "kind" , "ExecCredentials" } ,
430
- { "spec" , new Dictionary < string , bool > { { "interactive" , Environment . UserInteractive } } } ,
430
+ { "spec" , new Dictionary < string , bool > { { "interactive" , Environment . UserInteractive } } } ,
431
431
} ;
432
432
433
433
var process = new Process ( ) ;
@@ -464,7 +464,7 @@ public static string ExecuteExternalCommand(ExternalExecution config)
464
464
}
465
465
466
466
var stdout = process . StandardOutput . ReadToEnd ( ) ;
467
- var stderr = process . StandardOutput . ReadToEnd ( ) ;
467
+ var stderr = process . StandardError . ReadToEnd ( ) ;
468
468
if ( string . IsNullOrWhiteSpace ( stderr ) == false )
469
469
{
470
470
throw new KubeConfigException ( $ "external exec failed due to: { stderr } ") ;
@@ -660,7 +660,7 @@ private static string GetFullPath(K8SConfiguration configuration, string path)
660
660
/// <param name="mergek8SConfig">The <see cref="K8SConfiguration"/> to merge from</param>
661
661
private static void MergeKubeConfig ( K8SConfiguration basek8SConfig , K8SConfiguration mergek8SConfig )
662
662
{
663
- // For scalar values, prefer local values
663
+ // For scalar values, prefer local values
664
664
basek8SConfig . CurrentContext = basek8SConfig . CurrentContext ?? mergek8SConfig . CurrentContext ;
665
665
basek8SConfig . FileName = basek8SConfig . FileName ?? mergek8SConfig . FileName ;
666
666
0 commit comments