From eedd33b618bf8d5642549f304bdd28680e29b013 Mon Sep 17 00:00:00 2001 From: Jeana Routh Date: Mon, 21 Oct 2024 16:07:13 -0400 Subject: [PATCH] OSDOCS-12394: GCP machineset single svc acct limit --- modules/cpmso-yaml-provider-spec-gcp.adoc | 11 ++++++----- modules/machineset-yaml-gcp.adoc | 7 ++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/cpmso-yaml-provider-spec-gcp.adoc b/modules/cpmso-yaml-provider-spec-gcp.adoc index dce5d961b2..bfb4f33b06 100644 --- a/modules/cpmso-yaml-provider-spec-gcp.adoc +++ b/modules/cpmso-yaml-provider-spec-gcp.adoc @@ -67,7 +67,7 @@ spec: subnetwork: -master-subnet projectID: <4> region: <5> - serviceAccounts: + serviceAccounts: <6> - email: -m@.iam.gserviceaccount.com scopes: - https://www.googleapis.com/auth/cloud-platform @@ -77,8 +77,8 @@ spec: targetPools: - -api userDataSecret: - name: master-user-data <6> - zone: "" <7> + name: master-user-data <7> + zone: "" <8> ---- <1> Specifies the secret name for the cluster. Do not change this value. <2> Specifies the path to the image that was used to create the disk. @@ -93,5 +93,6 @@ To use a GCP Marketplace image, specify the offer to use: <3> Specifies the cloud provider platform type. Do not change this value. <4> Specifies the name of the GCP project that you use for your cluster. <5> Specifies the GCP region for the cluster. -<6> Specifies the control plane user data secret. Do not change this value. -<7> This parameter is configured in the failure domain, and is shown with an empty value here. If a value specified for this parameter differs from the value in the failure domain, the Operator overwrites it with the value in the failure domain. \ No newline at end of file +<6> Specifies a single service account. Multiple service accounts are not supported. +<7> Specifies the control plane user data secret. Do not change this value. +<8> This parameter is configured in the failure domain, and is shown with an empty value here. If a value specified for this parameter differs from the value in the failure domain, the Operator overwrites it with the value in the failure domain. \ No newline at end of file diff --git a/modules/machineset-yaml-gcp.adoc b/modules/machineset-yaml-gcp.adoc index 1ed2319200..72f58ad2b8 100644 --- a/modules/machineset-yaml-gcp.adoc +++ b/modules/machineset-yaml-gcp.adoc @@ -106,7 +106,7 @@ endif::infra[] subnetwork: -worker-subnet projectID: <5> region: us-central1 - serviceAccounts: + serviceAccounts: <6> - email: -w@.iam.gserviceaccount.com scopes: - https://www.googleapis.com/auth/cloud-platform @@ -116,7 +116,7 @@ endif::infra[] name: worker-user-data zone: us-central1-a ifdef::infra[] - taints: <6> + taints: <7> - key: node-role.kubernetes.io/infra effect: NoSchedule endif::infra[] @@ -139,8 +139,9 @@ To use a GCP Marketplace image, specify the offer to use: -- <4> Optional: Specify custom metadata in the form of a `key:value` pair. For example use cases, see the GCP documentation for link:https://cloud.google.com/compute/docs/metadata/setting-custom-metadata[setting custom metadata]. <5> For ``, specify the name of the GCP project that you use for your cluster. +<6> Specifies a single service account. Multiple service accounts are not supported. ifdef::infra[] -<6> Specify a taint to prevent user workloads from being scheduled on infra nodes. +<7> Specify a taint to prevent user workloads from being scheduled on infra nodes. + [NOTE] ====