master_ipv4_cidr_block should be in line with documentation (#4732)

* master_ipv4_cidr_block should be in line with documentation As per https://cloud.google.com/composer/docs/reference/rest/v1beta1/projects.locations.environments#PrivateClusterConfig masterIpv4CidrBlock is Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of '172.16.0.0/23' is used. Suggesting change default value to be in line with docs or remove it so it's assigned/computed by API. * Update resource_composer_environment.go.erb * Update resource_composer_environment.go.erb * Update resource_composer_environment.go.erb * Update composer_environment.html.markdown * fix tabs * fix tabs * align tf documentation with google cloud documentation
GoogleCloudPlatform · Apr 28, 2021 · 5664a39 · 5664a39
1 parent 37c8bdb
commit 5664a39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mmv1/third_party/terraform/resources/resource_composer_environment.go.erb b/mmv1/third_party/terraform/resources/resource_composer_environment.go.erb
@@ -340,14 +340,14 @@ func resourceComposerEnvironment() *schema.Resource {
 									"master_ipv4_cidr_block": {
 										Type:     schema.TypeString,
 										Optional: true,
+										Computed: true,
 										AtLeastOneOf: []string{
 											"config.0.private_environment_config.0.enable_private_endpoint",
 											"config.0.private_environment_config.0.master_ipv4_cidr_block",
 											"config.0.private_environment_config.0.cloud_sql_ipv4_cidr_block",
 											"config.0.private_environment_config.0.web_server_ipv4_cidr_block",
 										},
 										ForceNew:    true,
-										Default:     "172.16.0.0/28",
 										Description: `The IP range in CIDR notation to use for the hosted master network. This range is used for assigning internal IP addresses to the cluster master or set of masters and to the internal load balancer virtual IP. This range must not overlap with any other ranges in use within the cluster's network. If left blank, the default value of '172.16.0.0/28' is used.`,
 									},
 									"web_server_ipv4_cidr_block": {

diff --git a/mmv1/third_party/terraform/website/docs/r/composer_environment.html.markdown b/mmv1/third_party/terraform/website/docs/r/composer_environment.html.markdown
@@ -313,7 +313,7 @@ See [documentation](https://cloud.google.com/composer/docs/how-to/managing/confi
   for assigning internal IP addresses to the cluster master or set of masters and to the
   internal load balancer virtual IP. This range must not overlap with any other ranges
   in use within the cluster's network.
-  If left blank, the default value of '172.16.0.0/28' is used.
+  If left blank, the default value of is used. See [documentation](https://cloud.google.com/composer/docs/how-to/managing/configuring-private-ip#defaults) for default values per region. 
 
 * `cloud_sql_ipv4_cidr_block` -
   (Optional)