Skip to content

Commit c80e88f

Browse files
DrFaust92DrFaust92
authored
feat(TPG>=6.38)!: bump hpa_profile to GA (#2362)
Signed-off-by: drfaust92 <[email protected]>
1 parent 552b3f4 commit c80e88f

File tree

35 files changed

+90
-37
lines changed

35 files changed

+90
-37
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ Then perform the following commands on the root folder:
196196
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
197197
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
198198
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
199+
| hpa\_profile | Enable the Horizontal Pod Autoscaling profile for this cluster. Values are "NONE" and "PERFORMANCE". | `string` | `""` | no |
199200
| http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |
200201
| identity\_namespace | The workload pool to attach all Kubernetes service accounts to. (Default value of `enabled` automatically sets project-based pool `[project_id].svc.id.goog`) | `string` | `"enabled"` | no |
201202
| initial\_node\_count | The number of nodes to create in this cluster's default node pool. | `number` | `0` | no |
@@ -418,7 +419,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
418419
#### Terraform and Plugins
419420

420421
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
421-
- [Terraform Provider for GCP][terraform-provider-google] v6.36+
422+
- [Terraform Provider for GCP][terraform-provider-google] v6.38+
422423

423424
#### gcloud
424425

‎autogen/main/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
307307

308308
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
309309
{% if beta_cluster %}
310-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.36+
310+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
311311
{% else %}
312-
- [Terraform Provider for GCP][terraform-provider-google] v6.36+
312+
- [Terraform Provider for GCP][terraform-provider-google] v6.38+
313313
{% endif %}
314314

315315
#### gcloud

‎autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,12 @@ resource "google_container_cluster" "primary" {
262262
}
263263
}
264264

265-
{% if beta_cluster %}
266265
dynamic "pod_autoscaling" {
267266
for_each = length(var.hpa_profile) > 0 ? [1] : []
268267
content {
269268
hpa_profile = var.hpa_profile
270269
}
271270
}
272-
{% endif %}
273271

274272
dynamic "enterprise_config" {
275273
for_each = var.enterprise_config != null ? [1] : []

‎autogen/main/variables.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,13 +647,11 @@ variable "enable_confidential_nodes" {
647647
default = false
648648
}
649649

650-
{% if beta_cluster %}
651650
variable "hpa_profile" {
652651
description = "Enable the Horizontal Pod Autoscaling profile for this cluster. Values are \"NONE\" and \"PERFORMANCE\"."
653652
type = string
654653
default = ""
655654
}
656-
{% endif %}
657655
{% if autopilot_cluster != true %}
658656

659657
variable "enable_gcfs" {

‎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.36.0, < 7"
27+
version = ">= 6.38.0, < 7"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 6.36.0, < 7"
31+
version = ">= 6.38.0, < 7"
3232
}
3333
{% elif beta_cluster and autopilot_cluster %}
3434
required_providers {
3535
google = {
3636
source = "hashicorp/google"
37-
version = ">= 6.36.0, < 7"
37+
version = ">= 6.38.0, < 7"
3838
}
3939
google-beta = {
4040
source = "hashicorp/google-beta"
41-
version = ">= 6.36.0, < 7"
41+
version = ">= 6.38.0, < 7"
4242
}
4343
{% elif autopilot_cluster %}
4444
required_providers {
4545
google = {
4646
source = "hashicorp/google"
47-
version = ">= 6.36.0, < 7"
47+
version = ">= 6.38.0, < 7"
4848
}
4949
{% else %}
5050
required_providers {
5151
google = {
5252
source = "hashicorp/google"
53-
version = ">= 6.36.0, < 7"
53+
version = ">= 6.38.0, < 7"
5454
}
5555
{% endif %}
5656
kubernetes = {

‎cluster.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@ resource "google_container_cluster" "primary" {
201201
}
202202
}
203203

204+
dynamic "pod_autoscaling" {
205+
for_each = length(var.hpa_profile) > 0 ? [1] : []
206+
content {
207+
hpa_profile = var.hpa_profile
208+
}
209+
}
204210

205211
dynamic "enterprise_config" {
206212
for_each = var.enterprise_config != null ? [1] : []

‎docs/upgrading_to_v37.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
The v37.0 release of *kubernetes-engine* is a backwards incompatible release.
33

44
### Google Cloud Platform Provider upgrade
5-
The Terraform Kubernetes Engine Module now requires version 6.36 or higher of the Google Cloud Platform Providers.
5+
The Terraform Kubernetes Engine Module now requires version 6.38 or higher of the Google Cloud Platform Providers.
66

77
### Private Cluster DNS Allow External Traffic
88
DNS allow external traffic is now controlled solely by `dns_allow_external_traffic` for private clusters.

‎metadata.display.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ spec:
195195
horizontal_pod_autoscaling:
196196
name: horizontal_pod_autoscaling
197197
title: Horizontal Pod Autoscaling
198+
hpa_profile:
199+
name: hpa_profile
200+
title: Hpa Profile
198201
http_load_balancing:
199202
name: http_load_balancing
200203
title: Http Load Balancing

‎metadata.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,10 @@ spec:
522522
description: An optional flag to enable confidential node config.
523523
varType: bool
524524
defaultValue: false
525+
- name: hpa_profile
526+
description: Enable the Horizontal Pod Autoscaling profile for this cluster. Values are "NONE" and "PERFORMANCE".
527+
varType: string
528+
defaultValue: ""
525529
- name: enable_gcfs
526530
description: Enable image streaming on cluster level.
527531
varType: bool

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

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

230230
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
231-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.36+
231+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v6.38+
232232

233233
#### gcloud
234234

0 commit comments

Comments
 (0)