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 ```

Merge pull request #50971 from CaoShuFeng/audit_json
b5bb8099 · Kubernetes Submit Queue · GitHub · ccae631f · 130f5d10 · b5bb8099
Commit b5bb8099 authored Aug 25, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

options_test.go cmd/kube-apiserver/app/options/options_test.go +1 -1

audit.go staging/src/k8s.io/apiserver/pkg/server/options/audit.go +1 -1

No files found.
--- a/cmd/kube-apiserver/app/options/options_test.go
+++ b/cmd/kube-apiserver/app/options/options_test.go
@@ -157,7 +157,7 @@ func TestAddFlags(t *testing.T) {
 				MaxAge:     11,
 				MaxBackups: 12,
 				MaxSize:    13,
-				Format:     "legacy",
+				Format:     "json",
 			},
 			WebhookOptions: apiserveroptions.AuditWebhookOptions{
 				Mode:       "blocking",

--- a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
@@ -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},
 	}
 }