Fix clusterloader2 failures after flag registration changes

Author: wojtek-t

clusterloader2/cmd/clusterloader.go

@@ -124,6 +124,8 @@ func validateClusterFlags() *errors.ErrorList {
 }
 
 func initFlags() {
+	flags.InitFlagSet()
+
 	flags.StringVar(&clusterLoaderConfig.ReportDir, "report-dir", "", "Path to the directory where the reports should be saved. Default is empty, which cause reports being written to standard output.")
 	// TODO(https://github.com/kubernetes/perf-tests/issues/641): Remove testconfig and testoverrides flags when test suite is fully supported.
 	flags.StringArrayVar(&testConfigPaths, "testconfig", []string{}, "Paths to the test config files")

clusterloader2/pkg/flags/flags.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/klog/v2"
 )
 
-func init() {
+func InitFlagSet() {
 	pflag.CommandLine = pflag.NewFlagSet(os.Args[0], pflag.ContinueOnError)
 	klog.InitFlags(nil)
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)

clusterloader2/pkg/measurement/common/slos/api_responsiveness_prometheus_test.go

@@ -19,7 +19,6 @@ package slos
 import (
 	"bytes"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"strings"
 	"testing"
@@ -32,34 +31,12 @@ import (
 	"k8s.io/perf-tests/clusterloader2/pkg/measurement"
 	"k8s.io/perf-tests/clusterloader2/pkg/measurement/common/executors"
 	measurementutil "k8s.io/perf-tests/clusterloader2/pkg/measurement/util"
-
-	_ "k8s.io/perf-tests/clusterloader2/pkg/flags" // init klog
-)
-
-var (
-	// klogv1 allows users to turn on/off logging to stderr only through
-	// the use of flag. This prevents us from having control over which
-	// of the test functions have that mechanism turned off when we run
-	// go test command.
-	// TODO(#1286): refactor api_responsiveness_prometheus.go to make
-	// testing of logging easier and remove this hack in the end.
-	klogLogToStderr = true
 )
 
-func turnOffLoggingToStderrInKlog(t *testing.T) {
-	if klogLogToStderr {
-		err := flag.Set("logtostderr", "false")
-		if err != nil {
-			t.Errorf("Unable to set flag %v", err)
-			return
-		}
-		err = flag.Set("v", "2")
-		if err != nil {
-			t.Errorf("Unable to set flag %v", err)
-			return
-		}
-		flag.Parse()
-		klogLogToStderr = false
+func changeLoggingVerbosity(t *testing.T, logLevel string) {
+	var level klog.Level
+	if err := level.Set(logLevel); err != nil {
+		t.Errorf("Unable to set flag %v", err)
 	}
 }
 
@@ -574,10 +551,13 @@ func TestLogging(t *testing.T) {
 		},
 	}
 
-	turnOffLoggingToStderrInKlog(t)
+	klog.LogToStderr(false)
+	defer klog.LogToStderr(true)
+	changeLoggingVerbosity(t, "2")
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			// FIXME: Why this doesn't catch output?
 			buf := bytes.NewBuffer(nil)
 			klog.SetOutput(buf)
 
@@ -763,10 +743,13 @@ func TestAPIResponsivenessCustomThresholds(t *testing.T) {
 		},
 	}
 
-	turnOffLoggingToStderrInKlog(t)
+	klog.LogToStderr(false)
+	defer klog.LogToStderr(true)
+	changeLoggingVerbosity(t, "2")
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
+			// FIXME: Why this doesn't catch output?
 			buf := bytes.NewBuffer(nil)
 			klog.SetOutput(buf)
 

clusterloader2/run-e2e.sh

@@ -131,4 +131,4 @@ users:
 export KUBECONFIG=${kubeconfig}
 
 cd "${CLUSTERLOADER_ROOT}"/ && go build -o clusterloader './cmd/'
-./clusterloader --alsologtostderr --v="${CL2_VERBOSITY:-2}" "$@"
+./clusterloader --v="${CL2_VERBOSITY:-2}" "$@"