Add support for Kubenet with containerd #9104
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
hakman
changed the title
k8s-ci-robot
added
the
do-not-merge/work-in-progress
hakman
force-pushed
the
containerd-kubenet
branch
5 times, most recently
from
89637b0 to
b49e859
Compare
k8s-ci-robot
added
size/L
hakman
force-pushed
the
containerd-kubenet
branch
2 times, most recently
from
ca51a1c to
217d39a
Compare
k8s-ci-robot
added
size/M
hakman
force-pushed
the
containerd-kubenet
branch
7 times, most recently
from
9548546 to
6004786
Compare
k8s-ci-robot
added
size/L
hakman
force-pushed
the
containerd-kubenet
branch
3 times, most recently
from
5e67e2a to
8cfd8cc
Compare
hakman
force-pushed
the
containerd-kubenet
branch
4 times, most recently
from
4bd79ac to
abbf60a
Compare
k8s-ci-robot
added
size/M
hakman
force-pushed
the
containerd-kubenet
branch
from
abbf60a to
d308b6f
Compare
hakman
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
hakman
force-pushed
the
containerd-kubenet
branch
from
d308b6f to
e608cd5
Compare
|
Test results with containerd enabled: |
|
@olemarkus maybe you can have a look at this. Seems somehow related to the work you are doing in CNI plugins reorg. Thanks! |
|
Looks good. Just generally look use |
k8s-ci-robot
added
size/L
|
Thanks @olemarkus hopefully at some point this will be simplified. |
hakman
force-pushed
the
containerd-kubenet
branch
from
9faa862 to
9d666c7
Compare
|
/retest |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/retest |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hakman, rifelpet The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Docker generates the a conflist file for Kubenet when needed.
containerd has a different approach:
https://github.com/containerd/cri/blob/master/docs/config.md#cni-config-template
At some point, Kubenet will migrate to CNI and this workaround can be removed. Until then, this is the default in Kops and should be added, if possible.
kubernetes/kubernetes#38890
CNI config template is based on:
https://github.com/containerd/cri/blob/master/hack/install/install-cni-config.sh