Merge pull request #52790 from mburke5678/mco-custom-label

BZ2062718:Atomatically allocating system-reserved define a custom label on MCP but not actuallly using it in the kubeletConfig CR

Author: mburke5678

modules/nodes-cluster-overcommit-node-enforcing.adoc

@@ -18,54 +18,40 @@ If you disable CPU limit enforcement, it is important to understand the impact o
 
 .Prerequisites
 
-. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure. Perform one of the following steps:
-
-.. View the machine config pool:
+. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure by entering the following command:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool <name>
+$ oc edit machineconfigpool <name>
 ----
 +
 For example:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool worker
+$ oc edit machineconfigpool worker
 ----
 +
 .Example output
-[source,terminal]
+[source,yaml]
 ----
 apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfigPool
 metadata:
-  creationTimestamp: 2019-02-08T14:52:39Z
-  generation: 1
+  creationTimestamp: "2022-11-16T15:34:25Z"
+  generation: 4
   labels:
-    custom-kubelet: small-pods <1>
-----
-<1> If a label has been added it appears under `labels`.
-
-.. If the label is not present, add a key/value pair:
-+
-[source,terminal]
-----
-$ oc label machineconfigpool worker custom-kubelet=small-pods
+    pools.operator.machineconfiguration.openshift.io/worker: "" <1>
+  name: worker
 ----
+<1> The label appears under Labels.
 +
 [TIP]
 ====
-You can alternatively apply the following YAML to add the label:
+If the label is not present, add a key/value pair such as:
 
-[source,yaml]
 ----
-apiVersion: machineconfiguration.openshift.io/v1
-kind: MachineConfigPool
-metadata:
-  labels:
-    custom-kubelet: small-pods
-  name: worker
+$ oc label machineconfigpool worker custom-kubelet=small-pods
 ----
 ====
 
@@ -83,11 +69,18 @@ metadata:
 spec:
   machineConfigPoolSelector:
     matchLabels:
-      custom-kubelet: small-pods <2>
+      pools.operator.machineconfiguration.openshift.io/worker: "" <2>
   kubeletConfig:
     cpuCfsQuota: <3>
       - "false"
 ----
 <1> Assign a name to CR.
-<2> Specify the label to apply the configuration change.
+<2> Specify the label from the machine config pool.
 <3> Set the `cpuCfsQuota` parameter to `false`.
+
+. Run the following command to create the CR:
++
+[source,terminal]
+----
+$ oc create -f <file_name>.yaml
+----

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

@@ -17,57 +17,46 @@ As an administrator, you can configure how {product-title} performs garbage coll
 
 You can configure any combination of the following:
 
-* Soft eviction for containers 
+* Soft eviction for containers
 * Hard eviction for containers
 * Eviction for images
 
 .Prerequisites
 
-. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure.
-Perform one of the following steps:
-
-.. View the machine config pool:
+. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure by entering the following command:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool <name>
+$ oc edit machineconfigpool <name>
 ----
 +
 For example:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool worker
+$ oc edit machineconfigpool worker
 ----
 +
 .Example output
 [source,yaml]
 ----
-Name:         worker
-Namespace:
-Labels:       custom-kubelet=small-pods <1>
-----
-<1> If a label has been added it appears under `Labels`.
-
-.. If the label is not present, add a key/value pair:
-+
-[source,terminal]
-----
-$ oc label machineconfigpool worker custom-kubelet=small-pods
+apiVersion: machineconfiguration.openshift.io/v1
+kind: MachineConfigPool
+metadata:
+  creationTimestamp: "2022-11-16T15:34:25Z"
+  generation: 4
+  labels:
+    pools.operator.machineconfiguration.openshift.io/worker: "" <1>
+  name: worker
 ----
+<1> The label appears under Labels.
 +
 [TIP]
 ====
-You can alternatively apply the following YAML to add the label:
+If the label is not present, add a key/value pair such as:
 
-[source,yaml]
 ----
-apiVersion: machineconfiguration.openshift.io/v1
-kind: MachineConfigPool
-metadata:
-  labels:
-    custom-kubelet: small-pods
-  name: worker
+$ oc label machineconfigpool worker custom-kubelet=small-pods
 ----
 ====
 
@@ -90,7 +79,7 @@ metadata:
 spec:
   machineConfigPoolSelector:
     matchLabels:
-      custom-kubelet: small-pods <2>
+      pools.operator.machineconfiguration.openshift.io/worker: "" <2>
   kubeletConfig:
     evictionSoft: <3>
       memory.available: "500Mi" <4>
