Sync to upsteam #2990
Merged
Sync to upsteam #2990
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
Codecov Report
@@ Coverage Diff @@
## master #2990 +/- ##
=========================================
- Coverage 68.12% 66.73% -1.4%
=========================================
Files 291 291
Lines 18389 18655 +266
=========================================
- Hits 12528 12449 -79
- Misses 4405 4720 +315
- Partials 1456 1486 +30
|
|
Thanks for your contribution. 🍻 @rudyfly |
|
Thanks for your contribution. 🍻 @rudyfly |
rudyfly
force-pushed
the
sync_to_upsteam
branch
5 times, most recently
from
8040c58
to
c93ab8c
Compare
add resize exec window for pouch cli `pouch exec` Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
When containerd publishes more and more oom event during container-delete action, the updateContainerState eventHook will put the dead container info into local disk, which removed by container-delete action. It is concurrent issue. Therefore, before we update container status first, if it is dead(removing), we should skip it.
fix can not scan volume plugin add --volume-driver for pouch command. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Signed-off-by: huaihuan.zy <huaihuan.zy@alibaba-inc.com>
Signed-off-by: huaihuan.zy <huaihuan.zy@alibaba-inc.com>
fix wrong way to set http timeout, and change timeout to 10 min. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
fix wrong way to prepare working directory, detail: https://work.aone.alibaba-inc.com/issue/21989036 Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Signed-off-by: huaihuan.zy <huaihuan.zy@alibaba-inc.com>
push should not try to fetch the manifest like pull, because the repository is brand new one and doesn't exist.
…ainer rootfs is set to shared mount propagation, bind mount may inherit rootfs mount propagation if bind mount propagation is "". This is not as expected. Signed-off-by: allen.wang <allen.wq@alipay.com>
refact daemon log, and request id and container id. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
govendor fetch "github.com/cri-o/ocicni/pkg/ocicni::github.com/alibaba/ocicni/pkg/ocicni" Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
1. container may be deleted using 'pouch rm' thus, stop pod would fail and netns would leak. this patch dismiss the container not found error 2. the existence of pod depends on sandbox metadata not the metadata of pouch container Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
when project quota, use `chattr -R` to set quota id recursively. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
when starting or creating containers in environments which has thousands of lines in /proc/mounts https://work.aone.alibaba-inc.com/issue/22582695 Signed-off-by: shenling.yyb <shenling.yyb@alibaba-inc.com>
Signed-off-by: zhijin <zhijin.zqh@alibaba-inc.com>
rudyfly
force-pushed
the
sync_to_upsteam
branch
from
c93ab8c
to
fb20a74
Compare
|
@rudyfly Thanks for your contribution. 🍻 |
|
merging first, and I will submit another pr to fix the node e2e test |
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.
Ⅰ. Describe what this PR did
sync to upsteam
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com
Signed-off-by: zhijin zhijin.zqh@alibaba-inc.com
Signed-off-by: shenling.yyb shenling.yyb@alibaba-inc.com