Commitf583305

authored

Merge pull request#132651 from iholder101/swap/ga

GA the NodeSwap feature gate

2 parents31f31de +b9ce92d commitf583305Copy full SHA for f583305

File tree

+108

-166

lines changed

+108

-166

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1433,6 +1433,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate`
`1433`	`1433`	`{Version:version.MustParse("1.22"),Default:false,PreRelease:featuregate.Alpha},`
`1434`	`1434`	`{Version:version.MustParse("1.28"),Default:false,PreRelease:featuregate.Beta},`
`1435`	`1435`	`{Version:version.MustParse("1.30"),Default:true,PreRelease:featuregate.Beta},`
	`1436`	`+{Version:version.MustParse("1.34"),Default:true,PreRelease:featuregate.GA,LockToDefault:true},// remove in 1.37`
`1436`	`1437`	`},`
`1437`	`1438`
`1438`	`1439`	`NominatedNodeNameForExpectation: {`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -381,14 +381,6 @@ func TestValidateKubeletConfiguration(t *testing.T) {`
`381`	`381`	`returnconf`
`382`	`382`	`},`
`383`	`383`	`errMsg:"invalid configuration: memorySwap.swapBehavior\"invalid-behavior\" must be one of:\"\",\"LimitedSwap\" or\"NoSwap\"",`
`384`		`-}, {`
`385`		`-name:"specify MemorySwap.SwapBehavior without enabling NodeSwap",`
`386`		`-configure:func(confkubeletconfig.KubeletConfiguration)kubeletconfig.KubeletConfiguration {`
`387`		`-conf.FeatureGates=map[string]bool{"NodeSwap":false}`
`388`		`-conf.MemorySwap.SwapBehavior=string(kubetypes.LimitedSwap)`
`389`		`-returnconf`
`390`		`-},`
`391`		`-errMsg:"invalid configuration: memorySwap.swapBehavior cannot be set when NodeSwap feature flag is disabled",`
`392`	`384`	`}, {`
`393`	`385`	`name:"CrashLoopBackOff.MaxContainerRestartPeriod too low",`
`394`	`386`	`configure:func(confkubeletconfig.KubeletConfiguration)kubeletconfig.KubeletConfiguration {`

Comments

(0)