Skip to content

Fix proxy plugin config validation#3615

Merged
estesp merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-proxy-plugin-config
Sep 4, 2019
Merged

Fix proxy plugin config validation#3615
estesp merged 1 commit intocontainerd:masterfrom
dmcgowan:fix-proxy-plugin-config

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan commented Sep 4, 2019

Proxy plugins are keyed only on the identifier, the type is specified within the proxy plugin configuration which maps to the full URI. The proxy plugin configuration is not passed to the plugin for configuration like other plugins.

Fixes a compatibility error with proxy plugins from v1 configs. Fixing the validation caused the proxy plugin ID to be wrong since "io.containerd.snapshotter.v1" or "io.containerd.content.v1" is always added based on the type.

Proxy plugins are keyed only on the identifier, the type
is specified within the proxy plugin configuration which
maps to the full URI. The proxy plugin configuration is
not passed to the plugin for configuration like other
plugins.

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan added this to the 1.3 milestone Sep 4, 2019
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 4, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3615 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3615   +/-   ##
=======================================
  Coverage   42.38%   42.38%           
=======================================
  Files         126      126           
  Lines       13901    13901           
=======================================
  Hits         5892     5892           
  Misses       7123     7123           
  Partials      886      886
Flag Coverage Δ
#linux 45.91% <ø> (ø) ⬆️
#windows 37.2% <ø> (ø) ⬆️

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 48fb479...a4482d9. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

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

@estesp estesp merged commit 3050b36 into containerd:master Sep 4, 2019
@dmcgowan dmcgowan deleted the fix-proxy-plugin-config branch September 10, 2019 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants