Merge pull request #65199 from tallclair/maxage

Automatic merge from submit-queue (batch tested with PRs 65152, 65199, 65179, 64598, 65216). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix MaxAge default audit log option Fix typo in flag default. ```release-note NONE ```

Merge pull request #65199 from tallclair/maxage
01bc75c2 · Kubernetes Submit Queue · GitHub · af1450df · 3dae49c6 · 01bc75c2
Unverified Commit 01bc75c2 authored Jun 21, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/audit.go
@@ -369,7 +369,7 @@ func (o *AuditTruncateOptions) wrapBackend(delegate audit.Backend, gv schema.Gro
 func (o *AuditLogOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.Path, "audit-log-path", o.Path,
 		"If set, all requests coming to the apiserver will be logged to this file.  '-' means standard out.")
-	fs.IntVar(&o.MaxAge, "audit-log-maxage", o.MaxBackups,
+	fs.IntVar(&o.MaxAge, "audit-log-maxage", o.MaxAge,
 		"The maximum number of days to retain old audit log files based on the timestamp encoded in their filename.")
 	fs.IntVar(&o.MaxBackups, "audit-log-maxbackup", o.MaxBackups,
 		"The maximum number of old audit log files to retain.")