From fbe8ccc9bdf6c6cf3702be36acd49c4b16868202 Mon Sep 17 00:00:00 2001 From: xiongzhongliang Date: Sun, 28 Feb 2021 01:00:09 +0800 Subject: [PATCH] Optimize some codes Kubernetes-commit: 4a24a08f936a295bf332b9567bea182e2feff554 --- pkg/server/options/audit.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/server/options/audit.go b/pkg/server/options/audit.go index ba79eb466..e88e8ca78 100644 --- a/pkg/server/options/audit.go +++ b/pkg/server/options/audit.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" + "k8s.io/apimachinery/pkg/util/sets" auditinternal "k8s.io/apiserver/pkg/apis/audit" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1" auditv1alpha1 "k8s.io/apiserver/pkg/apis/audit/v1alpha1" @@ -478,14 +479,7 @@ func (o *AuditLogOptions) Validate() []error { } // Check log format - validFormat := false - for _, f := range pluginlog.AllowedFormats { - if f == o.Format { - validFormat = true - break - } - } - if !validFormat { + if !sets.NewString(pluginlog.AllowedFormats...).Has(o.Format) { allErrors = append(allErrors, fmt.Errorf("invalid audit log format %s, allowed formats are %q", o.Format, strings.Join(pluginlog.AllowedFormats, ","))) }