Merge pull request #129375 from carlory/remove-fg-AppArmor

Remove general available feature-gate AppArmor

Author: k8s-ci-robot

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
 	//

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},

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(

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