Rebase devel on peer pods #311
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
The return value ('foundMcp') was never used. The same retrieval happens
again further down the function with an identical error handling which
however also handles the success case.
Signed-off-by: Pavel Mores <pmores@redhat.com>
The function will be useful in processKataConfigDeleteRequest() as well so we factor it out of processKataConfigInstallRequest(). Signed-off-by: Pavel Mores <pmores@redhat.com>
This is the central commit of this series. It replaces several arbitrary 60 seconds waits and node-counting conditionals which have proved fragile in practice with a straightened-out flow that's identical to what installation uses: first, change MCO resources (here by unlabeling nodes and deleting the extension MC), then wait for the MCO to notice the changes and start processing them, then wait for the MCO to finish processing the changes, and finally finish up the OSC part of the operation by deleting the custom pool if applicable, the Daemonset and the Scc, and then KataConfig itself. Signed-off-by: Pavel Mores <pmores@redhat.com>
This fixes a long-standing omission. Signed-off-by: Pavel Mores <pmores@redhat.com>
All of the other resource removals at the bottom of processKataConfigDeleteRequest() are removed by separate functions. Also, the new function is a logical counterpart to the already existing addFinalizer(). Signed-off-by: Pavel Mores <pmores@redhat.com>
'r.Client.Status().Update()' was called right after updateStatus() call, basically duplicating the same catch-all call performed after processKataConfigDeleteRequest() return. The processKataConfigDeleteRequest() call site was modified to ensure that the status update is always performed, even if a deletion reconciliation ends in an error. This seems to make sense, no matter how reconciliation ends it might well have updated the status, and if not the update is just a no-op. Signed-off-by: Pavel Mores <pmores@redhat.com>
The problem and the fix are described in more detail in a code comment, please see the diff. Signed-off-by: Pavel Mores <pmores@redhat.com>
Fixes: #KATA-2165 Signed-off-by: Pradipta Banerjee <pradipta.banerjee@gmail.com>
Bump up peerpod-ctrl and peerpodconfig-ctrl deps
cloud providers Signed-off-by: Snir Sheriber <ssheribe@redhat.com>
add image creation jobs for aws and azure
|
I think it needs another rebase now that #306 is merged :-( |
|
Yes, apparently. Otherwise it looks good. |
`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>
gkurz
force-pushed
the
rebase-devel-on-peer-pods
branch
from
319fd38
to
a604fed
Compare
|
Forced push because of #306 just being merged into |
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-previewanddevelbranches 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 peer-pods-tech-preview- How to verify it
PR branch should be just one patch ahead from
peer-pods-tech-preview, i.e.HEAD^of the PR branch ==HEADofpeer-pods-tech-preview- Description for the changelog
Pull all changes from
peer-pods-tech-previewtodevel. Next step will be to mergedevelintopeer-pods-tech-previewso that they are identical.