From afa266d7ef933f7aa52eb7700dc0f52cf93ced70 Mon Sep 17 00:00:00 2001 From: carlory Date: Tue, 7 Jan 2025 17:06:29 +0800 Subject: [PATCH] remove genernal available feature-gate AppArmor --- pkg/features/kube_features.go | 3 --- pkg/features/versioned_kube_features.go | 5 ----- .../test/fixtures_appArmorProfile.go | 2 -- .../test_data/versioned_feature_list.yaml | 10 ---------- 4 files changed, 20 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 64149d6f6f8..f2b0a13b973 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -58,9 +58,6 @@ const ( // Enables usage of any object for volume data source in PVCs AnyVolumeDataSource featuregate.Feature = "AnyVolumeDataSource" - // owner: @tallclair - AppArmor featuregate.Feature = "AppArmor" - // owner: @liggitt // kep: https://kep.k8s.io/4601 // diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 0b7c4dd3472..224e9ee46f3 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -63,11 +63,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.33 -> remove in 1.36 }, - AppArmor: { - {Version: version.MustParse("1.4"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33 - }, - AuthorizeNodeWithSelectors: { {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta}, diff --git a/staging/src/k8s.io/pod-security-admission/test/fixtures_appArmorProfile.go b/staging/src/k8s.io/pod-security-admission/test/fixtures_appArmorProfile.go index 1c9559609a4..8802c118b7f 100644 --- a/staging/src/k8s.io/pod-security-admission/test/fixtures_appArmorProfile.go +++ b/staging/src/k8s.io/pod-security-admission/test/fixtures_appArmorProfile.go @@ -18,7 +18,6 @@ package test import ( corev1 "k8s.io/api/core/v1" - "k8s.io/component-base/featuregate" "k8s.io/pod-security-admission/api" ) @@ -55,7 +54,6 @@ func init() { }), } }, - failRequiresFeatures: []featuregate.Feature{"AppArmor"}, } registerFixtureGenerator( diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index 46044446e7b..bcab0fce3fb 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -142,16 +142,6 @@ lockToDefault: false preRelease: Alpha version: "1.30" -- name: AppArmor - versionedSpecs: - - default: true - lockToDefault: false - preRelease: Beta - version: "1.4" - - default: true - lockToDefault: true - preRelease: GA - version: "1.31" - name: AuthorizeNodeWithSelectors versionedSpecs: - default: false