From 71ef9219cca6452470c9714f51e035936342d59c Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Fri, 25 Oct 2019 10:15:57 -0700 Subject: [PATCH 1/4] Add GKE taint changes to the upgrade guide --- .../docs/version_3_upgrade.html.markdown | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/third_party/terraform/website/docs/version_3_upgrade.html.markdown b/third_party/terraform/website/docs/version_3_upgrade.html.markdown index 201bcc10dce5..f9a77dbafd46 100644 --- a/third_party/terraform/website/docs/version_3_upgrade.html.markdown +++ b/third_party/terraform/website/docs/version_3_upgrade.html.markdown @@ -123,6 +123,35 @@ logging_service = "logging.googleapis.com/kubernetes" monitoring_service = "monitoring.googleapis.com/kubernetes" ``` +### `taint` field is now authoritative when set + +The `taint` field inside of `node_config` blocks on `google_container_cluster` +and `google_container_node_pool` will no longer ignored GPU-related values when +set. + +Previously, the field ignored upstream taints when unset and ignored unset GPU +taints when other taints were set. Now it will ignore upstream taints when set +and act authoritatively when set, requiring all taints (including Kubenetes and +GKE-managed ones) to be defined in config. + +Additionally, the empty taint can be specified. As a result of this change, the +JSON/state representation of the field has changed, introducing an +incompatibility for users who specify config in JSON instead of HCL. + +#### Old Defaults + +```hcl +logging_service = "logging.googleapis.com" +monitoring_service = "monitoring.googleapis.com" +``` + +#### New Defaults + +```hcl +logging_service = "logging.googleapis.com/kubernetes" +monitoring_service = "monitoring.googleapis.com/kubernetes" +``` + ## Resource: `google_project_services` ### `google_project_services` has been removed from the provider From e2be1126b0917c97492ce107bbe2818cf313d60a Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Fri, 25 Oct 2019 10:17:50 -0700 Subject: [PATCH 2/4] Remove bad copy-paste, add dynamic --- .../docs/version_3_upgrade.html.markdown | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/third_party/terraform/website/docs/version_3_upgrade.html.markdown b/third_party/terraform/website/docs/version_3_upgrade.html.markdown index f9a77dbafd46..ac0fb76e14c1 100644 --- a/third_party/terraform/website/docs/version_3_upgrade.html.markdown +++ b/third_party/terraform/website/docs/version_3_upgrade.html.markdown @@ -134,23 +134,10 @@ taints when other taints were set. Now it will ignore upstream taints when set and act authoritatively when set, requiring all taints (including Kubenetes and GKE-managed ones) to be defined in config. -Additionally, the empty taint can be specified. As a result of this change, the -JSON/state representation of the field has changed, introducing an -incompatibility for users who specify config in JSON instead of HCL. - -#### Old Defaults - -```hcl -logging_service = "logging.googleapis.com" -monitoring_service = "monitoring.googleapis.com" -``` - -#### New Defaults - -```hcl -logging_service = "logging.googleapis.com/kubernetes" -monitoring_service = "monitoring.googleapis.com/kubernetes" -``` +Additionally, an empty taint can now be specified with `taint = []`. As a result +of this change, the JSON/state representation of the field has changed, +introducing an incompatibility for users who specify config in JSON instead of +HCL or who use `dynamic` blocks. ## Resource: `google_project_services` From 42a774b66eb14613cd45c8d9dc33383154ec2729 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Tue, 29 Oct 2019 13:30:49 -0700 Subject: [PATCH 3/4] Code review --- .../terraform/website/docs/version_3_upgrade.html.markdown | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/third_party/terraform/website/docs/version_3_upgrade.html.markdown b/third_party/terraform/website/docs/version_3_upgrade.html.markdown index ac0fb76e14c1..62a5a1e002e2 100644 --- a/third_party/terraform/website/docs/version_3_upgrade.html.markdown +++ b/third_party/terraform/website/docs/version_3_upgrade.html.markdown @@ -126,18 +126,19 @@ monitoring_service = "monitoring.googleapis.com/kubernetes" ### `taint` field is now authoritative when set The `taint` field inside of `node_config` blocks on `google_container_cluster` -and `google_container_node_pool` will no longer ignored GPU-related values when +and `google_container_node_pool` will no longer ignore GPU-related values when set. Previously, the field ignored upstream taints when unset and ignored unset GPU taints when other taints were set. Now it will ignore upstream taints when set -and act authoritatively when set, requiring all taints (including Kubenetes and +and act authoritatively when set, requiring all taints (including Kubernetes and GKE-managed ones) to be defined in config. Additionally, an empty taint can now be specified with `taint = []`. As a result of this change, the JSON/state representation of the field has changed, introducing an incompatibility for users who specify config in JSON instead of -HCL or who use `dynamic` blocks. +HCL or who use `dynamic` blocks. See more details in the [Attributes as Blocks](https://www.terraform.io/docs/configuration/attr-as-blocks.html) +documentation. ## Resource: `google_project_services` From e9b1df99db5362e25c12e435da857c097efcef4a Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 29 Oct 2019 20:47:41 +0000 Subject: [PATCH 4/4] Update tracked submodules -> HEAD on Tue Oct 29 20:47:41 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/terraform b/build/terraform index 7c404ed529b9..a0fb67e68c6d 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 7c404ed529b9841cb54980d45358c840559bdd38 +Subproject commit a0fb67e68c6d0d91af90657dfabd9e2f2741c4bf diff --git a/build/terraform-beta b/build/terraform-beta index 33dc4444cd6d..8d3bdd31d309 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 33dc4444cd6de407482f0f1cbe1ba6ac7e682337 +Subproject commit 8d3bdd31d3092eb0b0791d1c4ffa878c9fd01a76