Skip to content

Commit 3711334

Browse files
authored
Merge pull request #65097 from kelbrown20/fixing-config-parameters-in-azure-arm
Update azure and aws config parameters for installation
2 parents 7c2b0ac + eece22f commit 3711334

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@
2525
ifeval::["{context}" == "installing-aws-customizations"]
2626
:aws:
2727
endif::[]
28-
//Starting in 4.10, aws on arm64 is only supported for installation on custom, network custom, private clusters and VPC . This attribute excludes arm64 content from installing on gov regions. When government regions are supported on arm64, change `aws-govcloud` to `aws`.
2928
ifeval::["{context}" == "installing-aws-government-region"]
30-
:aws-govcloud:
29+
:aws:
3130
endif::[]
32-
//Starting in 4.10, aws on arm64 is only supported for installation on custom, network custom, private clusters and VPC. This attribute excludes arm64 content from installing on secret regions. When secret regions are supported on arm64, change `aws-secret` to `aws`.
3331
ifeval::["{context}" == "installing-aws-secret-region"]
34-
:aws-secret:
32+
:aws:
3533
endif::[]
3634
ifeval::["{context}" == "installing-aws-network-customizations"]
3735
:aws:
@@ -462,11 +460,14 @@ ifndef::aws,bare,gcp,ibm-power,ibm-z,azure,ibm-power-vs[]
462460
|String
463461
endif::aws,bare,gcp,ibm-power,ibm-z,azure,ibm-power-vs[]
464462

465-
ifdef::aws,bare,azure,gcp[]
463+
ifdef::aws,azure,gcp,bare[]
466464
|`compute.architecture`
467-
|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` and `arm64`. See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
465+
|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` and `arm64`.
466+
ifdef::aws,azure[]
467+
Not all installation options support the 64-bit ARM architecture. To verify if your installation option is supported on your platform, see _Supported installation methods for different platforms_ in _Selecting a cluster installation method and preparing it for users_.
468+
endif::aws,azure[]
468469
|String
469-
endif::aws,bare,azure,gcp[]
470+
endif::aws,azure,gcp,bare[]
470471

471472
ifdef::ibm-z[]
472473
|`compute.architecture`
@@ -529,11 +530,14 @@ ifndef::aws,bare,gcp,ibm-z,ibm-power,azure,ibm-power-vs[]
529530
|String
530531
endif::aws,bare,gcp,ibm-z,ibm-power,azure,ibm-power-vs[]
531532

532-
ifdef::aws,bare,azure,gcp[]
533+
ifdef::aws,azure,gcp,bare[]
533534
|`controlPlane.architecture`
534-
|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` and `arm64`. See _Supported installation methods for different platforms_ in _Installing_ documentation for information about instance availability.
535+
|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` and `arm64`.
536+
ifdef::aws,azure[]
537+
Not all installation options support the 64-bit ARM architecture. To verify if your installation option is supported on your platform, see _Supported installation methods for different platforms_ in _Selecting a cluster installation method and preparing it for users_.
538+
endif::aws,azure[]
535539
|String
536-
endif::aws,bare,azure,gcp[]
540+
endif::aws,azure,gcp,bare[]
537541

538542
ifdef::ibm-z[]
539543
|`controlPlane.architecture`
@@ -629,10 +633,10 @@ endif::openshift-origin[]
629633
|`publish`
630634
|How to publish or expose the user-facing endpoints of your cluster, such as the Kubernetes API, OpenShift routes.
631635
|
632-
ifdef::aws,aws-govcloud,aws-secret,azure,gcp,ibm-cloud[]
636+
ifdef::aws,azure,gcp,ibm-cloud[]
633637
`Internal` or `External`. To deploy a private cluster, which cannot be accessed from the internet, set `publish` to `Internal`. The default value is `External`.
634638
endif::[]
635-
ifndef::aws,aws-govcloud,aws-secret,azure,gcp,ibm-cloud[]
639+
ifndef::aws,azure,gcp,ibm-cloud[]
636640
`Internal` or `External`. The default value is `External`.
637641

638642
Setting this field to `Internal` is not supported on non-cloud platforms.
@@ -656,7 +660,7 @@ a|For example, `sshKey: ssh-ed25519 AAAA..`.
656660

657661
|====
658662

659-
ifdef::aws,aws-govcloud,aws-secret[]
663+
ifdef::aws[]
660664
[id="installation-configuration-parameters-optional-aws_{context}"]
661665
== Optional AWS configuration parameters
662666

@@ -793,7 +797,7 @@ For clusters that use AWS Local Zones, you must add AWS Local Zone subnets to th
793797
|`true` or `false`. The default value is `false`, which results in the S3 bucket being deleted.
794798

795799
|====
796-
endif::aws,aws-govcloud,aws-secret[]
800+
endif::aws[]
797801

798802
ifdef::osp[]
799803
[id="installation-configuration-parameters-additional-osp_{context}"]
@@ -2083,10 +2087,10 @@ ifeval::["{context}" == "installing-aws-customizations"]
20832087
:!aws:
20842088
endif::[]
20852089
ifeval::["{context}" == "installing-aws-government-region"]
2086-
:!aws-govcloud:
2090+
:!aws:
20872091
endif::[]
20882092
ifeval::["{context}" == "installing-aws-secret-region"]
2089-
:!aws-secret:
2093+
:!aws:
20902094
endif::[]
20912095
ifeval::["{context}" == "installing-aws-network-customizations"]
20922096
:!aws:

0 commit comments

Comments
 (0)