Skip to content

Commit 782acd8

Browse files
authored
Merge pull request #99962 from bscott-rh/config-params-refactor
OSDOCS-16386 Combining values column of install config parameters into description column for readability
2 parents ce1a50f + 887762d commit 782acd8

File tree

1 file changed

+72
-40
lines changed

1 file changed

+72
-40
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 72 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -823,176 +823,195 @@ ifdef::aws[]
823823
Optional AWS configuration parameters are described in the following table:
824824

825825
.Optional AWS parameters
826-
[cols=".^2l,.^3,.^5a",options="header"]
826+
[cols=".^l,.^a",options="header"]
827827
|====
828-
|Parameter|Description|Values
828+
|Parameter|Description
829829

830830
|compute:
831831
platform:
832832
aws:
833833
amiID:
834834
|The AWS AMI used to boot compute machines for the cluster. This is required for regions that require a custom {op-system} AMI.
835-
|Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
835+
836+
*Value:* Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
836837

837838
|compute:
838839
platform:
839840
aws:
840841
iamProfile:
841842
|The name of the IAM instance profile that you use for the machine. If you want the installation program to create the IAM instance profile for you, do not use the `iamProfile` parameter. You can specify either the `iamProfile` or `iamRole` parameter, but you cannot specify both.
842-
|String
843+
844+
*Value:* String
843845

844846
|compute:
845847
platform:
846848
aws:
847849
iamRole:
848850
|The name of the IAM instance role that you use for the machine. When you specify an IAM role, the installation program creates an instance profile. If you want the installation program to create the IAM instance role for you, do not select the `iamRole` parameter. You can specify either the `iamRole` or `iamProfile` parameter, but you cannot specify both.
849-
|String
851+
852+
*Value:* String
850853

851854
|compute:
852855
platform:
853856
aws:
854857
rootVolume:
855858
iops:
856859
|The Input/Output Operations Per Second (IOPS) that is reserved for the root volume.
857-
|Integer, for example `4000`.
860+
861+
*Value:* Integer, for example `4000`.
858862

859863
|compute:
860864
platform:
861865
aws:
862866
rootVolume:
863867
size:
864868
|The size in GiB of the root volume.
865-
|Integer, for example `500`.
869+
870+
*Value:* Integer, for example `500`.
866871

867872
|compute:
868873
platform:
869874
aws:
870875
rootVolume:
871876
type:
872877
|The type of the root volume.
873-
|Valid link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html[AWS EBS volume type],
874-
such as `io1`.
878+
879+
*Value:* Valid link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html[AWS EBS volume type], such as `io1`.
875880

876881
|compute:
877882
platform:
878883
aws:
879884
rootVolume:
880885
kmsKeyARN:
881886
|The Amazon Resource Name (key ARN) of a KMS key. This is required to encrypt operating system volumes of worker nodes with a specific KMS key.
882-
|Valid link:https://docs.aws.amazon.com/kms/latest/developerguide/find-cmk-id-arn.html[key ID or the key ARN].
887+
888+
*Value:* Valid link:https://docs.aws.amazon.com/kms/latest/developerguide/find-cmk-id-arn.html[key ID or the key ARN].
883889

884890
|compute:
885891
platform:
886892
aws:
887893
type:
888894
|The EC2 instance type for the compute machines.
889-
|Valid {aws-short} instance type, such as `m4.2xlarge`. See the "Tested instance types for AWS" table on the "Installing a cluster on AWS with customizations" page.
895+
896+
*Value:* Valid {aws-short} instance type, such as `m4.2xlarge`. See the "Tested instance types for AWS" table on the "Installing a cluster on AWS with customizations" page.
890897

891898
|compute:
892899
platform:
893900
aws:
894901
zones:
895902
|The availability zones where the installation program creates machines for the compute machine pool. If you provide your own VPC, you must provide a subnet in that availability zone.
896-
|A list of valid AWS availability zones, such as `us-east-1c`, in a
897-
link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
903+
904+
*Value:* A list of valid AWS availability zones, such as `us-east-1c`, in a link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
898905

