From 22721644102a8b6b875439c80a6571266e6bf723 Mon Sep 17 00:00:00 2001 From: Endre Czirbesz Date: Mon, 20 May 2024 22:45:30 +0100 Subject: [PATCH] feat: Add option image_type in cluster_autoscaling block (#1905) --- README.md | 2 +- autogen/main/cluster.tf.tmpl | 2 ++ autogen/main/variables.tf.tmpl | 2 ++ cluster.tf | 2 ++ modules/beta-private-cluster-update-variant/README.md | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 ++ modules/beta-private-cluster-update-variant/variables.tf | 2 ++ modules/beta-private-cluster/README.md | 2 +- modules/beta-private-cluster/cluster.tf | 2 ++ modules/beta-private-cluster/variables.tf | 2 ++ modules/beta-public-cluster-update-variant/README.md | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 ++ modules/beta-public-cluster-update-variant/variables.tf | 2 ++ modules/beta-public-cluster/README.md | 2 +- modules/beta-public-cluster/cluster.tf | 2 ++ modules/beta-public-cluster/variables.tf | 2 ++ modules/private-cluster-update-variant/README.md | 2 +- modules/private-cluster-update-variant/cluster.tf | 2 ++ modules/private-cluster-update-variant/variables.tf | 2 ++ modules/private-cluster/README.md | 2 +- modules/private-cluster/cluster.tf | 2 ++ modules/private-cluster/variables.tf | 2 ++ variables.tf | 2 ++ 23 files changed, 39 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f9f0f4ac21..8954edefbc 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ Then perform the following commands on the root folder: | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | additional\_ip\_range\_pods | List of _names_ of the additional secondary subnet ip ranges to use for pods | `list(string)` | `[]` | 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 | -| 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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index d870a46cdf..4d05a76bec 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -169,6 +169,8 @@ resource "google_container_cluster" "primary" { {% if beta_cluster %} min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") {% endif %} + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl index 8cb575bed8..84ef97a000 100644 --- a/autogen/main/variables.tf.tmpl +++ b/autogen/main/variables.tf.tmpl @@ -255,6 +255,7 @@ variable "cluster_autoscaling" { 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) @@ -275,6 +276,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/cluster.tf b/cluster.tf index 140d7d754c..0d586b2259 100644 --- a/cluster.tf +++ b/cluster.tf @@ -139,6 +139,8 @@ resource "google_container_cluster" "primary" { } } + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md index 6252b260a7..37613be7c1 100644 --- a/modules/beta-private-cluster-update-variant/README.md +++ b/modules/beta-private-cluster-update-variant/README.md @@ -171,7 +171,7 @@ Then perform the following commands on the root folder: | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index 15a7c2d9a4..781eaf7c45 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -146,6 +146,8 @@ resource "google_container_cluster" "primary" { } min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf index 9e25085fd9..156a6f9983 100644 --- a/modules/beta-private-cluster-update-variant/variables.tf +++ b/modules/beta-private-cluster-update-variant/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md index fc937d8ea9..275ea32a1b 100644 --- a/modules/beta-private-cluster/README.md +++ b/modules/beta-private-cluster/README.md @@ -149,7 +149,7 @@ Then perform the following commands on the root folder: | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 5a2caa5d04..d4bab69721 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -146,6 +146,8 @@ resource "google_container_cluster" "primary" { } min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf index 9e25085fd9..156a6f9983 100644 --- a/modules/beta-private-cluster/variables.tf +++ b/modules/beta-private-cluster/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md index 5d3e3a1d3f..7694591dc5 100644 --- a/modules/beta-public-cluster-update-variant/README.md +++ b/modules/beta-public-cluster-update-variant/README.md @@ -165,7 +165,7 @@ Then perform the following commands on the root folder: | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 68c40f0103..a303342f76 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -146,6 +146,8 @@ resource "google_container_cluster" "primary" { } min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf index 66f68f5c9a..6cadf89cfd 100644 --- a/modules/beta-public-cluster-update-variant/variables.tf +++ b/modules/beta-public-cluster-update-variant/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md index da6310fb62..e0442f9063 100644 --- a/modules/beta-public-cluster/README.md +++ b/modules/beta-public-cluster/README.md @@ -143,7 +143,7 @@ Then perform the following commands on the root folder: | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 431bf9b02c..45f95e2002 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -146,6 +146,8 @@ resource "google_container_cluster" "primary" { } min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "") + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf index 66f68f5c9a..6cadf89cfd 100644 --- a/modules/beta-public-cluster/variables.tf +++ b/modules/beta-public-cluster/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md index 3584eb155f..aa00ef6489 100644 --- a/modules/private-cluster-update-variant/README.md +++ b/modules/private-cluster-update-variant/README.md @@ -166,7 +166,7 @@ Then perform the following commands on the root folder: | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | additional\_ip\_range\_pods | List of _names_ of the additional secondary subnet ip ranges to use for pods | `list(string)` | `[]` | 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 | -| 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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 44c2e22604..a025a5e19e 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -139,6 +139,8 @@ resource "google_container_cluster" "primary" { } } + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf index 787352a83e..ba16201dd5 100644 --- a/modules/private-cluster-update-variant/variables.tf +++ b/modules/private-cluster-update-variant/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index daec89ea7a..5fd6912b2b 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -144,7 +144,7 @@ Then perform the following commands on the root folder: | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | additional\_ip\_range\_pods | List of _names_ of the additional secondary subnet ip ranges to use for pods | `list(string)` | `[]` | 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 | -| 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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
    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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "enabled": false,
  "gpu_resources": [],
  "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           = number
    max_cpu_cores           = number
    min_memory_gb           = number
    max_memory_gb           = 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)
  })
| 
{
  "auto_repair": true,
  "auto_upgrade": true,
  "autoscaling_profile": "BALANCED",
  "disk_size": 100,
  "disk_type": "pd-standard",
  "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 | diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index f8bf294875..043393d771 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -139,6 +139,8 @@ resource "google_container_cluster" "primary" { } } + + image_type = lookup(var.cluster_autoscaling, "image_type", "COS_CONTAINERD") } } autoscaling_profile = var.cluster_autoscaling.autoscaling_profile != null ? var.cluster_autoscaling.autoscaling_profile : "BALANCED" diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf index 787352a83e..ba16201dd5 100644 --- a/modules/private-cluster/variables.tf +++ b/modules/private-cluster/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" } diff --git a/variables.tf b/variables.tf index dc2352b24a..8c965b8ec8 100644 --- a/variables.tf +++ b/variables.tf @@ -250,6 +250,7 @@ variable "cluster_autoscaling" { 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) @@ -270,6 +271,7 @@ variable "cluster_autoscaling" { auto_upgrade = true disk_size = 100 disk_type = "pd-standard" + image_type = "COS_CONTAINERD" } description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)" }