Automated cherry pick of #10585: containerd: Add /etc/crictl config to enable crictl #10651: Add back support for kubenet style networking with containerd #10653
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
This configuration file means users don't have to pass the endpoint to run crictl.
k8s-ci-robot
added
cncf-cla: yes
|
[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 |
k8s-ci-robot
added
area/nodeup
approved
|
/cc @rifelpet |
|
I vote we don't do this for 1.19.0 at least. |
|
I think it can wait until 1.19.1. Just wanted it to be ready in case anyone considers this as required. |
k8s-ci-robot
added
the
do-not-merge/hold
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
|
/lgtm |
k8s-ci-robot
added
the
lgtm
hakman
deleted the
automated-cherry-pick-of-#10585-#10651-upstream-release-1.19
branch
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.
Cherry pick of #10585 #10651 on release-1.19.
#10585: containerd: Add /etc/crictl config to enable crictl
#10651: Add back support for kubenet style networking with containerd
For details on the cherry pick process, see the cherry pick requests page.