Skip to content

Commit fd6447b

Browse files
authored
Merge branch 'kubernetes:main' into translation/ptBrPortsAndProtocols
2 parents 1ebf0f3 + b1226e2 commit fd6447b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

content/en/blog/_posts/2020-12-02-dockershim-faq.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ as cgroups v2 and user namespaces are being implemented in these newer CRI
2828
runtimes. Removing support for the dockershim will allow further development in
2929
those areas.
3030

31-
[drkep]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/1985-remove-dockershim
31+
[drkep]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2221-remove-dockershim
3232

3333
### Can I still use Docker in Kubernetes 1.20?
3434

@@ -42,9 +42,11 @@ startup if using Docker as the runtime.
4242

4343
Given the impact of this change, we are using an extended deprecation timeline.
4444
It will not be removed before Kubernetes 1.22, meaning the earliest release without
45-
dockershim would be 1.23 in late 2021. We will be working closely with vendors
46-
and other ecosystem groups to ensure a smooth transition and will evaluate things
47-
as the situation evolves.
45+
dockershim would be 1.23 in late 2021.
46+
_Update_: removal of dockershim is scheduled for Kubernetes v1.24, see
47+
[Dockershim Removal Kubernetes Enhancement Proposal][drkep].
48+
We will be working closely with vendors and other ecosystem groups to ensure a smooth transition and will evaluate
49+
things as the situation evolves.
4850

4951

5052
### Can I still use dockershim after it is removed from Kubernetes?

content/en/blog/_posts/2021-08-13-SIG-Node-Spotlight/index.md renamed to content/en/blog/_posts/2021-09-27-SIG-Node-Spotlight/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ slug: sig-node-spotlight-2021
99

1010
## Introduction
1111

12-
[SIG Node](https://github.com/kubernetes/community/tree/master/sig-node) is responsible for the components that support the controlled interactions between pods and host resources. The work of this group manages the lifecycle of pods that are scheduled to a node, and focuses on enabling a broad set of workload types, including workloads with hardware specific or performance sensitive requirements. In this blog, we have summarized our conversation with [Elana Hashman (EH)](https://twitter.com/ehashdn) & [Sergey Kanzhelev (SK)](https://twitter.com/SergeyKanzhelev), who walk us through the various aspects of being a part of the SIG and share some insights about how others can get involved.
13-
12+
In Kubernetes, a _Node_ is a representation of a single machine in your cluster. [SIG Node](https://github.com/kubernetes/community/tree/master/sig-node) owns that very important Node component and supports various subprojects such as Kubelet, Container Runtime Interface (CRI) and more to support how the pods and host resources interact. In this blog, we have summarized our conversation with [Elana Hashman (EH)](https://twitter.com/ehashdn) & [Sergey Kanzhelev (SK)](https://twitter.com/SergeyKanzhelev), who walk us through the various aspects of being a part of the SIG and share some insights about how others can get involved.
1413

1514
## A summary of our conversation
1615

0 commit comments

Comments
 (0)