Skip to content

Commit 3ccaff4

Browse files
authored
Merge pull request #14059 from mburke5678/node-edits
Node edits
2 parents cd8822c + 36804ae commit 3ccaff4

26 files changed

+169
-84
lines changed

_topic_map.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,8 @@ Topics:
416416
- Name: Working with nodes
417417
Dir: nodes
418418
Topics:
419+
- Name: Viewing and listing the nodes in your cluster
420+
File: nodes-nodes-viewing
419421
- Name: Working with nodes
420422
File: nodes-nodes-working
421423
- Name: Managing Nodes
@@ -424,10 +426,6 @@ Topics:
424426
File: nodes-nodes-managing-max-pods
425427
- Name: Using the Node Tuning Operator
426428
File: nodes-node-tuning-operator
427-
- Name: Modifying existing nodes
428-
File: nodes-nodes-modifying
429-
- Name: Viewing and listing the nodes in your cluster
430-
File: nodes-nodes-viewing
431429
- Name: Understanding node rebooting
432430
File: nodes-nodes-rebooting
433431
- Name: Freeing node resources using garbage collection

admission-config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
kind: AdmissionConfiguration
2+
apiVersion: apiserver.k8s.io/v1alpha1
3+
plugins:
4+
- name: RunOnceDurationConfig
5+
activeDeadlineSecondsOverride: 3600

modules/nodes-cluster-overcommit-configure-nodes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[id="nodes-cluster-overcommit-configure-nodes-{context}"]
66

7-
= Configuring nodes for overcommitment
7+
= Understanding nodes overcommitment
88

99
In an overcommitted environment, it is important to properly configure your node to provide best system behavior.
1010

modules/nodes-cluster-resource-configure-oom.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ exiting immediately. If the container PID 1 process receives the *SIGKILL*, the
1414
container will exit immediately. Otherwise, the container behavior is
1515
dependent on the behavior of the other processes.
1616

17+
For example, a container process exited with code 137, indicating it received a SIGKILL signal.
18+
1719
If the container does not exit immediately, an OOM kill is detectable as
1820
follows:
1921

20-
. A container process exited with code 137, indicating it received a SIGKILL
21-
signal
22+
. Access the pod using a remote shell:
23+
+
24+
----
25+
# oc rsh test
26+
----
2227

2328
. The oom_kill counter in `/sys/fs/cgroup/memory/memory.oom_control` is
2429
incremented

modules/nodes-containers-copying-files-procedure.adoc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,26 @@ use with the `oc rsync` command.
3333
.Procedure
3434

3535
* To copy a local directory to a pod directory:
36-
36+
+
37+
----
38+
oc rsync <local-dir> <pod-name>:/<remote-dir>
39+
----
40+
+
41+
For example:
42+
+
3743
----
3844
$ oc rsync /home/user/source devpod1234:/src
45+
46+
WARNING: cannot use rsync: rsync not available in container
47+
status.txt
3948
----
4049

4150
* To copy a pod directory to a local directory:
4251

4352
----
4453
$ oc rsync devpod1234:/src /home/user/source
54+
55+
oc rsync devpod1234:/src/status.txt /home/user/
56+
WARNING: cannot use rsync: rsync not available in container
57+
status.txt
4558
----

modules/nodes-containers-events-viewing.adoc

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,29 @@ You can get a list of events in a given project using the CLI.
1515
$ oc get events [-n <project>] <1>
1616
----
1717
<1> The name of the project.
18+
+
19+
For example:
20+
+
21+
----
22+
$ oc get events -n openshift-config
23+
24+
LAST SEEN TYPE REASON OBJECT MESSAGE
25+
97m Normal Scheduled pod/dapi-env-test-pod Successfully assigned openshift-config/dapi-env-test-pod to ip-10-0-171-202.ec2.internal
26+
97m Normal Pulling pod/dapi-env-test-pod pulling image "gcr.io/google_containers/busybox"
27+
97m Normal Pulled pod/dapi-env-test-pod Successfully pulled image "gcr.io/google_containers/busybox"
28+
97m Normal Created pod/dapi-env-test-pod Created container
29+
9m5s Warning FailedCreatePodSandBox pod/dapi-volume-test-pod Failed create pod sandbox: rpc error: code = Unknown desc = failed to create pod network sandbox k8s_dapi-volume-test-pod_openshift-config_6bc60c1f-452e-11e9-9140-0eec59c23068_0(748c7a40db3d08c07fb4f9eba774bd5effe5f0d5090a242432a73eee66ba9e22): Multus: Err adding pod to network "openshift-sdn": cannot set "openshift-sdn" ifname to "eth0": no netns: failed to Statfs "/proc/33366/ns/net": no such file or directory
30+
8m31s Normal Scheduled pod/dapi-volume-test-pod Successfully assigned openshift-config/dapi-volume-test-pod to ip-10-0-171-202.ec2.internal
31+
----
32+
1833

1934
* To view events in your project from the {product-title} console.
2035
+
2136
. Launch the {product-title} console.
2237
+
2338
. Click *Home* -> *Events* and select your project.
39+
40+
. Move to resource that you want to see events. For example: *Home* -> *Projects* -> <project-name> -> <resource-name>.
2441
+
25-
Many other objects, such as pods and deployments, have their own
42+
Many objects, such as pods and deployments, have their own
2643
*Events* tab as well, which shows events related to that object.

modules/nodes-containers-init-creating.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ The following example outlines a simple Pod which has two Init Containers. The f
1111

1212
. Create a YAML file for the Init Container:
1313
+
14+
[source-yaml]
1415
----
1516
apiVersion: v1
1617
kind: Pod
@@ -34,6 +35,7 @@ spec:
3435

3536
. Create a YAML file for the `myservice` service.
3637
+
38+
[source-yaml]
3739
----
3840
kind: Service
3941
apiVersion: v1

modules/nodes-containers-port-forwarding-using.adoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,29 @@ For example:
2121
+
2222
----
2323
$ oc port-forward <pod> 5000 6000
24+
25+
Forwarding from 127.0.0.1:5000 -> 5000
26+
Forwarding from [::1]:5000 -> 5000
27+
Forwarding from 127.0.0.1:6000 -> 6000
28+
Forwarding from [::1]:6000 -> 6000
2429
----
2530

2631
* Use the following command to listen on port `8888` locally and forward to `5000` in the pod:
2732
+
2833
----
2934
$ oc port-forward <pod> 8888:5000
35+
36+
Forwarding from 127.0.0.1:8888 -> 5000
37+
Forwarding from [::1]:8888 -> 5000
3038
----
3139

3240
* Use the following command to listen on a free port locally and forward to `5000` in the pod:
3341
+
3442
----
3543
$ oc port-forward <pod> :5000
44+
45+
Forwarding from 127.0.0.1:42390 -> 5000
46+
Forwarding from [::1]:42390 -> 5000
3647
----
3748
+
3849
Or:

modules/nodes-containers-projected-volumes-creating.adoc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@ The following example shows how to use a projected volume to mount an existing S
1313

1414
To use a projected volume to mount an existing Secret volume source.
1515

16-
. Create files containing the secrets:
17-
+
18-
For example:
19-
+
20-
----
21-
$ nano secret.yaml
22-
----
23-
+
24-
Enter the following, replacing the password and user information as appropriate:
16+
. Create files containing the secrets, entering the following, replacing the password and user information as appropriate:
2517
+
2618
[source,yaml]
2719
----
@@ -117,11 +109,12 @@ spec:
117109
- name: all-in-one
118110
projected:
119111
sources:
120-
- secret:
112+
- secret: <1>
121113
name: user
122-
- secret:
114+
- secret: <1>
123115
name: pass
124116
----
117+
<1> The name of the secret you created.
125118

126119
. Create the pod from the configuration file:
127120
+

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// Module included in the following assemblies:
23
//
34
// * nodes/nodes-nodes-garbage-collection.adoc
@@ -34,7 +35,7 @@ metadata:
3435
----
3536
<1> If a label has been added it appears under `labels`.
3637

37-
.. If the label is not present, add a key/value pair:
38+
.. If a label is not present, add a key/value pair:
3839
+
3940
----
4041
$ oc label machineconfigpool worker custom-kubelet=small-pods
@@ -65,3 +66,10 @@ spec:
6566
<3> Specify the minimum age for an unused image before it is garbage collected. A value of `0` means no limit.
6667
<4> Specify the percent of disk usage after which image garbage collection is always run.
6768
<5> Specify the percent of disk usage before which image garbage collection is never run.
69+
70+
. Create the garbage collection object:
71+
+
72+
----
73+
oc create -f <file-name>.yaml
74+
----
75+

0 commit comments

Comments
 (0)