Skip to content

Implement WithNoNewKeyring#2361

Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom
masters-of-cats:no-new-keyring
May 29, 2018
Merged

Implement WithNoNewKeyring#2361
AkihiroSuda merged 1 commit intocontainerd:masterfrom
masters-of-cats:no-new-keyring

Conversation

@ostenbom
Copy link
Copy Markdown
Contributor

WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage.

There is an upper limit on the number of keyrings in a linux system, so passing this flag allows more containers to be created than the keyring limit.

Implements #2360

Signed-off-by: Oliver Stenbom [email protected]

@codecov-io
Copy link
Copy Markdown

codecov-io commented May 25, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2361   +/-   ##
=======================================
  Coverage   44.99%   44.99%           
=======================================
  Files          92       92           
  Lines        9336     9336           
=======================================
  Hits         4201     4201           
  Misses       4457     4457           
  Partials      678      678
Flag Coverage Δ
#linux 49.29% <ø> (ø) ⬆️
#windows 41.25% <ø> (ø) ⬆️

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 cecf576...7132ca2. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented May 25, 2018

Can you squash into 1 commit now that it's passing?

Comment thread task_opts_linux_test.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

errors.New is not needed

@yulianedyalkova yulianedyalkova force-pushed the no-new-keyring branch 3 times, most recently from f43db7c to 2fc9a43 Compare May 28, 2018 09:20
It does not override existing CreateOptions but assumes that the
TaskInfo's options are of type CreateOptions.

Signed-off-by: Oliver Stenbom <[email protected]>
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@AkihiroSuda AkihiroSuda merged commit 80bbaff into containerd:master May 29, 2018
@ostenbom ostenbom deleted the no-new-keyring branch July 5, 2018 15:00
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