mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
rebase: update k8s.io packages to v0.30.1
rebase: update kubernetes to 1.30 Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
23
vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go
generated
vendored
23
vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go
generated
vendored
@ -49,14 +49,16 @@ var (
|
||||
|
||||
func init() {
|
||||
// ktesting and testinit already registered the -v and -vmodule
|
||||
// command line flags. To configure the textlogger instead, we
|
||||
// need to swap out the flag.Value for those.
|
||||
// command line flags. To configure the textlogger and klog
|
||||
// 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
|
||||
logConfig.AddFlags(&fs)
|
||||
fs.VisitAll(func(loggerFlag *flag.Flag) {
|
||||
klogFlag := flag.CommandLine.Lookup(loggerFlag.Name)
|
||||
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...)
|
||||
}
|
||||
|
||||
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) {
|
||||
location := ginkgotypes.NewCodeLocation(skip + 1)
|
||||
return location.FileName, location.LineNumber
|
||||
|
Reference in New Issue
Block a user