Skip to content

Commit 8c81efd

Browse files
apeabodyapeabody
authored
Merge branch 'master' into enabled-components-autopilot
2 parents 47f746d + e3f016e commit 8c81efd

File tree

45 files changed

+168
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+168
-125
lines changed

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
Extending the adopted spec, each change should have a link to its corresponding pull request appended.
88

9+
## [34.0.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.1.0...v34.0.0) (2024-10-30)
10+
11+
12+
### ⚠ BREAKING CHANGES
13+
14+
* **TPG>=5.44.2:** add standard cluster support for `insecureKubeletReadonlyPortEnabled` ([#2082](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2082))
15+
* **deps:** Update Terraform terraform-google-modules/project-factory/google to v17 ([#2109](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2109))
16+
17+
### Features
18+
19+
* Add create_ignore_already_exists to workload_identity ([#2142](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2142)) ([76d779c](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/76d779c314727bfccf64bfd34c61e1ce56bc55b9))
20+
* **safer-cluster:** add create_service_account variable ([#2138](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2138)) ([cccabcb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/cccabcb0eca2a7755908e8d17b40ffba87f4839e))
21+
* **TPG>=5.44.2:** add standard cluster support for `insecureKubeletReadonlyPortEnabled` ([#2082](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2082)) ([96626d5](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/96626d541617cb99a3ee19b019ba51c6146f69c0))
22+
23+
24+
### Bug Fixes
25+
26+
* add kubelet_config to default-pool ([#2147](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2147)) ([7828a0f](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/7828a0ff35136a9e5fa91a7d26ba07bda734c31b))
27+
* add target tags to `node_pool_auto_config` for standard clusters ([#2118](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2118)) ([d5f66e8](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/d5f66e86dd163d505ff455a9c5fafe7d659da36f))
28+
* correct confidential node field name ([#2140](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2140)) ([373c969](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/373c96954af9ce53dd3eb062f372efa832378334))
29+
* **deps:** Update Terraform terraform-google-modules/project-factory/google to v17 ([#2109](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2109)) ([3073b04](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/3073b048cb79524aeaaf46ff2835b79a6f7b7f23))
30+
* fix typo in kube-dns-upstream-nameservers configmap ([#2149](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2149)) ([843c56c](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/843c56cef4157a3bcc281a8bd08021baa733dae1))
31+
* **node_pools:** Update Variants: Add recreate for `secondary_boot_disk` and `local_ssd_ephemeral_count` (beta) ([#2139](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2139)) ([66231d5](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/66231d5ad91e282e750b4c9c3b398ab97aa8c147))
32+
* remove dns from autopilot ([#2152](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2152)) ([2e645cd](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2e645cd4248b1a3663fde9f9fea4372f408e7b36))
33+
* remove unnecessary lookup for safer_cluster nodepool ID ([#2160](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2160)) ([179a8ec](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/179a8ecd241690215253ec860ca041b7b3781e9e))
34+
* send provider enum values for `insecureKubeletReadonlyPortEnabled` ([#2145](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2145)) ([922ab1d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/922ab1daa32b97325b8c62a19f0b24ee71e189e5))
35+
* update resource names to snake_case ([#2151](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2151)) ([375d27c](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/375d27cffddb1af851462c2b3a773a25e4dd40ac))
36+
937
## [33.1.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.0.4...v33.1.0) (2024-10-09)
1038

1139

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,10 @@ resource "google_container_cluster" "primary" {
324324
disabled = !var.horizontal_pod_autoscaling
325325
}
326326

327+
gcp_filestore_csi_driver_config {
328+
enabled = var.filestore_csi_driver
329+
}
330+
327331
{% if autopilot_cluster != true %}
328332
network_policy_config {
329333
disabled = !var.network_policy
@@ -333,10 +337,6 @@ resource "google_container_cluster" "primary" {
333337
enabled = var.dns_cache
334338
}
335339

336-
gcp_filestore_csi_driver_config {
337-
enabled = var.filestore_csi_driver
338-
}
339-
340340
dynamic "gce_persistent_disk_csi_driver_config" {
341341
for_each = local.cluster_gce_pd_csi_config
342342

‎autogen/main/variables.tf.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,12 @@ variable "enable_tpu" {
696696
default = false
697697
}
698698

699+
variable "filestore_csi_driver" {
700+
type = bool
701+
description = "The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes"
702+
default = false
703+
}
704+
699705
{% if autopilot_cluster != true %}
700706
variable "network_policy" {
701707
type = bool
@@ -721,12 +727,6 @@ variable "remove_default_node_pool" {
721727
default = false
722728
}
723729

724-
variable "filestore_csi_driver" {
725-
type = bool
726-
description = "The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes"
727-
default = false
728-
}
729-
730730
variable "disable_legacy_metadata_endpoints" {
731731
type = bool
732732
description = "Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated."

‎autogen/main/versions.tf.tmpl‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,17 @@ terraform {
4040
}
4141
}
4242
provider_meta "google-beta" {
43-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.1.0"
43+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
4444
}
4545
{% elif beta_cluster and autopilot_cluster %}
4646
required_providers {
4747
google = {
4848
source = "hashicorp/google"
49-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
50-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
49+
version = ">= 6.5.0, < 7"
5150
}
5251
google-beta = {
5352
source = "hashicorp/google-beta"
54-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
55-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
53+
version = ">= 6.5.0, < 7"
5654
}
5755
kubernetes = {
5856
source = "hashicorp/kubernetes"
@@ -64,14 +62,13 @@ terraform {
6462
}
6563
}
6664
provider_meta "google-beta" {
67-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.1.0"
65+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
6866
}
6967
{% elif autopilot_cluster %}
7068
required_providers {
7169
google = {
7270
source = "hashicorp/google"
73-
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
74-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, != 6.3.0, < 7"
71+
version = ">= 6.5.0, < 7"
7572
}
7673
kubernetes = {
7774
source = "hashicorp/kubernetes"
@@ -83,7 +80,7 @@ terraform {
8380
}
8481
}
8582
provider_meta "google" {
86-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.1.0"
83+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
8784
}
8885
{% else %}
8986
required_providers {
@@ -101,7 +98,7 @@ terraform {
10198
}
10299
}
103100
provider_meta "google" {
104-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.1.0"
101+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
105102
}
106103
{% endif %}
107104
}

‎autogen/safer-cluster/versions.tf.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ terraform {
2323
required_version = ">=1.3"
2424

2525
provider_meta "google-beta" {
26-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.1.0"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v34.0.0"
2727
}
2828
}

‎cluster.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@ resource "google_container_cluster" "primary" {
239239
disabled = !var.horizontal_pod_autoscaling
240240
}
241241

242+
gcp_filestore_csi_driver_config {
243+
enabled = var.filestore_csi_driver
244+
}
245+
242246
network_policy_config {
243247
disabled = !var.network_policy
244248
}
@@ -247,10 +251,6 @@ resource "google_container_cluster" "primary" {
247251
enabled = var.dns_cache
248252
}
249253

250-
gcp_filestore_csi_driver_config {
251-
enabled = var.filestore_csi_driver
252-
}
253-
254254
dynamic "gce_persistent_disk_csi_driver_config" {
255255
for_each = local.cluster_gce_pd_csi_config
256256

‎modules/acm/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v33.1.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0"
2323
}
2424

2525
provider_meta "google-beta" {
26-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v33.1.0"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v34.0.0"
2727
}
2828

2929
required_providers {

‎modules/asm/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ terraform {
3636
}
3737

3838
provider_meta "google" {
39-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v33.1.0"
39+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v34.0.0"
4040
}
4141

4242
provider_meta "google-beta" {
43-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v33.1.0"
43+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v34.0.0"
4444
}
4545
}

‎modules/auth/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ terraform {
2626
}
2727

2828
provider_meta "google" {
29-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v33.1.0"
29+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v34.0.0"
3030
}
3131
}

‎modules/beta-autopilot-private-cluster/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Then perform the following commands on the root folder:
102102
| enable\_secret\_manager\_addon | (Beta) Enable the Secret Manager add-on for this cluster | `bool` | `false` | no |
103103
| enable\_tpu | Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive! | `bool` | `false` | no |
104104
| enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | `bool` | `true` | no |
105+
| filestore\_csi\_driver | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
105106
| firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers. Either flag `add_master_webhook_firewall_rules` or `add_cluster_firewall_rules` (also adds egress rules) must be set to `true` for inbound-ports firewall rules to be applied. | `list(string)` | <pre>[<br> "8443",<br> "9443",<br> "15017"<br>]</pre> | no |
106107
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
107108
| fleet\_project | (Optional) Register the cluster with the fleet in this project. | `string` | `null` | no |

0 commit comments

Comments
 (0)