Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use containerd.sock for AmazonVPC CNI with containerd #10502

Merged
merged 1 commit into from
Dec 27, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Dec 27, 2020

Amazon VPC CNI requires access to the CRI socket to get the local container info:
xRef: aws/amazon-vpc-cni-k8s#371

This is the reason the periodic test for Amazon VPC CNI is failing since switching it to containerd:
https://testgrid.k8s.io/kops-network-plugins#kops-aws-cni-amazon-vpc

There are proposed changes to get away from the "dockershim" name, but still not merged:
xRef: aws/amazon-vpc-cni-k8s#1175

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 27, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@hakman
Copy link
Member Author

hakman commented Dec 27, 2020

/cc @rifelpet @MoShitrit

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 27, 2020
@hakman hakman force-pushed the amazonvpc-cni-containerd branch 3 times, most recently from 72e7ec6 to 2e05eee Compare December 27, 2020 15:04
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 27, 2020
@moshevayner
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 27, 2020
@k8s-ci-robot k8s-ci-robot merged commit 72a4797 into kubernetes:master Dec 27, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Dec 27, 2020
@hakman hakman deleted the amazonvpc-cni-containerd branch December 27, 2020 16:23
k8s-ci-robot added a commit that referenced this pull request Dec 28, 2020
…-upstream-release-1.19

Automated cherry pick of #10502: Use containerd.sock for AmazonVPC CNI with containerd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants