Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Promote NamespaceDefaultLabelName to GA #101342

Merged
merged 2 commits into from
Apr 22, 2021
Merged

Promote NamespaceDefaultLabelName to GA #101342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d4551
Promote NamespaceDefaultLabelName to GA
rosenhouse Apr 21, 2021
176c07d
fix up test for setting default namespace labels
rosenhouse Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions pkg/apis/core/v1/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,9 +1417,6 @@ func TestSetDefaultNamespace(t *testing.T) {
}

func TestSetDefaultNamespaceLabels(t *testing.T) {
// Although this is defaulted to true, it's still worth to enable the feature gate during the test
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NamespaceDefaultLabelName, true)()

theNs := "default-ns-labels-are-great"
s := &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -1432,22 +1429,6 @@ func TestSetDefaultNamespaceLabels(t *testing.T) {
if s2.ObjectMeta.Labels[v1.LabelMetadataName] != theNs {
t.Errorf("Expected default namespace label value of %v, but got %v", theNs, s2.ObjectMeta.Labels[v1.LabelMetadataName])
}

// And let's disable the FG and check if it still defaults creating the labels
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NamespaceDefaultLabelName, false)()

theNs = "default-ns-labels-are-not-that-great"
s = &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: theNs,
},
}
obj2 = roundTrip(t, runtime.Object(s))
s2 = obj2.(*v1.Namespace)

if _, ok := s2.ObjectMeta.Labels[v1.LabelMetadataName]; ok {
t.Errorf("Default namespace shouldn't exist here, as the feature gate is disabled %v", s)
}
}

func TestSetDefaultPodSpecHostNetwork(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion pkg/features/kube_features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ const (

// owner: @jayunit100 @abhiraut @rikatz
// beta: v1.21
// ga: v1.22
//
// Labels all namespaces with a default label "kubernetes.io/metadata.name: <namespaceName>"
NamespaceDefaultLabelName featuregate.Feature = "NamespaceDefaultLabelName"
Expand Down Expand Up @@ -869,7 +870,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ServiceInternalTrafficPolicy: {Default: false, PreRelease: featuregate.Alpha},
SuspendJob: {Default: false, PreRelease: featuregate.Alpha},
KubeletPodResourcesGetAllocatable: {Default: false, PreRelease: featuregate.Alpha},
NamespaceDefaultLabelName: {Default: true, PreRelease: featuregate.Beta}, // graduate to GA and lock to default in 1.22, remove in 1.24
NamespaceDefaultLabelName: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.24
CSIVolumeHealth: {Default: false, PreRelease: featuregate.Alpha},

// inherited features from generic apiserver, relisted here to get a conflict if it is changed
Expand Down