close
Skip to content

Remove the containerd executor#2568

Merged
cyli merged 1 commit into
moby:masterfrom
ijc:nuke-containerd-executor
Mar 23, 2018
Merged

Remove the containerd executor#2568
cyli merged 1 commit into
moby:masterfrom
ijc:nuke-containerd-executor

Conversation

@ijc

@ijc ijc commented Mar 23, 2018

Copy link
Copy Markdown
Contributor

It targets an old pre v1.0 alpha version of containerd and is not currently
maintained.

closes #2219, closes #2258, closes #2259 and closes #2299.

The vendoring of libtrust did not become obsolete here but vndr noted that it
was unused so I dropped it while I was there.

Signed-off-by: Ian Campbell ijc@docker.com

It targets an old pre v1.0 alpha version of containerd and is not currently
maintained.

closes moby#2219, closes moby#2258, closes moby#2259 and closes moby#2299.

The vendoring of libtrust did not become obsolete here but vndr noted that it
was unused so I dropped it while I was there.

Signed-off-by: Ian Campbell <ijc@docker.com>
@ijc ijc force-pushed the nuke-containerd-executor branch from 1cc057c to fe9b063 Compare March 23, 2018 14:00
@ijc

ijc commented Mar 23, 2018

Copy link
Copy Markdown
Contributor Author

I don't think this can be my changes:


	Error Trace:	integration_test.go:582
		
	Error:		Received unexpected error unsupported key format due to FIPS compliance

Flakey test?

@cyli

cyli commented Mar 23, 2018

Copy link
Copy Markdown
Contributor

@ijc yes, I have a PR to remove the environment variable so we can test without setting a glibal end var, which causes issues when tests are run in parallel

@ijc

ijc commented Mar 23, 2018

Copy link
Copy Markdown
Contributor Author

@cyli is it #2562 ? In any case I'll wait for whichever PR and rebase.

@cyli

cyli commented Mar 23, 2018

Copy link
Copy Markdown
Contributor

@ijc It is - it might take a while, since that's based on some other PRs. I'll just rebuild for now.

@dperny

dperny commented Mar 23, 2018

Copy link
Copy Markdown
Collaborator

LGTM when it passes tests. Thanks for cleaning up after yourself.

@cyli cyli left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM on tests passing. Hooray for code removal!

@codecov

codecov Bot commented Mar 23, 2018

Copy link
Copy Markdown

Codecov Report

Merging #2568 into master will increase coverage by 0.31%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2568      +/-   ##
==========================================
+ Coverage   61.46%   61.77%   +0.31%     
==========================================
  Files         134      134              
  Lines       21800    21800              
==========================================
+ Hits        13399    13468      +69     
+ Misses       6958     6886      -72     
- Partials     1443     1446       +3

@cyli cyli merged commit 4185be5 into moby:master Mar 23, 2018
@ijc ijc deleted the nuke-containerd-executor branch March 26, 2018 09:16
@ijc

ijc commented Mar 26, 2018

Copy link
Copy Markdown
Contributor Author

Thanks for shepherding it through the tests!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants