Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ExactlyOneOf restriction for auto_provisioning_defaults #5642

Merged
merged 1 commit into from
Feb 11, 2020
Merged

Remove ExactlyOneOf restriction for auto_provisioning_defaults #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3106.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
container: Removed restriction on `auto_provisioning_defaults` to allow both `oauth_scopes` and `service_account` to be set
```
8 changes: 0 additions & 8 deletions google/resource_container_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,19 +267,11 @@ func resourceContainerCluster() *schema.Resource {
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
DiffSuppressFunc: containerClusterAddedScopesSuppress,
ExactlyOneOf: []string{
"cluster_autoscaling.0.auto_provisioning_defaults.0.oauth_scopes",
"cluster_autoscaling.0.auto_provisioning_defaults.0.service_account",
},
},
"service_account": {
Type: schema.TypeString,
Optional: true,
Default: "default",
ExactlyOneOf: []string{
"cluster_autoscaling.0.auto_provisioning_defaults.0.oauth_scopes",
"cluster_autoscaling.0.auto_provisioning_defaults.0.service_account",
},
},
},
},
Expand Down
2 changes: 0 additions & 2 deletions website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,12 +378,10 @@ for a list of types.
The `auto_provisioning_defaults` block supports:

* `oauth_scopes` - (Optional) Scopes that are used by NAP when creating node pools.
If `oauth_scopes` are specified, `service_account` must be empty.

-> `monitoring.write` is always enabled regardless of user input. `monitoring` and `logging.write` may also be enabled depending on the values for `monitoring_service` and `logging_service`.

* `service_account` - (Optional) The Google Cloud Platform Service Account to be used by the node VMs.
If `service_account` is specified, `oauth_scopes` must be empty.

The `authenticator_groups_config` block supports:

Expand Down