Skip to content

Commit c8f4033

Browse files
authored
Merge pull request #83906 from jeana-redhat/OSDOCS-12394-gcp-svc-acct-limitation
OSDOCS-12394: GCP machineset single svc acct limit
2 parents de41769 + b0c70cd commit c8f4033

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

modules/cpmso-yaml-provider-spec-gcp.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
subnetwork: <cluster_id>-master-subnet
6868
projectID: <project_name> <4>
6969
region: <region> <5>
70-
serviceAccounts:
70+
serviceAccounts: <6>
7171
- email: <cluster_id>-m@<project_name>.iam.gserviceaccount.com
7272
scopes:
7373
- https://www.googleapis.com/auth/cloud-platform
@@ -77,8 +77,8 @@ spec:
7777
targetPools:
7878
- <cluster_id>-api
7979
userDataSecret:
80-
name: master-user-data <6>
81-
zone: "" <7>
80+
name: master-user-data <7>
81+
zone: "" <8>
8282
----
8383
<1> Specifies the secret name for the cluster. Do not change this value.
8484
<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:
9393
<3> Specifies the cloud provider platform type. Do not change this value.
9494
<4> Specifies the name of the GCP project that you use for your cluster.
9595
<5> Specifies the GCP region for the cluster.
96-
<6> Specifies the control plane user data secret. Do not change this value.
97-
<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.
96+
<6> Specifies a single service account. Multiple service accounts are not supported.
97+
<7> Specifies the control plane user data secret. Do not change this value.
98+
<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.

modules/machineset-yaml-gcp.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ endif::infra[]
106106
subnetwork: <infrastructure_id>-worker-subnet
107107
projectID: <project_name> <5>
108108
region: us-central1
109-
serviceAccounts:
109+
serviceAccounts: <6>
110110
- email: <infrastructure_id>-w@<project_name>.iam.gserviceaccount.com
111111
scopes:
112112
- https://www.googleapis.com/auth/cloud-platform
@@ -116,7 +116,7 @@ endif::infra[]
116116
name: worker-user-data
117117
zone: us-central1-a
118118
ifdef::infra[]
119-
taints: <6>
119+
taints: <7>
120120
- key: node-role.kubernetes.io/infra
121121
effect: NoSchedule
122122
endif::infra[]
@@ -139,8 +139,9 @@ To use a GCP Marketplace image, specify the offer to use:
139139
--
140140
<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].
141141
<5> For `<project_name>`, specify the name of the GCP project that you use for your cluster.
142+
<6> Specifies a single service account. Multiple service accounts are not supported.
142143
ifdef::infra[]
143-
<6> Specify a taint to prevent user workloads from being scheduled on infra nodes.
144+
<7> Specify a taint to prevent user workloads from being scheduled on infra nodes.
144145
+
145146
[NOTE]
146147
====

0 commit comments

Comments
 (0)