Merge pull request #43933 from kelbrown20/fix-module-for-aws-upi-machine-types

Fixing aws installer modules for non arm specific sections

Author: mburke5678

modules/installation-configuration-parameters.adoc

@@ -56,11 +56,13 @@ endif::[]
 ifeval::["{context}" == "installing-aws-customizations"]
 :aws:
 endif::[]
+//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`.
 ifeval::["{context}" == "installing-aws-government-region"]
-:aws:
+:aws-govcloud:
 endif::[]
+//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`.
 ifeval::["{context}" == "installing-aws-secret-region"]
-:aws:
+:aws-secret:
 endif::[]
 ifeval::["{context}" == "installing-aws-network-customizations"]
 :aws:
@@ -71,8 +73,9 @@ endif::[]
 ifeval::["{context}" == "installing-aws-vpc"]
 :aws:
 endif::[]
+//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 in restricted networks upi. When restricted networks upi is supported on arm64, change `aws-restricted` to `aws`.
 ifeval::["{context}" == "installing-restricted-networks-aws-installer-provisioned"]
-:aws:
+:aws-restricted:
 endif::[]
 ifeval::["{context}" == "installing-azure-customizations"]
 :azure:
@@ -626,10 +629,10 @@ endif::openshift-origin[]
 |`publish`
 |How to publish or expose the user-facing endpoints of your cluster, such as the Kubernetes API, OpenShift routes.
 |
-ifdef::aws,azure,gcp[]
+ifdef::aws,aws-govcloud,aws-secret,aws-restricted,azure,gcp[]
 `Internal` or `External`. To deploy a private cluster, which cannot be accessed from the internet, set `publish` to `Internal`. The default value is `External`.
 endif::[]
-ifndef::aws,azure,gcp[]
+ifndef::aws,aws-govcloud,aws-secret,aws-restricted,azure,gcp[]
 `Internal` or `External`. The default value is `External`.
 
 Setting this field to `Internal` is not supported on non-cloud platforms and IBM Cloud.
@@ -651,7 +654,7 @@ a|For example, `sshKey: ssh-ed25519 AAAA..`.
 
 |====
 
-ifdef::aws[]
+ifdef::aws,aws-govcloud,aws-secret,aws-restricted[]
 [id="installation-configuration-parameters-optional-aws_{context}"]
 == Optional AWS configuration parameters
 
@@ -754,7 +757,7 @@ host must trust the certificate.
 |Valid subnet IDs.
 
 |====
-endif::aws[]
+endif::aws,aws-govcloud,aws-secret,aws-restricted[]
 
 ifdef::osp[]
 [id="installation-configuration-parameters-additional-osp_{context}"]
@@ -1491,10 +1494,10 @@ ifeval::["{context}" == "installing-aws-customizations"]
 :!aws:
 endif::[]
 ifeval::["{context}" == "installing-aws-government-region"]
-:!aws:
+:!aws-govcloud:
 endif::[]
 ifeval::["{context}" == "installing-aws-secret-region"]
-:!aws:
+:!aws-secret:
 endif::[]
 ifeval::["{context}" == "installing-aws-network-customizations"]
 :!aws:
@@ -1506,7 +1509,7 @@ ifeval::["{context}" == "installing-aws-vpc"]
 :!aws:
 endif::[]
 ifeval::["{context}" == "installing-restricted-networks-aws-installer-provisioned"]
-:!aws:
+:!aws-restricted:
 endif::[]
 ifeval::["{context}" == "installing-azure-customizations"]
 :!azure:

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

@@ -8,6 +8,25 @@
 // * installing/installing_aws/installing-aws-customizations.adoc
 // * installing/installing_aws/installing-aws-vpc.adoc
 // * installing/installing_aws/installing-aws-private.adoc
+// * installing/installing_aws/installing-aws-china.adoc
+
+//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 in restricted networks upi. When restricted networks upi is supported on arm64, remove this ifdevel.
+ifeval::["{context}" == "installing-restricted-networks-aws"]
+:aws-restricted-upi:
+endif::[]
+//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, remove this ifdevel.
+ifeval::["{context}" == "installing-aws-government-region"]
+:aws-govcloud:
+endif::[]
+//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, remove this ifdevel.
+ifeval::["{context}" == "installing-aws-secret-region"]
+:aws-secret:
+endif::[]
+//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 in china regions. When china regions are supported on arm64, remove this ifdevel.
+ifeval::["{context}" == "installing-aws-china-region"]
+:aws-china:
+endif::[]
+
 
 [id="installation-supported-aws-machine-types_{context}"]
 = Supported AWS machine types
@@ -383,6 +402,7 @@ The following Amazon Web Services (AWS) instance types are supported with {produ
 |===
 ====
 
+ifndef::aws-restricted-upi,aws-govcloud,aws-secret,aws-china[]
 .Machine types based on arm64 architecture
 [%collapsible]
 ====
@@ -466,3 +486,17 @@ The following Amazon Web Services (AWS) instance types are supported with {produ
 
 |===
 ====
+endif::[]
+
+ifeval::["{context}" == "installing-restricted-networks-aws"]
+:!aws-restricted-upi:
+endif::[]
+ifeval::["{context}" == "installing-aws-government-region"]
+:!aws-govcloud:
+endif::[]
+ifeval::["{context}" == "installing-aws-secret-region"]
+:!aws-secret:
+endif::[]
+ifeval::["{context}" == "installing-aws-china-region"]
+:!aws-china:
+endif::[]