From 17f95fea0803bcb8f1d635e4e7064127c03ac8b6 Mon Sep 17 00:00:00 2001 From: diegolnasc Date: Wed, 24 Mar 2021 00:09:30 -0300 Subject: [PATCH 1/3] feat: Default image type for gke sandbox --- autogen/main/cluster.tf.tmpl | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster/cluster.tf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index d6c3fe4c4e..19ec0356d2 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -483,7 +483,7 @@ resource "google_container_node_pool" "pools" { {% endif %} node_config { - image_type = lookup(each.value, "image_type", "COS") + image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index f8e6ce526e..9ca9ab2891 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -438,7 +438,7 @@ resource "google_container_node_pool" "pools" { } node_config { - image_type = lookup(each.value, "image_type", "COS") + image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 5681faa2f8..d7d1087ee7 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -354,7 +354,7 @@ resource "google_container_node_pool" "pools" { } node_config { - image_type = lookup(each.value, "image_type", "COS") + image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 5bef8c1481..d7b5279425 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -419,7 +419,7 @@ resource "google_container_node_pool" "pools" { } node_config { - image_type = lookup(each.value, "image_type", "COS") + image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 1ead5fcc13..b5cc56768e 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -335,7 +335,7 @@ resource "google_container_node_pool" "pools" { } node_config { - image_type = lookup(each.value, "image_type", "COS") + image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, From 0d5501726b027da6cc9198b90ce72b31ab9d7f9e Mon Sep 17 00:00:00 2001 From: diegolnasc Date: Wed, 24 Mar 2021 13:16:54 -0300 Subject: [PATCH 2/3] generate_modules --- autogen/main/cluster.tf.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 19ec0356d2..506fa979cc 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -483,7 +483,11 @@ resource "google_container_node_pool" "pools" { {% endif %} node_config { + {% if beta_cluster %} image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") + {% else %} + image_type = lookup(each.value, "image_type", "COS") + {% endif %} machine_type = lookup(each.value, "machine_type", "e2-medium") labels = merge( lookup(lookup(local.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {}, From de54272671c6a0d069e17ef4b255fb814bad9f37 Mon Sep 17 00:00:00 2001 From: diegolnasc Date: Wed, 24 Mar 2021 13:22:29 -0300 Subject: [PATCH 3/3] generate_modules + white spaces --- autogen/main/cluster.tf.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 506fa979cc..65a3c2565f 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -483,7 +483,7 @@ resource "google_container_node_pool" "pools" { {% endif %} node_config { - {% if beta_cluster %} + {% if beta_cluster %} image_type = lookup(each.value, "image_type", var.sandbox_enabled ? "COS_CONTAINERD" : "COS") {% else %} image_type = lookup(each.value, "image_type", "COS")