899906
|controlPlane:
900907
platform:
901908
aws:
902909
amiID:
903910
|The AWS AMI used to boot control plane machines for the cluster. This is required for regions that require a custom {op-system} AMI.
904-
|Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
911+
912+
*Value:* Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
905913

906914
|controlPlane:
907915
platform:
908916
aws:
909917
iamProfile:
910918
|The name of the IAM instance profile that you use for the machine. If you want the installation program to create the IAM instance profile for you, do not use the `iamProfile` parameter. You can specify either the `iamProfile` or `iamRole` parameter, but you cannot specify both.
911-
|String
919+
920+
*Value:* String
912921

913922
|controlPlane:
914923
platform:
915924
aws:
916925
iamRole:
917926
|The name of the IAM instance role that you use for the machine. When you specify an IAM role, the installation program creates an instance profile. If you want the installation program to create the IAM instance role for you, do not use the `iamRole` parameter. You can specify either the `iamRole` or `iamProfile` parameter, but you cannot specify both.
918-
|String
927+
928+
*Value:* String
919929

920930
|controlPlane:
921931
platform:
922932
aws:
923933
rootVolume:
924934
iops:
925935
|The Input/Output Operations Per Second (IOPS) that is reserved for the root volume on control plane machines.
926-
|Integer, for example `4000`.
936+
937+
*Value:* Integer, for example `4000`.
927938

928939
|controlPlane:
929940
platform:
930941
aws:
931942
rootVolume:
932943
size:
933944
|The size in GiB of the root volume for control plane machines.
934-
|Integer, for example `500`.
945+
946+
*Value:* Integer, for example `500`.
935947

936948
|controlPlane:
937949
platform:
938950
aws:
939951
rootVolume:
940952
type:
941953
|The type of the root volume for control plane machines.
942-
|Valid link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html[AWS EBS volume type],
943-
such as `io1`.
954+
955+
*Value:* Valid link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html[AWS EBS volume type], such as `io1`.
944956

945957
|controlPlane:
946958
platform:
947959
aws:
948960
rootVolume:
949961
kmsKeyARN:
950962
|The Amazon Resource Name (key ARN) of a KMS key. This is required to encrypt operating system volumes of control plane nodes with a specific KMS key.
951-
|Valid link:https://docs.aws.amazon.com/kms/latest/developerguide/find-cmk-id-arn.html[key ID and the key ARN].
963+
964+
*Value:* Valid link:https://docs.aws.amazon.com/kms/latest/developerguide/find-cmk-id-arn.html[key ID and the key ARN].
952965

953966
|controlPlane:
954967
platform:
955968
aws:
956969
type:
957970
|The EC2 instance type for the control plane machines.
958-
|Valid {aws-short} instance type, such as `m6i.xlarge`. See the "Tested instance types for AWS" table on the "Installing a cluster on AWS with customizations" page.
971+
972+
*Value:* Valid {aws-short} instance type, such as `m6i.xlarge`. See the "Tested instance types for AWS" table on the "Installing a cluster on AWS with customizations" page.
959973

960974
|controlPlane:
961975
platform:
962976
aws:
963977
zones:
964-
|The availability zones where the installation program creates machines for the
965-
control plane machine pool.
966-
|A list of valid AWS availability zones, such as `us-east-1c`, in a link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
978+
|The availability zones where the installation program creates machines for the control plane machine pool.
979+
980+
*Value:* A list of valid AWS availability zones, such as `us-east-1c`, in a link:https://yaml.org/spec/1.2/spec.html#sequence//[YAML sequence].
967981

968982
|platform:
969983
aws:
970984
amiID:
971-
|The AWS AMI used to boot all machines for the cluster. If set, the AMI must
972-
belong to the same region as the cluster. This is required for regions that require a custom {op-system} AMI.
973-
|Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
985+
|The AWS AMI used to boot all machines for the cluster. If set, the AMI must belong to the same region as the cluster. This is required for regions that require a custom {op-system} AMI.
986+
987+
*Value:* Any published or custom {op-system} AMI that belongs to the set AWS region. See _{op-system} AMIs for AWS infrastructure_ for available AMI IDs.
974988

975989
|platform:
976990
aws:
977991
hostedZone:
978992
|An existing Route 53 private hosted zone for the cluster. You can only use a pre-existing hosted zone when also supplying your own VPC. The hosted zone must already be associated with the user-provided VPC before installation. Also, the domain of the hosted zone must be the cluster domain or a parent of the cluster domain. If undefined, the installation program creates a new hosted zone.
979-
|String, for example `Z3URY6TWQ91KVV`.
993+
994+
*Value:* String, for example `Z3URY6TWQ91KVV`.
980995

981996
|platform:
982997
aws:
983998
hostedZoneRole:
984999
|An Amazon Resource Name (ARN) for an existing IAM role in the account containing the specified hosted zone. The installation program and cluster operators assume this role when performing operations on the hosted zone. Use this parameter only when you are installing a cluster into a shared VPC.
985-
|String, for example `arn:aws:iam::1234567890:role/shared-vpc-role`.
1000+
1001+
*Value:* String, for example `arn:aws:iam::1234567890:role/shared-vpc-role`.
9861002

9871003
|platform:
9881004
aws:
9891005
region:
9901006
|The AWS region that the installation program creates all cluster resources in.
991-
|Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type by running the following command:
1007+
1008+
*Value:* Any valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS region], such as `us-east-1`. You can use the AWS CLI to access the regions available based on your selected instance type by running the following command:
1009+
9921010
[source,terminal]
9931011
----
9941012
$ aws ec2 describe-instance-type-offerings --filters Name=instance-type,Values=c7g.xlarge
9951013
----
1014+
9961015
ifndef::openshift-origin[]
9971016
[IMPORTANT]
9981017
====
@@ -1006,13 +1025,15 @@ endif::openshift-origin[]
10061025
- name:
10071026
url:
10081027
|The AWS service endpoint name and URL. Custom endpoints are only required for cases where alternative AWS endpoints, such as FIPS, must be used. Custom API endpoints can be specified for EC2, S3, IAM, Elastic Load Balancing, Tagging, Route 53, and STS AWS services.
1009-
|Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS service endpoint] name and valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS service endpoint] URL.
1028+
1029+
*Value:* Valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS service endpoint] name and valid link:https://docs.aws.amazon.com/general/latest/gr/rande.html[AWS service endpoint] URL.
10101030

10111031
|platform:
10121032
aws:
10131033
userTags:
10141034
|A map of keys and values that the installation program adds as tags to all resources that it creates.
1015-
|Any valid YAML map, such as key value pairs in the `<key>: <value>` format. For more information about AWS tags, see link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html[Tagging Your Amazon EC2 Resources] in the AWS documentation.
1035+
1036+
*Value:* Any valid YAML map, such as key value pairs in the `<key>: <value>` format. For more information about AWS tags, see link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html[Tagging Your Amazon EC2 Resources] in the AWS documentation.
10161037

10171038
[NOTE]
10181039
====
@@ -1022,14 +1043,16 @@ You can add up to 25 user-defined tags during installation. The remaining 25 tag
10221043
|platform:
10231044
aws:
10241045
propagateUserTags:
1025-
| A flag that directs in-cluster Operators to include the specified user tags in the tags of the AWS resources that the Operators create.
1026-
| Boolean values, for example `true` or `false`.
1046+
|A flag that directs in-cluster Operators to include the specified user tags in the tags of the AWS resources that the Operators create.
1047+
1048+
*Value:* Boolean values, for example `true` or `false`.
10271049

