Skip to content

Commit dfba30c

Browse files
authored
Fixing PR (#5)
* Adressing the changes asked by @tg123
1 parent ee77895 commit dfba30c

File tree

3 files changed

+19
-34
lines changed

3 files changed

+19
-34
lines changed

src/KubernetesClient.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<PackageVersion>0.2.1-beta</PackageVersion>
3+
<PackageVersion>0.2.0-beta</PackageVersion>
44
<Authors>The Kubernetes Project Authors</Authors>
55
<Copyright>2017 The Kubernetes Project Authors</Copyright>
66
<Description>Client library for the Kubernetes open source container orchestrator.</Description>
@@ -11,10 +11,6 @@
1111

1212
<TargetFramework>netstandard1.4</TargetFramework>
1313
<RootNamespace>k8s</RootNamespace>
14-
<Version>1.1.0</Version>
15-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
16-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
17-
<PackageId>KubernetesClientDXBrazil</PackageId>
1814
</PropertyGroup>
1915
<ItemGroup>
2016
<Compile Remove="GlobalSuppressions.cs" />
@@ -29,4 +25,4 @@
2925
<PackageReference Include="YamlDotNet.Signed" Version="4.2.3" />
3026
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
3127
</ItemGroup>
32-
</Project>
28+
</Project>

src/KubernetesClientConfiguration.ConfigFile.cs

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(FileInfo k
5050
}
5151

5252
var k8SConfig = LoadKubeConfig(kubeconfig);
53-
var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
53+
var k8SConfiguration = GetKubernetesClientConfiguration(currentContext, masterUrl, k8SConfig);
5454

5555
return k8SConfiguration;
5656
}
@@ -69,7 +69,7 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(string kub
6969
}
7070

7171
var k8SConfig = LoadKubeConfig(kubeconfig);
72-
var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
72+
var k8SConfiguration = GetKubernetesClientConfiguration(currentContext, masterUrl, k8SConfig);
7373

7474
return k8SConfiguration;
7575
}
@@ -85,22 +85,22 @@ public static KubernetesClientConfiguration BuildConfigFromConfigFile(Stream kub
8585
if (kubeconfig == null)
8686
{
8787
throw new NullReferenceException(nameof(kubeconfig));
88-
}
89-
90-
if (!kubeconfig.CanSeek)
91-
{
92-
throw new Exception("Stream don't support seeking!");
93-
}
94-
88+
}
89+
90+
if (!kubeconfig.CanSeek)
91+
{
92+
throw new Exception("Stream don't support seeking!");
93+
}
94+
9595
kubeconfig.Position = 0;
9696

9797
var k8SConfig = LoadKubeConfig(kubeconfig);
98-
var k8SConfiguration = GetKubernetesClientConfiguration(ref currentContext, masterUrl, k8SConfig);
98+
var k8SConfiguration = GetKubernetesClientConfiguration(currentContext, masterUrl, k8SConfig);
9999

100100
return k8SConfiguration;
101101
}
102102

103-
private static KubernetesClientConfiguration GetKubernetesClientConfiguration(ref string currentContext, string masterUrl, K8SConfiguration k8SConfig)
103+
private static KubernetesClientConfiguration GetKubernetesClientConfiguration(string currentContext, string masterUrl, K8SConfiguration k8SConfig)
104104
{
105105
var k8SConfiguration = new KubernetesClientConfiguration();
106106

@@ -300,10 +300,12 @@ private static K8SConfiguration LoadKubeConfig(string kubeconfig)
300300
/// <param name="kubeconfig">Kube config file contents</param>
301301
/// <returns>Instance of the <see cref="K8SConfiguration"/> class</returns>
302302
private static K8SConfiguration LoadKubeConfig(Stream kubeconfig)
303-
{
304-
StreamReader sr = new StreamReader(kubeconfig);
305-
string strKubeConfig = sr.ReadToEnd();
306-
return LoadKubeConfig(strKubeConfig);
303+
{
304+
using (var sr = new StreamReader(kubeconfig))
305+
{
306+
var strKubeConfig = sr.ReadToEnd();
307+
return LoadKubeConfig(strKubeConfig);
308+
}
307309
}
308310
}
309311
}

src/Properties/PublishProfiles/FolderProfile.pubxml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)