This repository has been archived by the owner on May 12, 2021. It is now read-only.
Stable 1.11 backports #3055
Merged
Stable 1.11 backports #3055
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
|
/test |
likebreath
approved these changes
Nov 11, 2020
Improve formatting, grammar and whitespace. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit f53406f)
Add missing annotation definitions for a hypervisor control binary: - `io.katacontainers.config.hypervisor.ctlpath` - `io.katacontainers.config.hypervisor.hypervisorctl_hash` This is a partial cherry-pick. The test changes in asset_test.go have not been included since the tests structure has changed in newer branches. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit 7d9860d)
Make `asset.go` the arbiter of asset annotations by removing all asset
annotations lists from other parts of the codebase.
This makes the code simpler, easier to maintain, and more robust.
Specifically, the previous behaviour was inconsistent as the following
ways:
- `createAssets()` in `sandbox.go` was not handling the following asset
annotations:
- firmware:
- `io.katacontainers.config.hypervisor.firmware`
- `io.katacontainers.config.hypervisor.firmware_hash`
- hypervisor:
- `io.katacontainers.config.hypervisor.path`
- `io.katacontainers.config.hypervisor.hypervisor_hash`
- hypervisor control binary:
- `io.katacontainers.config.hypervisor.ctlpath`
- `io.katacontainers.config.hypervisor.hypervisorctl_hash`
- jailer:
- `io.katacontainers.config.hypervisor.jailer_path`
- `io.katacontainers.config.hypervisor.jailer_hash`
- `addAssetAnnotations()` in the `oci` package was not handling the
following asset annotations:
- hypervisor:
- `io.katacontainers.config.hypervisor.path`
- `io.katacontainers.config.hypervisor.hypervisor_hash`
- hypervisor control binary:
- `io.katacontainers.config.hypervisor.ctlpath`
- `io.katacontainers.config.hypervisor.hypervisorctl_hash`
- jailer:
- `io.katacontainers.config.hypervisor.jailer_path`
- `io.katacontainers.config.hypervisor.jailer_hash`
This change fixes the bug where specifying a custom hypervisor path via an
asset annotation was having no effect.
Fixes: kata-containers#3030.
Signed-off-by: James O. D. Hunt <[email protected]>
(cherry picked from commit 6a5eb0d)
Deleted `HypervisorConfig`'s unused `CustomFirmwareAsset()` and `JailerAssetPath()` methods. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit 4ce09fb)
If sandbox/container's dir is not exist, the kill/delete will always fail,and this make kubelet/container delete it repeatedly but fail always. In some kind of abnormal situation(e.g. kill -9 $pidofqemu), kata-runtime may kill/delete sandbox first, this make container'dir not exist, so kata-runtime should skip this error. Fixes: kata-containers#2959. Signed-off-by: Shukui Yang <[email protected]> (cherry picked from commit 120e616)
This link is generated during build, but not ignored by .gitignore. fixes kata-containers#3034 Signed-off-by: David Gibson <[email protected]> (cherry picked from commit 5069ea4)
The device pcie-pci-bridge in qemu will create a pci bus not pcie bus. It should be corrected for QEMUVIRT. After correct this, vfio pci device can be hotplugged in arm64. Fixes: kata-containers#3016 Signed-off-by: Jianyong Wu <[email protected]> (cherry picked from commit 141de5c)
amshinde
force-pushed
the
stable-1.11-backports
branch
from
62166b3 to
eca202e
Compare
|
/test |
Codecov Report
@@ Coverage Diff @@
## stable-1.11 #3055 +/- ##
===============================================
- Coverage 50.43% 48.78% -1.65%
===============================================
Files 118 118
Lines 17114 15354 -1760
===============================================
- Hits 8631 7491 -1140
+ Misses 7425 6820 -605
+ Partials 1058 1043 -15 |
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.
62166b3 arm64: correct bridge type for QEMUVIRT machine
41538ae gitignore: Ignore cli/containerd-shim-kata-v2/config-generated.go
915411a runtime: Ignore ENOENT in kill/delete
b6e7e74 hypervisor: Remove unused methods
f187588 annotations: Improve asset annotation handling
8656862 annotations: Add missing hypervisor control annotation
79af466 asset: Formatting, grammar and whitespace