mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 18:43:34 +00:00
rebase: update kubernetes to latest
updating the kubernetes release to the latest in main go.mod Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
committed by
mergify[bot]
parent
63c4c05b35
commit
5a66991bb3
1
vendor/k8s.io/component-base/logs/api/v1/options.go
generated
vendored
1
vendor/k8s.io/component-base/logs/api/v1/options.go
generated
vendored
@ -282,6 +282,7 @@ func apply(c *LoggingConfiguration, options *LoggingOptions, featureGate feature
|
||||
if err := loggingFlags.Lookup("vmodule").Value.Set(VModuleConfigurationPflag(&c.VModule).String()); err != nil {
|
||||
return fmt.Errorf("internal error while setting klog vmodule: %v", err)
|
||||
}
|
||||
setSlogDefaultLogger()
|
||||
klog.StartFlushDaemon(c.FlushFrequency.Duration.Duration)
|
||||
klog.EnableContextualLogging(p.ContextualLoggingEnabled)
|
||||
return nil
|
||||
|
24
vendor/k8s.io/component-base/logs/api/v1/options_no_slog.go
generated
vendored
Normal file
24
vendor/k8s.io/component-base/logs/api/v1/options_no_slog.go
generated
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
//go:build !go1.21
|
||||
// +build !go1.21
|
||||
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package v1
|
||||
|
||||
func setSlogDefaultLogger() {
|
||||
// Do nothing when build with Go < 1.21.
|
||||
}
|
37
vendor/k8s.io/component-base/logs/api/v1/options_slog.go
generated
vendored
Normal file
37
vendor/k8s.io/component-base/logs/api/v1/options_slog.go
generated
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
//go:build go1.21
|
||||
// +build go1.21
|
||||
|
||||
/*
|
||||
Copyright 2023 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package v1
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
|
||||
"github.com/go-logr/logr"
|
||||
"k8s.io/klog/v2"
|
||||
)
|
||||
|
||||
// setSlogDefaultLogger sets the global slog default logger to the same default
|
||||
// that klog currently uses.
|
||||
func setSlogDefaultLogger() {
|
||||
// klog.Background() always returns a valid logr.Logger, regardless of
|
||||
// how logging was configured. We just need to turn it into a
|
||||
// slog.Handler. SetDefault then needs a slog.Logger.
|
||||
handler := logr.ToSlogHandler(klog.Background())
|
||||
slog.SetDefault(slog.New(handler))
|
||||
}
|
Reference in New Issue
Block a user