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.

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

Upgrade terraform-provider-google-beta to v6.20.0 #2965

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.3.0
24 changes: 12 additions & 12 deletions patches/0005-docs-patching.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1523,10 +1523,10 @@ index e96d17f09..bbd005a6a 100644
resource "google_compute_ssl_certificate" "default" {
name_prefix = "my-certificate-"
diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown
index 1ba64e0db..a047ac09f 100644
index 0e032b7b4..495e3e8f9 100644
--- a/website/docs/r/compute_subnetwork.html.markdown
+++ b/website/docs/r/compute_subnetwork.html.markdown
@@ -391,9 +391,6 @@ The following arguments are supported:
@@ -392,9 +392,6 @@ The following arguments are supported:
contained in this subnetwork. The primary IP of such VM must belong
to the primary ipCidrRange of the subnetwork. The alias IPs may belong
to either primary or secondary ranges.
Expand Down Expand Up @@ -1581,7 +1581,7 @@ index f18c91533..924ad4cc0 100644
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=vpn_tunnel_basic&open_in_editor=main.tf" target="_blank">
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index 1705867a2..56115da46 100644
index c170ef83a..b6c0cea0e 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -13,15 +13,12 @@ To get more information about GKE clusters, see:
Expand Down Expand Up @@ -1672,7 +1672,7 @@ index 1705867a2..56115da46 100644
release channel, but will not unenroll it. Instead, use the `"UNSPECIFIED"`
channel. Structure is [documented below](#nested_release_channel).

@@ -904,10 +922,6 @@ gvnic {
@@ -909,10 +927,6 @@ gvnic {

* `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance.
Structure [documented below](#nested_guest_accelerator).
Expand All @@ -1683,7 +1683,7 @@ index 1705867a2..56115da46 100644

* `image_type` - (Optional) The image type to use for this node. Note that changing the image type
will delete and recreate all nodes in the node pool.
@@ -930,7 +944,7 @@ gvnic {
@@ -935,7 +949,7 @@ gvnic {
* `metadata` - (Optional) The metadata key/value pairs assigned to instances in
the cluster. From GKE `1.12` onwards, `disable-legacy-endpoints` is set to
`true` by the API; if `metadata` is set but that default value is not
Expand All @@ -1692,7 +1692,7 @@ index 1705867a2..56115da46 100644
value in your config.

* `min_cpu_platform` - (Optional) Minimum CPU platform to be used by this instance.
@@ -955,10 +969,7 @@ gvnic {
@@ -960,10 +974,7 @@ gvnic {
See the [official documentation](https://cloud.google.com/kubernetes-engine/docs/concepts/spot-vms)
for more information. Defaults to false.

Expand All @@ -1704,7 +1704,7 @@ index 1705867a2..56115da46 100644

* `service_account` - (Optional) The service account to be used by the Node VMs.
If not specified, the "default" service account is used.
@@ -972,13 +983,14 @@ gvnic {
@@ -977,13 +988,14 @@ gvnic {

* `resource_manager_tags` - (Optional) A map of resource manager tag keys and values to be attached to the nodes for managing Compute Engine firewalls using Network Firewall Policies. Tags must be according to specifications found [here](https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications). A maximum of 5 tag key-value pairs can be specified. Existing tags will be replaced with new values. Tags must be in one of the following formats ([KEY]=[VALUE]) 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}` 2. `{org_id}/{tag_key_name}={tag_value_name}` 3. `{project_id}/{tag_key_name}={tag_value_name}`.

Expand All @@ -1726,7 +1726,7 @@ index 1705867a2..56115da46 100644

* `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool.
Structure is [documented below](#nested_workload_metadata_config).
@@ -1037,6 +1049,20 @@ sole_tenant_config {
@@ -1042,6 +1054,20 @@ sole_tenant_config {

* `enable_nested_virtualization`- (Optional) Defines whether the instance should have nested virtualization enabled. Defaults to false.

Expand All @@ -1747,7 +1747,7 @@ index 1705867a2..56115da46 100644
<a name="nested_ephemeral_storage_config"></a>The `ephemeral_storage_config` block supports:

* `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
@@ -1218,7 +1244,7 @@ for more details. This field only applies to private clusters, when
@@ -1223,7 +1249,7 @@ for more details. This field only applies to private clusters, when
* `private_endpoint_subnetwork` - (Optional) Subnetwork in cluster's network where master's endpoint will be provisioned.

* `master_global_access_config` (Optional) - Controls cluster master global
Expand All @@ -1756,7 +1756,7 @@ index 1705867a2..56115da46 100644
not modify the previously-set value. Structure is [documented below](#nested_master_global_access_config).

In addition, the `private_cluster_config` allows access to the following read-only fields:
@@ -1320,9 +1346,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
@@ -1325,9 +1351,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at

* `mode` (Required) How to expose the node metadata to the workload running on the node.
Accepted values are:
Expand Down Expand Up @@ -3749,10 +3749,10 @@ index 91dc27f01..89f1e371b 100644
## Attributes Reference

diff --git a/website/docs/r/storage_bucket_object.html.markdown b/website/docs/r/storage_bucket_object.html.markdown
index c58c1c856..4278b76f6 100644
index 85b67ab8b..fa23249f9 100644
--- a/website/docs/r/storage_bucket_object.html.markdown
+++ b/website/docs/r/storage_bucket_object.html.markdown
@@ -48,7 +48,7 @@ The following arguments are supported:
@@ -52,7 +52,7 @@ The following arguments are supported:

One of the following is required:

Expand Down
Loading
Loading