From ddc48c241befe86d0a8295a094b87f7aca792d1b Mon Sep 17 00:00:00 2001 From: Ashun Date: Wed, 31 Aug 2022 17:58:19 +0530 Subject: [PATCH 1/6] Removing docker mentions from replicationControllers and Containers --- .../concepts/workloads/controllers/replicationcontroller.md | 4 ++-- content/en/docs/concepts/workloads/pods/init-containers.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/en/docs/concepts/workloads/controllers/replicationcontroller.md b/content/en/docs/concepts/workloads/controllers/replicationcontroller.md index b55db484e0..a0f3d3bf06 100644 --- a/content/en/docs/concepts/workloads/controllers/replicationcontroller.md +++ b/content/en/docs/concepts/workloads/controllers/replicationcontroller.md @@ -138,8 +138,8 @@ labels and an appropriate restart policy. For labels, make sure not to overlap w 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. -For local container restarts, ReplicationControllers delegate to an agent on the node, -for example the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/) or Docker. +For local container restarts, ReplicationControllers delegate to some agent on the node, +such as the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/). ### Labels on the ReplicationController diff --git a/content/en/docs/concepts/workloads/pods/init-containers.md b/content/en/docs/concepts/workloads/pods/init-containers.md index 85c5ec413b..d217baa749 100644 --- a/content/en/docs/concepts/workloads/pods/init-containers.md +++ b/content/en/docs/concepts/workloads/pods/init-containers.md @@ -186,8 +186,8 @@ Events: 16s 16s 1 {default-scheduler } Normal Scheduled Successfully assigned myapp-pod to 172.17.4.201 16s 16s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Pulling pulling image "busybox" 13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Pulled Successfully pulled image "busybox" - 13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Created Created container with docker id 5ced34a04634; Security:[seccomp=unconfined] - 13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Started Started container with docker id 5ced34a04634 + 13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Created Created container init-myservice + 13s 13s 1 {kubelet 172.17.4.201} spec.initContainers{init-myservice} Normal Started Started container init-myservice ``` To see logs for the init containers in this Pod, run: From 7d2cf001246c0d50ce3436c630d90c0eeb45685e Mon Sep 17 00:00:00 2001 From: rogue-gamer-ryt Date: Wed, 31 Aug 2022 18:20:38 +0530 Subject: [PATCH 2/6] Removed docker usage from replicationControllers --- .../concepts/workloads/controllers/replicationcontroller.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/docs/concepts/workloads/controllers/replicationcontroller.md b/content/en/docs/concepts/workloads/controllers/replicationcontroller.md index a0f3d3bf06..90a04f6f17 100644 --- a/content/en/docs/concepts/workloads/controllers/replicationcontroller.md +++ b/content/en/docs/concepts/workloads/controllers/replicationcontroller.md @@ -138,8 +138,8 @@ labels and an appropriate restart policy. For labels, make sure not to overlap w 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. -For local container restarts, ReplicationControllers delegate to some agent on the node, -such as the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/). +For local container restarts, ReplicationControllers delegate to an agent on the node, +for example the [Kubelet](/docs/reference/command-line-tools-reference/kubelet/). ### Labels on the ReplicationController @@ -270,7 +270,7 @@ Note that we recommend using Deployments instead of directly using Replica Sets, ### Bare Pods -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). +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. ### Job From a174afba762cbd71e9e8d208a5785e331c045352 Mon Sep 17 00:00:00 2001 From: rogue-gamer-ryt Date: Wed, 31 Aug 2022 18:22:21 +0530 Subject: [PATCH 3/6] Removed docker usage from daemontsets --- content/en/docs/concepts/workloads/controllers/daemonset.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/en/docs/concepts/workloads/controllers/daemonset.md b/content/en/docs/concepts/workloads/controllers/daemonset.md index d74a4a0c62..98147a6e64 100644 --- a/content/en/docs/concepts/workloads/controllers/daemonset.md +++ b/content/en/docs/concepts/workloads/controllers/daemonset.md @@ -203,8 +203,7 @@ running such processes via a DaemonSet: - Ability to monitor and manage logs for daemons in the same way as applications. - Same config language and tools (e.g. Pod templates, `kubectl`) for daemons and applications. - Running daemons in containers with resource limits increases isolation between daemons from app - containers. However, this can also be accomplished by running the daemons in a container but not in a Pod - (e.g. start directly via Docker). + containers. However, this can also be accomplished by running the daemons in a container but not in a Pod. ### Bare Pods From 1b4a32ce6c97ea748549f16d2104952009f0ed49 Mon Sep 17 00:00:00 2001 From: rogue-gamer-ryt Date: Wed, 31 Aug 2022 19:42:47 +0530 Subject: [PATCH 4/6] Updated usage of "docker" --- content/en/docs/concepts/workloads/pods/_index.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/content/en/docs/concepts/workloads/pods/_index.md b/content/en/docs/concepts/workloads/pods/_index.md index d4521ece8a..13458a7463 100644 --- a/content/en/docs/concepts/workloads/pods/_index.md +++ b/content/en/docs/concepts/workloads/pods/_index.md @@ -39,12 +39,10 @@ runtime, and it helps to describe Pods using some terminology from Docker. {{< /note >}} The shared context of a Pod is a set of Linux namespaces, cgroups, and -potentially other facets of isolation - the same things that isolate a Docker -container. Within a Pod's context, the individual applications may have +potentially other facets of isolation - the same things that isolate a {{< glossary_tooltip text="containers" term_id="container" >}}. Within a Pod's context, the individual applications may have further sub-isolations applied. -In terms of Docker concepts, a Pod is similar to a group of Docker containers -with shared namespaces and shared filesystem volumes. +A Pod is similar to a set of containers with shared namespaces and shared filesystem volumes. ## Using Pods From d7a2a8f45a348d27a3cc265c43af7591520b7d23 Mon Sep 17 00:00:00 2001 From: rogue-gamer-ryt Date: Thu, 1 Sep 2022 23:26:33 +0530 Subject: [PATCH 5/6] Removed docker mentions from daemonset code sample --- content/en/examples/controllers/daemonset.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/content/en/examples/controllers/daemonset.yaml b/content/en/examples/controllers/daemonset.yaml index 5b47b61ac1..aa540e9697 100644 --- a/content/en/examples/controllers/daemonset.yaml +++ b/content/en/examples/controllers/daemonset.yaml @@ -35,14 +35,8 @@ spec: volumeMounts: - name: varlog mountPath: /var/log - - name: varlibdockercontainers - mountPath: /var/lib/docker/containers - readOnly: true terminationGracePeriodSeconds: 30 volumes: - name: varlog hostPath: path: /var/log - - name: varlibdockercontainers - hostPath: - path: /var/lib/docker/containers From f7248fa427514e52e6a90feb8f8e0b31e16bf5f4 Mon Sep 17 00:00:00 2001 From: rogue-gamer-ryt Date: Thu, 1 Sep 2022 23:27:39 +0530 Subject: [PATCH 6/6] grammar correction in pod overview --- content/en/docs/concepts/workloads/pods/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/workloads/pods/_index.md b/content/en/docs/concepts/workloads/pods/_index.md index 13458a7463..e49bbefc07 100644 --- a/content/en/docs/concepts/workloads/pods/_index.md +++ b/content/en/docs/concepts/workloads/pods/_index.md @@ -39,7 +39,7 @@ runtime, and it helps to describe Pods using some terminology from Docker. {{< /note >}} The shared context of a Pod is a set of Linux namespaces, cgroups, and -potentially other facets of isolation - the same things that isolate a {{< glossary_tooltip text="containers" term_id="container" >}}. Within a Pod's context, the individual applications may have +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 further sub-isolations applied. A Pod is similar to a set of containers with shared namespaces and shared filesystem volumes.