Skip to content
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.

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

revert pruner keep and keep-since simultaneous support #1446

Merged
Merged
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions pkg/apis/operator/v1alpha1/tektonconfig_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ func (p Prune) validate() *apis.FieldError {
errs = errs.Also(apis.ErrMissingField("spec.pruner.resources"))
}

// tkn cli supports both "keep" and "keep-since", even though there is an issue with the logic
// when we supply both "keep" and "keep-since", the outcome always equivalent to "keep", "keep-since" ignored
// hence we strict with a single flag support until the issue is fixed in tkn cli
// cli issue: https://github.com/tektoncd/cli/issues/1990
if p.Keep != nil && p.KeepSince != nil {
errs = errs.Also(apis.ErrMultipleOneOf("spec.pruner.keep", "spec.pruner.keep-since"))
}

if p.Keep == nil && p.KeepSince == nil {
errs = errs.Also(apis.ErrMissingOneOf("spec.pruner.keep", "spec.pruner.keep-since"))
}
Expand Down