Skip to content

Pass ttrpc address to shim via env#3573

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:ttrpc-env
Aug 22, 2019
Merged

Pass ttrpc address to shim via env#3573
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:ttrpc-env

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

Because of the way go handles flags, passing a flag that is not defined
will cause an error. In our case, if we kept this as a flag, then
third-party shims would break when they see this new flag. To fix this,
I moved this new configuration option to an env var. We should use env
vars from here on out to avoid breaking shim compat.

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

@crosbymichael crosbymichael added this to the 1.3 milestone Aug 22, 2019
Copy link
Copy Markdown
Contributor

@jterry75 jterry75 left a comment

Choose a reason for hiding this comment

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

LGTM

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 22, 2019

Build succeeded.

Because of the way go handles flags, passing a flag that is not defined
will cause an error. In our case, if we kept this as a flag, then
third-party shims would break when they see this new flag.  To fix this,
I moved this new configuration option to an env var.  We should use env
vars from here on out to avoid breaking shim compat.

Signed-off-by: Michael Crosby <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 22, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3573 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3573      +/-   ##
==========================================
- Coverage   42.27%   42.26%   -0.02%     
==========================================
  Files         126      126              
  Lines       13877    13881       +4     
==========================================
  Hits         5867     5867              
- Misses       7124     7128       +4     
  Partials      886      886
Flag Coverage Δ
#linux 45.75% <0%> (-0.02%) ⬇️
#windows 37.23% <0%> (-0.02%) ⬇️
Impacted Files Coverage Δ
runtime/v2/shim/shim.go 0% <0%> (ø) ⬆️
runtime/v2/shim/util.go 0% <0%> (ø) ⬆️

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 1be6ee5...6cf031e. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3573 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3573      +/-   ##
==========================================
- Coverage   42.27%   42.26%   -0.02%     
==========================================
  Files         126      126              
  Lines       13877    13881       +4     
==========================================
  Hits         5867     5867              
- Misses       7124     7128       +4     
  Partials      886      886
Flag Coverage Δ
#linux 45.75% <0%> (-0.02%) ⬇️
#windows 37.23% <0%> (-0.02%) ⬇️
Impacted Files Coverage Δ
runtime/v2/shim/shim.go 0% <0%> (ø) ⬆️
runtime/v2/shim/util.go 0% <0%> (ø) ⬆️

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 1be6ee5...6cf031e. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member Author

@dmcgowan fixed it

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit 80ed8e1 into containerd:master Aug 22, 2019
@jterry75
Copy link
Copy Markdown
Contributor

Wahoo!

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