github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix kubelet AppArmor rejection test

Browse Source 
The corresponding e2e test needs to be adjusted side by side to the
merged PR: https://github.com/kubernetes/kubernetes/pull/125776.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
This commit is contained in:
Sascha Grunert 2024-07-03 10:13:03 +02:00
parent 11c689b945
commit 2df920120a
No known key found for this signature in database
GPG Key ID: 09D97D153EF94D93
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/apparmor_test.go
View File

@ -92,7 +92,7 @@ var _ = SIGDescribe("AppArmor", feature.AppArmor, nodefeature.AppArmor, func() {
ginkgo.It("should reject a pod with an AppArmor profile", func(ctx context.Context) { ginkgo.It("should reject a pod with an AppArmor profile", func(ctx context.Context) {
status := runAppArmorTest(ctx, f, false, v1.DeprecatedAppArmorBetaProfileRuntimeDefault) status := runAppArmorTest(ctx, f, false, v1.DeprecatedAppArmorBetaProfileRuntimeDefault)
expectSoftRejection(status) expectRejection(status)
}) })
}) })
} }
@ -229,12 +229,11 @@ func createPodWithAppArmor(ctx context.Context, f *framework.Framework, profile
return e2epod.NewPodClient(f).Create(ctx, pod) return e2epod.NewPodClient(f).Create(ctx, pod)
} }
func expectSoftRejection(status v1.PodStatus) { func expectRejection(status v1.PodStatus) {
args := []interface{}{"PodStatus: %+v", status} args := []interface{}{"PodStatus: %+v", status}
gomega.Expect(status.Phase).To(gomega.Equal(v1.PodPending), args...) gomega.Expect(status.Phase).To(gomega.Equal(v1.PodFailed), args...)
gomega.Expect(status.Reason).To(gomega.Equal("AppArmor"), args...) gomega.Expect(status.Reason).To(gomega.Equal("AppArmor"), args...)
gomega.Expect(status.Message).To(gomega.ContainSubstring("AppArmor"), args...) gomega.Expect(status.Message).To(gomega.ContainSubstring("AppArmor"), args...)
gomega.Expect(status.ContainerStatuses[0].State.Waiting.Reason).To(gomega.Equal("Blocked"), args...)
} }
func isAppArmorEnabled() bool { func isAppArmorEnabled() bool {