Skip to content

Commit 6070207

Browse files
authored
Merge pull request #25462 from bl-ue/patch-3
Update grammar in Docker deprecation blog posts
2 parents 113d80e + 56840df commit 6070207

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ All your existing images will still work exactly the same.
5555

5656
### What about private images?
5757

58-
Also yes. All CRI runtimes support the same pull secrets configuration used in
58+
Yes. All CRI runtimes support the same pull secrets configuration used in
5959
Kubernetes, either via the PodSpec or ServiceAccount.
6060

6161

@@ -82,7 +82,7 @@ usability of other container runtimes. As an example, OpenShift 4.x has been
8282
using the [CRI-O] runtime in production since June 2019.
8383

8484
For other examples and references you can look at the adopters of containerd and
85-
cri-o, two container runtimes under the Cloud Native Computing Foundation ([CNCF]).
85+
CRI-O, two container runtimes under the Cloud Native Computing Foundation ([CNCF]).
8686
- [containerd](https://github.com/containerd/containerd/blob/master/ADOPTERS.md)
8787
- [CRI-O](https://github.com/cri-o/cri-o/blob/master/ADOPTERS.md)
8888

@@ -110,7 +110,7 @@ provide an end-to-end standard for managing containers.
110110

111111
That’s a complex question and it depends on a lot of factors. If Docker is
112112
working for you, moving to containerd should be a relatively easy swap and
113-
has have strictly better performance and less overhead. However we encourage you
113+
will have strictly better performance and less overhead. However, we encourage you
114114
to explore all the options from the [CNCF landscape] in case another would be an
115115
even better fit for your environment.
116116

@@ -129,7 +129,7 @@ common things to consider when migrating are:
129129
- Kubectl plugins that require docker CLI or the control socket
130130
- Kubernetes tools that require direct access to Docker (e.g. kube-imagepuller)
131131
- Configuration of functionality like `registry-mirrors` and insecure registries
132-
- Other support scripts or daemons that expect docker to be available and are run
132+
- Other support scripts or daemons that expect Docker to be available and are run
133133
outside of Kubernetes (e.g. monitoring or security agents)
134134
- GPUs or special hardware and how they integrate with your runtime and Kubernetes
135135

content/en/blog/_posts/2020-12-02-dont-panic-kubernetes-and-docker.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ as a container runtime after v1.20.
1313

1414
**You do not need to panic. It’s not as dramatic as it sounds.**
1515

16-
tl;dr Docker as an underlying runtime is being deprecated in favor of runtimes
17-
that use the [Container Runtime Interface(CRI)](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes/)
16+
TL;DR Docker as an underlying runtime is being deprecated in favor of runtimes
17+
that use the [Container Runtime Interface (CRI)](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes/)
1818
created for Kubernetes. Docker-produced images will continue to work in your
1919
cluster with all runtimes, as they always have.
2020

@@ -48,7 +48,7 @@ is a popular choice for that runtime (other common options include containerd
4848
and CRI-O), but Docker was not designed to be embedded inside Kubernetes, and
4949
that causes a problem.
5050

51-
You see, the thing we call “Docker” isn’t actually one thing -- it’s an entire
51+
You see, the thing we call “Docker” isn’t actually one thing—it’s an entire
5252
tech stack, and one part of it is a thing called “containerd,” which is a
5353
high-level container runtime by itself. Docker is cool and useful because it has
5454
a lot of UX enhancements that make it really easy for humans to interact with
@@ -66,11 +66,11 @@ does Kubernetes need the Dockershim?
6666

6767
Docker isn’t compliant with CRI, the [Container Runtime Interface](https://kubernetes.io/blog/2016/12/container-runtime-interface-cri-in-kubernetes/).
6868
If it were, we wouldn’t need the shim, and this wouldn’t be a thing. But it’s
69-
not the end of the world, and you don’t need to panic -- you just need to change
69+
not the end of the world, and you don’t need to panic—you just need to change
7070
your container runtime from Docker to another supported container runtime.
7171

7272
One thing to note: If you are relying on the underlying docker socket
73-
(/var/run/docker.sock) as part of a workflow within your cluster today, moving
73+
(`/var/run/docker.sock`) as part of a workflow within your cluster today, moving
7474
to a different runtime will break your ability to use it. This pattern is often
7575
called Docker in Docker. There are lots of options out there for this specific
7676
use case including things like
@@ -82,10 +82,10 @@ use case including things like
8282

8383
This change addresses a different environment than most folks use to interact
8484
with Docker. The Docker installation you’re using in development is unrelated to
85-
the Docker runtime inside your Kubernetes cluster. It’s confusing, I know. As a
86-
developer, Docker is still useful to you in all the ways it was before this
85+
the Docker runtime inside your Kubernetes cluster. It’s confusing, we understand.
86+
As a developer, Docker is still useful to you in all the ways it was before this
8787
change was announced. The image that Docker produces isn’t really a
88-
Docker-specific image -- it’s an OCI ([Open Container Initiative](https://opencontainers.org/)) image.
88+
Docker-specific image—it’s an OCI ([Open Container Initiative](https://opencontainers.org/)) image.
8989
Any OCI-compliant image, regardless of the tool you use to build it, will look
9090
the same to Kubernetes. Both [containerd](https://containerd.io/) and
9191
[CRI-O](https://cri-o.io/) know how to pull those images and run them. This is
@@ -95,10 +95,10 @@ So, this change is coming. It’s going to cause issues for some, but it isn’t
9595
catastrophic, and generally it’s a good thing. Depending on how you interact
9696
with Kubernetes, this could mean nothing to you, or it could mean a bit of work.
9797
In the long run, it’s going to make things easier. If this is still confusing
98-
for you, that’s okay -- there’s a lot going on here, Kubernetes has a lot of
98+
for you, that’s okay—there’s a lot going on here; Kubernetes has a lot of
9999
moving parts, and nobody is an expert in 100% of it. We encourage any and all
100100
questions regardless of experience level or complexity! Our goal is to make sure
101-
everyone is educated as much as possible on the upcoming changes. `<3` We hope
102-
this has answered most of your questions and soothed some anxieties!
101+
everyone is educated as much as possible on the upcoming changes. We hope
102+
this has answered most of your questions and soothed some anxieties! ❤️
103103

104104
Looking for more answers? Check out our accompanying [Dockershim Deprecation FAQ](/blog/2020/12/02/dockershim-faq/).

0 commit comments

Comments
 (0)