Skip to content

Commit 1e70b5c

Browse files
authored
Merge pull request #36457 from rogue-gamer-ryt/chore/remove_docker_mentions
Removed usage of docker from replicationControllers, containers, pods and daemonsets
2 parents 6530f1d + f7248fa commit 1e70b5c

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

content/en/docs/concepts/workloads/controllers/daemonset.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,7 @@ running such processes via a DaemonSet:
203203
- Ability to monitor and manage logs for daemons in the same way as applications.
204204
- Same config language and tools (e.g. Pod templates, `kubectl`) for daemons and applications.
205205
- Running daemons in containers with resource limits increases isolation between daemons from app
206-
containers. However, this can also be accomplished by running the daemons in a container but not in a Pod
207-
(e.g. start directly via Docker).
206+
containers. However, this can also be accomplished by running the daemons in a container but not in a Pod.
208207

209208
### Bare Pods
210209

content/en/docs/concepts/workloads/controllers/replicationcontroller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ labels and an appropriate restart policy. For labels, make sure not to overlap w
139139
Only a [`.spec.template.spec.restartPolicy`](/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy) equal to `Always` is allowed, which is the default if not specified.
140140

141141
For local container restarts, ReplicationControllers delegate to an agent on the node,
142-
for example the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/) or Docker.
142+
for example the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/).
143143

144144
### Labels on the ReplicationController
145145

@@ -270,7 +270,7 @@ Note that we recommend using Deployments instead of directly using Replica Sets,
270270

271271
### Bare Pods
272272

273-
Unlike in the case where a user directly created pods, a ReplicationController replaces pods that are deleted or terminated for any reason, such as in the case of node failure or disruptive node maintenance, such as a kernel upgrade. For this reason, we recommend that you use a ReplicationController even if your application requires only a single pod. Think of it similarly to a process supervisor, only it supervises multiple pods across multiple nodes instead of individual processes on a single node. A ReplicationController delegates local container restarts to some agent on the node (for example, Kubelet or Docker).
273+
Unlike in the case where a user directly created pods, a ReplicationController replaces pods that are deleted or terminated for any reason, such as in the case of node failure or disruptive node maintenance, such as a kernel upgrade. For this reason, we recommend that you use a ReplicationController even if your application requires only a single pod. Think of it similarly to a process supervisor, only it supervises multiple pods across multiple nodes instead of individual processes on a single node. A ReplicationController delegates local container restarts to some agent on the node, such as the kubelet.
274274

275275
### Job
276276

content/en/docs/concepts/workloads/pods/_index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,10 @@ runtime, and it helps to describe Pods using some terminology from Docker.
3939
{{< /note >}}
4040

4141
The shared context of a Pod is a set of Linux namespaces, cgroups, and
42-
potentially other facets of isolation - the same things that isolate a Docker
43-
container. Within a Pod's context, the individual applications may have
42+
potentially other facets of isolation - the same things that isolate a {{< glossary_tooltip text="container" term_id="container" >}}. Within a Pod's context, the individual applications may have
4443
further sub-isolations applied.
4544

46-
In terms of Docker concepts, a Pod is similar to a group of Docker containers
47-
with shared namespaces and shared filesystem volumes.
45+
A Pod is similar to a set of containers with shared namespaces and shared filesystem volumes.
4846

4947
## Using Pods
5048

content/en/docs/concepts/workloads/pods/init-containers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ Events:
186186
16s 16s 1 {default-scheduler } Normal Scheduled Successfully assigned myapp-pod to 172.17.4.201
187187
16s 16s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Pulling pulling image "busybox"
188188
13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Pulled Successfully pulled image "busybox"
189-
13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Created Created container with docker id 5ced34a04634; Security:[seccomp=unconfined]
190-
13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Started Started container with docker id 5ced34a04634
189+
13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Created Created container init-myservice
190+
13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Started Started container init-myservice
191191
```
192192

193193
To see logs for the init containers in this Pod, run:

content/en/examples/controllers/daemonset.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,8 @@ spec:
3535
volumeMounts:
3636
- name: varlog
3737
mountPath: /var/log
38-
- name: varlibdockercontainers
39-
mountPath: /var/lib/docker/containers
40-
readOnly: true
4138
terminationGracePeriodSeconds: 30
4239
volumes:
4340
- name: varlog
4441
hostPath:
4542
path: /var/log
46-
- name: varlibdockercontainers
47-
hostPath:
48-
path: /var/lib/docker/containers

0 commit comments

Comments
 (0)