github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50971 from CaoShuFeng/audit_json

Browse Source 
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
parent ccae631ff9 130f5d10ad
commit b5bb8099e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/options/options_test.go
View File

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

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

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