From 28f260e244a64b5489dcf157b44aedf2860c9577 Mon Sep 17 00:00:00 2001 From: Xinzhao Xu Date: Mon, 28 Mar 2022 16:51:33 +0800 Subject: [PATCH] Add omitempty option to LoginHistoryMaximumEntries field to avoid it being set to 0 --- pkg/apiserver/authentication/options.go | 2 +- pkg/apiserver/config/config_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/apiserver/authentication/options.go b/pkg/apiserver/authentication/options.go index 84c0b9000..0bba53fea 100644 --- a/pkg/apiserver/authentication/options.go +++ b/pkg/apiserver/authentication/options.go @@ -51,7 +51,7 @@ type Options struct { LoginHistoryRetentionPeriod time.Duration `json:"loginHistoryRetentionPeriod" yaml:"loginHistoryRetentionPeriod"` // retention login history, records beyond this amount will be deleted // LoginHistoryMaximumEntries restricts for all kubesphere accounts and must be greater than AuthenticateRateLimiterMaxTries - LoginHistoryMaximumEntries int `json:"loginHistoryMaximumEntries" yaml:"loginHistoryMaximumEntries"` + LoginHistoryMaximumEntries int `json:"loginHistoryMaximumEntries,omitempty" yaml:"loginHistoryMaximumEntries,omitempty"` // allow multiple users login from different location at the same time MultipleLogin bool `json:"multipleLogin" yaml:"multipleLogin"` // secret to sign jwt token diff --git a/pkg/apiserver/config/config_test.go b/pkg/apiserver/config/config_test.go index cbe1983af..55de258e6 100644 --- a/pkg/apiserver/config/config_test.go +++ b/pkg/apiserver/config/config_test.go @@ -151,6 +151,7 @@ func newTestConfig() (*Config, error) { AuthenticateRateLimiterMaxTries: 5, AuthenticateRateLimiterDuration: 30 * time.Minute, JwtSecret: "xxxxxx", + LoginHistoryMaximumEntries: 100, MultipleLogin: false, OAuthOptions: &oauth.Options{ Issuer: oauth.DefaultIssuer,