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

These fields were duplicated, they shouldn't be #2873

Merged
merged 2 commits into from
Dec 19, 2019
Merged

These fields were duplicated, they shouldn't be #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cd5682
These fields were duplicated, they shouldn't be
slevenick Dec 19, 2019
301eedd
Update tracked submodules -> HEAD on Thu Dec 19 23:13:04 UTC 2019
modular-magician Dec 19, 2019
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
2 changes: 1 addition & 1 deletion build/ansible
Open in desktop
Submodule ansible updated from 070354 to 7d85e9
2 changes: 1 addition & 1 deletion build/inspec
Open in desktop
Submodule inspec updated 4 files
+4 −4 docs/resources/google_container_regional_cluster.md
+2 −2 docs/resources/google_container_regional_clusters.md
+4 −4 libraries/google_container_regional_cluster.rb
+4 −4 libraries/google_container_regional_clusters.rb
10 changes: 1 addition & 9 deletions products/container/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,16 +368,14 @@ objects:
The IP address range of the container pods in this cluster, in CIDR
notation (e.g. 10.96.0.0/14). Leave blank to have one automatically
chosen or specify a /14 block in 10.0.0.0/8.
- !ruby/object:Api::Type::String
- !ruby/object:Api::Type::Boolean
name: 'enableTpu'
min_version: beta
description: |
(Optional) Whether to enable Cloud TPU resources in this cluster.
See the official documentation - https://cloud.google.com/tpu/docs/kubernetes-engine-setup
- !ruby/object:Api::Type::String
name: 'tpuIpv4CidrBlock'
output: true
min_version: beta
description: |
The IP address range of the Cloud TPUs in this cluster, in
[CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
Expand Down Expand Up @@ -636,12 +634,6 @@ objects:
The time the cluster will be automatically deleted in RFC3339 text
format.
output: true
- !ruby/object:Api::Type::Boolean
name: 'enableTpu'
description: Enable the ability to use Cloud TPUs in this cluster.
- !ruby/object:Api::Type::String
name: 'tpuIpv4CidrBlock'
description: The IP address range of the Cloud TPUs in this cluster, in CIDR notation
- !ruby/object:Api::Type::Array
name: 'conditions'
description: Which conditions caused the current cluster state.
Expand Down