Skip to content

Commit 78d6490

Browse files
authored
Merge pull request kubernetes#127302 from cici37/costFG
Promote cost related feature gate to default true
2 parents dd87bc0 + baeeb66 commit 78d6490

File tree

5 files changed

+310
-7
lines changed

5 files changed

+310
-7
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,12 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
296296

297297
genericfeatures.StrictCostEnforcementForVAP: {
298298
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta},
299+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
299300
},
300301

301302
genericfeatures.StrictCostEnforcementForWebhooks: {
302303
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta},
304+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
303305
},
304306

305307
genericfeatures.StructuredAuthenticationConfiguration: {

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,12 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
408408

409409
StrictCostEnforcementForVAP: {
410410
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta},
411+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
411412
},
412413

413414
StrictCostEnforcementForWebhooks: {
414415
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Beta},
416+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
415417
},
416418

417419
StructuredAuthenticationConfiguration: {

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,12 +1146,20 @@
11461146
lockToDefault: false
11471147
preRelease: Beta
11481148
version: "1.30"
1149+
- default: true
1150+
lockToDefault: true
1151+
preRelease: GA
1152+
version: "1.32"
11491153
- name: StrictCostEnforcementForWebhooks
11501154
versionedSpecs:
11511155
- default: false
11521156
lockToDefault: false
11531157
preRelease: Beta
11541158
version: "1.30"
1159+
- default: true
1160+
lockToDefault: true
1161+
preRelease: GA
1162+
version: "1.32"
11551163
- name: StructuredAuthenticationConfiguration
11561164
versionedSpecs:
11571165
- default: false

0 commit comments

Comments
 (0)