Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions autogen/main/cluster.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -697,15 +697,10 @@ resource "google_container_cluster" "primary" {

{% endif %}
dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) {% endif %}? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
{% if private_cluster %}
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
{% else %}
allow_external_traffic = var.dns_allow_external_traffic
{% endif %}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions docs/upgrading_to_v37.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Upgrading to v37.0
The v37.0 release of *kubernetes-engine* is a backwards incompatible release.

### Google Cloud Platform Provider upgrade
The Terraform Kubernetes Engine Module now requires version 6.27 or higher of the Google Cloud Platform Providers.

### Private Cluster DNS Allow External Traffic
DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.
To enable, set `dns_allow_external_traffic` to `true`.

```diff
module "cluster" {
- version = "~> 36.0"
+ version = "~> 37.0"

+ dns_allow_external_traffic = true
}
```
5 changes: 2 additions & 3 deletions modules/beta-autopilot-private-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,10 @@ resource "google_container_cluster" "primary" {
}

dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
allow_external_traffic = var.dns_allow_external_traffic
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions modules/beta-private-cluster-update-variant/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -592,11 +592,10 @@ resource "google_container_cluster" "primary" {
}

dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
allow_external_traffic = var.dns_allow_external_traffic
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions modules/beta-private-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -592,11 +592,10 @@ resource "google_container_cluster" "primary" {
}

dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
allow_external_traffic = var.dns_allow_external_traffic
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions modules/private-cluster-update-variant/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,10 @@ resource "google_container_cluster" "primary" {
}

dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
allow_external_traffic = var.dns_allow_external_traffic
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions modules/private-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -541,11 +541,10 @@ resource "google_container_cluster" "primary" {
}

dynamic "control_plane_endpoints_config" {
for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
for_each = var.dns_allow_external_traffic != null ? [1] : []
content {
dns_endpoint_config {
# TODO: Migrate to only dns_allow_external_traffic in next breaking release
allow_external_traffic = var.dns_allow_external_traffic == true || var.deploy_using_private_endpoint
allow_external_traffic = var.dns_allow_external_traffic
}
}
}
Expand Down