Merge pull request #11662 from sbueringer/pr-test-log-flags

🌱 Add log command line flags to e2e test binary

Author: k8s-ci-robot

test/e2e/e2e_suite_test.go

@@ -32,6 +32,8 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/component-base/logs"
+	logsv1 "k8s.io/component-base/logs/api/v1"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 
@@ -63,6 +65,8 @@ var (
 
 	// skipCleanup prevents cleanup of test resources e.g. for debug purposes.
 	skipCleanup bool
+
+	logOptions = logs.NewOptions()
 )
 
 // Test suite global vars.
@@ -94,11 +98,19 @@ func init() {
 	flag.BoolVar(&skipCleanup, "e2e.skip-resource-cleanup", false, "if true, the resource cleanup after tests will be skipped")
 	flag.StringVar(&clusterctlConfig, "e2e.clusterctl-config", "", "file which tests will use as a clusterctl config. If it is not set, a local clusterctl repository (including a clusterctl config) will be created automatically.")
 	flag.BoolVar(&useExistingCluster, "e2e.use-existing-cluster", false, "if true, the test uses the current cluster instead of creating a new one (default discovery rules apply)")
+
+	logsv1.AddGoFlags(logOptions, flag.CommandLine)
 }
 
 func TestE2E(t *testing.T) {
 	g := NewWithT(t)
 
+	if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
+		fmt.Printf("Unable to start tests: %v\n", err)
+		os.Exit(1)
+	}
+
+	// klog.Background will automatically use the right logger.
 	ctrl.SetLogger(klog.Background())
 
 	// If running in prow, make sure to use the artifacts folder that will be reported in test grid (ignoring the value provided by flag).