Merge pull request #105885 from gnufied/move-configurable-fsgroup-ga
Move configurable fsgroup to GA
This commit is contained in:
@@ -562,56 +562,24 @@ func TestDropFSGroupFields(t *testing.T) {
|
||||
}
|
||||
podInfos := []struct {
|
||||
description string
|
||||
featureEnabled bool
|
||||
newPodHasFSGroupChangePolicy bool
|
||||
pod func() *api.Pod
|
||||
expectPolicyInPod bool
|
||||
}{
|
||||
{
|
||||
description: "oldPod.FSGroupChangePolicy=nil, feature=true, newPod.FSGroupChangePolicy=true",
|
||||
featureEnabled: true,
|
||||
pod: nofsGroupPod,
|
||||
newPodHasFSGroupChangePolicy: 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",
|
||||
featureEnabled: true,
|
||||
pod: func() *api.Pod { return nil },
|
||||
newPodHasFSGroupChangePolicy: 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",
|
||||
featureEnabled: true,
|
||||
pod: fsGroupPod,
|
||||
newPodHasFSGroupChangePolicy: false,
|
||||
expectPolicyInPod: false,
|
||||
@@ -619,7 +587,6 @@ func TestDropFSGroupFields(t *testing.T) {
|
||||
}
|
||||
for _, podInfo := range podInfos {
|
||||
t.Run(podInfo.description, func(t *testing.T) {
|
||||
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConfigurableFSGroupPolicy, podInfo.featureEnabled)()
|
||||
oldPod := podInfo.pod()
|
||||
newPod := oldPod.DeepCopy()
|
||||
if oldPod == nil && podInfo.newPodHasFSGroupChangePolicy {
|
||||
|
Reference in New Issue
Block a user