diff --git a/README.md b/README.md
index 89cd5a73cd..5004a03e6e 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ Then perform the following commands on the root folder:
| anonymous\_authentication\_config\_mode | Allows users to restrict or enable anonymous access to the cluster. Valid values are `ENABLED` and `LIMITED`. | `string` | `null` | 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 gke-security-groups@yourdomain.com | `string` | `null` | no |
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -160,7 +160,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| description | The description of the cluster | `string` | `""` | no |
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
index 4cfc009dc4..31cb87f37c 100644
--- a/autogen/main/cluster.tf.tmpl
+++ b/autogen/main/cluster.tf.tmpl
@@ -162,7 +162,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
index 71c1d701e3..65b399ee80 100644
--- a/autogen/main/variables.tf.tmpl
+++ b/autogen/main/variables.tf.tmpl
@@ -346,43 +346,45 @@ variable "enable_resource_consumption_export" {
{% if autopilot_cluster != true %}
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool,false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -886,13 +888,14 @@ variable "enable_shielded_nodes" {
}
{% endif %}
-
+{% if autopilot_cluster == true %}
variable "default_compute_class_enabled" {
type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
+ description = "Enable default compute class for Node Auto-Provisioning"
default = null
}
+{% endif %}
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/cluster.tf b/cluster.tf
index d0846115f9..00f98c308b 100644
--- a/cluster.tf
+++ b/cluster.tf
@@ -129,7 +129,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/metadata.yaml b/metadata.yaml
index f6cee8a9ba..d620798bfd 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -361,27 +361,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -389,6 +390,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -667,9 +669,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/beta-autopilot-private-cluster/README.md b/modules/beta-autopilot-private-cluster/README.md
index 59250e83a2..f141fd79df 100644
--- a/modules/beta-autopilot-private-cluster/README.md
+++ b/modules/beta-autopilot-private-cluster/README.md
@@ -86,7 +86,7 @@ Then perform the following commands on the root folder:
| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
+| default\_compute\_class\_enabled | Enable default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
| description | The description of the cluster | `string` | `""` | no |
diff --git a/modules/beta-autopilot-private-cluster/metadata.yaml b/modules/beta-autopilot-private-cluster/metadata.yaml
index 72d3bd5d0d..799b56abf6 100644
--- a/modules/beta-autopilot-private-cluster/metadata.yaml
+++ b/modules/beta-autopilot-private-cluster/metadata.yaml
@@ -453,7 +453,7 @@ spec:
- key_name: ""
state: DECRYPTED
- name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
+ description: Enable default compute class for Node Auto-Provisioning
varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
diff --git a/modules/beta-autopilot-private-cluster/variables.tf b/modules/beta-autopilot-private-cluster/variables.tf
index 8ce8cd68d4..94e4e3f06b 100644
--- a/modules/beta-autopilot-private-cluster/variables.tf
+++ b/modules/beta-autopilot-private-cluster/variables.tf
@@ -536,10 +536,9 @@ variable "database_encryption" {
}]
}
-
variable "default_compute_class_enabled" {
type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
+ description = "Enable default compute class for Node Auto-Provisioning"
default = null
}
diff --git a/modules/beta-autopilot-public-cluster/README.md b/modules/beta-autopilot-public-cluster/README.md
index b14e095451..6961d09a2a 100644
--- a/modules/beta-autopilot-public-cluster/README.md
+++ b/modules/beta-autopilot-public-cluster/README.md
@@ -80,7 +80,7 @@ Then perform the following commands on the root folder:
| cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | `map(string)` | `{}` | no |
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
+| default\_compute\_class\_enabled | Enable default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| description | The description of the cluster | `string` | `""` | no |
| disable\_default\_snat | Whether to disable the default SNAT to support the private use of public IP addresses | `bool` | `false` | no |
diff --git a/modules/beta-autopilot-public-cluster/metadata.yaml b/modules/beta-autopilot-public-cluster/metadata.yaml
index 113eb932b0..71c4948d01 100644
--- a/modules/beta-autopilot-public-cluster/metadata.yaml
+++ b/modules/beta-autopilot-public-cluster/metadata.yaml
@@ -431,7 +431,7 @@ spec:
- key_name: ""
state: DECRYPTED
- name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
+ description: Enable default compute class for Node Auto-Provisioning
varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
diff --git a/modules/beta-autopilot-public-cluster/variables.tf b/modules/beta-autopilot-public-cluster/variables.tf
index 40f230127b..8749d1eb0d 100644
--- a/modules/beta-autopilot-public-cluster/variables.tf
+++ b/modules/beta-autopilot-public-cluster/variables.tf
@@ -500,10 +500,9 @@ variable "database_encryption" {
}]
}
-
variable "default_compute_class_enabled" {
type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
+ description = "Enable default compute class for Node Auto-Provisioning"
default = null
}
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
index 706e89c315..19b1abb567 100644
--- a/modules/beta-private-cluster-update-variant/README.md
+++ b/modules/beta-private-cluster-update-variant/README.md
@@ -182,7 +182,7 @@ Then perform the following commands on the root folder:
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -194,7 +194,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
index 9f480d9a8d..b985a4ffdf 100644
--- a/modules/beta-private-cluster-update-variant/cluster.tf
+++ b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/beta-private-cluster-update-variant/metadata.yaml b/modules/beta-private-cluster-update-variant/metadata.yaml
index 4d192a329d..c5bdfeb16b 100644
--- a/modules/beta-private-cluster-update-variant/metadata.yaml
+++ b/modules/beta-private-cluster-update-variant/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -660,9 +662,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf
index 2eb80d54ce..cb7d9e587e 100644
--- a/modules/beta-private-cluster-update-variant/variables.tf
+++ b/modules/beta-private-cluster-update-variant/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -837,13 +839,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
index 6b52c3bf95..287a2779e2 100644
--- a/modules/beta-private-cluster/README.md
+++ b/modules/beta-private-cluster/README.md
@@ -160,7 +160,7 @@ Then perform the following commands on the root folder:
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -172,7 +172,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
index c86df6c0ae..320cc434e1 100644
--- a/modules/beta-private-cluster/cluster.tf
+++ b/modules/beta-private-cluster/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/beta-private-cluster/metadata.yaml b/modules/beta-private-cluster/metadata.yaml
index 306294a71d..bea5e6355b 100644
--- a/modules/beta-private-cluster/metadata.yaml
+++ b/modules/beta-private-cluster/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -660,9 +662,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
index 2eb80d54ce..cb7d9e587e 100644
--- a/modules/beta-private-cluster/variables.tf
+++ b/modules/beta-private-cluster/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -837,13 +839,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md
index 91c625c061..dfd227596f 100644
--- a/modules/beta-public-cluster-update-variant/README.md
+++ b/modules/beta-public-cluster-update-variant/README.md
@@ -176,7 +176,7 @@ Then perform the following commands on the root folder:
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -188,7 +188,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| description | The description of the cluster | `string` | `""` | no |
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
index 8db30a3a02..fe27841b5d 100644
--- a/modules/beta-public-cluster-update-variant/cluster.tf
+++ b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/beta-public-cluster-update-variant/metadata.yaml b/modules/beta-public-cluster-update-variant/metadata.yaml
index ed4407ca7b..2f31c9af74 100644
--- a/modules/beta-public-cluster-update-variant/metadata.yaml
+++ b/modules/beta-public-cluster-update-variant/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -638,9 +640,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf
index b61891d069..244e67febb 100644
--- a/modules/beta-public-cluster-update-variant/variables.tf
+++ b/modules/beta-public-cluster-update-variant/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -801,13 +803,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
index 393a63b80f..4300223741 100644
--- a/modules/beta-public-cluster/README.md
+++ b/modules/beta-public-cluster/README.md
@@ -154,7 +154,7 @@ Then perform the following commands on the root folder:
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -166,7 +166,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| description | The description of the cluster | `string` | `""` | no |
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
index 55cde45efc..6d7e984788 100644
--- a/modules/beta-public-cluster/cluster.tf
+++ b/modules/beta-public-cluster/cluster.tf
@@ -135,7 +135,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/beta-public-cluster/metadata.yaml b/modules/beta-public-cluster/metadata.yaml
index 2d923c27b8..f23d7dc937 100644
--- a/modules/beta-public-cluster/metadata.yaml
+++ b/modules/beta-public-cluster/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -638,9 +640,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
index b61891d069..244e67febb 100644
--- a/modules/beta-public-cluster/variables.tf
+++ b/modules/beta-public-cluster/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -801,13 +803,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/modules/gke-autopilot-cluster/metadata.yaml b/modules/gke-autopilot-cluster/metadata.yaml
index a248d7957d..a3ba4df9e9 100644
--- a/modules/gke-autopilot-cluster/metadata.yaml
+++ b/modules/gke-autopilot-cluster/metadata.yaml
@@ -573,9 +573,9 @@ spec:
roles:
- level: Project
roles:
- - roles/compute.admin
- roles/container.admin
- roles/iam.serviceAccountUser
+ - roles/compute.admin
services:
- compute.googleapis.com
- container.googleapis.com
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
index d3759fc246..3c9458bcf5 100644
--- a/modules/private-cluster-update-variant/README.md
+++ b/modules/private-cluster-update-variant/README.md
@@ -177,7 +177,7 @@ Then perform the following commands on the root folder:
| anonymous\_authentication\_config\_mode | Allows users to restrict or enable anonymous access to the cluster. Valid values are `ENABLED` and `LIMITED`. | `string` | `null` | 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 gke-security-groups@yourdomain.com | `string` | `null` | no |
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -188,7 +188,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
index 10f27833c9..3c4d0c2bf0 100644
--- a/modules/private-cluster-update-variant/cluster.tf
+++ b/modules/private-cluster-update-variant/cluster.tf
@@ -129,7 +129,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/private-cluster-update-variant/metadata.yaml b/modules/private-cluster-update-variant/metadata.yaml
index 1b47acd409..a1c842ffbe 100644
--- a/modules/private-cluster-update-variant/metadata.yaml
+++ b/modules/private-cluster-update-variant/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -649,9 +651,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf
index ba6864787e..4f04994c7e 100644
--- a/modules/private-cluster-update-variant/variables.tf
+++ b/modules/private-cluster-update-variant/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -819,13 +821,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
index dccd4b354d..e0b0311db4 100644
--- a/modules/private-cluster/README.md
+++ b/modules/private-cluster/README.md
@@ -155,7 +155,7 @@ Then perform the following commands on the root folder:
| anonymous\_authentication\_config\_mode | Allows users to restrict or enable anonymous access to the cluster. Valid values are `ENABLED` and `LIMITED`. | `string` | `null` | 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 gke-security-groups@yourdomain.com | `string` | `null` | no |
| boot\_disk\_kms\_key | The Customer Managed Encryption Key used to encrypt the boot disk attached to each node in the node pool, if not overridden in `node_pools`. This should be of the form projects/[KEY\_PROJECT\_ID]/locations/[LOCATION]/keyRings/[RING\_NAME]/cryptoKeys/[KEY\_NAME]. For more information about protecting resources with Cloud KMS Keys please see: https://cloud.google.com/compute/docs/disks/customer-managed-encryption | `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) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | no |
+| cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object({
enabled = bool
autoscaling_profile = string
min_cpu_cores = optional(number)
max_cpu_cores = optional(number)
min_memory_gb = optional(number)
max_memory_gb = optional(number)
gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
auto_repair = bool
auto_upgrade = bool
disk_size = optional(number)
disk_type = optional(string)
image_type = optional(string)
strategy = optional(string)
max_surge = optional(number)
max_unavailable = optional(number)
node_pool_soak_duration = optional(string)
batch_soak_duration = optional(string)
batch_percentage = optional(number)
batch_node_count = optional(number)
enable_secure_boot = optional(bool, false)
enable_integrity_monitoring = optional(bool, true)
enable_default_compute_class = optional(bool, false)
}) | {
"auto_repair": true,
"auto_upgrade": true,
"autoscaling_profile": "BALANCED",
"disk_size": 100,
"disk_type": "pd-standard",
"enable_default_compute_class": false,
"enable_integrity_monitoring": true,
"enable_secure_boot": false,
"enabled": false,
"gpu_resources": [],
"image_type": "COS_CONTAINERD",
"max_cpu_cores": 0,
"max_memory_gb": 0,
"min_cpu_cores": 0,
"min_memory_gb": 0
} | 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 |
@@ -166,7 +166,6 @@ Then perform the following commands on the root folder:
| create\_service\_account | Defines if service account specified to run nodes should be created. | `bool` | `true` | no |
| database\_encryption | Application-layer Secrets Encryption settings. The object format is {state = string, key\_name = string}. Valid values of state are: "ENCRYPTED"; "DECRYPTED". key\_name is the name of a CloudKMS key. | `list(object({ state = string, key_name = string }))` | [
{
"key_name": "",
"state": "DECRYPTED"
}
]
| no |
| datapath\_provider | The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature. | `string` | `"DATAPATH_PROVIDER_UNSPECIFIED"` | no |
-| default\_compute\_class\_enabled | Enable Spot VMs as the default compute class for Node Auto-Provisioning | `bool` | `null` | no |
| default\_max\_pods\_per\_node | The maximum number of pods to schedule per node | `number` | `110` | no |
| deletion\_protection | Whether or not to allow Terraform to destroy the cluster. | `bool` | `true` | no |
| deploy\_using\_private\_endpoint | A toggle for Terraform and kubectl to connect to the master's internal IP address during deployment. | `bool` | `false` | no |
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
index 19d82caabd..188d91ee2b 100644
--- a/modules/private-cluster/cluster.tf
+++ b/modules/private-cluster/cluster.tf
@@ -129,7 +129,7 @@ resource "google_container_cluster" "primary" {
cluster_autoscaling {
enabled = var.cluster_autoscaling.enabled
- default_compute_class_enabled = var.default_compute_class_enabled
+ default_compute_class_enabled = lookup(var.cluster_autoscaling, "enable_default_compute_class", false)
dynamic "auto_provisioning_defaults" {
for_each = var.cluster_autoscaling.enabled ? [1] : []
diff --git a/modules/private-cluster/metadata.yaml b/modules/private-cluster/metadata.yaml
index 7710d3f5b9..b7e10bafd1 100644
--- a/modules/private-cluster/metadata.yaml
+++ b/modules/private-cluster/metadata.yaml
@@ -321,27 +321,28 @@ spec:
description: Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)
varType: |-
object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
defaultValue:
auto_repair: true
@@ -349,6 +350,7 @@ spec:
autoscaling_profile: BALANCED
disk_size: 100
disk_type: pd-standard
+ enable_default_compute_class: false
enable_integrity_monitoring: true
enable_secure_boot: false
enabled: false
@@ -649,9 +651,6 @@ spec:
description: Enable Shielded Nodes features on all nodes in this cluster
varType: bool
defaultValue: true
- - name: default_compute_class_enabled
- description: Enable Spot VMs as the default compute class for Node Auto-Provisioning
- varType: bool
- name: enable_binary_authorization
description: Enable BinAuthZ Admission controller
varType: bool
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
index ba6864787e..4f04994c7e 100644
--- a/modules/private-cluster/variables.tf
+++ b/modules/private-cluster/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -819,13 +821,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"
diff --git a/variables.tf b/variables.tf
index 9fd4bc2edd..60780854a0 100644
--- a/variables.tf
+++ b/variables.tf
@@ -324,43 +324,45 @@ variable "enable_resource_consumption_export" {
variable "cluster_autoscaling" {
type = object({
- enabled = bool
- autoscaling_profile = string
- min_cpu_cores = optional(number)
- max_cpu_cores = optional(number)
- min_memory_gb = optional(number)
- max_memory_gb = optional(number)
- gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
- auto_repair = bool
- auto_upgrade = bool
- disk_size = optional(number)
- disk_type = optional(string)
- image_type = optional(string)
- strategy = optional(string)
- max_surge = optional(number)
- max_unavailable = optional(number)
- node_pool_soak_duration = optional(string)
- batch_soak_duration = optional(string)
- batch_percentage = optional(number)
- batch_node_count = optional(number)
- enable_secure_boot = optional(bool, false)
- enable_integrity_monitoring = optional(bool, true)
+ enabled = bool
+ autoscaling_profile = string
+ min_cpu_cores = optional(number)
+ max_cpu_cores = optional(number)
+ min_memory_gb = optional(number)
+ max_memory_gb = optional(number)
+ gpu_resources = list(object({ resource_type = string, minimum = number, maximum = number }))
+ auto_repair = bool
+ auto_upgrade = bool
+ disk_size = optional(number)
+ disk_type = optional(string)
+ image_type = optional(string)
+ strategy = optional(string)
+ max_surge = optional(number)
+ max_unavailable = optional(number)
+ node_pool_soak_duration = optional(string)
+ batch_soak_duration = optional(string)
+ batch_percentage = optional(number)
+ batch_node_count = optional(number)
+ enable_secure_boot = optional(bool, false)
+ enable_integrity_monitoring = optional(bool, true)
+ enable_default_compute_class = optional(bool, false)
})
default = {
- enabled = false
- autoscaling_profile = "BALANCED"
- max_cpu_cores = 0
- min_cpu_cores = 0
- max_memory_gb = 0
- min_memory_gb = 0
- gpu_resources = []
- auto_repair = true
- auto_upgrade = true
- disk_size = 100
- disk_type = "pd-standard"
- image_type = "COS_CONTAINERD"
- enable_secure_boot = false
- enable_integrity_monitoring = true
+ enabled = false
+ autoscaling_profile = "BALANCED"
+ max_cpu_cores = 0
+ min_cpu_cores = 0
+ max_memory_gb = 0
+ min_memory_gb = 0
+ gpu_resources = []
+ auto_repair = true
+ auto_upgrade = true
+ disk_size = 100
+ disk_type = "pd-standard"
+ image_type = "COS_CONTAINERD"
+ enable_secure_boot = false
+ enable_integrity_monitoring = true
+ enable_default_compute_class = false
}
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
}
@@ -783,13 +785,6 @@ variable "enable_shielded_nodes" {
default = true
}
-
-variable "default_compute_class_enabled" {
- type = bool
- description = "Enable Spot VMs as the default compute class for Node Auto-Provisioning"
- default = null
-}
-
variable "enable_binary_authorization" {
type = bool
description = "Enable BinAuthZ Admission controller"