Skip to content

Add v2 server config support with plugin URIs#3322

Merged
fuweid merged 1 commit intocontainerd:masterfrom
crosbymichael:configs
Jun 11, 2019
Merged

Add v2 server config support with plugin URIs#3322
fuweid merged 1 commit intocontainerd:masterfrom
crosbymichael:configs

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

@crosbymichael crosbymichael commented Jun 4, 2019

Closes #3210

Signed-off-by: Michael Crosby [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 4, 2019

Build succeeded.

@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 4, 2019

Windows: invalid plugin key URI "linux"

failed to dial "\\\\.\\pipe\\containerd-containerd-test": context deadline exceeded: containerd: invalid plugin key URI "linux"
exit status 1
FAIL	github.com/containerd/containerd	10.168s

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 4, 2019

Build succeeded.

@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 5, 2019

I think the config used during the CRI testsuite probably needs some update--we don't have the logs, but given the output on every CRI test that it can't get to the containerd socket, I assume containerd didn't start because of some mismatch with the new scheme/config?

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 5, 2019

Build succeeded.

fuweid
fuweid reviewed Jun 10, 2019
View reviewed changes
Comment thread daemon_config_linux_test.go Outdated
Comment thread services/server/config/config.go Outdated
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 10, 2019

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 10, 2019

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 10, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jun 10, 2019

Codecov Report

Merging #3322 into master will decrease coverage by 4.65%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3322      +/-   ##
==========================================
- Coverage   44.86%   40.21%   -4.66%     
==========================================
  Files         113       76      -37     
  Lines       12338    10276    -2062     
==========================================
- Hits         5535     4132    -1403     
+ Misses       5953     5566     -387     
+ Partials      850      578     -272
Flag Coverage Δ
#linux ?
#windows 40.21% <0%> (-0.05%) ⬇️
Impacted Files Coverage Δ
services/server/server.go 1.23% <0%> (-0.04%) ⬇️
snapshots/native/native.go 1.79% <0%> (-41.26%) ⬇️
archive/tar.go 16.99% <0%> (-26.8%) ⬇️
metadata/snapshot.go 21.53% <0%> (-24.28%) ⬇️
cio/io.go 1.52% <0%> (-21.38%) ⬇️
content/local/writer.go 57.69% <0%> (-0.97%) ⬇️
gc/scheduler/scheduler.go 66.34% <0%> (-0.97%) ⬇️
oci/spec_opts.go 30.33% <0%> (-0.25%) ⬇️
content/local/store.go 49.51% <0%> (-0.02%) ⬇️
mount/temp_unix.go
... and 36 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 42f4bb9...9547d26. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member Author

crosbymichael commented Jun 10, 2019

This is good to review now. I fixed the issues with the default config for the tests.

estesp
estesp approved these changes Jun 10, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

fuweid
fuweid approved these changes Jun 11, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fuweid fuweid merged commit 2f69be5 into containerd:master Jun 11, 2019
@jcordasc jcordasc mentioned this pull request Jun 11, 2019
Closed
This was referenced Jun 11, 2019
Merged
Closed
@Random-Liu
Copy link
Copy Markdown
Member

Random-Liu commented Jun 11, 2019

This is still a breaking change. Containerd won't start with old configurations. One good thing is that users can just add a version = 1 in the config to make it work.

We should emphasize this change in the 1.3 release note.

@Random-Liu Random-Liu mentioned this pull request Jun 11, 2019
Closed
@AkihiroSuda AkihiroSuda mentioned this pull request May 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Plugin ID uniqueness not enforced at registration

5 participants

@crosbymichael @estesp @codecov-io @Random-Liu @fuweid