Consolidate updateAwaitConfig/createAwaitConfig #3139
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
blampe
force-pushed
the
blampe/2996-await-delete
branch
from
49579dd
to
1d398f2
Compare
blampe
added
the
impact/no-changelog-required
blampe
force-pushed
the
blampe/await-config
branch
from
edfb8bf
to
30d4147
Compare
Does the PR have any schema changes?Looking good! No breaking changes found. |
blampe
force-pushed
the
blampe/2996-await-delete
branch
from
5322331
to
b1d2cfb
Compare
blampe
force-pushed
the
blampe/await-config
branch
from
30d4147
to
3fc61eb
Compare
|
This change is part of the following stack: Change managed by git-spice. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #3139 +/- ##
==========================================
+ Coverage 36.34% 36.53% +0.18%
==========================================
Files 70 70
Lines 9258 9230 -28
==========================================
+ Hits 3365 3372 +7
+ Misses 5556 5527 -29
+ Partials 337 331 -6 ☔ View full report in Codecov by Sentry. |
This was referenced Jul 31, 2024
blampe
force-pushed
the
blampe/2996-await-delete
branch
from
b1d2cfb
to
6383aa6
Compare
blampe
force-pushed
the
blampe/await-config
branch
2 times, most recently
from
f702f3d
to
535ace3
Compare
EronWright
approved these changes
Aug 6, 2024
Comment on lines
-452
to
-682
| oldSpec, _ := openapi.Pluck(c.lastOutputs.Object, "spec") | ||
| newSpec, _ := openapi.Pluck(c.currentOutputs.Object, "spec") | ||
| if !reflect.DeepEqual(oldSpec, newSpec) { | ||
| return untilCoreV1ResourceQuotaInitialized(c.createAwaitConfig) | ||
| } |
There was a problem hiding this comment.
The old logic seems to say, if nothing has changed, then skip waiting for anything. But waiting is harmless I suppose?
There was a problem hiding this comment.
Confirmed this still works as expected. Tested by adding an annotation to a ResourceQuota to exercise this case where the spec is unchanged -- previously we would have short-circuited but awaiting works just as well.
blampe
force-pushed
the
blampe/await-config
branch
from
535ace3
to
55283ce
Compare
blampe
force-pushed
the
blampe/await-config
branch
from
55283ce
to
2bde7af
Compare
blampe
added a commit
that referenced
this pull request
Aug 16, 2024
The `ServiceAccount` awaiter is the only one which uses `clusterVersion` to decide its behavior, and we were only populating this on creation. #3139 consolidated create/update wait logic, which introduced a panic in this case because we're now calling the init awaiter during update. This PR adds a `nil` check to be safe and also populates `clusterVersion` for update/delete/read in the off chance that another awaiter might want to use it later down the line. Fixes #3166
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.
There's no functional difference between our "update" and "create" await logic
-- in every case, our update awaiters simply invoke the create awaiter, or vice
versa.
(The only minor exception to this is
untilCoreV1ResourceQuotaUpdated, whichhas a little logic to short-circuit but otherwise still calls into the
corresponding create awaiter.)
This PR consolidates the create/update configs into one. This will make it more
straightforward to glue together our legacy awaiters.
The first commit replaces
updateAwaitConfigwithcreateAwaitConfig, and thesecond commit is just renaming.
The third commit adds test coverage for the
Updatepath, essentiallycopy-pasted from the
Creationtests. This will help guarantee that subsequentPRs preserve existing behavior.
Fixes #2799.
Refs #2824.