Skip to content

Commit 30f2444

Browse files
bharathkkbbharathkkb
authored
Merge branch 'master' into feature/maintenance-exclusion
2 parents b52ac6a + b63471a commit 30f2444

File tree

44 files changed

+134
-35
lines changed

Some content is hidden

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

44 files changed

+134
-35
lines changed

‎CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@ 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+
## [21.2.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v21.1.0...v21.2.0) (2022-06-22)
10+
11+
12+
### Features
13+
14+
* Add keeper for `enable_secure_boot` nodepool option for update variant. ([#1277](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1277)) ([a8b6f20](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/a8b6f2001ac94a24f4e2c7b402e713e1173a999a))
15+
* Add maintenance variables for safer cluster ([#1282](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1282)) ([19f59c4](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/19f59c4d55e0761fac0e37103502c70b90536800))
16+
* expose timeouts ([6011c80](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/6011c80f139abeecccaeb157e0a93ab28ceb7aab))
17+
* Recurring maintenance window to GA ([#1262](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1262)) ([4bba52f](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/4bba52f53402b4a32bf744868fdefe2a82f08829))
18+
19+
20+
### Bug Fixes
21+
22+
* source node pools' auto_upgrade configuration from the GKE cluster ([#1293](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/1293)) ([c7c9f44](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/commit/c7c9f4448be74687ad43f4e1b080467ddc3ccaec))
23+
924
## [21.1.0](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/compare/v21.0.0...v21.1.0) (2022-05-24)
1025

1126

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ resource "google_container_node_pool" "pools" {
537537

538538
cluster = google_container_cluster.primary.name
539539

540-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
540+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
541541
each.value,
542542
"version",
543543
google_container_cluster.primary.min_master_version,

‎autogen/main/networks.tf renamed to ‎autogen/main/networks.tf.tmpl

File renamed without changes.

‎autogen/main/versions.tf.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ terraform {
3232
}
3333
}
3434
provider_meta "google-beta" {
35-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v21.1.0"
35+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v21.2.0"
3636
}
3737
{% else %}
3838
required_providers {
@@ -46,7 +46,7 @@ terraform {
4646
}
4747
}
4848
provider_meta "google" {
49-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v21.1.0"
49+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v21.2.0"
5050
}
5151
{% endif %}
5252
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ module "gke" {
7676
datapath_provider = var.datapath_provider
7777

7878
maintenance_start_time = var.maintenance_start_time
79+
maintenance_end_time = var.maintenance_end_time
80+
maintenance_recurrence = var.maintenance_recurrence
81+
maintenance_exclusions = var.maintenance_exclusions
7982

8083
// We suggest removing the default node pool, as it cannot be modified without
8184
// destroying the cluster.

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,24 @@ variable "maintenance_start_time" {
107107
default = "05:00"
108108
}
109109

110+
variable "maintenance_exclusions" {
111+
type = list(object({ name = string, start_time = string, end_time = string }))
112+
description = "List of maintenance exclusions. A cluster can have up to three"
113+
default = []
114+
}
115+
116+
variable "maintenance_end_time" {
117+
type = string
118+
description = "Time window specified for recurring maintenance operations in RFC3339 format"
119+
default = ""
120+
}
121+
122+
variable "maintenance_recurrence" {
123+
type = string
124+
description = "Frequency of the recurring maintenance window in RFC5545 format."
125+
default = ""
126+
}
127+
110128
variable "ip_range_pods" {
111129
type = string
112130
description = "The _name_ of the secondary subnet ip range to use for pods"

‎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 = ">=0.13"
2424

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

‎cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ resource "google_container_node_pool" "pools" {
266266

267267
cluster = google_container_cluster.primary.name
268268

269-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
269+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
270270
each.value,
271271
"version",
272272
google_container_cluster.primary.min_master_version,

‎modules/acm/creds.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ resource "time_sleep" "wait_acm" {
2525
count = (var.create_ssh_key == true || var.ssh_auth_key != null) ? 1 : 0
2626
depends_on = [google_gke_hub_feature_membership.main]
2727

28-
create_duration = "30s"
28+
create_duration = "60s"
2929
}
3030

3131
resource "kubernetes_secret_v1" "creds" {

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

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

2929
required_providers {

‎modules/asm/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ module "asm" {
3333
}
3434
```
3535

36+
Note that the [`mesh_id` label on the cluster](https://cloud.google.com/service-mesh/docs/managed/auto-control-plane-with-fleet#apply_the_mesh_id_label) is required for metrics to get displayed on the Anthos Service Mesh pages in the Cloud console (Topology, etc.). Illustrated with the full example mentioned above, here is an example of what your cluster should have:
37+
```tf
38+
module "gke" {
39+
...
40+
cluster_resource_labels = { "mesh_id" : "proj-${data.google_project.project.number}" }
41+
...
42+
}
43+
```
44+
3645
To deploy this config:
3746

3847
1. Run `terraform apply`

‎modules/asm/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ terraform {
2626
}
2727

2828
provider_meta "google" {
29-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v21.1.0"
29+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v21.2.0"
3030
}
3131

3232
provider_meta "google-beta" {
33-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v21.1.0"
33+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v21.2.0"
3434
}
3535
}

‎modules/auth/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v21.1.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:auth/v21.2.0"
2323
}
2424
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-private-cluster/v21.2.0"
3333
}
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-autopilot-public-cluster/v21.2.0"
3333
}
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ resource "google_container_node_pool" "pools" {
472472

473473
cluster = google_container_cluster.primary.name
474474

475-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
475+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
476476
each.value,
477477
"version",
478478
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v21.2.0"
3333
}
3434
}

‎modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ resource "google_container_node_pool" "pools" {
384384

385385
cluster = google_container_cluster.primary.name
386386

387-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
387+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
388388
each.value,
389389
"version",
390390
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v21.2.0"
3333
}
3434
}

‎modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ resource "google_container_node_pool" "pools" {
453453

454454
cluster = google_container_cluster.primary.name
455455

456-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
456+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
457457
each.value,
458458
"version",
459459
google_container_cluster.primary.min_master_version,

‎modules/beta-public-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v21.2.0"
3333
}
3434
}

‎modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ resource "google_container_node_pool" "pools" {
365365

366366
cluster = google_container_cluster.primary.name
367367

368-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
368+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
369369
each.value,
370370
"version",
371371
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google-beta" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v21.2.0"
3333
}
3434
}

‎modules/binary-authorization/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v21.1.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:binary-authorization/v21.2.0"
2323
}
2424
}

‎modules/fleet-membership/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v21.1.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v21.2.0"
2323
}
2424
}

‎modules/hub-legacy/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ terraform {
1919
required_version = ">= 0.13.0"
2020

2121
provider_meta "google" {
22-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v21.1.0"
22+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:hub/v21.2.0"
2323
}
2424
}

‎modules/private-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ resource "google_container_node_pool" "pools" {
366366

367367
cluster = google_container_cluster.primary.name
368368

369-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
369+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
370370
each.value,
371371
"version",
372372
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v21.2.0"
3333
}
3434
}

‎modules/private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ resource "google_container_node_pool" "pools" {
279279

280280
cluster = google_container_cluster.primary.name
281281

282-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
282+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
283283
each.value,
284284
"version",
285285
google_container_cluster.primary.min_master_version,

‎modules/private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ terraform {
2929
}
3030
}
3131
provider_meta "google" {
32-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v21.1.0"
32+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v21.2.0"
3333
}
3434
}

‎modules/safer-cluster-update-variant/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ For simplicity, we suggest using `roles/container.admin` and
234234
| istio\_auth | (Beta) The authentication type between services in Istio. | `string` | `"AUTH_MUTUAL_TLS"` | no |
235235
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. The module enforces certain minimum versions to ensure that specific features are available. | `string` | `null` | no |
236236
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | `string` | `"logging.googleapis.com/kubernetes"` | no |
237+
| maintenance\_end\_time | Time window specified for recurring maintenance operations in RFC3339 format | `string` | `""` | no |
238+
| maintenance\_exclusions | List of maintenance exclusions. A cluster can have up to three | `list(object({ name = string, start_time = string, end_time = string }))` | `[]` | no |
239+
| maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | `string` | `""` | no |
237240
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | `string` | `"05:00"` | no |
238241
| master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |
239242
| master\_ipv4\_cidr\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `"10.0.0.0/28"` | no |

‎modules/safer-cluster-update-variant/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ module "gke" {
7272
datapath_provider = var.datapath_provider
7373

7474
maintenance_start_time = var.maintenance_start_time
75+
maintenance_end_time = var.maintenance_end_time
76+
maintenance_recurrence = var.maintenance_recurrence
77+
maintenance_exclusions = var.maintenance_exclusions
7578

7679
// We suggest removing the default node pool, as it cannot be modified without
7780
// destroying the cluster.

‎modules/safer-cluster-update-variant/variables.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,24 @@ variable "maintenance_start_time" {
107107
default = "05:00"
108108
}
109109

110+
variable "maintenance_exclusions" {
111+
type = list(object({ name = string, start_time = string, end_time = string }))
112+
description = "List of maintenance exclusions. A cluster can have up to three"
113+
default = []
114+
}
115+
116+
variable "maintenance_end_time" {
117+
type = string
118+
description = "Time window specified for recurring maintenance operations in RFC3339 format"
119+
default = ""
120+
}
121+
122+
variable "maintenance_recurrence" {
123+
type = string
124+
description = "Frequency of the recurring maintenance window in RFC5545 format."
125+
default = ""
126+
}
127+
110128
variable "ip_range_pods" {
111129
type = string
112130
description = "The _name_ of the secondary subnet ip range to use for pods"

‎modules/safer-cluster-update-variant/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ terraform {
2121
required_version = ">=0.13"
2222

2323
provider_meta "google-beta" {
24-
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v21.1.0"
24+
module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v21.2.0"
2525
}
2626
}

‎modules/safer-cluster/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ For simplicity, we suggest using `roles/container.admin` and
234234
| istio\_auth | (Beta) The authentication type between services in Istio. | `string` | `"AUTH_MUTUAL_TLS"` | no |
235235
| kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. The module enforces certain minimum versions to ensure that specific features are available. | `string` | `null` | no |
236236
| logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | `string` | `"logging.googleapis.com/kubernetes"` | no |
237+
| maintenance\_end\_time | Time window specified for recurring maintenance operations in RFC3339 format | `string` | `""` | no |
238+
| maintenance\_exclusions | List of maintenance exclusions. A cluster can have up to three | `list(object({ name = string, start_time = string, end_time = string }))` | `[]` | no |
239+
| maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | `string` | `""` | no |
237240
| maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | `string` | `"05:00"` | no |
238241
| master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |
239242
| master\_ipv4\_cidr\_block | The IP range in CIDR notation to use for the hosted master network | `string` | `"10.0.0.0/28"` | no |

‎modules/safer-cluster/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ module "gke" {
7272
datapath_provider = var.datapath_provider
7373

7474
maintenance_start_time = var.maintenance_start_time
75+
maintenance_end_time = var.maintenance_end_time
76+
maintenance_recurrence = var.maintenance_recurrence
77+
maintenance_exclusions = var.maintenance_exclusions
7578

7679
// We suggest removing the default node pool, as it cannot be modified without
7780
// destroying the cluster.

0 commit comments

Comments
 (0)