fix networking_mode in container_cluster (#5504) (#3896)

Co-authored-by: Emily Cai <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: Emily Cai <[email protected]>
hashicorp · Dec 3, 2021 · b02047b · b02047b
1 parent 21bcff5
commit b02047b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/.changelog/5504.txt b/.changelog/5504.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+container: fixed the `ROUTES` value for the `networking_mode` field in `google_container_cluster`. A recent API change unintentionally changed the default to a `VPC_NATIVE` cluster, and removed the ability to create a `ROUTES`-based one. Provider versions prior to this one will default to `VPC_NATIVE` due to this change, and are unable to create `ROUTES` clusters.
+```
diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go
@@ -2972,6 +2972,7 @@ func expandIPAllocationPolicy(configured interface{}, networkingMode string) (*c
 		}
 		return &container.IPAllocationPolicy{
 			UseIpAliases:    false,
+			UseRoutes:       true,
 			ForceSendFields: []string{"UseIpAliases"},
 		}, nil
 	}

diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
@@ -180,7 +180,7 @@ VPC-native clusters. Adding this block enables [IP aliasing](https://cloud.googl
 making the cluster VPC-native instead of routes-based. Structure is [documented
 below](#nested_ip_allocation_policy).
 
-* `networking_mode` - (Optional, [Beta]) Determines whether alias IPs or routes will be used for pod IPs in the cluster.
+* `networking_mode` - (Optional) Determines whether alias IPs or routes will be used for pod IPs in the cluster.
 Options are `VPC_NATIVE` or `ROUTES`. `VPC_NATIVE` enables [IP aliasing](https://cloud.google.com/kubernetes-engine/docs/how-to/ip-aliases),
 and requires the `ip_allocation_policy` block to be defined. By default when this field is unspecified, GKE will create a `ROUTES`-based cluster.
 

diff --git a/website/docs/r/os_config_os_policy_assignment.html.markdown b/website/docs/r/os_config_os_policy_assignment.html.markdown
@@ -703,24 +703,6 @@ The `disruption_budget` block supports:
   (Optional)
   Specifies the relative value defined as a percentage, which will be multiplied by a reference value.
 
-The `source` block supports:
-
-* `allow_insecure` -
-  (Optional)
-  Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.
-
-* `gcs` -
-  (Optional)
-  A Cloud Storage object.
-
-* `local_path` -
-  (Optional)
-  A local path within the VM to use.
-
-* `remote` -
-  (Optional)
-  A generic remote file.
-
 - - -
 
 * `description` -
@@ -970,6 +952,24 @@ The `zypper` block supports:
   (Required)
   Required. A one word, unique name for this repository. This is the `repo id` in the zypper config file and also the `display_name` if `display_name` is omitted. This id is also used as the unique identifier when checking for GuestPolicy conflicts.
 
+The `file` block supports:
+
+* `allow_insecure` -
+  (Optional)
+  Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.
+
+* `gcs` -
+  (Optional)
+  A Cloud Storage object.
+
+* `local_path` -
+  (Optional)
+  A local path within the VM to use.
+
+* `remote` -
+  (Optional)
+  A generic remote file.
+
 The `gcs` block supports:
 
 * `bucket` -