Skip to content

Commit 8d114d3

Browse files
Promote datapath and some networking fields of GKE to GA. (#4432) (#2905)
* promote some fields to GA Co-authored-by: upodroid <[email protected]> * add intranode test to GA Signed-off-by: Modular Magician <[email protected]>
1 parent 4ca7bd5 commit 8d114d3

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.changelog/4432.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
container: promoted `master_global_access_config`, `tpu_ipv4_cidr_block`, `default_snat_status` and `datapath_provider` fields of `google_container_cluster` to GA.
3+
```

google-beta/resource_container_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,7 @@ func resourceContainerCluster() *schema.Resource {
11381138
ValidateFunc: validation.StringInSlice([]string{"DATAPATH_PROVIDER_UNSPECIFIED", "LEGACY_DATAPATH", "ADVANCED_DATAPATH"}, false),
11391139
DiffSuppressFunc: emptyOrDefaultStringSuppress("DATAPATH_PROVIDER_UNSPECIFIED"),
11401140
},
1141+
11411142
"enable_intranode_visibility": {
11421143
Type: schema.TypeBool,
11431144
Optional: true,
@@ -1641,7 +1642,6 @@ func resourceContainerClusterRead(d *schema.ResourceData, meta interface{}) erro
16411642
if err := d.Set("datapath_provider", cluster.NetworkConfig.DatapathProvider); err != nil {
16421643
return fmt.Errorf("Error setting datapath_provider: %s", err)
16431644
}
1644-
16451645
if err := d.Set("default_snat_status", flattenDefaultSnatStatus(cluster.NetworkConfig.DefaultSnatStatus)); err != nil {
16461646
return err
16471647
}

website/docs/r/container_cluster.html.markdown

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ for more information.
149149
this cluster. Note that when this option is enabled, the cluster cannot be upgraded
150150
and will be automatically deleted after 30 days.
151151

152-
* `enable_tpu` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) Whether to enable Cloud TPU resources in this cluster.
152+
* `enable_tpu` - (Optional) Whether to enable Cloud TPU resources in this cluster.
153153
See the [official documentation](https://cloud.google.com/tpu/docs/kubernetes-engine-setup).
154154

155155
* `enable_legacy_abac` - (Optional) Whether the ABAC authorizer is enabled for this cluster.
@@ -298,10 +298,13 @@ subnetwork in which the cluster's instances are launched.
298298
[Google IAM Service Account](https://cloud.google.com/iam/docs/service-accounts#user-managed_service_accounts).
299299
Structure is documented below.
300300

301-
* `enable_intranode_visibility` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
301+
* `enable_intranode_visibility` - (Optional)
302302
Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network.
303303

304-
* `default_snat_status` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
304+
* `datapath_provider` - (Optional)
305+
The desired datapath provider for this cluster. By default, uses the IPTables-based kube-proxy implementation.
306+
307+
* `default_snat_status` - (Optional)
305308
[GKE SNAT](https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent#how_ipmasq_works) DefaultSnatStatus contains the desired state of whether default sNAT should be disabled on the cluster, [API doc](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#networkconfig).
306309

307310
The `default_snat_status` block supports
@@ -711,7 +714,7 @@ subnet. See [Private Cluster Limitations](https://cloud.google.com/kubernetes-en
711714
for more details. This field only applies to private clusters, when
712715
`enable_private_nodes` is `true`.
713716

714-
* `master_global_access_config` (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) - Controls cluster master global
717+
* `master_global_access_config` (Optional) - Controls cluster master global
715718
access settings. If unset, Terraform will no longer manage this field and will
716719
not modify the previously-set value. Structure is documented below.
717720

@@ -863,7 +866,7 @@ exported:
863866
be different than the `min_master_version` set in the config if the master
864867
has been updated by GKE.
865868

866-
* `tpu_ipv4_cidr_block` - ([Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) The IP address range of the Cloud TPUs in this cluster, in
869+
* `tpu_ipv4_cidr_block` - The IP address range of the Cloud TPUs in this cluster, in
867870
[CIDR](http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing)
868871
notation (e.g. `1.2.3.4/29`).
869872

0 commit comments

Comments
 (0)