Skip to content

Commit 495623e

Browse files
florianmutterflorianmutter
authored
feat(TPG>=5.9)!: cluster autoscaling profile is GA (terraform-google-modules#1839)
1 parent 699fdb1 commit 495623e

File tree

28 files changed

+101
-98
lines changed

28 files changed

+101
-98
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Then perform the following commands on the root folder:
137137
| add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no |
138138
| additional\_ip\_range\_pods | List of _names_ of the additional secondary subnet ip ranges to use for pods | `list(string)` | `[]` | no |
139139
| authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no |
140-
| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | <pre>object({<br> enabled = bool<br> min_cpu_cores = number<br> max_cpu_cores = number<br> min_memory_gb = number<br> max_memory_gb = number<br> gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))<br> auto_repair = bool<br> auto_upgrade = bool<br> disk_size = optional(number)<br> disk_type = optional(string)<br> })</pre> | <pre>{<br> "auto_repair": true,<br> "auto_upgrade": true,<br> "disk_size": 100,<br> "disk_type": "pd-standard",<br> "enabled": false,<br> "gpu_resources": [],<br> "max_cpu_cores": 0,<br> "max_memory_gb": 0,<br> "min_cpu_cores": 0,<br> "min_memory_gb": 0<br>}</pre> | no |
140+
| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | <pre>object({<br> enabled = bool<br> autoscaling_profile = string<br> min_cpu_cores = number<br> max_cpu_cores = number<br> min_memory_gb = number<br> max_memory_gb = number<br> gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))<br> auto_repair = bool<br> auto_upgrade = bool<br> disk_size = optional(number)<br> disk_type = optional(string)<br> })</pre> | <pre>{<br> "auto_repair": true,<br> "auto_upgrade": true,<br> "autoscaling_profile": "BALANCED",<br> "disk_size": 100,<br> "disk_type": "pd-standard",<br> "enabled": false,<br> "gpu_resources": [],<br> "max_cpu_cores": 0,<br> "max_memory_gb": 0,<br> "min_cpu_cores": 0,<br> "min_memory_gb": 0<br>}</pre> | no |
141141
| cluster\_dns\_domain | The suffix used for all cluster service records. | `string` | `""` | no |
142142
| cluster\_dns\_provider | Which in-cluster DNS provider should be used. PROVIDER\_UNSPECIFIED (default) or PLATFORM\_DEFAULT or CLOUD\_DNS. | `string` | `"PROVIDER_UNSPECIFIED"` | no |
143143
| cluster\_dns\_scope | The scope of access to cluster DNS records. DNS\_SCOPE\_UNSPECIFIED (default) or CLUSTER\_SCOPE or VPC\_SCOPE. | `string` | `"DNS_SCOPE_UNSPECIFIED"` | no |
@@ -335,7 +335,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
335335
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
336336
#### Terraform and Plugins
337337
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
338-
- [Terraform Provider for GCP][terraform-provider-google] v5
338+
- [Terraform Provider for GCP][terraform-provider-google] v5.9+
339339
#### gcloud
340340
Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
341341
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.

‎autogen/main/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
272272
#### Terraform and Plugins
273273
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
274274
{% if beta_cluster %}
275-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5
275+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5.9+
276276
{% else %}
277-
- [Terraform Provider for GCP][terraform-provider-google] v5
277+
- [Terraform Provider for GCP][terraform-provider-google] v5.9+
278278
{% endif %}
279279
#### gcloud
280280
Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,7 @@ resource "google_container_cluster" "primary" {
153153
{% endif %}
154154
}
155155
}
156-
{% if beta_cluster %}
157156
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"
158-
{% endif %}
159157
dynamic "resource_limits" {
160158
for_each = local.autoscaling_resource_limits
161159
content {

‎autogen/main/variables.tf.tmpl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ variable "enable_resource_consumption_export" {
245245
variable "cluster_autoscaling" {
246246
type = object({
247247
enabled = bool
248-
{% if beta_cluster %}
249248
autoscaling_profile = string
250-
{% endif %}
251249
min_cpu_cores = number
252250
max_cpu_cores = number
253251
min_memory_gb = number
@@ -260,9 +258,7 @@ variable "cluster_autoscaling" {
260258
})
261259
default = {
262260
enabled = false
263-
{% if beta_cluster %}
264261
autoscaling_profile = "BALANCED"
265-
{% endif %}
266262
max_cpu_cores = 0
267263
min_cpu_cores = 0
268264
max_memory_gb = 0

‎autogen/main/versions.tf.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 5.0.0, < 6"
27+
version = ">= 5.9.0, < 6"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 5.0.0, < 6"
31+
version = ">= 5.9.0, < 6"
3232
}
3333
kubernetes = {
3434
source = "hashicorp/kubernetes"
@@ -46,7 +46,7 @@ terraform {
4646
required_providers {
4747
google = {
4848
source = "hashicorp/google"
49-
version = ">= 5.0.0, < 6"
49+
version = ">= 5.9.0, < 6"
5050
}
5151
kubernetes = {
5252
source = "hashicorp/kubernetes"

‎cluster.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ resource "google_container_cluster" "primary" {
115115

116116
}
117117
}
118+
autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED"
118119
dynamic "resource_limits" {
119120
for_each = local.autoscaling_resource_limits
120121
content {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
197197
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
198198
#### Terraform and Plugins
199199
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
200-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5
200+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5.9+
201201
#### gcloud
202202
Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
203203
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.

‎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 = ">= 5.0.0, < 6"
24+
version = ">= 5.9.0, < 6"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.0.0, < 6"
28+
version = ">= 5.9.0, < 6"
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
@@ -184,7 +184,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
184184
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x
185185
#### Terraform and Plugins
186186
- [Terraform](https://www.terraform.io/downloads.html) 1.3+
187-
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5
187+
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v5.9+
188188
#### gcloud
189189
Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
190190
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.

‎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 = ">= 5.0.0, < 6"
24+
version = ">= 5.9.0, < 6"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 5.0.0, < 6"
28+
version = ">= 5.9.0, < 6"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

0 commit comments

Comments
 (0)