Merge pull request openshift#32472 from mburke5678/declarative-statem…

…ents-node GH#1944035: Adding declarative statements for Nodes and MCO topics
chinmayi-chandrasekar · Jun 24, 2021 · 64e163c · 64e163c
2 parents 8b3e7fb + 2c2e725
commit 64e163c
Show file tree

Hide file tree

Showing 27 changed files with 880 additions and 38 deletions.
diff --git a/_unused_topics/nodes-cluster-overcommit-node-memory.adoc b/_unused_topics/nodes-cluster-overcommit-node-memory.adoc
@@ -45,6 +45,21 @@ metadata:
 ----
 $ oc label machineconfigpool worker custom-kubelet=small-pods
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the label:
+
+[source,yaml]
+----
+apiVersion: machineconfiguration.openshift.io/v1
+kind: MachineConfigPool
+metadata:
+  labels:
+    custom-kubelet: small-pods
+  name: worker
+----
+====
 
 .Procedure
 

diff --git a/_unused_topics/nodes-scheduler-node-antiaffinity-configuring.adoc b/_unused_topics/nodes-scheduler-node-antiaffinity-configuring.adoc
@@ -9,7 +9,7 @@ You can configure two types of node affinity rules: required and preferred.
 
 ==  Configuring a required node affinity rule
 
-Required rules *must* be met before a pod can be scheduled on a node. 
+Required rules *must* be met before a pod can be scheduled on a node.
 
 .Procedure
 
@@ -20,6 +20,21 @@ The following steps demonstrate a simple configuration that creates a node and a
 ----
 $ oc label node node1 e2e-az-name=e2e-az1
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the label:
+
+[source,yaml]
+----
+kind: Node
+apiVersion: v1
+metadata:
+  name: <node_name>
+  labels:
+    e2e-az-name: e2e-az1
+----
+====
 
 . In the pod specification, use the `nodeAffinity` stanza to configure the `requiredDuringSchedulingIgnoredDuringExecution` parameter:
 +

diff --git a/_unused_topics/nodes-scheduler-taints-tolerations-examples.adoc b/_unused_topics/nodes-scheduler-taints-tolerations-examples.adoc
@@ -27,6 +27,27 @@ For example:
 ----
 $ oc adm taint nodes node1 dedicated=groupName:NoSchedule
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the taint:
+
+[source,yaml]
+----
+kind: Node
+apiVersion: v1
+metadata:
+  name: <node_name>
+  labels:
+    ...
+spec:
+  taints:
+    - key: dedicated
+      value: groupName
+      effect: NoSchedule
+    ...
+----
+====
 
 . Add a corresponding toleration to the pods by writing a custom admission controller.
 +
@@ -48,6 +69,27 @@ For example:
 ----
 $ oc adm taint nodes node1 dedicated=groupName:NoSchedule
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the taint:
+
+[source,yaml]
+----
+kind: Node
+apiVersion: v1
+metadata:
+  name: <node_name>
+  labels:
+    ...
+spec:
+  taints:
+    - key: dedicated
+      value: groupName
+      effect: NoSchedule
+    ...
+----
+====
 
 . Add a corresponding toleration to the pods by writing a custom admission controller.
 +
@@ -70,6 +112,27 @@ To ensure pods are blocked from the specialized hardware:
 $ oc adm taint nodes <node-name> disktype=ssd:NoSchedule
 $ oc adm taint nodes <node-name> disktype=ssd:PreferNoSchedule
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the taint:
+
+[source,yaml]
+----
+kind: Node
+apiVersion: v1
+metadata:
+  name: <node_name>
+  labels:
+    ...
+spec:
+  taints:
+    - key: disktype
+      value: ssd
+      effect: PreferNoSchedule
+    ...
+----
+====
 
 . Adding a corresponding toleration to pods that use the special hardware using an admission controller.
 

diff --git a/modules/binding-infra-node-workloads-using-taints-tolerations.adoc b/modules/binding-infra-node-workloads-using-taints-tolerations.adoc
@@ -27,6 +27,26 @@ For example:
 $ oc adm taint nodes node1 node-role.kubernetes.io/infra:NoSchedule
 ----
 +
