Skip to content

Commit

Permalink
Merge pull request #116 from modular-magician/codegen-pr-890
Browse files Browse the repository at this point in the history
Make master_auth user/pass optional
  • Loading branch information
chrisst authored Nov 13, 2018
2 parents 3b0dde1 + f06e7bb commit 1ce966e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions google-beta/resource_container_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ func resourceContainerCluster() *schema.Resource {
Schema: map[string]*schema.Schema{
"password": {
Type: schema.TypeString,
Required: true,
Optional: true,
Sensitive: true,
},

"username": {
Type: schema.TypeString,
Required: true,
Optional: true,
},

"client_certificate_config": {
Expand Down
8 changes: 4 additions & 4 deletions website/docs/r/container_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ The `ip_allocation_policy` block supports:

The `master_auth` block supports:

* `password` - (Required) The password to use for HTTP basic authentication when accessing
the Kubernetes master endpoint
* `password` - (Optional) The password to use for HTTP basic authentication when accessing
the Kubernetes master endpoint.

* `username` - (Required) The username to use for HTTP basic authentication when accessing
the Kubernetes master endpoint
* `username` - (Optional) The username to use for HTTP basic authentication when accessing
the Kubernetes master endpoint. If not present basic auth will be disabled.

* `client_certificate_config` - (Optional) Whether client certificate authorization is enabled for this cluster. For example:

Expand Down

0 comments on commit 1ce966e

Please sign in to comment.