Upgrade k8s package verison (#5358)
* upgrade k8s package version Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> * Script upgrade and code formatting. Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io> Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
8
vendor/k8s.io/apiserver/plugin/pkg/audit/buffered/buffered.go
generated
vendored
8
vendor/k8s.io/apiserver/plugin/pkg/audit/buffered/buffered.go
generated
vendored
@@ -190,10 +190,10 @@ func (b *bufferedBackend) processIncomingEvents(stopCh <-chan struct{}) {
|
||||
// The following things can cause collectEvents to stop and return the list
|
||||
// of events:
|
||||
//
|
||||
// * Maximum number of events for a batch.
|
||||
// * Timer has passed.
|
||||
// * Buffer channel is closed and empty.
|
||||
// * stopCh is closed.
|
||||
// - Maximum number of events for a batch.
|
||||
// - Timer has passed.
|
||||
// - Buffer channel is closed and empty.
|
||||
// - stopCh is closed.
|
||||
func (b *bufferedBackend) collectEvents(timer <-chan time.Time, stopCh <-chan struct{}) []*auditinternal.Event {
|
||||
var events []*auditinternal.Event
|
||||
|
||||
|
||||
7
vendor/k8s.io/apiserver/plugin/pkg/audit/truncate/truncate.go
generated
vendored
7
vendor/k8s.io/apiserver/plugin/pkg/audit/truncate/truncate.go
generated
vendored
@@ -126,7 +126,12 @@ func truncate(e *auditinternal.Event) *auditinternal.Event {
|
||||
|
||||
newEvent.RequestObject = nil
|
||||
newEvent.ResponseObject = nil
|
||||
audit.LogAnnotation(newEvent, annotationKey, annotationValue)
|
||||
|
||||
if newEvent.Annotations == nil {
|
||||
newEvent.Annotations = make(map[string]string)
|
||||
}
|
||||
newEvent.Annotations[annotationKey] = annotationValue
|
||||
|
||||
return newEvent
|
||||
}
|
||||
|
||||
|
||||
8
vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go
generated
vendored
8
vendor/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go
generated
vendored
@@ -63,8 +63,12 @@ func retryOnError(err error) bool {
|
||||
}
|
||||
|
||||
func loadWebhook(configFile string, groupVersion schema.GroupVersion, retryBackoff wait.Backoff, customDial utilnet.DialFunc) (*webhook.GenericWebhook, error) {
|
||||
w, err := webhook.NewGenericWebhook(audit.Scheme, audit.Codecs, configFile,
|
||||
[]schema.GroupVersion{groupVersion}, retryBackoff, customDial)
|
||||
clientConfig, err := webhook.LoadKubeconfig(configFile, customDial)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
w, err := webhook.NewGenericWebhook(audit.Scheme, audit.Codecs, clientConfig,
|
||||
[]schema.GroupVersion{groupVersion}, retryBackoff)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user