-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat!: Add support for disk_size and disk_type for cluster_autoscalin…
…g. (#1693) Co-authored-by: Bharath KKB <[email protected]>
- Loading branch information
1 parent
f077184
commit fd233e5
Showing
40 changed files
with
167 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,10 +12,14 @@ Sub modules are provided for creating private clusters, beta private clusters, a | |
|
||
## Compatibility | ||
|
||
This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+. | ||
If you find incompatibilities using Terraform `>=0.13`, please open an issue. | ||
This module is meant for use with Terraform 1.3+ and tested using Terraform 1.0+. | ||
If you find incompatibilities using Terraform `>=1.3`, please open an issue. | ||
|
||
If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform | ||
If you haven't [upgraded to 1.3][terraform-1.3-upgrade] and need a Terraform | ||
0.13.x-compatible version of this module, the last released version | ||
intended for Terraform 0.13.x is [27.0.0]. | ||
|
||
If you haven't [upgraded to 0.13][terraform-0.13-upgrade] and need a Terraform | ||
0.12.x-compatible version of this module, the last released version | ||
intended for Terraform 0.12.x is [12.3.0]. | ||
|
||
|
@@ -131,7 +135,7 @@ Then perform the following commands on the root folder: | |
| add\_master\_webhook\_firewall\_rules | Create master\_webhook firewall rules for ports defined in `firewall_inbound_ports` | `bool` | `false` | no | | ||
| add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | ||
| 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 [email protected] | `string` | `null` | no | | ||
| 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> })</pre> | <pre>{<br> "auto_repair": true,<br> "auto_upgrade": true,<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 | | ||
| 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 | | ||
| cluster\_dns\_domain | The suffix used for all cluster service records. | `string` | `""` | no | | ||
| cluster\_dns\_provider | Which in-cluster DNS provider should be used. PROVIDER\_UNSPECIFIED (default) or PLATFORM\_DEFAULT or CLOUD\_DNS. | `string` | `"PROVIDER_UNSPECIFIED"` | no | | ||
| 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 | | ||
|
@@ -317,7 +321,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog | |
#### Kubectl | ||
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x | ||
#### Terraform and Plugins | ||
- [Terraform](https://www.terraform.io/downloads.html) 0.13+ | ||
- [Terraform](https://www.terraform.io/downloads.html) 1.3+ | ||
- [Terraform Provider for GCP][terraform-provider-google] v4.51 | ||
#### gcloud | ||
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. | ||
|
@@ -346,3 +350,4 @@ In order to operate with the Service Account you must activate the following API | |
[terraform-provider-google]: https://github.com/terraform-providers/terraform-provider-google | ||
[12.3.0]: https://registry.terraform.io/modules/terraform-google-modules/kubernetes-engine/google/12.3.0 | ||
[terraform-0.13-upgrade]: https://www.terraform.io/upgrade-guides/0-13.html | ||
[terraform-1.3-upgrade]: https://developer.hashicorp.com/terraform/language/v1.3.x/upgrade-guides |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ | |
|
||
|
||
terraform { | ||
required_version = ">=0.13" | ||
required_version = ">=1.3" | ||
|
||
required_providers { | ||
google = { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ | |
|
||
|
||
terraform { | ||
required_version = ">=0.13" | ||
required_version = ">=1.3" | ||
|
||
required_providers { | ||
google = { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,10 +37,14 @@ The implications of this are that: | |
|
||
## Compatibility | ||
|
||
This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+. | ||
If you find incompatibilities using Terraform `>=0.13`, please open an issue. | ||
This module is meant for use with Terraform 1.3+ and tested using Terraform 1.0+. | ||
If you find incompatibilities using Terraform `>=1.3`, please open an issue. | ||
|
||
If you haven't [upgraded][terraform-0.13-upgrade] and need a Terraform | ||
If you haven't [upgraded to 1.3][terraform-1.3-upgrade] and need a Terraform | ||
0.13.x-compatible version of this module, the last released version | ||
intended for Terraform 0.13.x is [27.0.0]. | ||
|
||
If you haven't [upgraded to 0.13][terraform-0.13-upgrade] and need a Terraform | ||
0.12.x-compatible version of this module, the last released version | ||
intended for Terraform 0.12.x is [12.3.0]. | ||
|
||
|
@@ -165,7 +169,7 @@ Then perform the following commands on the root folder: | |
| 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 [email protected] | `string` | `null` | no | | ||
| cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no | | ||
| cloudrun\_load\_balancer\_type | (Beta) Configure the Cloud Run load balancer type. External by default. Set to `LOAD_BALANCER_TYPE_INTERNAL` to configure as an internal load balancer. | `string` | `""` | no | | ||
| 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> })</pre> | <pre>{<br> "auto_repair": true,<br> "auto_upgrade": true,<br> "autoscaling_profile": "BALANCED",<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 | | ||
| 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 | | ||
| cluster\_dns\_domain | The suffix used for all cluster service records. | `string` | `""` | no | | ||
| cluster\_dns\_provider | Which in-cluster DNS provider should be used. PROVIDER\_UNSPECIFIED (default) or PLATFORM\_DEFAULT or CLOUD\_DNS. | `string` | `"PROVIDER_UNSPECIFIED"` | no | | ||
| 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 | | ||
|
@@ -387,7 +391,7 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog | |
#### Kubectl | ||
- [kubectl](https://github.com/kubernetes/kubernetes/releases) 1.9.x | ||
#### Terraform and Plugins | ||
- [Terraform](https://www.terraform.io/downloads.html) 0.13+ | ||
- [Terraform](https://www.terraform.io/downloads.html) 1.3+ | ||
- [Terraform Provider for GCP Beta][terraform-provider-google-beta] v4.51 | ||
#### gcloud | ||
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. | ||
|
@@ -416,3 +420,4 @@ In order to operate with the Service Account you must activate the following API | |
[terraform-provider-google-beta]: https://github.com/terraform-providers/terraform-provider-google-beta | ||
[12.3.0]: https://registry.terraform.io/modules/terraform-google-modules/kubernetes-engine/google/12.3.0 | ||
[terraform-0.13-upgrade]: https://www.terraform.io/upgrade-guides/0-13.html | ||
[terraform-1.3-upgrade]: https://developer.hashicorp.com/terraform/language/v1.3.x/upgrade-guides |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.