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

[zh] sync migrating-from-dockershim/find-out-runtime-you-use.md #41476

Merged

Conversation

KKtheGhost
Copy link
Contributor

PR Summary

  • EN upstream: content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
  • Sync to: content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md

Sync check byscripts/lsync.sh on main branch:

$ scripts/lsync.sh content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
diff --git a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
index 8e04dd7a6c..f6f3db70dd 100644
--- a/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
+++ b/content/en/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
@@ -41,9 +41,9 @@ node-2       Ready    v1.16.15   docker://19.3.1
 node-3       Ready    v1.16.15   docker://19.3.1
 \`\`\`
 If your runtime shows as Docker Engine, you still might not be affected by the
-removal of dockershim in Kubernetes v1.24. [Check the runtime
-endpoint](#which-endpoint) to see if you use dockershim. If you don't use
-dockershim, you aren't affected.
+removal of dockershim in Kubernetes v1.24.
+[Check the runtime endpoint](#which-endpoint) to see if you use dockershim.
+If you don't use dockershim, you aren't affected.

 For containerd, the output is similar to this:

@@ -88,7 +88,8 @@ nodes.

     *   If your nodes use Kubernetes v1.23 and earlier and these flags aren't
         present or if the `--container-runtime` flag is not `remote`,
-        you use the dockershim socket with Docker Engine.
+        you use the dockershim socket with Docker Engine. The `--container-runtime` command line
+        argument is not available in Kubernetes v1.27 and later.
     *   If the `--container-runtime-endpoint` flag is present, check the socket
         name to find out which runtime you use. For example,
         `unix:///run/containerd/containerd.sock` is the containerd endpoint.
@@ -96,4 +97,4 @@ nodes.
 If you want to change the Container Runtime on a Node from Docker Engine to containerd,
 you can find out more information on [migrating from Docker Engine to  containerd](/docs/tasks/administer-cluster/migrating-from-dockershim/change-runtime-containerd/),
 or, if you want to continue using Docker Engine in Kubernetes v1.24 and later, migrate to a
-CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).
\ No newline at end of file
+CRI-compatible adapter like [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).

Sync check byscripts/lsync.sh on sync/tasks_find-out-runtime-you-use branch:

$ scripts/lsync.sh content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md
content/zh-cn/docs/tasks/administer-cluster/migrating-from-dockershim/find-out-runtime-you-use.md is still in sync

Thanks to the reviewers in advance.
Best Regards,

Kivinsae Fang

@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. language/zh Issues or PRs related to Chinese language labels Jun 5, 2023
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Jun 5, 2023
@netlify
Copy link

netlify bot commented Jun 5, 2023

Pull request preview available for checking

Built without sensitive environment variables

Name Link
🔨 Latest commit 81a1394
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/647e83dbaf32680008fb61f5
😎 Deploy Preview https://deploy-preview-41476--kubernetes-io-main-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@linux-foundation-easycla
Copy link

CLA Missing ID CLA Not Signed

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 6, 2023
@KKtheGhost KKtheGhost force-pushed the sync/tasks_find-out-runtime-you-use branch from 5edaf14 to 81a1394 Compare June 6, 2023 00:54
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 6, 2023
@tengqm
Copy link
Contributor

tengqm commented Jun 6, 2023

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2023
@KKtheGhost
Copy link
Contributor Author

Updates:

All Review suggestions were committed and squashed, and the word 并且 was removed as well.
Thanks so much for the amazing review! @windsonsea @tengqm
Wish you guys a nice day.

Best Regards,
Kivinsae Fang

Copy link
Member

@ydFu ydFu 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 k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 6, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm, ydFu

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

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 08f338d6aab4e5aec1749130edc538417b10aa42

@k8s-ci-robot k8s-ci-robot merged commit 1cfb729 into kubernetes:main Jun 6, 2023
@KKtheGhost KKtheGhost deleted the sync/tasks_find-out-runtime-you-use branch June 7, 2023 06:12
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants