Fix failures of bumped dependencies

Author: wojtek-t

clusterloader2/cmd/clusterloader.go

@@ -124,13 +124,16 @@ 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")
 	flags.StringArrayVar(&clusterLoaderConfig.OverridePaths, "testoverrides", []string{}, "Paths to the config overrides file. The latter overrides take precedence over changes in former files.")
 	flags.StringVar(&testSuiteConfigPath, "testsuite", "", "Path to the test suite config file")
 	flags.IntVar(&port, "port", 8000, "Port to be used by http server with pprof.")
 	flags.BoolVar(&dryRun, "dry-run", false, "Whether to skip running test and only compile test config")
+
 	initClusterFlags()
 	execservice.InitFlags(&clusterLoaderConfig.ExecServiceConfig)
 	modifier.InitFlags(&clusterLoaderConfig.ModifierConfig)

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/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 --alsologtostderr --v="${CL2_VERBOSITY:-2}" "--experimental-gcp-snapshot-prometheus-disk=true" "$@"