Skip to content

[v0.11] use effective version #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rohitsuse merged 2 commits into from
Sep 3, 2026
+17 −6
Merged

[v0.11] use effective version #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ca2cf2
use effective version
Aug 17, 2026
ed49dcf
Update pkg/resources/management.cattle.io/v3/setting/validator.go
joshmeranda Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/resources/management.cattle.io/v3/setting/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ 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 {
return field.TypeInvalid(valuePath, s.Value, err.Error())
if _, err := time.ParseDuration(effectiveValue(s) + "s"); err != nil {
return field.TypeInvalid(valuePath, effectiveValue(s), err.Error())
}

return nil
Expand Down
19 changes: 15 additions & 4 deletions pkg/resources/management.cattle.io/v3/setting/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 {
Expand All @@ -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)
})
}
Expand Down