From 7ca2cf255752ad14c3b044baa4c58cffb3cdaa89 Mon Sep 17 00:00:00 2001 From: joshmeranda Date: Mon, 17 Aug 2026 09:24:38 -0400 Subject: [PATCH 1/2] use effective version --- .../v3/setting/validator.go | 2 +- .../v3/setting/validator_test.go | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkg/resources/management.cattle.io/v3/setting/validator.go b/pkg/resources/management.cattle.io/v3/setting/validator.go index 6e7c37beda..884955dc3c 100644 --- a/pkg/resources/management.cattle.io/v3/setting/validator.go +++ b/pkg/resources/management.cattle.io/v3/setting/validator.go @@ -377,7 +377,7 @@ func (a *admitter) validateUserRetentionCron(s *v3.Setting) error { func (a *admitter) validateAuthUserInfoMaxAgeSeconds(s *v3.Setting) error { // We cannot use the validateDuration func since it does not allow for negative durations // which are valid for the auth-user-info-max-age-seconds setting. - if _, err := time.ParseDuration(s.Value + "s"); err != nil { + if _, err := time.ParseDuration(effectiveValue(s) + "s"); err != nil { return field.TypeInvalid(valuePath, s.Value, err.Error()) } diff --git a/pkg/resources/management.cattle.io/v3/setting/validator_test.go b/pkg/resources/management.cattle.io/v3/setting/validator_test.go index 7966d1efad..6667ba65dd 100644 --- a/pkg/resources/management.cattle.io/v3/setting/validator_test.go +++ b/pkg/resources/management.cattle.io/v3/setting/validator_test.go @@ -391,9 +391,10 @@ func (s *SettingSuite) TestValidateAuthUserInfoMaxAgeSecondsOnCreate() { func (s *SettingSuite) validateAuthUserInfoMaxAgeSeconds(op v1.Operation) { tests := []struct { - desc string - value string - allowed bool + desc string + value string + defaultValue string + allowed bool }{ { desc: "valid max age", @@ -409,6 +410,15 @@ func (s *SettingSuite) validateAuthUserInfoMaxAgeSeconds(op v1.Operation) { desc: "invalid max age", value: "foo", }, + { + desc: "empty value with default", + defaultValue: "3600", + allowed: true, + }, + { + desc: "empty value and default", + allowed: false, + }, } for _, test := range tests { @@ -425,7 +435,8 @@ func (s *SettingSuite) validateAuthUserInfoMaxAgeSeconds(op v1.Operation) { ObjectMeta: metav1.ObjectMeta{ Name: setting.AuthUserInfoMaxAgeSeconds, }, - Value: test.value, + Value: test.value, + Default: test.defaultValue, }, op, "foo", test.allowed) }) } From ed49dcf99afdf73541f0cba21d65e0ea43f1aa69 Mon Sep 17 00:00:00 2001 From: Josh Meranda Date: Fri, 21 Aug 2026 09:26:04 -0400 Subject: [PATCH 2/2] Update pkg/resources/management.cattle.io/v3/setting/validator.go Co-authored-by: Andreas Kupries --- pkg/resources/management.cattle.io/v3/setting/validator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/resources/management.cattle.io/v3/setting/validator.go b/pkg/resources/management.cattle.io/v3/setting/validator.go index 884955dc3c..6058440db7 100644 --- a/pkg/resources/management.cattle.io/v3/setting/validator.go +++ b/pkg/resources/management.cattle.io/v3/setting/validator.go @@ -378,7 +378,7 @@ func (a *admitter) validateAuthUserInfoMaxAgeSeconds(s *v3.Setting) error { // We cannot use the validateDuration func since it does not allow for negative durations // which are valid for the auth-user-info-max-age-seconds setting. if _, err := time.ParseDuration(effectiveValue(s) + "s"); err != nil { - return field.TypeInvalid(valuePath, s.Value, err.Error()) + return field.TypeInvalid(valuePath, effectiveValue(s), err.Error()) } return nil