Skip to content

Commit 1a2c26e

Browse files
authored
feat: Default to using cos_containerd image for GKE Sandbox clusters (terraform-google-modules#854)
1 parent 9de43d7 commit 1a2c26e

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,11 @@ resource "google_container_node_pool" "pools" {
483483
{% endif %}
484484

485485
node_config {
486+
{% if beta_cluster %}
487+
image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS")
488+
{% else %}
486489
image_type = lookup(each.value, "image_type", "COS")
490+
{% endif %}
487491
machine_type = lookup(each.value, "machine_type", "e2-medium")
488492
labels = merge(
489493
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

modules/beta-private-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ resource "google_container_node_pool" "pools" {
438438
}
439439

440440
node_config {
441-
image_type = lookup(each.value, "image_type", "COS")
441+
image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS")
442442
machine_type = lookup(each.value, "machine_type", "e2-medium")
443443
labels = merge(
444444
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ resource "google_container_node_pool" "pools" {
354354
}
355355

356356
node_config {
357-
image_type = lookup(each.value, "image_type", "COS")
357+
image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS")
358358
machine_type = lookup(each.value, "machine_type", "e2-medium")
359359
labels = merge(
360360
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ resource "google_container_node_pool" "pools" {
419419
}
420420

421421
node_config {
422-
image_type = lookup(each.value, "image_type", "COS")
422+
image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS")
423423
machine_type = lookup(each.value, "machine_type", "e2-medium")
424424
labels = merge(
425425
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ resource "google_container_node_pool" "pools" {
335335
}
336336

337337
node_config {
338-
image_type = lookup(each.value, "image_type", "COS")
338+
image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS")
339339
machine_type = lookup(each.value, "machine_type", "e2-medium")
340340
labels = merge(
341341
lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},

0 commit comments

Comments
 (0)