Skip to content

K
k3s
Unverified Commit 40806a26 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #65823 from loburm/fix_truncate

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix truncating and batch backends integration. Truncating backend was not starting batch thread that is responsible for reading events from the channel. Fixes https://github.com/kubernetes/kubernetes/pull/65819 ```release-note None ```
parents 32dc6cc0 20fb0b5e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered/buffered.go
View file @ 40806a26
...@@ -102,6 +102,7 @@ type bufferedBackend struct { ...@@ -102,6 +102,7 @@ type bufferedBackend struct {
var _ audit.Backend = &bufferedBackend{} var _ audit.Backend = &bufferedBackend{}
// NewBackend returns a buffered audit backend that wraps delegate backend. // NewBackend returns a buffered audit backend that wraps delegate backend.
// Buffered backend automatically runs and shuts down the delegate backend.
func NewBackend(delegate audit.Backend, config BatchConfig) audit.Backend { func NewBackend(delegate audit.Backend, config BatchConfig) audit.Backend {
var throttle flowcontrol.RateLimiter var throttle flowcontrol.RateLimiter
if config.ThrottleEnable { if config.ThrottleEnable {
......
staging/src/k8s.io/apiserver/plugin/pkg/audit/truncate/truncate.go
View file @ 40806a26
...@@ -62,6 +62,7 @@ type backend struct { ...@@ -62,6 +62,7 @@ type backend struct {
var _ audit.Backend = &backend{} var _ audit.Backend = &backend{}
// NewBackend returns a new truncating backend, using configuration passed in the parameters. // NewBackend returns a new truncating backend, using configuration passed in the parameters.
// Truncate backend automatically runs and shut downs the delegate backend.
func NewBackend(delegateBackend audit.Backend, config Config, groupVersion schema.GroupVersion) audit.Backend { func NewBackend(delegateBackend audit.Backend, config Config, groupVersion schema.GroupVersion) audit.Backend {
return &backend{ return &backend{
delegateBackend: delegateBackend, delegateBackend: delegateBackend,
...@@ -128,12 +129,11 @@ func truncate(e *auditinternal.Event) *auditinternal.Event { ...@@ -128,12 +129,11 @@ func truncate(e *auditinternal.Event) *auditinternal.Event {
} }
func (b *backend) Run(stopCh <-chan struct{}) error { func (b *backend) Run(stopCh <-chan struct{}) error {
// Nothing to do here return b.delegateBackend.Run(stopCh)
return nil
} }
func (b *backend) Shutdown() { func (b *backend) Shutdown() {
// Nothing to do here b.delegateBackend.Shutdown()
} }
func (b *backend) calcSize(e *auditinternal.Event) (int64, error) { func (b *backend) calcSize(e *auditinternal.Event) (int64, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment