Skip to content

Commit 057de9b

Browse files
mburke5678mburke5678
committed
edits per sjenning
1 parent ad5dd73 commit 057de9b

File tree

3 files changed

+165
-121
lines changed

3 files changed

+165
-121
lines changed

‎modules/nodes-nodes-viewing-listing.adoc

Lines changed: 73 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -62,79 +62,90 @@ $ oc describe node <node>
6262
+
6363
For example:
6464
+
65-
[source,bash]
65+
[source,bash,options="nowrap"]
6666
----
6767
$ oc describe node node1.example.com
6868
6969
Name: node1.example.com <1>
70-
Roles: compute <2>
71-
Labels: beta.kubernetes.io/arch=amd64 <3>
70+
Roles: worker <2>
71+
Labels: beta.kubernetes.io/arch=amd64 <3>
72+
beta.kubernetes.io/instance-type=m4.large
7273
beta.kubernetes.io/os=linux
73-
kubernetes.io/hostname=m01.example.com
74-
node-role.kubernetes.io/compute=true
75-
node-role.kubernetes.io/infra=true
76-
node-role.kubernetes.io/master=true
77-
zone=default
78-
Annotations: volumes.kubernetes.io/controller-managed-attach-detach=true <4>
79-
CreationTimestamp: Thu, 24 May 2018 11:46:56 -0400
80-
Taints: <none> <5>
74+
failure-domain.beta.kubernetes.io/region=us-east-2
75+
failure-domain.beta.kubernetes.io/zone=us-east-2a
76+
kubernetes.io/hostname=ip-10-0-140-16
77+
node-role.kubernetes.io/worker=
78+
Annotations: cluster.k8s.io/machine: openshift-cluster-api/ahardin-worker-us-east-2a-q5dzc <4>
79+
machineconfiguration.openshift.io/currentConfig: worker-309c228e8b3a92e2235edd544c62fea8
80+
machineconfiguration.openshift.io/desiredConfig: worker-309c228e8b3a92e2235edd544c62fea8
81+
machineconfiguration.openshift.io/state: Done
82+
volumes.kubernetes.io/controller-managed-attach-detach: true
83+
CreationTimestamp: Wed, 13 Feb 2019 11:05:57 -0500
84+
Taints: <none> <5>
8185
Unschedulable: false
82-
Conditions: <6>
86+
Conditions: <6>
8387
Type Status LastHeartbeatTime LastTransitionTime Reason Message
8488
---- ------ ----------------- ------------------ ------ -------
85-
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
86-
MemoryPressure False Tue, 17 Jul 2018 11:47:30 -0400 Tue, 10 Jul 2018 15:45:16 -0400 KubeletHasSufficientMemory kubelet has sufficient memory available
87-
DiskPressure False Tue, 17 Jul 2018 11:47:30 -0400 Tue, 10 Jul 2018 16:03:54 -0400 KubeletHasNoDiskPressure kubelet has no disk pressure
88-
Ready True Tue, 17 Jul 2018 11:47:30 -0400 Mon, 16 Jul 2018 15:10:25 -0400 KubeletReady kubelet is posting ready status
89-
PIDPressure False Tue, 17 Jul 2018 11:47:30 -0400 Thu, 05 Jul 2018 10:06:51 -0400 KubeletHasSufficientPID kubelet has sufficient PID available
90-
Addresses: <7>
91-
InternalIP: 192.168.122.248
92-
Hostname: node1.example.com
93-
Capacity: <8>
94-
cpu: 2
95-
hugepages-2Mi: 0
96-
memory: 8010336Ki
97-
pods: 40
89+
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
90+
MemoryPressure False Wed, 13 Feb 2019 15:09:42 -0500 Wed, 13 Feb 2019 11:05:57 -0500 KubeletHasSufficientMemory kubelet has sufficient memory available
91+
DiskPressure False Wed, 13 Feb 2019 15:09:42 -0500 Wed, 13 Feb 2019 11:05:57 -0500 KubeletHasNoDiskPressure kubelet has no disk pressure
92+
PIDPressure False Wed, 13 Feb 2019 15:09:42 -0500 Wed, 13 Feb 2019 11:05:57 -0500 KubeletHasSufficientPID kubelet has sufficient PID available
93+
Ready True Wed, 13 Feb 2019 15:09:42 -0500 Wed, 13 Feb 2019 11:07:09 -0500 KubeletReady kubelet is posting ready status
94+
Addresses: <7>
95+
InternalIP: 10.0.140.16
96+
InternalDNS: ip-10-0-140-16.us-east-2.compute.internal
97+
Hostname: ip-10-0-140-16.us-east-2.compute.internal
98+
Capacity: <8>
99+
attachable-volumes-aws-ebs: 39
100+
cpu: 2
101+
hugepages-1Gi: 0
102+
hugepages-2Mi: 0
103+
memory: 8172516Ki
104+
pods: 250
98105
Allocatable:
99-
cpu: 2
100-
hugepages-2Mi: 0
101-
memory: 7907936Ki
102-
pods: 40
103-
System Info: <9>
104-
Machine ID: b3adb9acbc49fc1f9a7d6
105-
System UUID: B3ADB9A-B0CB-C49FC1F9A7D6
106-
Boot ID: 9359d15aec9-81a20aef5876
107-
Kernel Version: 3.10.0-693.21.1.el7.x86_64
108-
OS Image: OpenShift Enterprise
109-
Operating System: linux
110-
Architecture: amd64
111-
Container Runtime Version: 1.13.1
112-
Kubelet Version: v1.10.0+b81c8f8
113-
Kube-Proxy Version: v1.10.0+b81c8f8
114-
ExternalID: node1.example.com
115-
Non-terminated Pods: (14 in total) <10>
116-
Namespace Name CPU Requests CPU Limits Memory Requests Memory Limits
117-
--------- ---- ------------ ---------- --------------- -------------
118-
default registry-2-w252l 100m (5%) 0 (0%) 256Mi (3%) 0 (0%)
119-
default registry-console-2-dpnc9 0 (0%) 0 (0%) 0 (0%) 0 (0%)
120-
default router-2-5snb2 100m (5%) 0 (0%) 256Mi (3%) 0 (0%)
121-
kube-service-catalog apiserver-jh6gt 0 (0%) 0 (0%) 0 (0%) 0 (0%)
122-
kube-service-catalog controller-manager-z4t5j 0 (0%) 0 (0%) 0 (0%) 0 (0%)
123-
kube-system master-api-m01.example.com 0 (0%) 0 (0%) 0 (0%) 0 (0%)
124-
kube-system master-controllers-m01.example.com 0 (0%) 0 (0%) 0 (0%) 0 (0%)
125-
kube-system master-etcd-m01.example.com 0 (0%) 0 (0%) 0 (0%) 0 (0%)
126-
service-broker sb-1-hnn5t 0 (0%) 0 (0%) 0 (0%) 0 (0%)
127-
openshift-node sync-dvhvs 0 (0%) 0 (0%) 0 (0%) 0 (0%)
128-
openshift-sdn ovs-zjs5k 100m (5%) 200m (10%) 300Mi (3%) 400Mi (5%)
129-
openshift-sdn sdn-zr4cb 100m (5%) 0 (0%) 200Mi (2%) 0 (0%)
130-
openshift-template-service-broker apiserver-s9n7t 0 (0%) 0 (0%) 0 (0%) 0 (0%)
131-
openshift-web-console webconsole-785689b664-q7s9j 100m (5%) 0 (0%) 100Mi (1%) 0 (0%)
106+
attachable-volumes-aws-ebs: 39
107+
cpu: 1500m
108+
hugepages-1Gi: 0
109+
hugepages-2Mi: 0
110+
memory: 7558116Ki
111+
pods: 250
112+
System Info: <9>
113+
Machine ID: 63787c9534c24fde9a0cde35c13f1f66
114+
System UUID: EC22BF97-A006-4A58-6AF8-0A38DEEA122A
115+
Boot ID: f24ad37d-2594-46b4-8830-7f7555918325
116+
Kernel Version: 3.10.0-957.5.1.el7.x86_64
117+
OS Image: Red Hat CoreOS 4.0
118+
Operating System: linux
119+
Architecture: amd64
120+
Container Runtime Version: cri-o://1.12.5-2.rhaos4.0.gitd4191df.el7-dev
121+
Kubelet Version: v1.12.4+91d94b671b
122+
Kube-Proxy Version: v1.12.4+91d94b671b
123+
PodCIDR: 10.128.4.0/24
124+
ProviderID: aws:///us-east-2a/i-04e87b31dc6b3e171
125+
Non-terminated Pods: (13 in total) <10>
126+
Namespace Name CPU Requests CPU Limits Memory Requests Memory Limits
127+
--------- ---- ------------ ---------- --------------- -------------
128+
openshift-cluster-node-tuning-operator tuned-hdl5q 0 (0%) 0 (0%) 0 (0%) 0 (0%)
129+
openshift-dns dns-default-l69zr 0 (0%) 0 (0%) 0 (0%) 0 (0%)
130+
openshift-image-registry node-ca-9hmcg 0 (0%) 0 (0%) 0 (0%) 0 (0%)
131+
openshift-ingress router-default-76455c45c-c5ptv 0 (0%) 0 (0%) 0 (0%) 0 (0%)
132+
openshift-machine-config-operator machine-config-daemon-cvqw9 20m (1%) 0 (0%) 50Mi (0%) 0 (0%)
133+
openshift-marketplace community-operators-f67fh 0 (0%) 0 (0%) 0 (0%) 0 (0%)
134+
openshift-monitoring alertmanager-main-0 50m (3%) 50m (3%) 210Mi (2%) 10Mi (0%)
135+
openshift-monitoring grafana-78765ddcc7-hnjmm 100m (6%) 200m (13%) 100Mi (1%) 200Mi (2%)
136+
openshift-monitoring node-exporter-l7q8d 10m (0%) 20m (1%) 20Mi (0%) 40Mi (0%)
137+
openshift-monitoring prometheus-adapter-75d769c874-hvb85 0 (0%) 0 (0%) 0 (0%) 0 (0%)
138+
openshift-multus multus-kw8w5 0 (0%) 0 (0%) 0 (0%) 0 (0%)
139+
openshift-sdn ovs-t4dsn 100m (6%) 0 (0%) 300Mi (4%) 0 (0%)
140+
openshift-sdn sdn-g79hg 100m (6%) 0 (0%) 200Mi (2%) 0 (0%)
132141
Allocated resources:
133142
(Total limits may be over 100 percent, i.e., overcommitted.)
134-
CPU Requests CPU Limits Memory Requests Memory Limits
135-
------------ ---------- --------------- -------------
136-
500m (25%) 200m (10%) 1112Mi (14%) 400Mi (5%)
137-
Events:
143+
Resource Requests Limits
144+
-------- -------- ------
145+
cpu 380m (25%) 270m (18%)
146+
memory 880Mi (11%) 250Mi (3%)
147+
attachable-volumes-aws-ebs 0 0
148+
Events: <11>
138149
Type Reason Age From Message
139150
---- ------ ---- ---- -------
140151
Normal NodeHasSufficientPID 6d (x5 over 6d) kubelet, m01.example.com Node m01.example.com status is now: NodeHasSufficientPID

‎modules/nodes-pods-secrets-certificates-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
metadata:
2323
name: registry
2424
annotations:
25-
service.alpha.openshift.io/serving-cert-secret-name: cert<1>
25+
service.alpha.openshift.io/serving-cert-secret-name: registry-cert<1>
2626
....
2727
----
2828
<1> Specify the name for the certificate

‎modules/nodes-pods-using-example.adoc

Lines changed: 91 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -19,82 +19,115 @@ which are discussed in other topics and thus only briefly mentioned here:
1919

2020
[source,yaml]
2121
----
22-
apiVersion: v1
2322
kind: Pod
23+
apiVersion: v1
2424
metadata:
25-
annotations: { ... }
26-
labels: <1>
27-
deployment: registry-1
28-
deploymentconfig: registry
29-
registry: default
30-
generateName: registry-1- <2>
25+
name: example
26+
namespace: default
27+
selfLink: /api/v1/namespaces/default/pods/example
28+
uid: 5cc30063-0265780783bc
29+
resourceVersion: '165032'
30+
creationTimestamp: '2019-02-13T20:31:37Z'
31+
labels: <1>
32+
app: hello-openshift
33+
annotations:
34+
openshift.io/scc: anyuid
3135
spec:
32-
containers: <3>
33-
- env: <4>
34-
- name: OPENSHIFT_CA_DATA
35-
value: ...
36-
- name: OPENSHIFT_CERT_DATA
37-
value: ...
38-
- name: OPENSHIFT_INSECURE
39-
value: "false"
40-
- name: OPENSHIFT_KEY_DATA
41-
value: ...
42-
- name: OPENSHIFT_MASTER
43-
value: https://master.example.com:8443
44-
image: openshift/origin-registry:v0.6.2 <5>
45-
imagePullPolicy: IfNotPresent
46-
name: registry
47-
ports: <6>
48-
- containerPort: 5000
49-
protocol: TCP
50-
resources: {}
51-
securityContext: { ... } <7>
52-
volumeMounts: <8>
53-
- mountPath: /registry
54-
name: registry-storage
55-
- mountPath: /var/run/secrets/kubernetes.io/serviceaccount
56-
name: default-token-br6yz
57-
readOnly: true
58-
dnsPolicy: ClusterFirst
36+
restartPolicy: Always <2>
37+
serviceAccountName: default
5938
imagePullSecrets:
60-
- name: default-cfg-at06w
61-
restartPolicy: Always <9>
62-
serviceAccount: default <10>
63-
volumes: <11>
64-
- emptyDir: {}
65-
name: registry-storage
66-
- name: default-token-br6yz
67-
secret:
68-
secretName: default-token-br6yz
39+
- name: default-dockercfg-5zrhb
40+
priority: 0
41+
schedulerName: default-scheduler
42+
terminationGracePeriodSeconds: 30
43+
nodeName: ip-10-0-140-16.us-east-2.compute.internal
44+
securityContext: <3>
45+
seLinuxOptions:
46+
level: 's0:c11,c10'
47+
containers: <4>
48+
- resources: {}
49+
terminationMessagePath: /dev/termination-log
50+
name: hello-openshift
51+
securityContext:
52+
capabilities:
53+
drop:
54+
- MKNOD
55+
procMount: Default
56+
ports: <5>
57+
- containerPort: 8080
58+
protocol: TCP
59+
imagePullPolicy: Always
60+
volumeMounts: <6>
61+
- name: default-token-wbqsl
62+
readOnly: true
63+
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
64+
terminationMessagePolicy: File
65+
image: openshift/hello-openshift
66+
serviceAccount: default <7>
67+
volumes: <8>
68+
- name: default-token-wbqsl
69+
secret:
70+
secretName: default-token-wbqsl
71+
defaultMode: 420
72+
dnsPolicy: ClusterFirst
73+
status:
74+
phase: Pending
75+
conditions:
76+
- type: Initialized
77+
status: 'True'
78+
lastProbeTime: null
79+
lastTransitionTime: '2019-02-13T20:31:37Z'
80+
- type: Ready
81+
status: 'False'
82+
lastProbeTime: null
83+
lastTransitionTime: '2019-02-13T20:31:37Z'
84+
reason: ContainersNotReady
85+
message: 'containers with unready status: [hello-openshift]'
86+
- type: ContainersReady
87+
status: 'False'
88+
lastProbeTime: null
89+
lastTransitionTime: '2019-02-13T20:31:37Z'
90+
reason: ContainersNotReady
91+
message: 'containers with unready status: [hello-openshift]'
92+
- type: PodScheduled
93+
status: 'True'
94+
lastProbeTime: null
95+
lastTransitionTime: '2019-02-13T20:31:37Z'
96+
hostIP: 10.0.140.16
97+
startTime: '2019-02-13T20:31:37Z'
98+
containerStatuses:
99+
- name: hello-openshift
100+
state:
101+
waiting:
102+
reason: ContainerCreating
103+
lastState: {}
104+
ready: false
105+
restartCount: 0
106+
image: openshift/hello-openshift
107+
imageID: ''
108+
qosClass: BestEffort
69109
----
70110

71111
<1> Pods can be "tagged" with one or more labels, which can then
72112
be used to select and manage groups of pods in a single operation. The labels
73113
are stored in key/value format in the `*metadata*` hash. One label in this
74114
example is *registry=default*.
75-
<2> Pods must have a unique name within their namespace. A pod definition can specify
76-
the basis of a name with the `*generateName*` attribute, and random characters
77-
will be added automatically to generate a unique name.
78-
<3> `*containers*` specifies an array of Container definitions; in this case (as
115+
<2> The pod restart policy with possible values `Always`, `OnFailure`, and `Never`. The default value is `Always`.
116+
<3> {product-title} defines a security context for Containers which specifies whether they are allowed to run as
117+
privileged Containers, run as a user of their choice, and more. The default context is very restrictive
118+
but administrators can modify this as needed.
119+
<4> `*containers*` specifies an array of Container definitions; in this case (as
79120
with most), just one.
80-
<4> Environment variables can be specified to pass necessary values to each
81-
Container.
82121
<5> Each Container in the pod is instantiated from its own Container image.
83-
<6> The Container can bind to ports which will be made available on the pod's
84-
IP.
85-
<7> {product-title} defines a security context for Containers which specifies whether they are allowed to run as
86-
privileged Containers, run as a user of their choice, and more. The default
87-
context is very restrictive but administrators can modify this as needed.
88-
<8> The Container specifies where external storage volumes should be mounted
122+
<6> The Container specifies where external storage volumes should be mounted
89123
within the Container. In this case, there is a volume for storing the registry's
90124
data, and one for access to credentials the registry needs for making requests
91125
against the {product-title} API.
92-
<9> The pod restart policy with possible values `Always`, `OnFailure`, and `Never`. The default value is `Always`.
93-
<10> Pods making requests against the {product-title} API is a common enough pattern
126+
<7> Pods making requests against the {product-title} API is a common enough pattern
94127
that there is a `*serviceAccount*` field for specifying which service account user the pod should
95128
authenticate as when making the requests. This enables fine-grained access
96129
control for custom infrastructure components.
97-
<11> The pod defines storage volumes that are available to its Container(s) to
130+
<8> The pod defines storage volumes that are available to its Container(s) to
98131
use. In this case, it provides an ephemeral volume for the registry storage and
99132
a `*secret*` volume containing the service account credentials.
100133

0 commit comments

Comments
 (0)