10281050
|platform:
10291051
aws:
10301052
publicIpv4Pool:
10311053
|The public IPv4 pool ID that is used to allocate Elastic IPs (EIPs) when `publish` is set to `External`. You must provision and advertise the pool in the same {aws-short} account and region of the cluster. You must ensure that you have 2n + 1 IPv4 addresses available in the pool where _n_ is the total number of {aws-short} zones used to deploy the Network Load Balancer (NLB) for API, NAT gateways, and bootstrap node. For more information about bring your own IP addresses (BYOIP) in {aws-short}, see link:https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-byoip.html#byoip-onboard[Onboard your BYOIP].
1032-
| A valid link:https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-public-ipv4-pools.html[public IPv4 pool id]
1054+
1055+
*Value:* A valid link:https://docs.aws.amazon.com/cli/latest/reference/ec2/describe-public-ipv4-pools.html[public IPv4 pool id]
10331056

10341057
[NOTE]
10351058
====
@@ -1040,26 +1063,33 @@ You can enable BYOIP only for customized installations that do not have any netw
10401063
aws:
10411064
preserveBootstrapIgnition:
10421065
|Prevents the S3 bucket from being deleted after completion of bootstrapping.
1043-
|`true` or `false`. The default value is `false`, which results in the S3 bucket being deleted.
1066+
1067+
*Value:* `true` or `false`. The default value is `false`, which results in the S3 bucket being deleted.
10441068

10451069
|platform:
10461070
aws:
10471071
vpc:
10481072
subnets:
10491073
|A list of subnets in an existing VPC to be used in place of automatically created subnets. You specify a subnet by providing the subnet ID and an optional list of roles that apply to that subnet. If you specify subnet IDs but do not specify roles for any subnet, the subnets' roles are decided automatically. If you do not specify any roles, you must ensure that any other subnets in your VPC have the `kubernetes.io/cluster/.*: .*` or `kubernetes.io/cluster/unmanaged: true` tags.
1074+
10501075
The subnets must be part of the same `machineNetwork[].cidr` ranges that you specify.
1076+
10511077
For a public cluster, specify a public and a private subnet for each availability zone.
1078+
10521079
For a private cluster, specify a private subnet for each availability zone.
1080+
10531081
For clusters that use AWS Local Zones, you must add AWS Local Zone subnets to this list to ensure edge machine pool creation.
1054-
|List of pairs of `id` and `roles` parameters.
1082+
1083+
*Value:* List of pairs of `id` and `roles` parameters.
10551084

10561085
|platform:
10571086
aws:
10581087
vpc:
10591088
subnets:
10601089
- id:
10611090
|The ID of an existing subnet to be used in place of a subnet created by the installation program.
1062-
|String. The subnet ID must be a unique ID containing only alphanumeric characters, beginning with "subnet-". The ID must be exactly 24 characters long.
1091+
1092+
*Value:* String. The subnet ID must be a unique ID containing only alphanumeric characters, beginning with "subnet-". The ID must be exactly 24 characters long.
10631093

10641094
|platform:
10651095
aws:
@@ -1069,8 +1099,10 @@ For clusters that use AWS Local Zones, you must add AWS Local Zone subnets to th
10691099
roles:
10701100
- type:
10711101
|One or more roles that apply to the subnet specified by `platform.aws.vpc.subnets.id`. If you specify a role for any subnet, each subnet must have at least one assigned role, and the `ClusterNode`, `IngressControllerLB`, `ControlPlaneExternalLB`, `BootstrapNode`, and `ControlPlaneInternalLB` roles must be assigned to at least one subnet. However, if the cluster scope is internal, then the `ControlPlaneExternalLB` role is not required.
1102+
10721103
You can only assign the `EdgeNode` role to subnets in {aws-short} Local Zones.
1073-
|List of one or more role types. Valid values include `ClusterNode`, `EdgeNode`, `BootstrapNode`, `IngressControllerLB`, `ControlPlaneExternalLB`, and `ControlPlaneInternalLB`.
1104+
1105+
*Value:* List of one or more role types. Valid values include `ClusterNode`, `EdgeNode`, `BootstrapNode`, `IngressControllerLB`, `ControlPlaneExternalLB`, and `ControlPlaneInternalLB`.
10741106

10751107
|====
10761108
endif::aws[]

0 commit comments

Comments
 (0)