mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 10:53:34 +00:00
rebase: bump sigs.k8s.io/controller-runtime
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). Updates `sigs.k8s.io/controller-runtime` from 0.20.4 to 0.21.0 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.20.4...v0.21.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.21.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
mergify[bot]
parent
d05ebd3456
commit
eb13efc9df
27
vendor/sigs.k8s.io/controller-runtime/pkg/log/warning_handler.go
generated
vendored
27
vendor/sigs.k8s.io/controller-runtime/pkg/log/warning_handler.go
generated
vendored
@ -17,13 +17,12 @@ limitations under the License.
|
||||
package log
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"github.com/go-logr/logr"
|
||||
)
|
||||
|
||||
// KubeAPIWarningLoggerOptions controls the behavior
|
||||
// of a rest.WarningHandler constructed using NewKubeAPIWarningLogger().
|
||||
// of a rest.WarningHandlerWithContext constructed using NewKubeAPIWarningLogger().
|
||||
type KubeAPIWarningLoggerOptions struct {
|
||||
// Deduplicate indicates a given warning message should only be written once.
|
||||
// Setting this to true in a long-running process handling many warnings can
|
||||
@ -33,10 +32,8 @@ type KubeAPIWarningLoggerOptions struct {
|
||||
|
||||
// KubeAPIWarningLogger is a wrapper around
|
||||
// a provided logr.Logger that implements the
|
||||
// rest.WarningHandler interface.
|
||||
// rest.WarningHandlerWithContext interface.
|
||||
type KubeAPIWarningLogger struct {
|
||||
// logger is used to log responses with the warning header
|
||||
logger logr.Logger
|
||||
// opts contain options controlling warning output
|
||||
opts KubeAPIWarningLoggerOptions
|
||||
// writtenLock gurads written
|
||||
@ -46,9 +43,11 @@ type KubeAPIWarningLogger struct {
|
||||
written map[string]struct{}
|
||||
}
|
||||
|
||||
// HandleWarningHeader handles logging for responses from API server that are
|
||||
// warnings with code being 299 and uses a logr.Logger for its logging purposes.
|
||||
func (l *KubeAPIWarningLogger) HandleWarningHeader(code int, agent string, message string) {
|
||||
// HandleWarningHeaderWithContext handles logging for responses from API server that are
|
||||
// warnings with code being 299 and uses a logr.Logger from context for its logging purposes.
|
||||
func (l *KubeAPIWarningLogger) HandleWarningHeaderWithContext(ctx context.Context, code int, _ string, message string) {
|
||||
log := FromContext(ctx)
|
||||
|
||||
if code != 299 || len(message) == 0 {
|
||||
return
|
||||
}
|
||||
@ -62,13 +61,13 @@ func (l *KubeAPIWarningLogger) HandleWarningHeader(code int, agent string, messa
|
||||
}
|
||||
l.written[message] = struct{}{}
|
||||
}
|
||||
l.logger.Info(message)
|
||||
log.Info(message)
|
||||
}
|
||||
|
||||
// NewKubeAPIWarningLogger returns an implementation of rest.WarningHandler that logs warnings
|
||||
// with code = 299 to the provided logr.Logger.
|
||||
func NewKubeAPIWarningLogger(l logr.Logger, opts KubeAPIWarningLoggerOptions) *KubeAPIWarningLogger {
|
||||
h := &KubeAPIWarningLogger{logger: l, opts: opts}
|
||||
// NewKubeAPIWarningLogger returns an implementation of rest.WarningHandlerWithContext that logs warnings
|
||||
// with code = 299 to the logger passed into HandleWarningHeaderWithContext via the context.
|
||||
func NewKubeAPIWarningLogger(opts KubeAPIWarningLoggerOptions) *KubeAPIWarningLogger {
|
||||
h := &KubeAPIWarningLogger{opts: opts}
|
||||
if opts.Deduplicate {
|
||||
h.written = map[string]struct{}{}
|
||||
}
|
||||
|
Reference in New Issue
Block a user