-
Notifications
You must be signed in to change notification settings - Fork 113
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
Enhance SSA ignoreChanges by having better field manager path comparisons #2828
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Does the PR have any schema changes?Looking good! No breaking changes found. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2828 +/- ##
==========================================
- Coverage 25.48% 25.46% -0.03%
==========================================
Files 48 48
Lines 7526 7533 +7
==========================================
Hits 1918 1918
- Misses 5450 5457 +7
Partials 158 158 ☔ View full report in Codecov by Sentry. |
fe715df
to
82306b2
Compare
82306b2
to
6eee4b5
Compare
EronWright
approved these changes
Feb 29, 2024
lumiere-bot bot
added a commit
to coolguy1771/home-ops
that referenced
this pull request
Mar 7, 2024
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@pulumi/kubernetes](https://pulumi.com) ([source](https://togithub.com/pulumi/pulumi-kubernetes)) | dependencies | minor | [`4.8.1` -> `4.9.0`](https://renovatebot.com/diffs/npm/@pulumi%2fkubernetes/4.8.1/4.9.0) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pulumi/pulumi-kubernetes (@​pulumi/kubernetes)</summary> ### [`v4.9.0`](https://togithub.com/pulumi/pulumi-kubernetes/blob/HEAD/CHANGELOG.md#490-March-4-2024) [Compare Source](https://togithub.com/pulumi/pulumi-kubernetes/compare/v4.8.1...v4.9.0) - Fix SSA ignoreChanges by enhancing field manager path comparisons ([pulumi/pulumi-kubernetes#2828) - Update nodejs SDK dependencies ([pulumi/pulumi-kubernetes#2858, [pulumi/pulumi-kubernetes#2861) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjcuMSIsInVwZGF0ZWRJblZlciI6IjM3LjIyNy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9--> Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
This PR enhances the field manager checks to ensure we do not take control of fields manager by other owners during a Patch Resource update. Previously, our set of managed fields only contains that the child node of a path. We now add the parent fields into the set as well.
Example:
Previously:
Set containing currently managed path(s):
.spec.metadata.template.labels
Path we want to check if present in set:
.spec.metadata.template
Using
set.Has(path)
will returnfalse
. However, this is not wanted since adding.spec.metadata.template
as an ignoreChanges path means we don't care about children fields as well.Now:
set.Has(path)
will now returntrue
, which indicates to our provider that we need to ignorespec.metadata.template
Related issues (optional)
Fixes: #2714