From 84b4f2095dcae740ce6874fda45e6c0873434934 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 11 Aug 2025 18:33:20 -0400 Subject: [PATCH 1/3] Add SetLogger to e2e tests Downstream is complaining of missing `SetLogger` call in the e2e. --- test/e2e/e2e_suite_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index dabfb48ca..526a83a5c 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -9,6 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/rest" + "k8s.io/klog/v2" "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -37,6 +38,7 @@ func TestMain(m *testing.M) { utilruntime.Must(apiextensionsv1.AddToScheme(scheme.Scheme)) c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) utilruntime.Must(err) + ctrl.SetLogger(klog.NewKlogr()) res := m.Run() err = utils.PrintSummary(testSummaryOutputEnvVar) From 302da9ec53c03439482709536fd25a4543f973a0 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 11 Aug 2025 21:51:30 -0400 Subject: [PATCH 2/3] Update busybox securityContext Signed-off-by: Todd Short --- test/e2e/cluster_extension_install_test.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go index bfa9c711f..3c9dcbc2a 100644 --- a/test/e2e/cluster_extension_install_test.go +++ b/test/e2e/cluster_extension_install_test.go @@ -1027,8 +1027,17 @@ func TestClusterExtensionRecoversFromExistingDeploymentWhenFailureFixed(t *testi ImagePullPolicy: corev1.PullAlways, Name: "busybox", SecurityContext: &corev1.SecurityContext{ - RunAsNonRoot: ptr.To(true), - RunAsUser: ptr.To(int64(1000)), + RunAsNonRoot: ptr.To(true), + RunAsUser: ptr.To(int64(1000)), + AllowPrivilegeEscalation: ptr.To(false), + Capabilities: &corev1.Capabilities{ + Drop: []corev1.Capability{ + "ALL", + }, + }, + SeccompProfile: &corev1.SeccompProfile{ + Type: corev1.SeccompProfileTypeRuntimeDefault, + }, }, }, }, From 781cd7a65f291b4cd0c3e155f49de563c87b9929 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 11 Aug 2025 23:13:32 -0400 Subject: [PATCH 3/3] Don't panic when PrintSummary fails Signed-off-by: Todd Short --- test/e2e/e2e_suite_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 526a83a5c..7b0f07436 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -2,6 +2,7 @@ package e2e import ( "context" + "fmt" "os" "testing" @@ -42,7 +43,9 @@ func TestMain(m *testing.M) { res := m.Run() err = utils.PrintSummary(testSummaryOutputEnvVar) - utilruntime.Must(err) + if err != nil { + fmt.Println("PrintSummary error", err) + } os.Exit(res) }