github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101342 from rosenhouse/promote-namespace-default-labels-to-ga

Browse Source 
Promote NamespaceDefaultLabelName to GA
This commit is contained in:
Kubernetes Prow Robot 2021-04-22 13:19:57 -07:00 committed by GitHub
commit 75d571a10b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/apis/core/v1/defaults_test.go
View File

@ -1417,9 +1417,6 @@ func TestSetDefaultNamespace(t *testing.T) {
} }
func TestSetDefaultNamespaceLabels(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" theNs := "default-ns-labels-are-great"
s := &v1.Namespace{ s := &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@ -1432,22 +1429,6 @@ func TestSetDefaultNamespaceLabels(t *testing.T) {
if s2.ObjectMeta.Labels[v1.LabelMetadataName] != theNs { 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]) 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) { func TestSetDefaultPodSpecHostNetwork(t *testing.T) {

3
pkg/features/kube_features.go
View File

@ -740,6 +740,7 @@ const (
// owner: @jayunit100 @abhiraut @rikatz // owner: @jayunit100 @abhiraut @rikatz
// beta: v1.21 // beta: v1.21
// ga: v1.22
// //
// Labels all namespaces with a default label "kubernetes.io/metadata.name: <namespaceName>" // Labels all namespaces with a default label "kubernetes.io/metadata.name: <namespaceName>"
NamespaceDefaultLabelName featuregate.Feature = "NamespaceDefaultLabelName" NamespaceDefaultLabelName featuregate.Feature = "NamespaceDefaultLabelName"
@ -860,7 +861,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ServiceInternalTrafficPolicy: {Default: false, PreRelease: featuregate.Alpha}, ServiceInternalTrafficPolicy: {Default: false, PreRelease: featuregate.Alpha},
SuspendJob: {Default: false, PreRelease: featuregate.Alpha}, SuspendJob: {Default: false, PreRelease: featuregate.Alpha},
KubeletPodResourcesGetAllocatable: {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}, CSIVolumeHealth: {Default: false, PreRelease: featuregate.Alpha},
// inherited features from generic apiserver, relisted here to get a conflict if it is changed // inherited features from generic apiserver, relisted here to get a conflict if it is changed