Merge pull request #13598 from mburke5678/nodes-remove-docker

Removing references to Docker from Nodes topics

Author: mburke5678

modules/nodes-cluster-overcommit-node-resources.adoc

@@ -8,7 +8,7 @@
 
 To provide more reliable scheduling and minimize node resource overcommitment, 
 each node can reserve a portion of its resources for use by system daemons 
-that are required to run on your node for your cluster to function (*sshd*, *docker*, etc.). 
+that are required to run on your node for your cluster to function (*sshd*, etc.). 
 In particular, it is recommended that you reserve resources for incompressible resources such as memory.
 
 .Procedure

modules/nodes-containers-using-about.adoc

@@ -17,16 +17,6 @@ as a web server or a database, though containers can be used for arbitrary
 workloads.
 
 The Linux kernel has been incorporating capabilities for container technologies
-for years. More recently the Docker project has developed a convenient
-management interface for Linux containers on a host. {product-title} and
-Kubernetes add the ability to orchestrate Docker-formatted containers across
+for years. {product-title} and
+Kubernetes add the ability to orchestrate containers across
 multi-host installations.
-
-Though you do not directly interact with the Docker CLI or service when using
-{product-title}, understanding their capabilities and terminology is
-important for understanding their role in {product-title} and how your
-applications function inside of containers. The *docker* RPM is available
-as part of RHEL 7, as well as CentOS and Fedora, so you can
-experiment with it separately from {product-title}. Refer to the article
-link:https://access.redhat.com/articles/881893[Get Started with Docker Formatted Container Images on Red Hat Systems] for a guided introduction.
-

modules/nodes-nodes-garbage-collection-containers.adoc

@@ -59,14 +59,6 @@ the `*maximum-dead-containers*` limit.
 When the node removes the dead containers, all files inside those containers are
 removed as well. Only containers created by the node are removed.
 
-ifdef::openshift-origin[]
-[NOTE]
-====
-Currently, Docker and rkt are supported. The following only applies to Docker;
-rkt has its own garbage collection.
-====
-endif::[]
-
 Each spin of the garbage collector loop goes through the following steps:
 
 1. Retrieve a list of available containers.

modules/nodes-nodes-modifying-maximum.adoc

@@ -20,11 +20,11 @@ maximum number of pods that can be scheduled to a node: `pods-per-core` and
 `max-pods`. When both options are in use, the lower of the two limits the number
 of pods on a node. Exceeding these values can result in:
 
-* Increased CPU utilization on both {product-title} and Docker.
+* Increased CPU utilization on {product-title}.
 * Slow pod scheduling.
 * Potential out-of-memory scenarios (depends on the amount of memory in the node).
 * Exhausting the pool of IP addresses.
-* Resource overcommitting, leading to poor user application performance.
+// * Resource overcommitting, leading to poor user application performance.
 
 [NOTE]
 ====

modules/nodes-nodes-problem-detector-about.adoc

@@ -54,15 +54,6 @@ status: false
 type: KernelDeadLock
 ----
 
-.Sample output for KernelDeadLock condition
-[source,bash]
-----
-message: task docker:1234 blocked for more than 120 seconds
-reason: DockerHung
-status: true
-type: KernelDeadLock
-----
-
 This example shows output from the Node Problem Detector watching for events on a node.
 The following command uses `oc get event` against the *default* project watching for
 events listed in the `kernel-monitor.json` section of the Node Problem Detector configuration map.
@@ -76,7 +67,6 @@ events listed in the `kernel-monitor.json` section of the Node Problem Detector
 [source,bash]
 ----
 LAST SEEN                       FIRST SEEN                    COUNT NAME     KIND  SUBOBJECT TYPE    REASON      SOURCE                   MESSAGE
