Reverse patch fixes from v1.92 into develop #1380
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
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.
What does this PR change?
Reverse patches changes that currently only exist in the
v1.92branch. The PRs that generated the original changes are:Unfortunately, I couldn't follow a proper
git cherry-pickprocess here because the Git history of #1361 was a little tricky. This PR was generated manually, I'd really appreciate a careful eye comparing this change to the PRs its based on.We don't have to do this for #1339 / #1346 because that change followed the standard release process.
For the future, we can avoid this by following the release process outlined in https://github.com/kubecost/release-scripts#if-you-need-to-patch-the-release-branch -- making patch fixes with a clean Git history first to
developand then cherry picking/opening a second PR to the current release branch.Supercedes and closes #1369.
Does this PR rely on any other PRs?
N/A
How does this PR impact users? (This is the kind of thing that goes in release notes!)
N/A, should be captured in impact notes of base PRs.
Links to Issues or ZD tickets this PR addresses or fixes
N/A
How was this PR tested?
Should be covered by the base PRs.
Have you made an update to documentation?
N/A