Skip to content

Commit 58f8032

Browse files
apeabodyapeabody
authored
Merge branch 'main' into feature/enable_k8s_beta_apis
2 parents 57649ff + e5ade9c commit 58f8032

File tree

28 files changed

+70
-47
lines changed

28 files changed

+70
-47
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ The node_pools variable takes the following parameters:
365365
| strategy | The upgrade stragey to be used for upgrading the nodes. Valid values of state are: `SURGE`, `BLUE_GREEN`, or for flex-start and queued provisioning `SHORT_LIVED` | "SURGE" | Optional |
366366
| threads_per_core | Optional The number of threads per physical core. To disable simultaneous multithreading (SMT) set this to 1. If unset, the maximum number of threads supported per core by the underlying processor is assumed | null | Optional |
367367
| enable_nested_virtualization | Whether the node should have nested virtualization | null | Optional |
368+
| performance_monitoring_unit | Level of Performance Monitoring Unit (PMU) requested. If unset, no access to the PMU is assumed. Values values are: `ARCHITECTURAL`, `STANDARD`, and `ENHANCED` | null | Optional |
368369
| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. Only works with `SURGE` strategy. | 1 | Optional |
369370
| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. Only works with `SURGE` strategy. | 0 | Optional |
370371
| node_pool_soak_duration | Time needed after draining the entire blue pool. After this period, the blue pool will be cleaned up. By default, it is set to one hour (3600 seconds). The maximum length of the soak time is 7 days (604,800 seconds). Only works with `BLUE_GREEN` strategy. | "3600s" | Optional |
@@ -430,7 +431,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
430431
#### Terraform and Plugins
431432

432433
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
433-
- [Terraform Provider for GCP][terraform-provider-google] v6.38+
434+
- [Terraform Provider for GCP][terraform-provider-google] v6.41+
434435

435436
#### gcloud
436437

‎autogen/main/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ The node_pools variable takes the following parameters:
244244
| strategy | The upgrade stragey to be used for upgrading the nodes. Valid values of state are: `SURGE`, `BLUE_GREEN`, or for flex-start and queued provisioning `SHORT_LIVED` | "SURGE" | Optional |
245245
| threads_per_core | Optional The number of threads per physical core. To disable simultaneous multithreading (SMT) set this to 1. If unset, the maximum number of threads supported per core by the underlying processor is assumed | null | Optional |
246246
| enable_nested_virtualization | Whether the node should have nested virtualization | null | Optional |
247+
| performance_monitoring_unit | Level of Performance Monitoring Unit (PMU) requested. If unset, no access to the PMU is assumed. Values values are: `ARCHITECTURAL`, `STANDARD`, and `ENHANCED` | null | Optional |
247248
| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. Only works with `SURGE` strategy. | 1 | Optional |
248249
| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. Only works with `SURGE` strategy. | 0 | Optional |
249250
| node_pool_soak_duration | Time needed after draining the entire blue pool. After this period, the blue pool will be cleaned up. By default, it is set to one hour (3600 seconds). The maximum length of the soak time is 7 days (604,800 seconds). Only works with `BLUE_GREEN` strategy. | "3600s" | Optional |
@@ -316,9 +317,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
316317

317318
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
318319
{% if beta_cluster %}
319-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
320+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.41+
320321
{% else %}
321-
- [Terraform Provider for GCP][terraform-provider-google] v6.38+
322+
- [Terraform Provider for GCP][terraform-provider-google] v6.41+
322323
{% endif %}
323324

324325
#### gcloud

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,10 +1172,11 @@ resource "google_container_node_pool" "windows_pools" {
11721172
}
11731173

11741174
dynamic "advanced_machine_features" {
1175-
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) ? [1] : []
1175+
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
11761176
content {
11771177
threads_per_core = lookup(each.value, "threads_per_core", 0)
11781178
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
1179+
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
11791180
}
11801181
}
11811182

‎autogen/main/versions.tf.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 6.38.0, < 7"
27+
version = ">= 6.41.0, < 7"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 6.38.0, < 7"
31+
version = ">= 6.41.0, < 7"
3232
}
3333
{% elif beta_cluster and autopilot_cluster %}
3434
required_providers {
3535
google = {
3636
source = "hashicorp/google"
37-
version = ">= 6.38.0, < 7"
37+
version = ">= 6.41.0, < 7"
3838
}
3939
google-beta = {
4040
source = "hashicorp/google-beta"
41-
version = ">= 6.38.0, < 7"
41+
version = ">= 6.41.0, < 7"
4242
}
4343
{% elif autopilot_cluster %}
4444
required_providers {
4545
google = {
4646
source = "hashicorp/google"
47-
version = ">= 6.38.0, < 7"
47+
version = ">= 6.41.0, < 7"
4848
}
4949
{% else %}
5050
required_providers {
5151
google = {
5252
source = "hashicorp/google"
53-
version = ">= 6.38.0, < 7"
53+
version = ">= 6.41.0, < 7"
5454
}
5555
{% endif %}
5656
kubernetes = {

‎cluster.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,10 +870,11 @@ resource "google_container_node_pool" "pools" {
870870
}
871871

872872
dynamic "advanced_machine_features" {
873-
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) ? [1] : []
873+
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
874874
content {
875875
threads_per_core = lookup(each.value, "threads_per_core", 0)
876876
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
877+
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
877878
}
878879
}
879880

@@ -1233,10 +1234,11 @@ resource "google_container_node_pool" "windows_pools" {
12331234
}
12341235

12351236
dynamic "advanced_machine_features" {
1236-
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) ? [1] : []
1237+
for_each = lookup(each.value, "threads_per_core", 0) > 0 || lookup(each.value, "enable_nested_virtualization", false) || lookup(each.value, "performance_monitoring_unit", null) != null ? [1] : []
12371238
content {
12381239
threads_per_core = lookup(each.value, "threads_per_core", 0)
12391240
enable_nested_virtualization = lookup(each.value, "enable_nested_virtualization", null)
1241+
performance_monitoring_unit = lookup(each.value, "performance_monitoring_unit", null)
12401242
}
12411243
}
12421244

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
227227
#### Terraform and Plugins
228228

229229
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
230-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
230+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.41+
231231

232232
#### gcloud
233233

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.38.0, < 7"
24+
version = ">= 6.41.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.38.0, < 7"
28+
version = ">= 6.41.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
213213
#### Terraform and Plugins
214214

215215
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
216-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
216+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.41+
217217

218218
#### gcloud
219219

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 6.38.0, < 7"
24+
version = ">= 6.41.0, < 7"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 6.38.0, < 7"
28+
version = ">= 6.41.0, < 7"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-private-cluster-update-variant/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ The node_pools variable takes the following parameters:
419419
| strategy | The upgrade stragey to be used for upgrading the nodes. Valid values of state are: `SURGE`, `BLUE_GREEN`, or for flex-start and queued provisioning `SHORT_LIVED` | "SURGE" | Optional |
420420
| threads_per_core | Optional The number of threads per physical core. To disable simultaneous multithreading (SMT) set this to 1. If unset, the maximum number of threads supported per core by the underlying processor is assumed | null | Optional |
421421
| enable_nested_virtualization | Whether the node should have nested virtualization | null | Optional |
422+
| performance_monitoring_unit | Level of Performance Monitoring Unit (PMU) requested. If unset, no access to the PMU is assumed. Values values are: `ARCHITECTURAL`, `STANDARD`, and `ENHANCED` | null | Optional |
422423
| max_surge | The number of additional nodes that can be added to the node pool during an upgrade. Increasing max_surge raises the number of nodes that can be upgraded simultaneously. Can be set to 0 or greater. Only works with `SURGE` strategy. | 1 | Optional |
423424
| max_unavailable | The number of nodes that can be simultaneously unavailable during an upgrade. Increasing max_unavailable raises the number of nodes that can be upgraded in parallel. Can be set to 0 or greater. Only works with `SURGE` strategy. | 0 | Optional |
424425
| node_pool_soak_duration | Time needed after draining the entire blue pool. After this period, the blue pool will be cleaned up. By default, it is set to one hour (3600 seconds). The maximum length of the soak time is 7 days (604,800 seconds). Only works with `BLUE_GREEN` strategy. | "3600s" | Optional |
@@ -484,7 +485,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
484485
#### Terraform and Plugins
485486

486487
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
487-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
488+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.41+
488489

489490
#### gcloud
490491

0 commit comments

Comments
 (0)