Skip to content

Commit afa266d

Browse files
committed
remove genernal available feature-gate AppArmor
1 parent b066ddc commit afa266d

File tree

4 files changed

+0
-20
lines changed

4 files changed

+0
-20
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ const (
5858
// Enables usage of any object for volume data source in PVCs
5959
AnyVolumeDataSource featuregate.Feature = "AnyVolumeDataSource"
6060

61-
// owner: @tallclair
62-
AppArmor featuregate.Feature = "AppArmor"
63-
6461
// owner: @liggitt
6562
// kep: https://kep.k8s.io/4601
6663
//

pkg/features/versioned_kube_features.go

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

66-
AppArmor: {
67-
{Version: version.MustParse("1.4"), Default: true, PreRelease: featuregate.Beta},
68-
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
69-
},
70-
7166
AuthorizeNodeWithSelectors: {
7267
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
7368
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},

staging/src/k8s.io/pod-security-admission/test/fixtures_appArmorProfile.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package test
1818

1919
import (
2020
corev1 "k8s.io/api/core/v1"
21-
"k8s.io/component-base/featuregate"
2221
"k8s.io/pod-security-admission/api"
2322
)
2423

@@ -55,7 +54,6 @@ func init() {
5554
}),
5655
}
5756
},
58-
failRequiresFeatures: []featuregate.Feature{"AppArmor"},
5957
}
6058

6159
registerFixtureGenerator(

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,6 @@
142142
lockToDefault: false
143143
preRelease: Alpha
144144
version: "1.30"
145-
- name: AppArmor
146-
versionedSpecs:
147-
- default: true
148-
lockToDefault: false
149-
preRelease: Beta
150-
version: "1.4"
151-
- default: true
152-
lockToDefault: true
153-
preRelease: GA
154-
version: "1.31"
155145
- name: AuthorizeNodeWithSelectors
156146
versionedSpecs:
157147
- default: false

0 commit comments

Comments
 (0)