This repository has been archived by the owner on Jun 28, 2024. It is now read-only.
backport: 1.6.3 rel #1525
Merged
backport: 1.6.3 rel #1525
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
Fixes: kata-containers#1483 Use git ls-remote instead of curl for git URL check Signed-off-by: Xu Wang <[email protected]> (cherry picked from commit 0d28f77) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
Do not restrict ubuntu version to run with devicemapper. We have now moved most of our jobs to ubuntu 18.04 and we were not testing with devicemapper. With this change, we will test cri-o with devicemapper on all ubuntu versions. Fixes: kata-containers#1493. Signed-off-by: Salvador Fuentes <[email protected]> (cherry picked from commit 77a8cd5) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
The `kata-manager` script needs to download `git` repos. But if `git` isn't available, it can fall back to using `curl` or `wget`. However, if none of these tools are available, it should exit before any changes are made to the system. Note: The script _could_ install one of the tools of course. However, all known Linux distro "default installs" provide at least one of these tools, so this scenario should only be hit on very minimal systems. In that case, install one of the tools the error mentions and re-run `kata-manager`. Fixes kata-containers#1502. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit cfa9c82) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
Consume twice the memory hot added to the container to guarantee the `out of memory` error. fixes kata-containers#1504 Signed-off-by: Julio Montes <[email protected]> (cherry picked from commit bb49514) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
Modify the `check_vendor()` function in the static check script. Rather than exiting the function as early as possible, change the logic to allow follow on future checks to be added. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit 50f3b03) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
Update the `check_vendor()` function in the static check script to run our current vendoring tool (`dep`) in check mode. This will ensure our vendoring does not get silently broken [1]. Fixes kata-containers#1506. [1] - See for example kata-containers/runtime#1442. Signed-off-by: James O. D. Hunt <[email protected]> (cherry picked from commit 830983f) Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
|
/test |
|
centos-7-4-q-35 fedora RHEL 7 |
jodh-intel
approved these changes
May 2, 2019
chavafg
approved these changes
May 2, 2019
jcvenegas
approved these changes
May 2, 2019
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.
Backporting below patches for 1.6.3 release.
#1484
#1494
#1503
#1505
#1508