github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10351 from containerd/dependabot/go_modules/k8s-1b02c00507

Browse Source 
build(deps): bump k8s.io/klog/v2 from 2.120.1 to 2.130.0 in the k8s group
This commit is contained in:
Maksym Pavlenko 2024-06-24 17:13:18 +00:00 committed by GitHub
commit 73422722f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -79,7 +79,7 @@ require (
k8s.io/client-go v0.30.2 k8s.io/client-go v0.30.2
k8s.io/component-base v0.30.2 k8s.io/component-base v0.30.2
k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654 k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654
k8s.io/klog/v2 v2.120.1 k8s.io/klog/v2 v2.130.0
k8s.io/kubelet v0.30.2 k8s.io/kubelet v0.30.2
k8s.io/utils v0.0.0-20230726121419-3b25d923346b k8s.io/utils v0.0.0-20230726121419-3b25d923346b
tags.cncf.io/container-device-interface v0.7.2 tags.cncf.io/container-device-interface v0.7.2

4
go.sum
View File

@ -530,8 +530,8 @@ k8s.io/component-base v0.30.2 h1:pqGBczYoW1sno8q9ObExUqrYSKhtE5rW3y6gX88GZII=
k8s.io/component-base v0.30.2/go.mod h1:yQLkQDrkK8J6NtP+MGJOws+/PPeEXNpwFixsUI7h/OE= k8s.io/component-base v0.30.2/go.mod h1:yQLkQDrkK8J6NtP+MGJOws+/PPeEXNpwFixsUI7h/OE=
k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654 h1:REcqRW1lajhGkr+RMfO5mQ7JYp93Fe65js/hJ8R/wq0= k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654 h1:REcqRW1lajhGkr+RMfO5mQ7JYp93Fe65js/hJ8R/wq0=
k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654/go.mod h1:8SzLKTnltnWXG9FMIL4SHWcAnnPGssi5viN/SMMMf4k= k8s.io/cri-api v0.31.0-alpha.0.0.20240529224029-3a66d9d86654/go.mod h1:8SzLKTnltnWXG9FMIL4SHWcAnnPGssi5viN/SMMMf4k=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.130.0 h1:5nB3+3HpqKqXJIXNtJdtxcDCfaa9KL8StJgMzGJkUkM=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/klog/v2 v2.130.0/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/kubelet v0.30.2 h1:Ck4E/pHndI20IzDXxS57dElhDGASPO5pzXF7BcKfmCY= k8s.io/kubelet v0.30.2 h1:Ck4E/pHndI20IzDXxS57dElhDGASPO5pzXF7BcKfmCY=

25
vendor/k8s.io/klog/v2/klog.go generated vendored
View File

@ -1011,7 +1011,8 @@ func (l *loggingT) exit(err error) {
logExitFunc(err) logExitFunc(err)
return return
} }
l.flushAll() files := l.flushAll()
l.syncAll(files)
OsExit(2) OsExit(2)
} }
@ -1223,24 +1224,38 @@ func StartFlushDaemon(interval time.Duration) {
// lockAndFlushAll is like flushAll but locks l.mu first. // lockAndFlushAll is like flushAll but locks l.mu first.
func (l *loggingT) lockAndFlushAll() { func (l *loggingT) lockAndFlushAll() {
l.mu.Lock() l.mu.Lock()
l.flushAll() files := l.flushAll()
l.mu.Unlock() l.mu.Unlock()
// Some environments are slow when syncing and holding the lock might cause contention.
l.syncAll(files)
} }
// flushAll flushes all the logs and attempts to "sync" their data to disk. // flushAll flushes all the logs
// l.mu is held. // l.mu is held.
func (l *loggingT) flushAll() { func (l *loggingT) flushAll() []flushSyncWriter {
files := make([]flushSyncWriter, 0, severity.NumSeverity)
// Flush from fatal down, in case there's trouble flushing. // Flush from fatal down, in case there's trouble flushing.
for s := severity.FatalLog; s >= severity.InfoLog; s-- { for s := severity.FatalLog; s >= severity.InfoLog; s-- {
file := l.file[s] file := l.file[s]
if file != nil { if file != nil {
_ = file.Flush() // ignore error _ = file.Flush() // ignore error
_ = file.Sync() // ignore error
} }
files = append(files, file)
} }
if logging.loggerOptions.flush != nil { if logging.loggerOptions.flush != nil {
logging.loggerOptions.flush() logging.loggerOptions.flush()
} }
return files
}
// syncAll attempts to "sync" their data to disk.
func (l *loggingT) syncAll(files []flushSyncWriter) {
// Flush from fatal down, in case there's trouble flushing.
for _, file := range files {
if file != nil {
_ = file.Sync() // ignore error
}
}
} }
// CopyStandardLogTo arranges for messages written to the Go "log" package's // CopyStandardLogTo arranges for messages written to the Go "log" package's

2
vendor/modules.txt vendored
View File

@ -816,7 +816,7 @@ k8s.io/component-base/logs/logreduction
## explicit; go 1.22.0 ## explicit; go 1.22.0
k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/apis/runtime/v1
k8s.io/cri-api/pkg/errors k8s.io/cri-api/pkg/errors
# k8s.io/klog/v2 v2.120.1 # k8s.io/klog/v2 v2.130.0
## explicit; go 1.18 ## explicit; go 1.18
k8s.io/klog/v2 k8s.io/klog/v2
k8s.io/klog/v2/internal/buffer k8s.io/klog/v2/internal/buffer