This repository has been archived by the owner on Jun 28, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 196
CC | Adapt to the containerd changes done on kata-containers repo #5773
Merged
fidencio
merged 4 commits into
kata-containers:CCv0
from
fidencio:topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file
Sep 19, 2023
Merged
CC | Adapt to the containerd changes done on kata-containers repo #5773
fidencio
merged 4 commits into
kata-containers:CCv0
from
fidencio:topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file
Sep 19, 2023
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
This will represent whether we will use the forked containerd for the Confidential Containers use case or not. This will never land into the main branch, but it's needed here for the time being. Signed-off-by: Fabiano Fidêncio <[email protected]>
/test |
fidencio
force-pushed
the
topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file
branch
from
September 19, 2023 12:26
336ab89
to
5cc79c5
Compare
/test |
Sorry, I forgot to point out that
|
Yeah, I just noticed with the test failing. At least we know the change works, and what will need to be updated. Let me grow this PR (and the one in the Kata Containers) a little bit so we avoid having to wait for this CI to finish to start doing the other work. |
katacontainersbot
added
size/large
Task of significant size
and removed
size/small
Small and simple task
labels
Sep 19, 2023
fidencio
force-pushed
the
topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file
branch
from
September 19, 2023 13:47
64f497f
to
2ee9f26
Compare
/test |
1 similar comment
/test |
stevenhorsman
approved these changes
Sep 19, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM assuming the tests are passing
The env var that was introduced in the previous commit, will allow us to install the proper containerd version depending on what our tests will need. Depends-on: github.com/kata-containers/kata-containers#7998 Signed-off-by: Fabiano Fidêncio <[email protected]>
To support the v0.12.0 nydus-snapshotter, we need to update the config files and the commandline to start nydus-snapshotter. Fixes kata-containers#5770 Signed-off-by: ChengyuZhu6 <[email protected]>
This is needed to workaround the following issue: kata-containers#5771 dragomball maintainers will help us to get this back in place later on. Signed-off-by: Fabiano Fidêncio <[email protected]> (cherry picked from commit 62afa00)
fidencio
force-pushed
the
topic/CC-adapt-to-containerd-changes-in-the-kata-repo-versions-file
branch
from
September 19, 2023 20:26
2ee9f26
to
87c7140
Compare
/test |
None of the changes here should directly impact TDX / SEV / SNP CIs, thus I'm going ahead and merging this one to avoid delaying even more v0.8.0 release. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 will easily allow us to test against the forked and the upstream containerd.
As the tests had changed completely on main, and as the main branch should never ever see the forked containerd, we're doing this only for the CCv0 case.