Skip to content

Commit 0a41956

Browse files
authored
Merge pull request #47957 from SNiemann15/delete_emptydir
[BZ2106760] Change delete-local-data to delete-emptydir-data
2 parents c1b30b3 + c198500 commit 0a41956

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

modules/cleaning-crio-storage.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ $ oc adm cordon <nodename>
4545
[source, terminal]
4646
+
4747
----
48-
$ oc adm drain <nodename> --ignore-daemonsets --delete-local-data
48+
$ oc adm drain <nodename> --ignore-daemonsets --delete-emptydir-data
4949
----
5050
+
5151
[NOTE]

modules/nodes-nodes-working-evacuating.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ value of `0` sets an infinite length of time:
8989
$ oc adm drain <node1> <node2> --timeout=5s
9090
----
9191

92-
** Delete pods even if there are pods using emptyDir using the `--delete-local-data` flag set to `true`. Local data is deleted when the node
92+
** Delete pods even if there are pods using `emptyDir` volumes by setting the `--delete-emptydir-data` flag to `true`. Local data is deleted when the node
9393
is drained:
9494
+
9595
[source,terminal]
9696
----
97-
$ oc adm drain <node1> <node2> --delete-local-data=true
97+
$ oc adm drain <node1> <node2> --delete-emptydir-data=true
9898
----
9999

100100
** List objects that will be migrated without actually performing the evacuation,

modules/rhel-removing-rhcos.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $ oc adm cordon <node_name> <1>
3535
+
3636
[source,terminal]
3737
----
38-
$ oc adm drain <node_name> --force --delete-local-data --ignore-daemonsets <1>
38+
$ oc adm drain <node_name> --force --delete-emptydir-data --ignore-daemonsets <1>
3939
----
4040
<1> Specify the node name of the {op-system} compute machine that you isolated.
4141

modules/virt-setting-node-maintenance-cli.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ $ oc adm cordon <node1>
2121
+
2222
[source,terminal]
2323
----
24-
$ oc adm drain <node1> --delete-local-data --ignore-daemonsets=true --force
24+
$ oc adm drain <node1> --delete-emptydir-data --ignore-daemonsets=true --force
2525
----
2626

27-
* The `--delete-local-data` flag removes any virtual machine instances on the node that use `emptyDir` volumes. Data in these volumes is ephemeral and is safe to be deleted after termination.
27+
* The `--delete-emptydir-data` flag removes any virtual machine instances on the node that use `emptyDir` volumes. Data in these volumes is ephemeral and is safe to be deleted after termination.
2828
2929
* The `--ignore-daemonsets=true` flag ensures that daemon sets are ignored and pod eviction can continue successfully.
3030

0 commit comments

Comments
 (0)