github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary unit tests that exercised disabling the feature gate

Browse Source
This commit is contained in:
Hemant Kumar 2021-10-28 08:10:08 -04:00
parent 481068c0d2
commit 9d9c3000b0
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/api/pod/util_test.go
View File

@ -562,56 +562,24 @@ func TestDropFSGroupFields(t *testing.T) {
} }
podInfos := []struct { podInfos := []struct {
description string description string
featureEnabled bool
newPodHasFSGroupChangePolicy bool newPodHasFSGroupChangePolicy bool
pod func() *api.Pod pod func() *api.Pod
expectPolicyInPod bool expectPolicyInPod bool
}{ }{
{ {
description: "oldPod.FSGroupChangePolicy=nil, feature=true, newPod.FSGroupChangePolicy=true", description: "oldPod.FSGroupChangePolicy=nil, feature=true, newPod.FSGroupChangePolicy=true",
featureEnabled: true,
pod: nofsGroupPod, pod: nofsGroupPod,
newPodHasFSGroupChangePolicy: true, newPodHasFSGroupChangePolicy: true,
expectPolicyInPod: true, expectPolicyInPod: true,
}, },
{
description: "oldPod=nil, feature=false, newPod.FSGroupChangePolicy=true",
featureEnabled: false,
pod: func() *api.Pod { return nil },
newPodHasFSGroupChangePolicy: true,
expectPolicyInPod: false,
},
{ {
description: "oldPod=nil, feature=true, newPod.FSGroupChangePolicy=true", description: "oldPod=nil, feature=true, newPod.FSGroupChangePolicy=true",
featureEnabled: true,
pod: func() *api.Pod { return nil }, pod: func() *api.Pod { return nil },
newPodHasFSGroupChangePolicy: true, newPodHasFSGroupChangePolicy: true,
expectPolicyInPod: true, expectPolicyInPod: true,
}, },
{
description: "oldPod.FSGroupChangePolicy=nil, feature=false, newPod.FSGroupChangePolicy=true",
featureEnabled: false,
pod: nofsGroupPod,
newPodHasFSGroupChangePolicy: true,
expectPolicyInPod: false,
},
{
description: "oldPod.FSGroupChangePolicy=true, feature=false, newPod.FSGroupChangePolicy=true",
featureEnabled: false,
pod: fsGroupPod,
newPodHasFSGroupChangePolicy: true,
expectPolicyInPod: true,
},
{
description: "oldPod.FSGroupChangePolicy=true, feature=false, newPod.FSGroupChangePolicy=false",
featureEnabled: false,
pod: fsGroupPod,
newPodHasFSGroupChangePolicy: false,
expectPolicyInPod: false,
},
{ {
description: "oldPod.FSGroupChangePolicy=true, feature=true, newPod.FSGroupChangePolicy=false", description: "oldPod.FSGroupChangePolicy=true, feature=true, newPod.FSGroupChangePolicy=false",
featureEnabled: true,
pod: fsGroupPod, pod: fsGroupPod,
newPodHasFSGroupChangePolicy: false, newPodHasFSGroupChangePolicy: false,
expectPolicyInPod: false, expectPolicyInPod: false,
@ -619,7 +587,6 @@ func TestDropFSGroupFields(t *testing.T) {
} }
for _, podInfo := range podInfos { for _, podInfo := range podInfos {
t.Run(podInfo.description, func(t *testing.T) { t.Run(podInfo.description, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConfigurableFSGroupPolicy, podInfo.featureEnabled)()
oldPod := podInfo.pod() oldPod := podInfo.pod()
newPod := oldPod.DeepCopy() newPod := oldPod.DeepCopy()
if oldPod == nil && podInfo.newPodHasFSGroupChangePolicy { if oldPod == nil && podInfo.newPodHasFSGroupChangePolicy {

2
pkg/features/kube_features.go
View File

@ -817,7 +817,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha}, InTreePluginvSphereUnregister: {Default: false, PreRelease: featuregate.Alpha},
CSIMigrationOpenStack: {Default: true, PreRelease: featuregate.Beta}, CSIMigrationOpenStack: {Default: true, PreRelease: featuregate.Beta},
InTreePluginOpenStackUnregister: {Default: false, PreRelease: featuregate.Alpha}, InTreePluginOpenStackUnregister: {Default: false, PreRelease: featuregate.Alpha},
ConfigurableFSGroupPolicy: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.24 ConfigurableFSGroupPolicy: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.25
CSIInlineVolume: {Default: true, PreRelease: featuregate.Beta}, CSIInlineVolume: {Default: true, PreRelease: featuregate.Beta},
CSIStorageCapacity: {Default: true, PreRelease: featuregate.Beta}, CSIStorageCapacity: {Default: true, PreRelease: featuregate.Beta},
CSIServiceAccountToken: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23 CSIServiceAccountToken: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23