Skip to content

Commit e774afe

Browse files
committed
Obsolete Context.Namespace
This property doesn't map to anything in the YAML and thus will never be set. Other clients I checked (java, golang) don't look for a property at this level. I think this was likely a mistake, and it should be obsoleted because it will never be populated. Example: ```yaml contexts: - context: cluster: ... namespace: ... # this is ContextDetails.Namespace user: ... name: foo ``` ```yaml contexts: - context: cluster: ... namespace: ... user: ... name: foo namespace: ... # this is Context.Namespace ```
1 parent fad5ab3 commit e774afe

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/KubernetesClient/KubeConfigModels/Context.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace k8s.KubeConfigModels
22
{
3+
using System;
34
using YamlDotNet.Serialization;
45

56
/// <summary>
@@ -19,6 +20,7 @@ public class Context
1920
[YamlMember(Alias = "name")]
2021
public string Name { get; set; }
2122

23+
[Obsolete("This property is not set by the YAML config. Use ContextDetails.Namespace instead.")]
2224
[YamlMember(Alias = "namespace")]
2325
public string Namespace { get; set; }
2426
}

src/KubernetesClient/KubernetesClientConfiguration.ConfigFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private void InitializeContext(K8SConfiguration k8SConfig, string currentContext
209209
SetUserDetails(k8SConfig, activeContext);
210210

211211
// namespace
212-
Namespace = activeContext.Namespace ?? activeContext.ContextDetails?.Namespace;
212+
Namespace = activeContext.ContextDetails?.Namespace;
213213
}
214214

215215
private void SetClusterDetails(K8SConfiguration k8SConfig, Context activeContext)

tests/KubernetesClient.Tests/KubernetesClientConfigurationTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ private void AssertConfigEqual(K8SConfiguration expected, K8SConfiguration actua
436436
private void AssertContextEqual(Context expected, Context actual)
437437
{
438438
Assert.Equal(expected.Name, actual.Name);
439-
Assert.Equal(expected.Namespace, actual.Namespace);
440439
Assert.Equal(expected.ContextDetails.Cluster, actual.ContextDetails.Cluster);
441440
Assert.Equal(expected.ContextDetails.User, actual.ContextDetails.User);
442441
Assert.Equal(expected.ContextDetails.Namespace, actual.ContextDetails.Namespace);

0 commit comments

Comments
 (0)