Merge pull request #21080 from soltysh/bug1631087_3.11

Bug 1632155 - Accept logFormat when passed to audit config
openshift · Oct 1, 2018 · f7602dd · f7602dd
2 parents 2a86335 + 67af498
commit f7602dd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/cmd/openshift-apiserver/openshiftapiserver/configprocessing/audit.go b/pkg/cmd/openshift-apiserver/openshiftapiserver/configprocessing/audit.go
@@ -38,7 +38,11 @@ func GetAuditConfig(auditConfig configapi.AuditConfig) (audit.Backend, auditpoli
 		// backwards compatible writer to regular log
 		writer = cmdutil.NewGLogWriterV(0)
 	}
-	backend = auditlog.NewBackend(writer, auditlog.FormatJson, auditv1beta1.SchemeGroupVersion)
+	format := auditConfig.LogFormat
+	if len(format) == 0 {
+		format = auditlog.FormatJson
+	}
+	backend = auditlog.NewBackend(writer, string(format), auditv1beta1.SchemeGroupVersion)
 	policyChecker = auditpolicy.NewChecker(&auditinternal.Policy{
 		// This is for backwards compatibility maintaining the old visibility, ie. just
 		// raw overview of the requests comming in.