Skip to content

Commit b44e3d6

Browse files
authored
Merge branch 'master' into filestore_autopilot
2 parents 21bc0f1 + 745b16a commit b44e3d6

File tree

46 files changed

+69
-50
lines changed

Some content is hidden

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

46 files changed

+69
-50
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@ 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.1.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.0.4...v33.1.0) (2024-10-09)
10+
11+
12+
### Features
13+
14+
* add a flag to allow access through Google Cloud public IP addresses ([#2078](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2078)) ([2f412bb](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/2f412bb54ed0e576af6fbeeac33382a384fe4dc0))
15+
* added confidential-nodes flag for node-pools ([#2110](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2110)) ([b2a597b](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/b2a597b8a7f7fded526a8000940efaea852437bc))
16+
* enable L4 ILB subsetting support for safer clusters ([#2105](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2105)) ([0733908](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/073390897e38310124646e56a39c305809fbded4))
17+
18+
19+
### Bug Fixes
20+
21+
* **acm:** correct membership location ([#2128](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2128)) ([7cf9894](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/7cf9894f40e76ad8bc787fbcfa9d06f1e658f855))
22+
* **acm:** use membership registration location ([#2123](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2123)) ([caa194f](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/caa194fd73720dd5ffea1ac36817a4601a700735))
23+
* allow changing `enable_identity_service` value in place ([#2132](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2132)) ([9c2191e](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/9c2191eca6582f9f2be3fe941afdf26eb03d78e4))
24+
* allow null `enable_gcfs` setting in defined nodepools ([#2111](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2111)) ([700a01d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/700a01d56f063d2aeec97c30cd03abdfbf1ca312))
25+
* **autopilot:** narrow version exclusion ([#2112](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2112)) ([620bf32](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/620bf32e877201af5a7e575af61b9590431991ef))
26+
* ignore control plane network when private endpoint subnet is set ([#2122](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/2122)) ([a4b130d](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/a4b130d2bba7db0caa9a2339f016d9d880fbac9a))
27+
928
## [33.0.4](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v33.0.3...v33.0.4) (2024-09-18)
1029

1130

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Then perform the following commands on the root folder:
166166
| enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
167167
| enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
168168
| enable\_default\_node\_pools\_metadata | Whether to enable the default node pools metadata key-value pairs such as `cluster_name` and `node_pool` | `bool` | `true` | no |
169-
| enable\_identity\_service | Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
169+
| enable\_identity\_service | (Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API. | `bool` | `false` | no |
170170
| enable\_intranode\_visibility | Whether Intra-node visibility is enabled for this cluster. This makes same node pod to pod traffic visible for VPC network | `bool` | `false` | no |
171171
| enable\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `bool` | `false` | no |
172172
| enable\_l4\_ilb\_subsetting | Enable L4 ILB Subsetting on the cluster | `bool` | `false` | no |

autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ resource "google_container_cluster" "primary" {
219219
{% if autopilot_cluster != true %}
220220

221221
dynamic "identity_service_config" {
222-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
222+
for_each = var.enable_identity_service !=null ? [var.enable_identity_service] : []
223223
content {
224224
enabled = identity_service_config.value
225225
}

autogen/main/variables.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ variable "enable_gcfs" {
960960
{% if autopilot_cluster != true %}
961961
variable "enable_identity_service" {
962962
type = bool
963-
description = "Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
963+
description = "(Optional) Enable the Identity Service component, which allows customers to use external identity providers with the K8S API."
964964
default = false
965965
}
966966
{% endif %}

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

cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ resource "google_container_cluster" "primary" {
174174
}
175175

176176
dynamic "identity_service_config" {
177-
for_each = var.enable_identity_service ? [var.enable_identity_service] : []
177+
for_each = var.enable_identity_service != null ? [var.enable_identity_service] : []
178178
content {
179179
enabled = identity_service_config.value
180180
}

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

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

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

0 commit comments

Comments
 (0)