Merge pull request #50971 from CaoShuFeng/audit_json

Automatic merge from submit-queue (batch tested with PRs 51134, 51122, 50562, 50971, 51327)

set --audit-log-format default to json

Updates: https://github.com/kubernetes/kubernetes/issues/48561

**Release note**:
```
set --audit-log-format default to json for kube-apiserver
```
This commit is contained in:
Kubernetes Submit Queue
2017-08-25 14:01:33 -07:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -157,7 +157,7 @@ func TestAddFlags(t *testing.T) {
MaxAge: 11,
MaxBackups: 12,
MaxSize: 13,
Format: "legacy",
Format: "json",
},
WebhookOptions: apiserveroptions.AuditWebhookOptions{
Mode: "blocking",

View File

@@ -81,7 +81,7 @@ type AuditWebhookOptions struct {
func NewAuditOptions() *AuditOptions {
return &AuditOptions{
WebhookOptions: AuditWebhookOptions{Mode: pluginwebhook.ModeBatch},
LogOptions: AuditLogOptions{Format: pluginlog.FormatLegacy},
LogOptions: AuditLogOptions{Format: pluginlog.FormatJson},
}
}