-2018-06-27 09:08:27 -0400 EDT   2018-06-27 09:08:27 -0400 EDT 1     my-node1 node            Warning TaskHunk    kernel-monitor.my-node1  docker:1234 blocked for more than 300 seconds
 2018-06-27 09:08:27 -0400 EDT   2018-06-27 09:08:27 -0400 EDT 3     my-node2 node            Warning KernelOops  kernel-monitor.my-node2  BUG: unable to handle kernel NULL pointer deference at nowhere
 2018-06-27 09:08:27 -0400 EDT   2018-06-27 09:08:27 -0400 EDT 1     my-node1 node            Warning KernelOops  kernel-monitor.my-node2  divide error 0000 [#0] SMP
 ----

modules/nodes-nodes-problem-detector-customizing.adoc

@@ -26,26 +26,7 @@ kind: ConfigMap
 metadata:
   name: node-problem-detector
 data:
-  docker-monitor.json: |  <1>
-    {
-        "plugin": "journald", <2>
-        "pluginConfig": {
-                "source": "docker"
-        },
-        "logPath": "/host/log/journal", <3>
-        "lookback": "5m",
-        "bufferSize": 10,
-        "source": "docker-monitor",
-        "conditions": [],
-        "rules": [              <4>
-                {
-                        "type": "temporary", <5>
-                        "reason": "CorruptDockerImage", <6>
-                        "pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*" <7>
-                }
-        ]
-    }
-  kernel-monitor.json: |  <8>
+    kernel-monitor.json: |  <8>
     {
         "plugin": "journald", <2>
         "pluginConfig": {
@@ -94,12 +75,6 @@ data:
                         "reason": "AUFSUmountHung",
                         "pattern": "task umount\\.aufs:\\w+ blocked for more than \\w+ seconds\\."
                 },
-                {
-                        "type": "permanent",
-                        "condition": "KernelDeadlock",
-                        "reason": "DockerHung",
-                        "pattern": "task docker:\\w+ blocked for more than \\w+ seconds\\."
-                }
         ]
     }
 ----
@@ -161,7 +136,7 @@ spec:
         - node-problem-detector
         - --alsologtostderr=true <1>
         - --log_dir="/tmp" <2>
-        - --system-log-monitors=/etc/npd/kernel-monitor.json,/etc/npd/docker-monitor.json <3>
+        - --system-log-monitors=/etc/npd/kernel-monitor.json <3>
 ----
 +
 <1> Sends the output to standard output (stdout).

modules/nodes-nodes-problem-detector-verifying.adoc

@@ -53,6 +53,6 @@ I0416 23:22:00.641354       1 log_monitor.go:63] Finish parsing log monitor conf
 +
 [source,bash]
 ----
-# echo "kernel: task docker:7 blocked for more than 300 seconds." >> /dev/kmsg
+# echo "kernel: task blocked for more than 300 seconds." >> /dev/kmsg
 ----
 

modules/nodes-nodes-rebooting-affinity.adoc

@@ -33,7 +33,7 @@ spec:
         podAffinityTerm:
           labelSelector:
             matchExpressions:
-            - key: docker-registry <4>
+            - key: registry <4>
               operator: In <5>
               values: 
               - default
@@ -46,7 +46,7 @@ spec:
 <5> The operator represents the relationship between the label on the existing pod and the set of values in the `matchExpression` parameters in the specification for the new pod. Can be `In`, `NotIn`, `Exists`, or `DoesNotExist`.
 +
 This example assumes the container image registry pod has a label of
-`*docker-registry=default*`. Pod anti-affinity can use any Kubernetes match
+`*registry=default*`. Pod anti-affinity can use any Kubernetes match
 expression.
 
 . Enable the `*MatchInterPodAffinity*` scheduler predicate in *_/etc/origin/master/scheduler.json_*. See _Default Scheduling_.

modules/nodes-nodes-viewing-listing.adoc

@@ -18,15 +18,11 @@ node1.example.com      Ready     compute   7h        v1.9.1+a0ce1bc657
 node2.example.com      Ready     compute   7h        v1.9.1+a0ce1bc657
 ----
 
-* The `-wide` option provides provides additional information on all nodes:
+* The `-wide` option provides provides additional information on all nodes.
 +
 [source,bash]
 ----
 $ oc get nodes -o wide
-NAME                           STATUS    ROLES     AGE       VERSION           EXTERNAL-IP      OS-IMAGE                                      KERNEL-VERSION          CONTAINER-RUNTIME
-ip-172-18-0-39.ec2.internal    Ready     infra     1d        v1.10.0+b81c8f8   54.172.185.130   Red Hat Enterprise Linux Server 7.5 (Maipo)   3.10.0-862.el7.x86_64   docker://1.13.1
-ip-172-18-10-95.ec2.internal   Ready     master    1d        v1.10.0+b81c8f8   54.88.22.81      Red Hat Enterprise Linux Server 7.5 (Maipo)   3.10.0-862.el7.x86_64   docker://1.13.1
-ip-172-18-8-35.ec2.internal    Ready     compute   1d        v1.10.0+b81c8f8   34.230.50.57     Red Hat Enterprise Linux Server 7.5 (Maipo)   3.10.0-862.el7.x86_64   docker://1.13.1
 ----
 
 * The following command lists information about a single node:
@@ -66,79 +62,90 @@ $ oc describe node <node>
 +
 For example:
 +
-[source,bash]
+[source,bash,options="nowrap"]
 ----
 $ oc describe node node1.example.com
 
 Name:               node1.example.com <1>
-Roles:              compute <2>
-Labels:             beta.kubernetes.io/arch=amd64 <3>
+Roles:              worker <2>
+Labels:             beta.kubernetes.io/arch=amd64   <3>
+                    beta.kubernetes.io/instance-type=m4.large
                     beta.kubernetes.io/os=linux
-                    kubernetes.io/hostname=m01.example.com
-                    node-role.kubernetes.io/compute=true
-                    node-role.kubernetes.io/infra=true
-                    node-role.kubernetes.io/master=true
-                    zone=default
-Annotations:        volumes.kubernetes.io/controller-managed-attach-detach=true  <4>
-CreationTimestamp:  Thu, 24 May 2018 11:46:56 -0400
-Taints:             <none>   <5>
+                    failure-domain.beta.kubernetes.io/region=us-east-2
+                    failure-domain.beta.kubernetes.io/zone=us-east-2a
+                    kubernetes.io/hostname=ip-10-0-140-16
+                    node-role.kubernetes.io/worker=
+Annotations:        cluster.k8s.io/machine: openshift-cluster-api/ahardin-worker-us-east-2a-q5dzc  <4>
+                    machineconfiguration.openshift.io/currentConfig: worker-309c228e8b3a92e2235edd544c62fea8
+                    machineconfiguration.openshift.io/desiredConfig: worker-309c228e8b3a92e2235edd544c62fea8
+                    machineconfiguration.openshift.io/state: Done
+                    volumes.kubernetes.io/controller-managed-attach-detach: true
+CreationTimestamp:  Wed, 13 Feb 2019 11:05:57 -0500
+Taints:             <none>  <5>
 Unschedulable:      false
-Conditions:                  <6>
+Conditions:                 <6>
   Type             Status  LastHeartbeatTime                 LastTransitionTime                Reason                       Message
   ----             ------  -----------------                 ------------------                ------                       -------
-  OutOfDisk        False   Tue, 17 Jul 2018 11:47:30 -0400   Tue, 10 Jul 2018 15:45:16 -0400   KubeletHasSufficientDisk     kubelet has sufficient disk space available
-  MemoryPressure   False   Tue, 17 Jul 2018 11:47:30 -0400   Tue, 10 Jul 2018 15:45:16 -0400   KubeletHasSufficientMemory   kubelet has sufficient memory available
-  DiskPressure     False   Tue, 17 Jul 2018 11:47:30 -0400   Tue, 10 Jul 2018 16:03:54 -0400   KubeletHasNoDiskPressure     kubelet has no disk pressure
-  Ready            True    Tue, 17 Jul 2018 11:47:30 -0400   Mon, 16 Jul 2018 15:10:25 -0400   KubeletReady                 kubelet is posting ready status
-  PIDPressure      False   Tue, 17 Jul 2018 11:47:30 -0400   Thu, 05 Jul 2018 10:06:51 -0400   KubeletHasSufficientPID      kubelet has sufficient PID available
-Addresses:                   <7>
-  InternalIP:  192.168.122.248
-  Hostname:    node1.example.com
-Capacity:                    <8>
- cpu:            2
- hugepages-2Mi:  0
- memory:         8010336Ki
- pods:           40
+  OutOfDisk        False   Wed, 13 Feb 2019 15:09:42 -0500   Wed, 13 Feb 2019 11:05:57 -0500   KubeletHasSufficientDisk     kubelet has sufficient disk space available
+  MemoryPressure   False   Wed, 13 Feb 2019 15:09:42 -0500   Wed, 13 Feb 2019 11:05:57 -0500   KubeletHasSufficientMemory   kubelet has sufficient memory available
+  DiskPressure     False   Wed, 13 Feb 2019 15:09:42 -0500   Wed, 13 Feb 2019 11:05:57 -0500   KubeletHasNoDiskPressure     kubelet has no disk pressure
+  PIDPressure      False   Wed, 13 Feb 2019 15:09:42 -0500   Wed, 13 Feb 2019 11:05:57 -0500   KubeletHasSufficientPID      kubelet has sufficient PID available
+  Ready            True    Wed, 13 Feb 2019 15:09:42 -0500   Wed, 13 Feb 2019 11:07:09 -0500   KubeletReady                 kubelet is posting ready status
+Addresses:   <7>
+  InternalIP:   10.0.140.16
+  InternalDNS:  ip-10-0-140-16.us-east-2.compute.internal
+  Hostname:     ip-10-0-140-16.us-east-2.compute.internal
+Capacity:    <8>
+ attachable-volumes-aws-ebs:  39
+ cpu:                         2
+ hugepages-1Gi:               0
+ hugepages-2Mi:               0
+ memory:                      8172516Ki
+ pods:                        250
 Allocatable:
- cpu:            2
- hugepages-2Mi:  0
- memory:         7907936Ki
- pods:           40
-System Info:                 <9>
- Machine ID:                         b3adb9acbc49fc1f9a7d6
- System UUID:                        B3ADB9A-B0CB-C49FC1F9A7D6
- Boot ID:                            9359d15aec9-81a20aef5876
- Kernel Version:                     3.10.0-693.21.1.el7.x86_64
- OS Image:                           OpenShift Enterprise
- Operating System:                   linux
- Architecture:                       amd64
- Container Runtime Version:          docker://1.13.1
- Kubelet Version:                    v1.10.0+b81c8f8
- Kube-Proxy Version:                 v1.10.0+b81c8f8
-ExternalID:                          node1.example.com
-Non-terminated Pods:                 (14 in total)       <10>
-  Namespace                          Name                                  CPU Requests  CPU Limits  Memory Requests  Memory Limits
-  ---------                          ----                                  ------------  ----------  ---------------  -------------
-  default                            docker-registry-2-w252l               100m (5%)     0 (0%)      256Mi (3%)       0 (0%)
-  default                            registry-console-2-dpnc9              0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  default                            router-2-5snb2                        100m (5%)     0 (0%)      256Mi (3%)       0 (0%)
-  kube-service-catalog               apiserver-jh6gt                       0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  kube-service-catalog               controller-manager-z4t5j              0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  kube-system                        master-api-m01.example.com            0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  kube-system                        master-controllers-m01.example.com    0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  kube-system                        master-etcd-m01.example.com           0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  service-broker                     sb-1-hnn5t                            0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  openshift-node                     sync-dvhvs                            0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  openshift-sdn                      ovs-zjs5k                             100m (5%)     200m (10%)  300Mi (3%)       400Mi (5%)
-  openshift-sdn                      sdn-zr4cb                             100m (5%)     0 (0%)      200Mi (2%)       0 (0%)
-  openshift-template-service-broker  apiserver-s9n7t                       0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  openshift-web-console              webconsole-785689b664-q7s9j           100m (5%)     0 (0%)      100Mi (1%)       0 (0%)
+ attachable-volumes-aws-ebs:  39
+ cpu:                         1500m
+ hugepages-1Gi:               0
+ hugepages-2Mi:               0
+ memory:                      7558116Ki
+ pods:                        250
+System Info:    <9>
+ Machine ID:                              63787c9534c24fde9a0cde35c13f1f66
+ System UUID:                             EC22BF97-A006-4A58-6AF8-0A38DEEA122A
+ Boot ID:                                 f24ad37d-2594-46b4-8830-7f7555918325
+ Kernel Version:                          3.10.0-957.5.1.el7.x86_64
+ OS Image:                                Red Hat CoreOS 4.0
+ Operating System:                        linux
+ Architecture:                            amd64
+ Container Runtime Version:               cri-o://1.12.5-2.rhaos4.0.gitd4191df.el7-dev
+ Kubelet Version:                         v1.12.4+91d94b671b
+ Kube-Proxy Version:                      v1.12.4+91d94b671b
+PodCIDR:                                  10.128.4.0/24
+ProviderID:                               aws:///us-east-2a/i-04e87b31dc6b3e171
+Non-terminated Pods:                      (13 in total)  <10>  
+  Namespace                               Name                                   CPU Requests  CPU Limits  Memory Requests  Memory Limits
+  ---------                               ----                                   ------------  ----------  ---------------  -------------
+  openshift-cluster-node-tuning-operator  tuned-hdl5q                            0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-dns                           dns-default-l69zr                      0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-image-registry                node-ca-9hmcg                          0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-ingress                       router-default-76455c45c-c5ptv         0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-machine-config-operator       machine-config-daemon-cvqw9            20m (1%)      0 (0%)      50Mi (0%)        0 (0%)
+  openshift-marketplace                   community-operators-f67fh              0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-monitoring                    alertmanager-main-0                    50m (3%)      50m (3%)    210Mi (2%)       10Mi (0%)
+  openshift-monitoring                    grafana-78765ddcc7-hnjmm               100m (6%)     200m (13%)  100Mi (1%)       200Mi (2%)
+  openshift-monitoring                    node-exporter-l7q8d                    10m (0%)      20m (1%)    20Mi (0%)        40Mi (0%)
+  openshift-monitoring                    prometheus-adapter-75d769c874-hvb85    0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-multus                        multus-kw8w5                           0 (0%)        0 (0%)      0 (0%)           0 (0%)
+  openshift-sdn                           ovs-t4dsn                              100m (6%)     0 (0%)      300Mi (4%)       0 (0%)
+  openshift-sdn                           sdn-g79hg                              100m (6%)     0 (0%)      200Mi (2%)       0 (0%)
 Allocated resources:
   (Total limits may be over 100 percent, i.e., overcommitted.)
-  CPU Requests  CPU Limits  Memory Requests  Memory Limits
-  ------------  ----------  ---------------  -------------
-  500m (25%)    200m (10%)  1112Mi (14%)     400Mi (5%)
-Events:
+  Resource                    Requests     Limits
+  --------                    --------     ------
+  cpu                         380m (25%)   270m (18%)
+  memory                      880Mi (11%)  250Mi (3%)
+  attachable-volumes-aws-ebs  0            0
+Events:     <11>
   Type     Reason                   Age                From                      Message
   ----     ------                   ----               ----                      -------
   Normal   NodeHasSufficientPID     6d (x5 over 6d)    kubelet, m01.example.com  Node m01.example.com status is now: NodeHasSufficientPID