Skip to content

Commit

Permalink
Merge pull request #35154 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-35086-to-enterprise-4.8

[enterprise-4.8] CNV-12482: New content for skip node annotation
  • Loading branch information
vikram-redhat committed Aug 3, 2021
2 parents 5ed44aa + e0ff0a8 commit f8b2435
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 1 deletion.
4 changes: 3 additions & 1 deletion _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2663,7 +2663,7 @@ Topics:
- Name: SMCP configuration reference
File: ossm-reference-smcp
- Name: Jaeger configuration reference
File: ossm-reference-jaeger
File: ossm-reference-jaeger
- Name: Uninstalling Service Mesh
File: removing-ossm
- Name: Service Mesh 1.x
Expand Down Expand Up @@ -2940,6 +2940,8 @@ Topics:
File: virt-automatic-certificates
- Name: Managing node labeling for obsolete CPU models
File: virt-managing-node-labeling-obsolete-cpu-models
- Name: Preventing node reconciliation
File: virt-preventing-node-reconciliation
# Node Networking
- Name: Node networking
Dir: node_network
Expand Down
25 changes: 25 additions & 0 deletions modules/virt-using-skip-node.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Module included in the following assembly:
//
// * virt/node_maintenance/virt-preventing-node-reconciliation.adoc
//

[id="virt-using-skip-node_{context}"]
= Using skip-node annotation

If you want the `node-labeller` to skip a node, annotate that node by using the `oc` CLI.

.Prerequisites
* You have installed the OpenShift CLI (`oc`).

.Procedure

* Annotate the node that you want to skip by running the following command:

+
[source,terminal]
----
$ oc annotate node <node_name> node-labeller.kubevirt.io/skip-node=true <1>
----
<1> Replace `<node_name>` with the name of the relevant node to skip.
+
Reconciliation resumes on the next cycle after the node annotation is removed or set to false.
16 changes: 16 additions & 0 deletions virt/node_maintenance/virt-preventing-node-reconciliation.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[id="virt-using-skip-node"]
= Preventing node reconciliation
include::modules/virt-document-attributes.adoc[]
include::modules/common-attributes.adoc[]
:context: virt-preventing-node-reconciliation

toc::[]

Use `skip-node` annotation to prevent the `node-labeller` from reconciling a node.

include::modules/virt-using-skip-node.adoc[leveloffset=+1]

[id="additional-resources_{context}"]
== Additional resources

* xref:../../virt/node_maintenance/virt-managing-node-labeling-obsolete-cpu-models.adoc#virt-managing-node-labeling-obsolete-cpu-models[Managing node labeling for obsolete CPU models]

0 comments on commit f8b2435

Please sign in to comment.