Rebase peer pods on devel #312
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
`make test` is leaking the kube-apiserver and etcd processes. When unoticed, this causes `make test` to fail with weird errors like failing to open a file because of rlimit. Investigation leads to commit 053f866 which was added to work around the very same problems at the time according to Pradipta. Reverting this commit fixes the issue. It seems that updates to the controller-runtime and deps might have changed something and we no longer need the workaround. Let's just revert 053f866. Fixes https://issues.redhat.com/browse/KATA-2168 Signed-off-by: Greg Kurz <groug@kaod.org>
Revert "Fix errors during envtest teardown"
`make test` is leaking the kube-apiserver and etcd processes. When unoticed, this causes `make test` to fail with weird errors like failing to open a file because of rlimit. Investigation leads to commit 053f866 which was added to work around the very same problems at the time according to Pradipta. Reverting this commit fixes the issue. It seems that updates to the controller-runtime and deps might have changed something and we no longer need the workaround. Let's just revert 053f866. Fixes https://issues.redhat.com/browse/KATA-2168 Signed-off-by: Greg Kurz <groug@kaod.org>
Rebase devel on peer pods
pmores
approved these changes
May 16, 2023
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.
- Description of the problem which is fixed/What is the use case
The peer-pods-tech-preview and devel branches aren't currently in sync. They haven't diverged too much but we'd like them to stay as much as sync as possible until OSC 1.4.0 is released.
- What I did
git rebase --ff devel- How to verify it
PR branch should be identical to
devel.- Description for the changelog
This makes
peer-pods-tech-previewanddevelidentical.