Merge pull request #66472 from SNiemann15/ibmz_mac_udp_workaround

[OCPBUGS-18394] Multiarch compute IBM Z - Add extra step to procedure

Author: opayne1

modules/machine-user-infra-machines-ibm-z-kvm.adoc

@@ -16,6 +16,31 @@ You can create more {op-system-first} compute machines for your cluster by using
 * An HTTP or HTTPS server is set up.
 
 .Procedure
+// Step 1 is a workaround for https://issues.redhat.com/browse/OCPBUGS-18394
+// Can be removed when bug is fixed.
+. Disable UDP aggregation.
++
+Currently, UDP aggregation is not supported on {ibmzProductName} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation.
+
+.. Create a YAML file `udp-aggregation-config.yaml` with the following content:
++
+[source,yaml]
+----
+apiVersion: v1
+kind: ConfigMap
+data:
+  disable-udp-aggregation: "true"
+metadata:
+  name: udp-aggregation-config
+  namespace: openshift-network-operator
+----
+
+.. Create the ConfigMap resource by running the following command:
++
+[source,terminal]
+----
+$ oc create -f udp-aggregation-config.yaml
+----
 
 . Extract the Ignition config file from the cluster by running the following command:
 +

modules/machine-user-infra-machines-ibm-z.adoc

@@ -14,6 +14,31 @@ You can create more {op-system-first} compute machines running on {ibmzProductNa
 * You have an HTTP or HTTPS server running on your provisioning machine that is accessible to the machines you create.
 
 .Procedure
+// Step 1 is a workaround for https://issues.redhat.com/browse/OCPBUGS-18394
+// Can be removed when bug is fixed.
+. Disable UDP aggregation.
++
+Currently, UDP aggregation is not supported on {ibmzProductName} and is not automatically deactivated on multi-architecture compute clusters with an `x86_64` control plane and additional `s390x` compute machines. To ensure that the addtional compute nodes are added to the cluster correctly, you must manually disable UDP aggregation.
+
+.. Create a YAML file `udp-aggregation-config.yaml` with the following content:
++
+[source,yaml]
+----
+apiVersion: v1
+kind: ConfigMap
+data:
+  disable-udp-aggregation: "true"
+metadata:
+  name: udp-aggregation-config
+  namespace: openshift-network-operator
+----
+
+.. Create the ConfigMap resource by running the following command:
++
+[source,terminal]
+----
+$ oc create -f udp-aggregation-config.yaml
+----
 
 . Extract the Ignition config file from the cluster by running the following command:
 +

modules/multi-architecture-verifying-cluster-compatibility.adoc

@@ -15,9 +15,9 @@ endif::[]
 :_content-type: PROCEDURE
 [id="multi-architecture-verifying-cluster-compatibility_{context}"]
 
-= Verifying cluster compatibility 
+= Verifying cluster compatibility
 
-Before you can start adding compute nodes of different architectures to your cluster, you must verify that your cluster is multi-architecture compatible. 
+Before you can start adding compute nodes of different architectures to your cluster, you must verify that your cluster is multi-architecture compatible.
 
 .Prerequisites
 
@@ -35,22 +35,25 @@ You should limit the number of network hops between the compute and control plan
 ====
 endif::ibm-power[]
 
-.Procedure 
+.Procedure
 
 * You can check that your cluster uses the architecture payload by running the following command:
 +
 [source,terminal]
 ----
-$ oc adm release info -o json | jq .metadata.metadata
+$ oc adm release info -o jsonpath="{ .metadata.metadata}"
 ----
 
-.Verification 
+.Verification
 
-. If you see the following output, then your cluster is using the multi-architecture payload: 
+. If you see the following output, then your cluster is using the multi-architecture payload:
 +
 [source,terminal]
 ----
-$ "release.openshift.io/architecture": "multi"
+{
+ "release.openshift.io/architecture": "multi",
+ "url": "https://access.redhat.com/errata/<errata_version>"
+}
 ----
 You can then begin adding multi-arch compute nodes to your cluster.
 
@@ -59,7 +62,7 @@ You can then begin adding multi-arch compute nodes to your cluster.
 [source,terminal]
 ----
 {
-    "url": "https://access.redhat.com/errata/RHSA-2023:4671"
+ "url": "https://access.redhat.com/errata/<errata_version>"
 }
 ----
 +