Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

shimv2: use the runtime config file passed from containerd/cri #1173

Merged
merged 1 commit into from
Jan 30, 2019

Conversation

lifupan
Copy link
Member

@lifupan lifupan commented Jan 25, 2019

containerd/cri's different runtime handlers can pass different
config files to shimv2 by a generic runtime options, by this kata
can launch the pods using different VMM for different runtime handlers.

Fixes:#1082

Signed-off-by: Fupan Li lifupan@gmail.com

@gnawux
Copy link
Member

gnawux commented Jan 25, 2019

env var and the protobuf field, which should have higher privilege?

@lifupan
Copy link
Member Author

lifupan commented Jan 25, 2019

env var and the protobuf field, which should have higher privilege?

protobuf > env var > /etc dir > /usr/share/defualt dif

@gnawux
Copy link
Member

gnawux commented Jan 25, 2019

I have another question with protobuf. if work with old version of containerd, will shimv2 panic due to the lack of a field?

@lifupan
Copy link
Member Author

lifupan commented Jan 25, 2019

I have another question with protobuf. if work with old version of containerd, will shimv2 panic due to the lack of a field?

No, it will check the pointer first as below:
if r.Options != nil {

For the old version containerd, here the r.Options will be nil.

@lifupan lifupan force-pushed the criconfig branch 6 times, most recently from 68054e6 to ce7864e Compare January 25, 2019 08:34
@lifupan
Copy link
Member Author

lifupan commented Jan 25, 2019

/test

@lifupan lifupan force-pushed the criconfig branch 5 times, most recently from ff6dbb6 to 7396a71 Compare January 25, 2019 11:22
containerd/cri's different runtime handlers can pass different
config files to shimv2 by a generic runtime options, by this kata
can launch the pods using different VMM for different runtime handlers.

Fixes:kata-containers#1082

Signed-off-by: Fupan Li <lifupan@gmail.com>
@lifupan
Copy link
Member Author

lifupan commented Jan 28, 2019

/test

@gnawux
Copy link
Member

gnawux commented Jan 29, 2019

lgtm

Approved with PullApprove

@lifupan
Copy link
Member Author

lifupan commented Jan 29, 2019

@grahamwhaley Is there any thing wrong with CI, the tests have been launched a day ago, but none of them has been scheduled?

@gnawux
Copy link
Member

gnawux commented Jan 29, 2019

/retest
try again

@grahamwhaley
Copy link
Contributor

hi @lifupan - yep, there was a problem yesterday when a disk filled up and things got stalled/backed up in the queu. I think some jobs then got dropped..... looks like the above action has kicked it into action again ...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants