Merge pull request openshift#10837 from mburke5678/BZ-1572985-master

[master] oc describe node shows less information
dougbtv · Jul 16, 2018 · 48fa6e9 · 48fa6e9
2 parents 712f621 + ed9f891
commit 48fa6e9
Showing 1 changed file with 71 additions and 24 deletions.
diff --git a/admin_guide/manage_nodes.adoc b/admin_guide/manage_nodes.adoc
@@ -78,30 +78,77 @@ $ oc describe node <node>
 For example:
 
 ----
-$ oc describe node node1.example.com
-Name:			node1.example.com
-Labels:			kubernetes.io/hostname=node1.example.com
-CreationTimestamp:	Wed, 10 Jun 2015 17:22:34 +0000
-Conditions:
-  Type		Status	LastHeartbeatTime			LastTransitionTime			Reason					Message
-  Ready 	True 	Wed, 10 Jun 2015 19:56:16 +0000 	Wed, 10 Jun 2015 17:22:34 +0000 	kubelet is posting ready status
-Addresses:	127.0.0.1
-Capacity:
- memory:	1017552Ki
- pods:		100
- cpu:		2
-Version:
- Kernel Version:		3.17.4-301.fc21.x86_64
- OS Image:			Fedora 21 (Twenty One)
- Container Runtime Version:	docker://1.6.0
- Kubelet Version:		v0.17.1-804-g496be63
- Kube-Proxy Version:		v0.17.1-804-g496be63
-ExternalID:			node1.example.com
-Pods:				(2 in total)
-  docker-registry-1-9yyw5
-  router-1-maytv
-No events.
-----
+# oc describe node node1.example.com 
+
+Name:               node1.example.com <1>
+Roles:              master <2>
+Labels:             beta.kubernetes.io/arch=amd64 <3>
+                    beta.kubernetes.io/os=linux
+                    glusterfs=storage-host
+                    kubernetes.io/hostname=node1.example.com
+                    node-role.kubernetes.io/master=true
+                    region=infra
+                    zone=default
+Annotations:        volumes.kubernetes.io/controller-managed-attach-detach=true <4>
+Taints:             <none> <5>
+CreationTimestamp:  Sat, 07 Apr 2018 16:49:31 +0530
+Conditions:                                                    <6>
+  Type             Status  LastHeartbeatTime                 LastTransitionTime                Reason                       Message
+  ----             ------  -----------------                 ------------------                ------                       -------
+  OutOfDisk        False   Wed, 30 May 2018 14:19:56 +0530   Sat, 07 Apr 2018 16:49:31 +0530   KubeletHasSufficientDisk     kubelet has sufficient disk space available
+  MemoryPressure   False   Wed, 30 May 2018 14:19:56 +0530   Sat, 07 Apr 2018 16:49:31 +0530   KubeletHasSufficientMemory   kubelet has sufficient memory available
+  DiskPressure     False   Wed, 30 May 2018 14:19:56 +0530   Sat, 07 Apr 2018 16:49:31 +0530   KubeletHasNoDiskPressure     kubelet has no disk pressure
+  Ready            True    Wed, 30 May 2018 14:19:56 +0530   Fri, 11 May 2018 15:09:42 +0530   KubeletReady                 kubelet is posting ready status
+Addresses:                           <7>
+  InternalIP:  10.74.2.51
+  Hostname:    node1.example.com
+Capacity:                            <8>
+ cpu:     2
+ memory:  16208764Ki
+ pods:    20
+Allocatable:
+ cpu:     2
+ memory:  16106364Ki
+ pods:    20
+System Info: <9>
+ Machine ID:                 edd6dd9a8530d2c8c442c2d4e7f
+ System UUID:                EDD6DD9A-853BD2C-8C442C2D4E7F
+ Boot ID:                    750641e2-1b5b02b-ee068821264e
+ Kernel Version:             3.10.0-693.el7.x86_64
+ OS Image:                   OpenShift Enterprise
+ Operating System:           linux
+ Architecture:               amd64
+ Container Runtime Version:  docker://1.13.1
+ Kubelet Version:            v1.9.1+a0ce1bc657
+ Kube-Proxy Version:         v1.9.1+a0ce1bc657
+ExternalID:                  vm252-51.example.com
+Non-terminated Pods:         (6 in total)           <10>
+  Namespace                  Name                              CPU Requests  CPU Limits  Memory Requests  Memory Limits
+  ---------                  ----                              ------------  ----------  ---------------  -------------
+  default                    docker-registry-1-prph7           100m (5%)     0 (0%)      256Mi (1%)       0 (0%)
+  default                    router-1-z625j                    100m (5%)     0 (0%)      256Mi (1%)       0 (0%)
+  glusterfs                  glusterfs-storage-8h59h           100m (5%)     0 (0%)      100Mi (0%)       0 (0%)
+  openshift-metrics          prometheus-0                      1 (50%)       1 (50%)     1Gi (6%)         1Gi (6%)
+  openshift-metrics          prometheus-node-exporter-j5hbp    100m (5%)     200m (10%)  30Mi (0%)        50Mi (0%)
+  openshift-web-console      webconsole-6c488985dd-4txcz       100m (5%)     0 (0%)      100Mi (0%)       0 (0%)
+Allocated resources:
+  (Total limits may be over 100 percent, i.e., overcommitted.)
+  CPU Requests  CPU Limits   Memory Requests  Memory Limits
+  ------------  ----------   ---------------  -------------
+  1500m (75%)   1200m (60%)  1766Mi (11%)     1074Mi (6%)
+Events:         <none>
+----
+
+<1> The name of the node.
+<2> The role of the node, either `master` or `compute`.
+<3> The xref:../install/configuring_inventory_file.adoc#configuring-node-host-labels[labels] applied to the node.
+<4> The annotations applied to the node.
+<5> The xref:../admin_guide/scheduling/taints_tolerations.adoc#admin-guide-taints[taints] applied to the node.
+<6> xref:../admin_guide/manage_nodes.adoc#node-conditions[Node conditions].
+<7> The IP address and host name of the node. 
+<8> The xref:../admin_guide/allocating_node_resources.adoc#admin-guide-allocating-node-resources[pod resources and allocatable resources].
+<9> Information about the node host.
+<10> The pods on the node.
 
 [[viewing-nodes]]
 == Viewing nodes