@@ -116,7 +105,7 @@ spec:
     imageGCLowThresholdPercent: 75 <10>
 ----
 <1> Name for the object.
-<2> Selector label.
+<2> Specify the label from the machine config pool.
 <3> Type of eviction: `evictionSoft` or `evictionHard`.
 <4> Eviction thresholds based on a specific eviction trigger signal.
 <5> Grace periods for the soft eviction. This parameter does not apply to `eviction-hard`.
@@ -127,11 +116,11 @@ For `evictionHard` you must specify all of these parameters.  If you do not spec
 <9> The percent of disk usage (expressed as an integer) that triggers image garbage collection.
 <10> The percent of disk usage (expressed as an integer) that image garbage collection attempts to free.
 
-. Create the object:
+. Run the following command to create the CR:
 +
 [source,terminal]
 ----
-$ oc create -f <file-name>.yaml
+$ oc create -f <file_name>.yaml
 ----
 +
 For example:
@@ -147,7 +136,9 @@ $ oc create -f gc-container.yaml
 kubeletconfig.machineconfiguration.openshift.io/gc-container created
 ----
 
-. Verify that garbage collection is active. The Machine Config Pool you specified in the custom resource appears with `UPDATING` as 'true` until the change is fully implemented:
+.Verification
+
+. Verify that garbage collection is active by entering the following command. The Machine Config Pool you specified in the custom resource appears with `UPDATING` as 'true` until the change is fully implemented:
 +
 [source,terminal]
 ----

modules/nodes-nodes-managing-max-pods-proc.adoc

@@ -13,21 +13,18 @@ For example, if `podsPerCore` is set to `10` on a node with 4 processor cores, t
 
 .Prerequisites
 
-. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure.
-Perform one of the following steps:
-
-.. View the machine config pool:
+. Obtain the label associated with the static `MachineConfigPool` CRD for the type of node you want to configure by entering the following command:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool <name>
+$ oc edit machineconfigpool <name>
 ----
 +
 For example:
 +
 [source,terminal]
 ----
-$ oc describe machineconfigpool worker
+$ oc edit machineconfigpool worker
 ----
 +
 .Example output
@@ -36,32 +33,20 @@ $ oc describe machineconfigpool worker
 apiVersion: machineconfiguration.openshift.io/v1
 kind: MachineConfigPool
 metadata:
-  creationTimestamp: 2019-02-08T14:52:39Z
-  generation: 1
+  creationTimestamp: "2022-11-16T15:34:25Z"
+  generation: 4
   labels:
-    custom-kubelet: small-pods <1>
-----
-<1> If a label has been added it appears under `labels`.
-
-.. If the label is not present, add a key/value pair:
-+
-[source,terminal]
-----
-$ oc label machineconfigpool worker custom-kubelet=small-pods
+    pools.operator.machineconfiguration.openshift.io/worker: "" <1>
+  name: worker
 ----
+<1> The label appears under Labels.
 +
 [TIP]
 ====
-You can alternatively apply the following YAML to add the label:
+If the label is not present, add a key/value pair such as:
 
-[source,yaml]
 ----
-apiVersion: machineconfiguration.openshift.io/v1
-kind: MachineConfigPool
-metadata:
-  labels:
-    custom-kubelet: small-pods
-  name: worker
+$ oc label machineconfigpool worker custom-kubelet=small-pods
 ----
 ====
 
@@ -79,13 +64,13 @@ metadata:
 spec:
   machineConfigPoolSelector:
     matchLabels:
-      custom-kubelet: small-pods <2>
+      pools.operator.machineconfiguration.openshift.io/worker: "" <2>
   kubeletConfig:
     podsPerCore: 10 <3>
     maxPods: 250 <4>
 ----
 <1> Assign a name to CR.
-<2> Specify the label to apply the configuration change.
+<2> Specify the label from the machine config pool.
 <3> Specify the number of pods the node can run based on the number of processor cores on the node.
 <4> Specify the number of pods the node can run to a fixed value, regardless of the properties of the node.
 +
@@ -96,6 +81,15 @@ Setting `podsPerCore` to `0` disables this limit.
 +
 In the above example, the default value for `podsPerCore` is `10` and the default value for `maxPods` is `250`. This means that unless the node has 25 cores or more, by default, `podsPerCore` will be the limiting factor.
 
+. Run the following command to create the CR:
++
+[source,terminal]
+----
+$ oc create -f <file_name>.yaml
+----
+
+.Verification
+
 . List the `MachineConfigPool` CRDs to see if the change is applied. The `UPDATING` column reports `True` if the change is picked up by the Machine Config Controller:
 +
 [source,terminal]