From 2df920120ab8ff2a93bee8bb982bb86320591f4e Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 3 Jul 2024 10:13:03 +0200 Subject: [PATCH] Fix kubelet AppArmor rejection test 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 --- test/e2e_node/apparmor_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/e2e_node/apparmor_test.go b/test/e2e_node/apparmor_test.go index 8e790098537..f3c1759a3d3 100644 --- a/test/e2e_node/apparmor_test.go +++ b/test/e2e_node/apparmor_test.go @@ -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) { 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) } -func expectSoftRejection(status v1.PodStatus) { +func expectRejection(status v1.PodStatus) { 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.Message).To(gomega.ContainSubstring("AppArmor"), args...) - gomega.Expect(status.ContainerStatuses[0].State.Waiting.Reason).To(gomega.Equal("Blocked"), args...) } func isAppArmorEnabled() bool {