Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: update the version of cri-o/ocicni #2065

Merged
merged 1 commit into from
Aug 11, 2018

Conversation

starnop
Copy link
Contributor

@starnop starnop commented Aug 8, 2018

Signed-off-by: Starnop [email protected]

Ⅰ. Describe what this PR did

update the version of cri-o/ocicni

Now that watcher is running and watching the pluginDir gather the initial configuration, before starting the goroutine which will actually process events. It has to be done in this order to avoid missing any updates which might otherwise occur between gathering the initial configuration and starting the watcher.

Ⅱ. Does this pull request fix one issue?

None.

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

Codecov Report

Merging #2065 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2065      +/-   ##
==========================================
- Coverage    63.8%   63.79%   -0.01%     
==========================================
  Files         202      202              
  Lines       15621    15621              
==========================================
- Hits         9967     9966       -1     
- Misses       4413     4415       +2     
+ Partials     1241     1240       -1
Flag Coverage Δ
#criv1alpha1test 33.53% <ø> (ø) ⬆️
#criv1alpha2test 34.21% <ø> (ø) ⬆️
#integrationtest 38.24% <ø> (-0.02%) ⬇️
#unittest 23.11% <ø> (ø) ⬆️
Impacted Files Coverage Δ
apis/server/utils.go 61.9% <0%> (-4.77%) ⬇️
cri/v1alpha1/cri.go 65.36% <0%> (+0.17%) ⬆️

@allencloud
Copy link
Collaborator

Please add more reasons about why we need to update the vendored package. For example, the newer version has fixed some certain bugs and so on. 😄 @starnop

@YaoZengzeng YaoZengzeng changed the title feature: update the version of cri-o/ocicni [WIP]feature: update the version of cri-o/ocicni Aug 9, 2018
@YaoZengzeng
Copy link
Contributor

@starnop Please remove WIP when this PR is being well tested.

@starnop starnop changed the title [WIP]feature: update the version of cri-o/ocicni feature: update the version of cri-o/ocicni Aug 9, 2018
@starnop
Copy link
Contributor Author

starnop commented Aug 9, 2018

@YaoZengzeng Has been well tested. :)

@YaoZengzeng
Copy link
Contributor

LGTM
@rudyfly PTAL

@pouchrobot
Copy link
Collaborator

ping @starnop
We found that this PR is 31 commits, which is more than 10 commits, behind master.
Please rebase the branch against master and push it back again. Thanks a lot.

@rudyfly
Copy link
Collaborator

rudyfly commented Aug 11, 2018

LGTM

@rudyfly rudyfly merged commit d84da94 into AliyunContainerService:master Aug 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants