kubernetes-client/csharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed KubernetesClientConfiguration.BuildConfigFromConfigFile not respecting the currentContext parameter (#269)

Browse Source
This commit is contained in:
Gaz Iqbal
2019-03-22 17:00:09 -07:00
committed by Kubernetes Prow Robot
parent bf995e55c6
commit fd1736f3e7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs
View File

@@ -48,14 +48,15 @@ namespace k8s
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="KubernetesClientConfiguration" /> from config file /// Initializes a new instance of the <see cref="KubernetesClientConfiguration" /> from config file
/// </summary> /// </summary>
/// <param name="masterUrl">kube api server endpoint</param>
/// <param name="kubeconfigPath">Explicit file path to kubeconfig. Set to null to use the default file path</param> /// <param name="kubeconfigPath">Explicit file path to kubeconfig. Set to null to use the default file path</param>
/// <param name="currentContext">override the context in config file, set null if do not want to override</param>
/// <param name="masterUrl">kube api server endpoint</param>
/// <param name="useRelativePaths">When <see langword="true"/>, the paths in the kubeconfig file will be considered to be relative to the directory in which the kubeconfig /// <param name="useRelativePaths">When <see langword="true"/>, the paths in the kubeconfig file will be considered to be relative to the directory in which the kubeconfig
/// file is located. When <see langword="false"/>, the paths will be considered to be relative to the current working directory.</param> /// file is located. When <see langword="false"/>, the paths will be considered to be relative to the current working directory.</param>
public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kubeconfigPath = null, public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kubeconfigPath = null,
string currentContext = null, string masterUrl = null, bool useRelativePaths = true) string currentContext = null, string masterUrl = null, bool useRelativePaths = true)
{ {
return BuildConfigFromConfigFile(new FileInfo(kubeconfigPath ?? KubeConfigDefaultLocation), null, return BuildConfigFromConfigFile(new FileInfo(kubeconfigPath ?? KubeConfigDefaultLocation), currentContext,
masterUrl, useRelativePaths); masterUrl, useRelativePaths);
} }
@@ -363,7 +364,7 @@ namespace k8s
return LoadKubeConfigAsync(kubeconfigPath, useRelativePaths).GetAwaiter().GetResult(); return LoadKubeConfigAsync(kubeconfigPath, useRelativePaths).GetAwaiter().GetResult();
} }
// <summary> /// <summary>
/// Loads Kube Config /// Loads Kube Config
/// </summary> /// </summary>
/// <param name="kubeconfig">Kube config file contents</param> /// <param name="kubeconfig">Kube config file contents</param>
@@ -402,7 +403,7 @@ namespace k8s
return LoadKubeConfigAsync(kubeconfig, useRelativePaths).GetAwaiter().GetResult(); return LoadKubeConfigAsync(kubeconfig, useRelativePaths).GetAwaiter().GetResult();
} }
// <summary> /// <summary>
/// Loads Kube Config /// Loads Kube Config
/// </summary> /// </summary>
/// <param name="kubeconfigStream">Kube config file contents stream</param> /// <param name="kubeconfigStream">Kube config file contents stream</param>