Merge pull request #4751 from iawia002/fix-config

Add omitempty option to LoginHistoryMaximumEntries field to avoid it being set to 0

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

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,