github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

fix option --audit-webhook-initial-backoff

Browse Source 
Before this change, --audit-webhook-initial-backoff has no effect
This commit is contained in:
Cao Shufeng 2018-03-10 17:44:20 +08:00
parent c6ae1e51ad
commit 5bc5cd1b2c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/options/audit.go
View File

@ -364,7 +364,7 @@ func (o *AuditWebhookOptions) applyTo(c *server.Config) error {
return nil return nil
} }
webhook, err := pluginwebhook.NewBackend(o.ConfigFile, auditv1beta1.SchemeGroupVersion) webhook, err := pluginwebhook.NewBackend(o.ConfigFile, auditv1beta1.SchemeGroupVersion, o.InitialBackoff)
if err != nil { if err != nil {
return fmt.Errorf("initializing audit webhook: %v", err) return fmt.Errorf("initializing audit webhook: %v", err)
} }

4
staging/src/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook.go
View File

@ -70,8 +70,8 @@ type backend struct {
} }
// NewBackend returns an audit backend that sends events over HTTP to an external service. // NewBackend returns an audit backend that sends events over HTTP to an external service.
func NewBackend(kubeConfigFile string, groupVersion schema.GroupVersion) (audit.Backend, error) { func NewBackend(kubeConfigFile string, groupVersion schema.GroupVersion, initialBackoff time.Duration) (audit.Backend, error) {
w, err := loadWebhook(kubeConfigFile, groupVersion, DefaultInitialBackoff) w, err := loadWebhook(kubeConfigFile, groupVersion, initialBackoff)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
staging/src/k8s.io/apiserver/plugin/pkg/audit/webhook/webhook_test.go
View File

@ -105,7 +105,7 @@ func newWebhook(t *testing.T, endpoint string, groupVersion schema.GroupVersion)
// NOTE(ericchiang): Do we need to use a proper serializer? // NOTE(ericchiang): Do we need to use a proper serializer?
require.NoError(t, stdjson.NewEncoder(f).Encode(config), "writing kubeconfig") require.NoError(t, stdjson.NewEncoder(f).Encode(config), "writing kubeconfig")
b, err := NewBackend(f.Name(), groupVersion) b, err := NewBackend(f.Name(), groupVersion, DefaultInitialBackoff)
require.NoError(t, err, "initializing backend") require.NoError(t, err, "initializing backend")
return b.(*backend) return b.(*backend)