use custom runtime "contrast-cc" #344
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
malt3
force-pushed
the
feat/custom-runtime
branch
3 times, most recently
from
3716db7 to
fbd6ad7
Compare
|
malt3
force-pushed
the
feat/custom-runtime
branch
2 times, most recently
from
09a0eab to
c0c7e08
Compare
burgerdev
reviewed
Apr 18, 2024
Comment on lines
+203
to
+208
| nix shell .#contrast --command resourcegen runtime workspace/runtime.yml | ||
| nix run .#kypatch images -- workspace/runtime.yml \ | ||
| --replace "ghcr.io/edgelesssys/contrast/node-installer:latest" "$nodeInstallerImgTagged" |
There was a problem hiding this comment.
cc @wirungu: another use case for image patching incoming.
Comment on lines
-171
to
+169
| paths = filterNonCoCoRuntime("kata-cc-isolation", paths, logger) | ||
| paths = filterNonCoCoRuntime("contrast-cc", paths, logger) |
There was a problem hiding this comment.
This reminds me that we'll likely need to do something here if kata-containers/kata-containers#8571 would eventually be fixed.
There was a problem hiding this comment.
Agreed. I do expect that resourcegen will give us a flag to specify the runtimeClassName to select, so this should be a trivial fix.
malt3
force-pushed
the
feat/custom-runtime
branch
2 times, most recently
from
0bfc39a to
91f3a53
Compare
katexochen
reviewed
Apr 19, 2024
| @@ -66,6 +66,7 @@ buildGoModule rec { | |||
| "-s" | |||
| "-w" | |||
| "-X main.version=v${version}" | |||
| "-X github.com/edgelesssys/contrast/cli/cmd.runtimeHandler=${runtimeHandler}" | |||
There was a problem hiding this comment.
Why create a second var when we already have one that contains runtimeHandler?
There was a problem hiding this comment.
The other var is in the internal e2e package.
malt3
force-pushed
the
feat/custom-runtime
branch
from
91f3a53 to
e4f9222
Compare
malt3
force-pushed
the
feat/custom-runtime
branch
from
e4f9222 to
89538ed
Compare
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.
This PR switches from the
kata-cc-isolationruntime tocontrast-cc-<VERSIONHASH>.I need to include a bunch of somewhat unrelated changes in this PR to make sure it is a clean switch.
Failing e2e tests are due to the test not using the new
ContrastTestframework. We need to decide what to do about that. I will probably open a PR in parallel to move the remaining tests.Test cases:
Planned follow ups (to limit the scope of this PR):
runtimeClassName: contrast-ccwithruntimeClassName: contrast-cc-<VERSIONHASH>in generate step