Skip to content

Commit f167454

Browse files
committed
remove feature gate AdmissionWebhookMatchConditions that was GAed in v1.30
1 parent 8195f82 commit f167454

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
198198
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha},
199199
},
200200

201-
genericfeatures.AdmissionWebhookMatchConditions: {
202-
{Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha},
203-
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta},
204-
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
205-
},
206-
207201
genericfeatures.AllowParsingUserUIDFromCertAuth: {
208202
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
209203
},

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ const (
3434
// of code conflicts because changes are more likely to be scattered
3535
// across the file.
3636

37-
// owner: @ivelichkovich, @tallclair
38-
// stable: v1.30
39-
// kep: https://kep.k8s.io/3716
40-
//
41-
// Enables usage of MatchConditions fields to use CEL expressions for matching on admission webhooks
42-
AdmissionWebhookMatchConditions featuregate.Feature = "AdmissionWebhookMatchConditions"
43-
4437
// owner: @modulitos
4538
//
4639
// Allow user.DefaultInfo.UID to be set from x509 cert during cert auth.
@@ -253,12 +246,6 @@ func init() {
253246
// Entries are alphabetized and separated from each other with blank lines to avoid sweeping gofmt changes
254247
// when adding or removing one entry.
255248
var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
256-
AdmissionWebhookMatchConditions: {
257-
{Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha},
258-
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta},
259-
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
260-
},
261-
262249
AllowParsingUserUIDFromCertAuth: {
263250
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.Beta},
264251
},

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
- name: AdmissionWebhookMatchConditions
2-
versionedSpecs:
3-
- default: false
4-
lockToDefault: false
5-
preRelease: Alpha
6-
version: "1.27"
7-
- default: true
8-
lockToDefault: false
9-
preRelease: Beta
10-
version: "1.28"
11-
- default: true
12-
lockToDefault: true
13-
preRelease: GA
14-
version: "1.30"
151
- name: AllowDNSOnlyNodeCSR
162
versionedSpecs:
173
- default: true

0 commit comments

Comments
 (0)