github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125257 from vinayakankugoyal/armor

Browse Source 
KEP-24: Update AppArmor feature gates to GA stage.
This commit is contained in:
Kubernetes Prow Robot
2024-07-23 09:20:52 -07:00
committed by GitHub
parent d7194eb370 bc06071495
commit 7590cb7adf
12 changed files with 39 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/feature/feature.go
View File

@@ -28,9 +28,6 @@ var (
// TODO: document the feature (owning SIG, when to use this feature for a test)
APIServerIdentity = framework.WithFeature(framework.ValidFeatures.Add("APIServerIdentity"))
// TODO: document the feature (owning SIG, when to use this feature for a test)
AppArmor = framework.WithFeature(framework.ValidFeatures.Add("AppArmor"))
// TODO: document the feature (owning SIG, when to use this feature for a test)
BootstrapTokens = framework.WithFeature(framework.ValidFeatures.Add("BootstrapTokens"))

3
test/e2e/nodefeature/nodefeature.go
View File

@@ -25,9 +25,6 @@ import (
var (
// Please keep the list in alphabetical order.
// TODO: document the feature (owning SIG, when to use this feature for a test)
AppArmor = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("AppArmor"))
// TODO: document the feature (owning SIG, when to use this feature for a test)
CheckpointContainer = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("CheckpointContainer"))

4
test/e2e_node/apparmor_test.go
View File

@@ -38,10 +38,8 @@ import (
watchtools "k8s.io/client-go/tools/watch"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/kubelet/kuberuntime"
"k8s.io/kubernetes/test/e2e/feature"
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/nodefeature"
admissionapi "k8s.io/pod-security-admission/api"
"github.com/onsi/ginkgo/v2"
@@ -49,7 +47,7 @@ import (
"github.com/opencontainers/runc/libcontainer/apparmor"
)
var _ = SIGDescribe("AppArmor", feature.AppArmor, nodefeature.AppArmor, func() {
var _ = SIGDescribe("AppArmor", framework.WithNodeConformance(), func() {
if isAppArmorEnabled() {
ginkgo.BeforeEach(func() {
ginkgo.By("Loading AppArmor profiles for testing")

2
test/integration/auth/podsecurity_test.go
View File

@@ -54,7 +54,6 @@ func TestPodSecurity(t *testing.T) {
// Enable all feature gates needed to allow all fields to be exercised
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ProcMountType, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.UserNamespacesSupport, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AppArmor, true)
// Start server
server := startPodSecurityServer(t)
opts := podsecuritytest.Options{
@@ -101,7 +100,6 @@ func TestPodSecurityWebhook(t *testing.T) {
// Enable all feature gates needed to allow all fields to be exercised
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ProcMountType, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.UserNamespacesSupport, true)
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.AppArmor, true)
// Start test API server.
capabilities.SetForTests(capabilities.Capabilities{AllowPrivileged: true})