Skip to content

Commit c75960c

Browse files
authored
Merge pull request kubernetes#129497 from carlory/remove-fg-AppArmorFields
Remove general available feature-gate AppArmorFields
2 parents 2ca9e2d + a811427 commit c75960c

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ const (
6161
// owner: @tallclair
6262
AppArmor featuregate.Feature = "AppArmor"
6363

64-
// owner: @tallclair
65-
AppArmorFields featuregate.Feature = "AppArmorFields"
66-
6764
// owner: @liggitt
6865
// kep: https://kep.k8s.io/4601
6966
//

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
6767
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
6868
},
6969

70-
AppArmorFields: {
71-
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
72-
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
73-
},
74-
7570
AuthorizeNodeWithSelectors: {
7671
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
7772
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,6 @@
148148
lockToDefault: true
149149
preRelease: GA
150150
version: "1.31"
151-
- name: AppArmorFields
152-
versionedSpecs:
153-
- default: true
154-
lockToDefault: false
155-
preRelease: Beta
156-
version: "1.30"
157-
- default: true
158-
lockToDefault: true
159-
preRelease: GA
160-
version: "1.31"
161151
- name: AuthorizeNodeWithSelectors
162152
versionedSpecs:
163153
- default: false

0 commit comments

Comments
 (0)