diff --git a/modules/hcp-aws-tags.adoc b/modules/hcp-aws-tags.adoc index 247405ee0144..ddbb86f97ddb 100644 --- a/modules/hcp-aws-tags.adoc +++ b/modules/hcp-aws-tags.adoc @@ -5,16 +5,17 @@ [id="hcp-aws-tags_{context}"] = Adding or updating {aws-short} tags for a hosted cluster +[role="_abstract"] As a cluster instance administrator, you can add or update {aws-first} tags without needing to re-create your hosted cluster. _Tags_ are key-value pairs that are attached to {aws-short} resources for management and automation. You might want to use tags for the following purposes: * Managing access controls. * Tracking chargeback or showback. -* Managing cloud IAM conditional permissions. +* Managing cloud Identity and Access Management (IAM) conditional permissions. * Aggregating resources based on tags. For example, you can query tags to calculate resource usage and billing costs. -You can add or update tags for several different types of resources, including EFS access points, load balancer resources, Amazon EBS volumes, IAM users, and {aws-short} S3. +You can add or update tags for several different types of resources, including Amazon Elastic File System (EFS) access points, load balancer resources, Amazon Elastic Block Storage (EBS) volumes, IAM users, and {aws-short} S3. [IMPORTANT] ==== @@ -31,7 +32,7 @@ In addition, tags cannot be updated on the default security group resource that . If you want to add or update tags for EFS access points, complete steps 1 and 2. If you are adding or updating tags for other types of resources, complete only step 2. -.. In the `aws-efs-csi-driver-operator` service account, add two annotations, as shown in the following example. These annotations are required so that the {aws-short} EKS pod identity webhook that runs on the cluster can correctly assign {aws-short} roles to the pods that the EFS Operator uses. +.. In the `aws-efs-csi-driver-operator` service account, add two annotations, as shown in the following example. These annotations are required so that the Amazon Elastic Kubernetes Service (EKS) pod identity webhook that runs on the cluster can correctly assign {aws-short} roles to the pods that the EFS Operator uses. + [source,yaml] ---- @@ -76,11 +77,11 @@ spec: aws: #... resourceTags: - - key: kubernetes.io/cluster/ #<1> + - key: kubernetes.io/cluster/ value: owned rolesRef: #... type: AWS ---- - -<1> Specify the tag that you want to add to your resource. \ No newline at end of file ++ +* `spec.platform.aws.resourceTags.key` specifies the tag that you want to add to your resource. \ No newline at end of file diff --git a/modules/hcp-migrate-aws-multiarch-nodepools.adoc b/modules/hcp-migrate-aws-multiarch-nodepools.adoc index f4d817a93bff..11949dd08ce4 100644 --- a/modules/hcp-migrate-aws-multiarch-nodepools.adoc +++ b/modules/hcp-migrate-aws-multiarch-nodepools.adoc @@ -6,7 +6,8 @@ [id="hcp-migrate-aws-multiarch-nodepools_{context}"] = Creating node pools on the multi-architecture hosted cluster -After transitioning your hosted cluster from single-architecture to multi-architecture, create node pools on compute machines based on 64-bit AMD and 64-bit ARM architectures. +[role="_abstract"] +After you transition your hosted cluster from single-architecture to multi-architecture, create node pools on compute machines based on 64-bit AMD and 64-bit ARM architectures. .Procedure @@ -15,28 +16,30 @@ After transitioning your hosted cluster from single-architecture to multi-archit [source,terminal] ---- $ hcp create nodepool aws \ - --cluster-name \// <1> - --name \// <2> - --node-count= \// <3> + --cluster-name \ + --name \ + --node-count= \ --arch arm64 ---- -<1> Replace `` with your hosted cluster name. -<2> Replace `` with your node pool name. -<3> Replace `` with integer for your node count, for example, `2`. ++ +* Replace `` with your hosted cluster name. +* Replace `` with your node pool name. +* Replace `` with integer for your node count, for example, `2`. . Create node pools based on 64-bit AMD architecture by entering the following command: + [source,terminal] ---- $ hcp create nodepool aws \ - --cluster-name \// <1> - --name \// <2> - --node-count= \// <3> + --cluster-name \ + --name \ + --node-count= \ --arch amd64 ---- -<1> Replace `` with your hosted cluster name. -<2> Replace `` with your node pool name. -<3> Replace `` with integer for your node count, for example, `2`. ++ +* Replace `` with your hosted cluster name. +* Replace `` with your node pool name. +* Replace `` with integer for your node count, for example, `2`. .Verification @@ -55,9 +58,8 @@ spec: arch: amd64 #... release: - image: quay.io/openshift-release-dev/ocp-release:<4.x.y>-multi <1> + image: quay.io/openshift-release-dev/ocp-release:4.20.0-multi <1> ---- -<1> Replace `<4.y.z>` with the supported {product-title} version that you use. + .Example output for 64-bit ARM node pools [source,yaml] @@ -67,5 +69,5 @@ spec: arch: arm64 #... release: - image: quay.io/openshift-release-dev/ocp-release:<4.x.y>-multi + image: quay.io/openshift-release-dev/ocp-release:4.20.0-multi ----