Skip to content

Commit b5da085

Browse files
authored
Merge branch 'master' into wyardley/promote_node_config_defaults_ga
2 parents 87a2db2 + 303b85d commit b5da085

File tree

24 files changed

+42
-35
lines changed

24 files changed

+42
-35
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ 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+
## [33.0.4](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.0.3...v33.0.4) (2024-09-18)
10+
11+
12+
### Bug Fixes
13+
14+
* TPG < 6.2 for Autopilot ([#2101](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2101)) ([bff49e1](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/bff49e1964889d49c0e0b774b2c23220c116ac15))
15+
916
## [33.0.3](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.0.2...v33.0.3) (2024-09-13)
1017

1118

autogen/main/versions.tf.tmpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ 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.0.3"
43+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.4"
4444
}
4545
{% elif beta_cluster and autopilot_cluster %}
4646
required_providers {
4747
google = {
4848
source = "hashicorp/google"
4949
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
50-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
50+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
5151
}
5252
google-beta = {
5353
source = "hashicorp/google-beta"
5454
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
55-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
55+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
5656
}
5757
kubernetes = {
5858
source = "hashicorp/kubernetes"
@@ -64,14 +64,14 @@ terraform {
6464
}
6565
}
6666
provider_meta "google-beta" {
67-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.3"
67+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.4"
6868
}
6969
{% elif autopilot_cluster %}
7070
required_providers {
7171
google = {
7272
source = "hashicorp/google"
7373
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
74-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
74+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
7575
}
7676
kubernetes = {
7777
source = "hashicorp/kubernetes"
@@ -83,7 +83,7 @@ terraform {
8383
}
8484
}
8585
provider_meta "google" {
86-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.3"
86+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.4"
8787
}
8888
{% else %}
8989
required_providers {
@@ -101,7 +101,7 @@ terraform {
101101
}
102102
}
103103
provider_meta "google" {
104-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.3"
104+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.4"
105105
}
106106
{% endif %}
107107
}

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.0.3"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v33.0.4"
2727
}
2828
}

examples/simple_windows_node_pool/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module "gke" {
6363
autoscaling = false
6464
auto_upgrade = true
6565
node_count = 1
66-
machine_type = "n2-standard-2"
66+
machine_type = "n2-standard-4"
6767
image_type = "WINDOWS_LTSC_CONTAINERD"
6868
},
6969
]

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.0.3"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v33.0.4"
2323
}
2424

2525
provider_meta "google-beta" {
26-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v33.0.3"
26+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v33.0.4"
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.0.3"
39+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v33.0.4"
4040
}
4141

4242
provider_meta "google-beta" {
43-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v33.0.3"
43+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v33.0.4"
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.0.3"
29+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v33.0.4"
3030
}
3131
}

modules/beta-autopilot-private-cluster/versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ terraform {
2222
google = {
2323
source = "hashicorp/google"
2424
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
25+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
2626
}
2727
google-beta = {
2828
source = "hashicorp/google-beta"
2929
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
30+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
3131
}
3232
kubernetes = {
3333
source = "hashicorp/kubernetes"
@@ -39,6 +39,6 @@ terraform {
3939
}
4040
}
4141
provider_meta "google-beta" {
42-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v33.0.3"
42+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v33.0.4"
4343
}
4444
}

modules/beta-autopilot-public-cluster/versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ terraform {
2222
google = {
2323
source = "hashicorp/google"
2424
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
25-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
25+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
2626
}
2727
google-beta = {
2828
source = "hashicorp/google-beta"
2929
# Workaround for https://github.com/hashicorp/terraform-provider-google/issues/19428
30-
version = ">= 5.40.0, != 5.44.0, != 6.2.0, < 7"
30+
version = ">= 5.40.0, != 5.44.0, < 6.2.0, < 7"
3131
}
3232
kubernetes = {
3333
source = "hashicorp/kubernetes"
@@ -39,6 +39,6 @@ terraform {
3939
}
4040
}
4141
provider_meta "google-beta" {
42-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v33.0.3"
42+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v33.0.4"
4343
}
4444
}

modules/beta-private-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ terraform {
3737
}
3838
}
3939
provider_meta "google-beta" {
40-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v33.0.3"
40+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v33.0.4"
4141
}
4242
}

0 commit comments

Comments
 (0)