Commit Graph

63 Commits

Author SHA1 Message Date
John Huang cc3ba5be2c
Fix stale advice on changing the Container Runtime on a Node (#42739)
* Stale advice on changing the Container Runtime on a Node from Docker Engine to containerd

* Update content/en/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd.md

Co-authored-by: Tim Bannister <tim@scalefactory.com>

* Update migrate-dockershim-dockerd.md

---------

Co-authored-by: Tim Bannister <tim@scalefactory.com>
2023-10-15 20:38:55 +02:00
Matt Smith a17face3ee
Add uncordon step to containerd migration doc (#41796)
* Add uncordon step

Added a step to uncordon the node since it was drained at the beginning of this process.

* Update change-runtime-containerd.md

One more edit to the wording

* Move the uncordon step to the end and reword previous step.
2023-07-12 05:05:12 -07:00
Qiming Teng f74c780731
Update find-out-runtime-you-use.md
Trivial edit to trigger the CI gate again.
2023-06-05 16:22:51 +08:00
Paco Xu 0731e3877c sync status with https://github.com/kubernetes/kubernetes/pull/114017 2023-06-01 18:13:57 +08:00
Paco Xu ab4604aa4c remove 2023-06-01 18:13:57 +08:00
Sergey Kanzhelev 9b78ecff2c
Apply suggestions from code review
Co-authored-by: Qiming Teng <tengqm@outlook.com>
2023-03-23 11:16:51 -07:00
Sergey Kanzhelev 4b5eb96147 updates for dockershim removal 2023-03-21 16:50:27 +00:00
William Walters (He/Him) 4ce224a0e5
Fix additional grammatical errors in check-whether-dockershim-removal-affects-you page 2023-03-02 13:28:43 -05:00
William Walters (He/Him) 63fb4cbc1f
Fix grammar in check-if-dockershim-removal-affects-you page 2023-03-02 10:49:18 -05:00
Abigail McCarthy b1202c78ff Update page weights in /tasks/administer-cluster section 2023-01-11 11:12:34 -05:00
Kubernetes Prow Robot f6e81edf80
Merge pull request #37645 from Ritikaa96/updating-migrating-dockershim-doc
Updating migrating-from-dockershim.md
2023-01-03 00:53:32 -08:00
Kubernetes Prow Robot 0f014c5b3f
Merge pull request #34430 from champtar/portmap
Add externalSetMarkChain to portmap config
2022-12-19 20:33:43 -08:00
Ritikaa96 668c2b1ca9 correcting grammatical mistakes in migrating-from-dockershim.md 2022-11-01 18:13:32 +05:30
carolina valencia d4fb248a84 Merge main into dev-1.25 to keep in sync
Merge remote-tracking branch 'upstream/main' into dev-1.25
2022-07-30 19:03:21 -03:00
Will Vesey b396da8a94
Fix minor typo (#35296)
* Fix minor typo

Removes an extraneous `"` character

* Additional minor grammatical changes
2022-07-25 20:45:55 -07:00
Ayushman Mishra 5246ba43a9 Remove list of container runtimes tested with v1.24 2022-07-15 12:23:27 +05:30
Guangwen Feng 973045a645 Fix a minor typo in migrating-telemetry-and-security-agents.md
Signed-off-by: Guangwen Feng <fenggw-fnst@fujitsu.com>
2022-06-28 15:00:26 +08:00
Etienne Champetier eab5945586 Add externalSetMarkChain to portmap config
Looking at the online portmap doc, this seems to be
the recommended configuration for k8s + portmap
https://www.cni.dev/plugins/current/meta/portmap/
2022-06-26 23:10:16 -04:00
Kubernetes Prow Robot 84c035d5a7
Merge pull request #34372 from tengqm/fix-links-1
Batch fixes for links (1)
2022-06-26 01:02:58 -07:00
Augustas 5a1ade2551
“Migrating telemetry and security agents from dockershim” task (#31607)
* Telemetery_and_security_agents_vendors

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* rename_dockershim

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* formatting and links update

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* Update content/en/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md

Co-authored-by: Tim Bannister <tim@scalefactory.com>

* Apply suggestions from code review

Co-authored-by: Tim Bannister <tim@scalefactory.com>

* spaces and thirdparty-content tag

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* formatting

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* Update content/en/docs/tasks/administer-cluster/migrating-from-dockershim/migrating-telemetry-and-security-agents.md

Co-authored-by: chrismetz09 <cymetz@gmail.com>

* Apply suggestions from code review

Co-authored-by: Rey Lejano <rlejano@gmail.com>

* formatting

Signed-off-by: AugustasV <reg1nt1z@gmail.com>

* Apply suggestions from code review

Co-authored-by: Qiming Teng <tengqm@outlook.com>

* zacharysarah-code-review-suggestions

Co-authored-by: ZSC <zacharysarah@users.noreply.github.com>

Co-authored-by: Tim Bannister <tim@scalefactory.com>
Co-authored-by: chrismetz09 <cymetz@gmail.com>
Co-authored-by: Rey Lejano <rlejano@gmail.com>
Co-authored-by: Qiming Teng <tengqm@outlook.com>
Co-authored-by: ZSC <zacharysarah@users.noreply.github.com>
2022-06-24 01:24:57 -07:00
Qiming Teng 7add552174 Batch fixes for links (1)
There are dangling links or links that redirects to a different destination page.
This PR fixes some of them.
2022-06-18 13:37:13 +08:00
Kubernetes Prow Robot e0f2e9362c
Merge pull request #34131 from JohnTitor/enhance-removal-de
Add a link to the "Uninstall Docker Engine" section
2022-06-14 15:51:32 -07:00
Yuki Okushi 044be48140
Reword to clarify
Co-authored-by: ZSC <zacharysarah@users.noreply.github.com>
2022-06-15 07:34:19 +09:00
Yuki Okushi 483d007248
Fix a tab attibute name's typo 2022-06-07 19:53:14 +09:00
Yuki Okushi 11e6bc1c7e
Add a link to the "Uninstall Docker Engine" section 2022-06-07 19:52:14 +09:00
Yuki Okushi dccee2fceb
Replace a recursive link on the "Migrating from dockershim" task 2022-06-05 10:52:27 +09:00
Kubernetes Prow Robot 2657fca7f6
Merge pull request #33662 from TinySong/main
update migrating-from-dockershim doc
2022-05-28 21:42:50 -07:00
Chris Short 3f3ad2aa9a
Update change-runtime-containerd.md
Install containerd from containerd
2022-05-24 16:22:15 -04:00
song 1fa24f7e32 update migrating-from-dockershim doc 2022-05-23 13:34:56 +08:00
Nate W 5ead53b3e8 Merge remote-tracking branch 'upstream/main' into dev-1.24 2022-05-02 10:29:49 -07:00
Gerald Mayr 86c0e4e5b9
Add missing verb 2022-04-29 20:27:22 +02:00
Kubernetes Prow Robot 07ae0348c3
Merge pull request #33287 from rolfedh/issue#33236proc
Add task page for troubleshooting CNI plugin-related errors
2022-04-29 11:07:14 -07:00
Rolfe Dlugy-Hegwer 32e1684fce Troubleshooting topic for CNI version-related issues #33240 2022-04-29 13:34:18 -04:00
Nate W 0135d3642b Merge remote-tracking branch 'upstream/main' into dev-1.24 2022-04-19 15:45:28 -07:00
Vitthal Sai 55a26e8242
Follow up to dockershim migration message after release of v1.24 2022-04-19 10:43:48 +05:30
Vitthal Sai 98d8be323f
Reword dockershim migration recommendation 2022-04-18 23:19:58 +05:30
Kubernetes Prow Robot c6472cbea3
Merge pull request #32132 from shannonxtreme/dockershim-am-i-on-dockerhsim
Add info about finding the runtime endpoint
2022-04-13 09:32:46 -07:00
Shannon Kularathna d3ad42f669 Add info about finding the runtime endpoint 2022-04-13 15:36:55 +00:00
Tim Bannister 05e987a47b
Highlight discussion issue for dockershim deprecation
- Link to k/kubernetes issue 106917
  (various places)
- Related rewording to make that extra link work in context

and also:
- Replace alias for dockershim FAQ with a Netlify redirect

Co-authored-by: Jihoon Seo <46767780+jihoon-seo@users.noreply.github.com>
2022-04-12 18:02:26 +01:00
Kubernetes Prow Robot f440c609e9
Merge pull request #32780 from reylejano/patch-check-dockershim-task
v1.24 Update to the Check if Dockershim Deprecation Affects You page
2022-04-12 07:57:23 -07:00
Nate W d1bce4cb0d Merge remote-tracking branch 'upstream/main' into dev-1.24 2022-04-07 10:41:49 -07:00
Kubernetes Prow Robot 3aef33c651
Merge pull request #32259 from tengqm/fix-links-3
Fix nits in the change runtime containerd page
2022-04-07 02:03:57 -07:00
Rey Lejano 9211599cfd update dockershim deprecation to removal on tasks page 2022-04-06 13:44:53 -07:00
Tim Bannister 83514e6dc1
Tweak page introduction
Co-authored-by: Shannon Kularathna <ax3shannonkularathna@gmail.com>
2022-03-30 23:15:09 +01:00
Tim Bannister 3cb2b0cb14
Fixup incorrect systemctl command
The subcommand for restart is "restart"
2022-03-30 22:26:12 +01:00
Tim Bannister b9a7ec6f35
Update cri-dockerd switchover docs for v1.24 2022-03-30 22:18:56 +01:00
Shannon Kularathna 5edbf56ec5 Add draft content for migrating to dockerd 2022-03-30 22:12:19 +01:00
Shannon Kularathna 180fa82d9c Add draft content for migrating to dockerd 2022-03-25 15:19:17 +00:00
Qiming Teng a11ecef6f1 Wrap long lines and fix a few nits in the text 2022-03-14 20:36:51 +08:00
Qiming Teng 06f35a55d5 Fix link to use relative path 2022-03-14 20:29:23 +08:00