[WIP] Repair dev-1.18 and sync master (redo #19221) #19233
Closed
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.
This PR replicates #19221.
This PR is necessary because #19221 was merged manually instead of with Prow. The manual merge applied the default repo merge strategy of squash. Sync PRs must merge with the merge method.
Note that #19221 had the
tide/merge-method-merge
label applied, but the manual merge overrode the tide label.For more information about why the merge method matters, see kubernetes/test-infra#13065 (comment).
Effect on open PRs
When this PR merges, all open PRs based on dev-1.18 will probably need to rebase.
Double check the merge strategy
Make sure this PR has the label
tide/merge-method-merge
. 👉Merge this PR via Prow with
/lgtm
and/approve
. Do not merge this PR manually.