Merge pull request #55665 from obrown1205/580_multiarchPayload

maxwelldb · web-flow · commit 80b36dc4a5ef · 2023-02-13T10:39:52.000-05:00
OSDOCS-4642: Updating procedure to include multi-arch (Update in heterogeneous clusters)
diff --git a/modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc b/modules/cnf-topology-aware-lifecycle-manager-preparing-for-updates.adoc
@@ -40,12 +40,14 @@ imageContentSources:
 $ OCP_RELEASE_NUMBER=<release_version>
 ----
 
-.. Specify the architecture of the server by running the following command:
+.. Specify the architecture of the cluster by running the following command:
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
+
 
 .. Get the release image digest from Quay by running the following command
 +
diff --git a/modules/installation-mirror-repository.adoc b/modules/installation-mirror-repository.adoc
@@ -108,13 +108,14 @@ $ RELEASE_NAME="okd"
 endif::[]
 
 ifndef::openshift-origin[]
-.. Export the type of architecture for your server, such as `x86_64` 
-or `aarch64`:
+.. Export the type of architecture for your cluster:
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
+
 endif::[]
 
 .. Export the path to the directory to host the mirrored images:
diff --git a/modules/ipi-install-mirroring-for-disconnected-registry.adoc b/modules/ipi-install-mirroring-for-disconnected-registry.adoc
@@ -103,12 +103,14 @@ $ RELEASE_NAME="okd"
 endif::[]
 
 ifndef::openshift-origin[]
-.. Export the type of architecture for your server, such as `x86_64`:
+.. Export the type of architecture for your cluster:
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
+
 endif::[]
 
 .. Export the path to the directory to host the mirrored images:
diff --git a/modules/update-configuring-image-signature.adoc b/modules/update-configuring-image-signature.adoc
@@ -30,9 +30,9 @@ to update the cluster, such as `4.4.0`.
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture> <1>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
-<1> For `server_architecture`, specify the architecture of the server, such as `x86_64`.
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
 
 . Get the release image digest from link:https://quay.io/[Quay]:
 +
diff --git a/modules/update-mirror-repository.adoc b/modules/update-mirror-repository.adoc
@@ -73,12 +73,13 @@ $ RELEASE_NAME="ocp-release"
 +
 For a production release, you must specify `ocp-release`.
 
-.. Export the type of architecture for your server, such as `x86_64`.:
+.. Export the type of architecture for your cluster:
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
 
 .. Export the path to the directory to host the mirrored images:
 +
diff --git a/modules/update-service-mirror-release.adoc b/modules/update-service-mirror-release.adoc
@@ -100,12 +100,13 @@ $ RELEASE_NAME="ocp-release"
 +
 For a production release, you must specify `ocp-release`.
 
-.. Export the type of architecture for your server, such as `x86_64`:
+.. Export the type of architecture for your cluster:
 +
 [source,terminal]
 ----
-$ ARCHITECTURE=<server_architecture>
+$ ARCHITECTURE=<cluster_architecture> <1>
 ----
+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
 
 .. Export the path to the directory to host the mirrored images:
 +

Original file line number	Diff line number	Diff line change
@@ -30,9 +30,9 @@ to update the cluster, such as `4.4.0`.
`30`	`30`	`+`
`31`	`31`	`[source,terminal]`
`32`	`32`	`----`
`33`		`-$ ARCHITECTURE=<server_architecture> <1>`
	`33`	`+$ ARCHITECTURE=<cluster_architecture> <1>`
`34`	`34`	`----`
`35`		-<1> For `server_architecture`, specify the architecture of the server, such as `x86_64`.
	`35`	+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
`36`	`36`
`37`	`37`	`. Get the release image digest from link:https://quay.io/[Quay]:`
`38`	`38`	`+`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,13 @@ $ RELEASE_NAME="ocp-release"`
`73`	`73`	`+`
`74`	`74`	For a production release, you must specify `ocp-release`.
`75`	`75`
`76`		-.. Export the type of architecture for your server, such as `x86_64`.:
	`76`	`+.. Export the type of architecture for your cluster:`
`77`	`77`	`+`
`78`	`78`	`[source,terminal]`
`79`	`79`	`----`
`80`		`-$ ARCHITECTURE=<server_architecture>`
	`80`	`+$ ARCHITECTURE=<cluster_architecture> <1>`
`81`	`81`	`----`
	`82`	+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
`82`	`83`
`83`	`84`	`.. Export the path to the directory to host the mirrored images:`
`84`	`85`	`+`
Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,13 @@ $ RELEASE_NAME="ocp-release"`
`100`	`100`	`+`
`101`	`101`	For a production release, you must specify `ocp-release`.
`102`	`102`
`103`		-.. Export the type of architecture for your server, such as `x86_64`:
	`103`	`+.. Export the type of architecture for your cluster:`
`104`	`104`	`+`
`105`	`105`	`[source,terminal]`
`106`	`106`	`----`
`107`		`-$ ARCHITECTURE=<server_architecture>`
	`107`	`+$ ARCHITECTURE=<cluster_architecture> <1>`
`108`	`108`	`----`
	`109`	+<1> Specify the architecture of the cluster, such as `x86_64`, `aarch64`, `s390x`, `ppc64le`, or `multi`.
`109`	`110`
`110`	`111`	`.. Export the path to the directory to host the mirrored images:`
`111`	`112`	`+`