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

Update release/4.0 from recent release/3.0 changes #420

Merged
merged 8 commits into from
Feb 26, 2024

Conversation

ericpromislow
Copy link
Collaborator

Most of these changes should be due to rebasing release/v3.0 onto release/v4.0

Copy link
Contributor

@alexandreLamarre alexandreLamarre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, couple of readability suggestions

pkg/resourcesets/collector.go Outdated Show resolved Hide resolved
pkg/resourcesets/collector.go Outdated Show resolved Hide resolved
pkg/resourcesets/testdata/README.md Outdated Show resolved Hide resolved
eliyamlevy and others added 8 commits February 26, 2024 10:46
Original was too greedy when dealing with both ResourceNameRegexp and ExcludeResourceNameRegexp
Fixed issue with ResourceName Filtering
This change adds in a number of unit tests that cover supported filter scenarios for name based filters.
Additionally we renamed a few methods to better make their name match their use/purpose.
Finally this change does fix an issue in the deduplication logic.
And this technique lets us reuse input files.
* Further refactoring: simplify and test kind and namespace matching.

* Added tests to verify that invalid regular expressions are
  caught as recoverable error messages (and runtime testing
  showed that they were reported and backups continued).
- Also: stop checking for a regexp == "." -- let the engine do it.
  Benchmarking shows the pattern-matching is a touch faster even with the function call
catalog.cattle.io/release-name: rancher-backup
catalog.cattle.io/scope: management
catalog.cattle.io/type: cluster-tool
catalog.cattle.io/ui-component: rancher-backup
catalog.cattle.io/upstream-version: 2.1.1
catalog.cattle.io/upstream-version: 3.0.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this match the base branch of release/v4.0.0 as 4.0.0

@ericpromislow ericpromislow merged commit a0d8d1e into rancher:release/v4.0 Feb 26, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants