Skip to content

Commit cabfa56

Browse files
authored
Merge pull request #89124 from openshift-cherrypick-robot/cherry-pick-87940-to-enterprise-4.16
[enterprise-4.16] OSDOCS:13011 Doc page for Managing unused rendered machine configs does not have consistency
2 parents b00121e + fc2c121 commit cabfa56

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

modules/machineconfig-garbage-collect-removing.adoc

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
You can remove unused rendered machine configs by using the `oc adm prune renderedmachineconfigs` command with the `--confirm` command. If any rendered machine config is not deleted, the command output indicates which was not deleted and lists the reason for skipping the deletion.
1010

11-
.Procedure
11+
.Procedure
1212

13-
. Optional: List the rendered machine configs that you can remove automatically by running the following command. Any rendered machine config marked with `as it's currently in use` in the command output is not removed.
13+
. Optional: List the rendered machine configs that you can remove automatically by running the following command. Any rendered machine config marked with the `as it's currently in use` message in the command output cannot be removed.
1414
+
1515
[source,terminal]
1616
----
@@ -21,9 +21,9 @@ $ oc adm prune renderedmachineconfigs --pool-name=worker
2121
[source,terminal]
2222
----
2323
Dry run enabled - no modifications will be made. Add --confirm to remove rendered machine configs.
24-
DRY RUN: Deleted rendered MachineConfig rendered-worker-23d7322831a57f02998e7e1600a0865f
25-
DRY RUN: Deleted rendered MachineConfig rendered-worker-fc94397dc7c43808c7014683c208956e
26-
DRY RUN: Skipping deletion of rendered MachineConfig rendered-worker-ad5a3cad36303c363cf458ab0524e7c0 as it's currently in use
24+
dry-run deleting rendered MachineConfig rendered-worker-f38bf61ced3c920cf5a29a200ed43243
25+
dry-run deleting MachineConfig rendered-worker-fc94397dc7c43808c7014683c208956e
26+
Skip dry-run deleting rendered MachineConfig rendered-worker-708c652868f7597eaa1e2622edc366ef as it's currently in use
2727
----
2828
+
2929
--
@@ -40,12 +40,19 @@ $ oc adm prune renderedmachineconfigs --pool-name=worker --count=2 --confirm
4040
----
4141
+
4242
--
43-
where:
43+
where:
4444

4545
`--count`:: Optional: Specifies the maximum number of unused rendered machine configs you want to delete, starting with the oldest.
4646

4747
`--confirm`:: Optional: Indicate that pruning should occur, instead of performing a dry-run.
4848

4949
`--pool-name`:: Optional: Specifies the machine config pool from which you want to delete the machine. If not specified, all the pools are evaluated.
50-
5150
--
51+
+
52+
.Example output
53+
[source,terminal]
54+
----
55+
deleting rendered MachineConfig rendered-worker-f38bf61ced3c920cf5a29a200ed43243
56+
deleting rendered MachineConfig rendered-worker-fc94397dc7c43808c7014683c208956e
57+
Skip deleting rendered MachineConfig rendered-worker-708c652868f7597eaa1e2622edc366ef as it's currently in use
58+
----

modules/machineconfig-garbage-collect-viewing.adoc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="machineconfig-garbage-collect-viewing_{context}"]
77
= Viewing rendered machine configs
88

9-
You can view a list of rendered machine configs by using the `oc adm prune renderedmachineconfigs` command with the `list` subcommand.
9+
You can view a list of rendered machine configs by using the `oc adm prune renderedmachineconfigs` command with the `list` subcommand.
1010

1111
For example, the command in the following procedure would list all rendered machine configs for the `worker` machine config pool.
1212

@@ -33,18 +33,20 @@ list:: Displays a list of rendered machine configs in your cluster.
3333
[source,terminal]
3434
----
3535
worker
36-
status: rendered-worker-ae115e2b5e6ae05e0e6e5d62c7d0dd81
37-
spec: rendered-worker-ae115e2b5e6ae05e0e6e5d62c7d0dd81
36+
37+
rendered-worker-f38bf61ced3c920cf5a29a200ed43243 -- 2025-01-21 13:45:01 +0000 UTC (Currently in use: false)
38+
rendered-worker-fc94397dc7c43808c7014683c208956e-- 2025-01-30 17:20:53 +0000 UTC (Currently in use: false)
39+
rendered-worker-708c652868f7597eaa1e2622edc366ef -- 2025-01-31 18:01:16 +0000 UTC (Currently in use: true)
3840
----
3941

40-
* List the rendered machine configs that you can remove automatically by running the following command. Any rendered machine config marked with `as it's currently in use` in the command output is not removed.
42+
* List the rendered machine configs that you can remove automatically by running the following command. Any rendered machine config marked with the `as it's currently in use` message in the command output cannot be removed.
4143
+
4244
[source,terminal]
4345
----
4446
$ oc adm prune renderedmachineconfigs --pool-name=worker
4547
----
4648
+
47-
The command runs in dry-run mode, and no machine configs are removed.
49+
The command runs in dry-run mode, and no machine configs are removed.
4850
+
4951
--
5052
where:
@@ -56,7 +58,7 @@ where:
5658
[source,terminal]
5759
----
5860
Dry run enabled - no modifications will be made. Add --confirm to remove rendered machine configs.
59-
DRY RUN: Deleted rendered MachineConfig rendered-worker-23d7322831a57f02998e7e1600a0865f
60-
DRY RUN: Deleted rendered MachineConfig rendered-worker-fc94397dc7c43808c7014683c208956e
61-
DRY RUN: Skipping deletion of rendered MachineConfig rendered-worker-ad5a3cad36303c363cf458ab0524e7c0 as it's currently in use
61+
dry-run deleting rendered MachineConfig rendered-worker-f38bf61ced3c920cf5a29a200ed43243
62+
dry-run deleting MachineConfig rendered-worker-fc94397dc7c43808c7014683c208956e
63+
Skip dry-run deleting rendered MachineConfig rendered-worker-708c652868f7597eaa1e2622edc366ef as it's currently in use
6264
----

0 commit comments

Comments
 (0)