github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #124289 from pohly/test-e2e-node-verbosity-fix

Browse Source 
e2e node: fix -v support
This commit is contained in:
Kubernetes Prow Robot 2024-04-18 04:24:23 -07:00 committed by GitHub
commit 1d171a7501
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/e2e/framework/ginkgologger.go
View File

@ -49,14 +49,16 @@ var (
func init() { func init() {
// ktesting and testinit already registered the -v and -vmodule // ktesting and testinit already registered the -v and -vmodule
// command line flags. To configure the textlogger instead, we // command line flags. To configure the textlogger and klog
// need to swap out the flag.Value for those. // consistently, we need to intercept the Set call. This
// can be done by swapping out the flag.Value for the -v and
// -vmodule flags with a wrapper which calls both.
var fs flag.FlagSet var fs flag.FlagSet
logConfig.AddFlags(&fs) logConfig.AddFlags(&fs)
fs.VisitAll(func(loggerFlag *flag.Flag) { fs.VisitAll(func(loggerFlag *flag.Flag) {
klogFlag := flag.CommandLine.Lookup(loggerFlag.Name) klogFlag := flag.CommandLine.Lookup(loggerFlag.Name)
if klogFlag != nil { if klogFlag != nil {
klogFlag.Value = loggerFlag.Value klogFlag.Value = &valueChain{Value: loggerFlag.Value, parentValue: klogFlag.Value}
} }
}) })
@ -75,6 +77,21 @@ func init() {
klog.SetLoggerWithOptions(ginkgoLogger, opts...) klog.SetLoggerWithOptions(ginkgoLogger, opts...)
} }
type valueChain struct {
flag.Value
parentValue flag.Value
}
func (v *valueChain) Set(value string) error {
if err := v.Value.Set(value); err != nil {
return err
}
if err := v.parentValue.Set(value); err != nil {
return err
}
return nil
}
func unwind(skip int) (string, int) { func unwind(skip int) (string, int) {
location := ginkgotypes.NewCodeLocation(skip + 1) location := ginkgotypes.NewCodeLocation(skip + 1)
return location.FileName, location.LineNumber return location.FileName, location.LineNumber

2
test/e2e_node/e2e_node_suite_test.go
View File

@ -40,7 +40,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
cliflag "k8s.io/component-base/cli/flag" cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
"k8s.io/kubernetes/pkg/util/rlimit" "k8s.io/kubernetes/pkg/util/rlimit"
commontest "k8s.io/kubernetes/test/e2e/common" commontest "k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -122,7 +121,6 @@ func TestMain(m *testing.M) {
e2econfig.CopyFlags(e2econfig.Flags, flag.CommandLine) e2econfig.CopyFlags(e2econfig.Flags, flag.CommandLine)
framework.RegisterCommonFlags(flag.CommandLine) framework.RegisterCommonFlags(flag.CommandLine)
registerNodeFlags(flag.CommandLine) registerNodeFlags(flag.CommandLine)
logs.AddFlags(pflag.CommandLine)
pflag.CommandLine.AddGoFlagSet(flag.CommandLine) pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
// Mark the run-services-mode flag as hidden to prevent user from using it. // Mark the run-services-mode flag as hidden to prevent user from using it.
pflag.CommandLine.MarkHidden("run-services-mode") pflag.CommandLine.MarkHidden("run-services-mode")