Skip to content

Add support for cri-dockerd#869

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:masterfrom
afbjorklund:cri-dockerd
Jan 10, 2022
Merged

Add support for cri-dockerd#869
k8s-ci-robot merged 1 commit intokubernetes-sigs:masterfrom
afbjorklund:cri-dockerd

Conversation

@afbjorklund
Copy link
Copy Markdown
Contributor

@afbjorklund afbjorklund commented Jan 7, 2022 •
edited
Loading

Since Kubernetes 1.24, dockershim.sock has been replaced
with cri-dockerd.sock (and similar npipe, for Windows)

What type of PR is this?

/kind feature

What this PR does / why we need it:

detect the "docker" runtime, after moving from dockershim to external endpoint

https://github.com/Mirantis/cri-dockerd

https://kubernetes.io/docs/setup/production-environment/container-runtimes/

Which issue(s) this PR fixes:

Fixes #868

Special notes for your reviewer:

Does this PR introduce a user-facing change?

detect cri-dockerd socket, after dockershim removal

@afbjorklund
Add support for cri-dockerd
1a64648 
Since Kubernetes 1.24, dockershim.sock has been replaced
with cri-dockerd.sock (and similar npipe, for Windows)

Signed-off-by: Anders F Björklund <[email protected]>
@k8s-ci-robot k8s-ci-robot added the kind/feature Categorizes issue or PR as related to a new feature. label Jan 7, 2022
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 7, 2022

Welcome @afbjorklund!

It looks like this is your first PR to kubernetes-sigs/cri-tools 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cri-tools has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 7, 2022
@feiskyer
Copy link
Copy Markdown
Member

feiskyer commented Jan 10, 2022

@afbjorklund thanks for adding this.

saschagrunert
saschagrunert approved these changes Jan 10, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 10, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 10, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 10, 2022
@k8s-ci-robot k8s-ci-robot merged commit 17484cd into kubernetes-sigs:master Jan 10, 2022
@afbjorklund afbjorklund mentioned this pull request Jan 13, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@yujuhong yujuhong Awaiting requested review from yujuhong

Assignees

@saschagrunert saschagrunert

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

The default docker CRI socket changed, in Kubernetes 1.24 and beyond

4 participants

@afbjorklund @k8s-ci-robot @feiskyer @saschagrunert