Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

add containerd and fix flannel and cilium #2967

Merged
merged 2 commits into from
May 15, 2018

Conversation

jessfraz
Copy link
Contributor

@jessfraz jessfraz commented May 15, 2018

closes #2966

Adds the following e2e tests:

  • examples/e2e-tests/kubernetes/kubernetes-config/containerd.json
  • examples/e2e-tests/kubernetes/kubernetes-config/flannel.json

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
@ghost ghost assigned jessfraz May 15, 2018
@ghost ghost added the in progress label May 15, 2018
@jessfraz
Copy link
Contributor Author

jessfraz commented May 15, 2018

@jessfraz
Copy link
Contributor Author

cc @thomastaylor312

@jessfraz jessfraz force-pushed the containerd branch 3 times, most recently from 5bd2ae2 to 8752f5f Compare May 15, 2018 17:42
@jessfraz
Copy link
Contributor Author

jessfraz commented May 15, 2018

closes Azure#2966

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
@jessfraz
Copy link
Contributor Author

both e2es passed :)

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @jessfraz!

@jackfrancis jackfrancis merged commit 244d661 into Azure:master May 15, 2018
@ghost ghost removed the in progress label May 15, 2018
@jessfraz jessfraz deleted the containerd branch May 15, 2018 18:44
@thomastaylor312
Copy link
Contributor

Thanks @jessfraz!

@jessfraz jessfraz mentioned this pull request May 15, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

network policy/plugin confusion
3 participants