Skip to content

Commit d25e8a3

Browse files
committed
Temporary removes arm64 references in the OKD doc flavour
1 parent 9bbac55 commit d25e8a3

6 files changed

+44
-6
lines changed

installing/installing-preparing.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ If you want to install and manage {product-title} yourself, you can install it o
1919

2020
* Alibaba Cloud
2121
* Amazon Web Services (AWS) on x86_64 instances
22+
ifndef::openshift-origin[]
2223
* Amazon Web Services (AWS) on arm64 instances
24+
endif::openshift-origin[]
2325
* Microsoft Azure
2426
* Microsoft Azure Stack Hub
2527
* Google Cloud Platform (GCP)

modules/architecture-rhcos-updating-bootloader.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Component EFI
3939
Installed: grub2-efi-x64-1:2.04-31.fc33.x86_64,shim-x64-15-8.x86_64
4040
Update: At latest version
4141
----
42+
ifndef::openshift-origin[]
4243
+
4344
.Example output for `arm64`
4445
[source, terminal]
@@ -47,6 +48,7 @@ Component EFI
4748
Installed: grub2-efi-aa64-1:2.02-99.el8_4.1.aarch64,shim-aa64-15.4-2.el8_1.aarch64
4849
Update: At latest version
4950
----
51+
endif::openshift-origin[]
5052

5153
[start=2]
5254
. {op-system} images created without `bootupd` installed on them require an explicit adoption phase.

modules/installation-aws-ami-stream-metadata.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ To parse the stream metadata, use one of the following methods:
2626
2727
* From a command-line utility that handles JSON data, such as `jq`:
2828
29-
** Print the current `x86_64` or `arm64` AMI for an AWS region, such as `us-west-1`:
29+
** Print the current `x86_64`
30+
ifndef::openshift-origin[]
31+
or `arm64`
32+
endif::openshift-origin[]
33+
AMI for an AWS region, such as `us-west-1`:
3034
+
3135
[source,terminal]
3236
----

modules/installation-configuration-parameters.adoc

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ ifdef::rhv[]
485485
For details, see the "Additional RHV parameters for machine pools" table.
486486
endif::rhv[]
487487

488+
ifndef::openshift-origin[]
489+
488490
ifndef::aws,bare,ibm-power,ibm-z[]
489491
|`compute.architecture`
490492
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` (the default).
@@ -514,6 +516,16 @@ ifdef::ibm-power[]
514516
|Determines the instruction set architecture of the machines in the pool. Currently, heteregeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `ppc64le` (the default).
515517
|String
516518
endif::ibm-power[]
519+
endif::openshift-origin[]
520+
521+
ifdef::openshift-origin[]
522+
|`compute.architecture`
523+
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` (the default).
524+
ifdef::aws[]
525+
See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
526+
endif::aws[]
527+
|String
528+
endif::openshift-origin[]
517529

518530
|`compute.hyperthreading`
519531
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on compute machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
@@ -543,6 +555,7 @@ ifdef::rhv[]
543555
For details, see the "Additional RHV parameters for machine pools" table.
544556
endif::rhv[]
545557

558+
ifndef::openshift-origin[]
546559
ifndef::aws,bare,ibm-z,ibm-power[]
547560
|`controlPlane.architecture`
548561
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64` (the default).
@@ -572,6 +585,16 @@ ifdef::ibm-power[]
572585
|Determines the instruction set architecture of the machines in the pool. Currently, heterogeneous clusters are not supported, so all pools must specify the same architecture. Valid values are `ppc64le` (the default).
573586
|String
574587
endif::ibm-power[]
588+
endif::openshift-origin[]
589+
590+
ifdef::openshift-origin[]
591+
|`controlPlane.architecture`
592+
|Determines the instruction set architecture of the machines in the pool. Currently, clusters with varied architectures are not supported. All pools must specify the same architecture. Valid values are `amd64`.
593+
ifdef::aws[]
594+
See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
595+
endif::aws[]
596+
|String
597+
endif::openshift-origin[]
575598

576599
|`controlPlane.hyperthreading`
577600
|Whether to enable or disable simultaneous multithreading, or `hyperthreading`, on control plane machines. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores.
@@ -699,10 +722,12 @@ link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
699722
|`compute.aws.region`
700723
|The AWS region that the installation program creates compute resources in.
701724
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`.
725+
ifndef::openshift-origin[]
702726
[IMPORTANT]
703727
====
704728
When running on ARM based AWS instances, ensure that you enter a region where AWS Graviton processors are available. See link:https://aws.amazon.com/ec2/graviton/#Global_availability[Global availability] map in the AWS documentation.
705729
====
730+
endif::openshift-origin[]
706731

707732

708733
|`controlPlane.platform.aws.amiID`

modules/installation-supported-aws-machine-types.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ The following Amazon Web Services (AWS) instance types are supported with {produ
412412
|===
413413
====
414414

415-
ifndef::aws-restricted-upi,aws-govcloud,aws-secret,aws-china[]
415+
ifndef::aws-restricted-upi,aws-govcloud,aws-secret,aws-china,openshift-origin[]
416416
.Machine types based on arm64 architecture
417417
[%collapsible]
418418
====

modules/installation-user-infra-machines-pxe.adoc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ This configuration does not enable serial console access on machines with a grap
203203
====
204204

205205
ifndef::only-pxe[]
206-
** For iPXE (`x86_64` + `arm64`):
206+
** For iPXE (`x86_64`
207+
ifndef::openshift-origin[]
208+
+ `arm64`
209+
endif::openshift-origin[]
210+
):
207211
+
208212
----
209213
kernel http://<HTTP_server>/rhcos-<version>-live-kernel-<architecture> initrd=main coreos.live.rootfs_url=http://<HTTP_server>/rhcos-<version>-live-rootfs.<architecture>.img coreos.inst.install_dev=/dev/sda coreos.inst.ignition_url=http://<HTTP_server>/bootstrap.ign <1> <2>
@@ -225,13 +229,14 @@ For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
225229
This configuration does not enable serial console access on machines with a graphical console. To configure a different console, add one or more `console=` arguments to the `kernel` line. For example, add `console=tty0 console=ttyS0` to set the first PC serial port as the primary console and the graphical console as a secondary console. For more information, see link:https://access.redhat.com/articles/7212[How does one set up a serial terminal and/or console in Red Hat Enterprise Linux?].
226230
====
227231
+
232+
ifndef::openshift-origin[]
228233
[NOTE]
229234
====
230235
To network boot the CoreOS `kernel` on `arm64` architecture, you need to use a version of iPXE build with the `IMAGE_GZIP` option enabled. See link:https://ipxe.org/buildcfg/image_gzip[`IMAGE_GZIP` option in iPXE].
231236
====
237+
endif::openshift-origin[]
232238
endif::only-pxe[]
233-
234-
ifndef::only-pxe[]
239+
ifndef::only-pxe,openshift-origin[]
235240
** For PXE (with UEFI and Grub as second stage) on `arm64`:
236241
+
237242
----
@@ -247,7 +252,7 @@ The `coreos.live.rootfs_url` parameter value is the location of the `rootfs` fil
247252
For example, to use DHCP on a NIC that is named `eno1`, set `ip=eno1:dhcp`.
248253
<3> Specify the location of the `initramfs` file that you uploaded to your TFTP server.
249254

250-
endif::only-pxe[]
255+
endif::only-pxe,openshift-origin[]
251256

252257
. Monitor the progress of the {op-system} installation on the console of the machine.
253258
+

0 commit comments

Comments
 (0)