Skip to content

Commit e5e0dea

Browse files
apeabodyapeabody
authored
Merge branch 'master' into filestore_autopilot
2 parents bf032c6 + ef6c1ba commit e5e0dea

File tree

54 files changed

+124
-259
lines changed

Some content is hidden

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

54 files changed

+124
-259
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ locals {
753753
resource "random_id" "name" {
754754
for_each = merge(local.node_pools, local.windows_node_pools)
755755
byte_length = 2
756-
prefix = format("%s-", lookup(each.value, "name"))
756+
prefix = "${each.key}-"
757757
keepers = merge(
758758
zipmap(
759759
local.force_node_pool_recreation_resources,

‎autogen/main/dns.tf.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
{{ autogeneration_note }}
1818

19+
{% if autopilot_cluster != true %}
1920
/******************************************
2021
Manage kube-dns configmaps
2122
*****************************************/
@@ -95,3 +96,4 @@ EOF
9596
{% endif %}
9697
]
9798
}
99+
{% endif %}

‎autogen/main/main.tf.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ locals {
7878
{% endif %}
7979

8080

81+
{% if autopilot_cluster != true %}
8182
custom_kube_dns_config = length(keys(var.stub_domains)) > 0
8283
upstream_nameservers_config = length(var.upstream_nameservers) > 0
84+
{% endif %}
8385
network_project_id = var.network_project_id != "" ? var.network_project_id : var.project_id
8486
zone_count = length(var.zones)
8587
cluster_type = var.regional ? "regional" : "zonal"

‎autogen/main/moved.tf.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
{% if autopilot_cluster != true %}
1718
# Updates for kebab to snake case, to match best practices and Google style.
1819
moved {
1920
from = kubernetes_config_map_v1_data.kube-dns
@@ -30,6 +31,7 @@ moved {
3031
from = kubernetes_config_map_v1_data.kube-dns-upstream-nameservers-and-stub-domains
3132
to = kubernetes_config_map_v1_data.kube_dns_upstream_nameservers_and_stub_domains
3233
}
34+
{% endif %}
3335

3436
moved {
3537
from = kubernetes_config_map.ip-masq-agent

‎autogen/main/variables.tf.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ variable "network_tags" {
357357
default = []
358358
}
359359

360+
{% if autopilot_cluster != true %}
360361
variable "stub_domains" {
361362
type = map(list(string))
362363
description = "Map of stub domains and their resolvers to forward DNS queries for a certain domain to an external DNS server"
@@ -368,6 +369,7 @@ variable "upstream_nameservers" {
368369
description = "If specified, the values replace the nameservers taken by default from the node’s /etc/resolv.conf"
369370
default = []
370371
}
372+
{% endif %}
371373

372374
variable "non_masquerade_cidrs" {
373375
type = list(string)

‎autogen/main/versions.tf.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ 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 {
@@ -62,7 +62,7 @@ terraform {
6262
}
6363
}
6464
provider_meta "google-beta" {
65-
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"
6666
}
6767
{% elif autopilot_cluster %}
6868
required_providers {
@@ -80,7 +80,7 @@ terraform {
8080
}
8181
}
8282
provider_meta "google" {
83-
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"
8484
}
8585
{% else %}
8686
required_providers {
@@ -98,7 +98,7 @@ terraform {
9898
}
9999
}
100100
provider_meta "google" {
101-
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"
102102
}
103103
{% endif %}
104104
}

‎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
}

‎examples/autopilot_private_firewalls/network.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ module "gcp-network" {
2323

2424
subnets = [
2525
{
26-
subnet_name = local.subnet_name
27-
subnet_ip = "10.0.0.0/17"
28-
subnet_region = var.region
26+
subnet_name = local.subnet_name
27+
subnet_ip = "10.0.0.0/17"
28+
subnet_region = var.region
29+
subnet_private_access = true
2930
},
3031
{
3132
subnet_name = local.master_auth_subnetwork

‎examples/safer_cluster_iap_bastion/bastion.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ locals {
2121

2222
module "bastion" {
2323
source = "terraform-google-modules/bastion-host/google"
24-
version = "~> 7.0"
24+
version = "~> 8.0"
2525

2626
network = module.vpc.network_self_link
2727
subnet = module.vpc.subnets_self_links[0]

0 commit comments

Comments
 (0)