kata-deploy: Fix shim check for snapshotter configuration #8733
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
We want to check whether the shim is part of the "plain text" shims passed to the daemonset (meaning, checking against `$SHIMS`). Before this fix we were checking against `$shims`, which is an array of shims instead of a string, resulting on a broken check. Fixes: kata-containers#8732 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
fidencio
added
force-skip-ci
|
/test |
fidencio
added a commit
to fidencio/cc-operator
that referenced
this pull request
Dec 26, 2023
This PR has been opened in order to test the changes needed for configuring containerd snapshotters per runtime handlers, and depends on a PR that's not yet merged on Kata Containers: kata-containers/kata-containers#8733 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
In the way the script is without this patch, we're trying to set ```toml [`$shim`] snapshotter = $snapshotter ``` However, what we actually want to set is the full runtime table instead of shim. Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
fidencio
added a commit
to fidencio/cc-operator
that referenced
this pull request
Dec 26, 2023
This PR has been opened in order to test the changes needed for configuring containerd snapshotters per runtime handlers, and depends on a PR that's not yet merged on Kata Containers: kata-containers/kata-containers#8733 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
Otherwise `jq` will complain about: ```sh jq: error: nydus/0 is not defined at <top-level>, line 1: .plugins."io.containerd.grpc.v1.cri".containerd.runtimes."kata-clh".snapshotter=nydus jq: 1 compile error ``` Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
fidencio
added a commit
to fidencio/cc-operator
that referenced
this pull request
Dec 26, 2023
This PR has been opened in order to test the changes needed for configuring containerd snapshotters per runtime handlers, and depends on a PR that's not yet merged on Kata Containers: kata-containers/kata-containers#8733 Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
|
/test |
danmihai1
approved these changes
Dec 26, 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.
We want to check whether the shim is part of the "plain text" shims passed to the daemonset (meaning, checking against
$SHIMS). Before this fix we were checking against$shims, which is an array of shims instead of a string, resulting on a broken check.Fixes: #8732