+[TIP]
+====
+You can alternatively apply the following YAML to add the taint:
+
+[source,yaml]
+----
+kind: Node
+apiVersion: v1
+metadata:
+  name: <node_name>
+  labels:
+    ...
+spec:
+  taints:
+    - key: node-role.kubernetes.io/infra
+      effect: NoSchedule
+  ...
+----
+====
++
 This example places a taint on `node1` that has key `node-role.kubernetes.io/infra` and taint effect `NoSchedule`. Nodes with the `NoSchedule` effect schedule only pods that tolerate the taint, but allow existing pods to remain scheduled on the node.
 +
 [NOTE]
@@ -38,14 +58,14 @@ If a descheduler is used, pods violating node taints could be evicted from the c
 +
 [source, yaml]
 ----
-tolerations: 
+tolerations:
   - effect: NoSchedule <1>
     key: node-role.kubernetes.io/infra <2>
     operator: Exists <3>
 ----
 <1> Specify the effect that you added to the node.
 <2> Specify the key that you added to the node.
-<3> Specify the `Exists` Operator to require a taint with the key `node-role.kubernetes.io/infra` to be present on the node. 
+<3> Specify the `Exists` Operator to require a taint with the key `node-role.kubernetes.io/infra` to be present on the node.
 +
 This toleration matches the taint created by the `oc adm taint` command. A pod with this toleration can be scheduled onto the infra node.
 +

diff --git a/modules/machineset-manually-scaling.adoc b/modules/machineset-manually-scaling.adoc
@@ -41,4 +41,20 @@ Or:
 $ oc edit machineset <machineset> -n openshift-machine-api
 ----
 +
+[TIP]
+====
+You can alternatively apply the following YAML to scale the machine set:
+
+[source,yaml]
+----
+apiVersion: machine.openshift.io/v1beta1
+kind: MachineSet
+metadata:
+  name: <machineset>
+  namespace: openshift-machine-api
+spec:
+  replicas: 2
+----
+====
++
 You can scale the machine set up or down. It takes several minutes for the new machines to be available.
diff --git a/modules/machineset-modifying.adoc b/modules/machineset-modifying.adoc
@@ -44,6 +44,22 @@ Or:
 $ oc edit machineset <machineset> -n openshift-machine-api
 ----
 +
+[TIP]
+====
+You can alternatively apply the following YAML to scale the machine set:
+
+[source,yaml]
+----
+apiVersion: machine.openshift.io/v1beta1
+kind: MachineSet
+metadata:
+  name: <machineset>
+  namespace: openshift-machine-api
+spec:
+  replicas: 0
+----
+====
++
 Wait for the machines to be removed.
 
 . Scale up the machine set as needed:
@@ -60,4 +76,20 @@ Or:
 $ oc edit machineset <machineset> -n openshift-machine-api
 ----
 +
+[TIP]
+====
+You can alternatively apply the following YAML to scale the machine set:
+
+[source,yaml]
+----
+apiVersion: machine.openshift.io/v1beta1
+kind: MachineSet
+metadata:
+  name: <machineset>
+  namespace: openshift-machine-api
+spec:
+  replicas: 2
+----
+====
++
 Wait for the machines to start. The new machines contain changes you made to the machine set.
diff --git a/modules/nodes-cluster-overcommit-node-enforcing.adoc b/modules/nodes-cluster-overcommit-node-enforcing.adoc
@@ -52,6 +52,21 @@ metadata:
 ----
 $ oc label machineconfigpool worker custom-kubelet=small-pods
 ----
++
+[TIP]
+====
+You can alternatively apply the following YAML to add the label:
+
+[source,yaml]
+----
+apiVersion: machineconfiguration.openshift.io/v1
+kind: MachineConfigPool
+metadata:
+  labels:
+    custom-kubelet: small-pods
+  name: worker
+----
+====
 
 .Procedure
 
@@ -75,4 +90,3 @@ spec:
 <1> Assign a name to CR.
 <2> Specify the label to apply the configuration change.
 <3> Set the `cpuCfsQuota` parameter to `false`.
-