From b1f4ce9cda3de9e57f39383d9c81ca41a9bb2207 Mon Sep 17 00:00:00 2001 From: Pavel Rudnitskiy Date: Tue, 9 Jan 2024 23:00:37 +0100 Subject: [PATCH] fix: alpha option for cluster creation (#1796) --- autogen/main/cluster.tf.tmpl | 5 +++++ cluster.tf | 5 +++++ modules/beta-private-cluster-update-variant/cluster.tf | 5 +++++ modules/beta-private-cluster/cluster.tf | 5 +++++ modules/beta-public-cluster-update-variant/cluster.tf | 5 +++++ modules/beta-public-cluster/cluster.tf | 5 +++++ modules/private-cluster-update-variant/cluster.tf | 5 +++++ modules/private-cluster/cluster.tf | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 61d6e10772..fea3e367ac 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -424,6 +424,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/cluster.tf b/cluster.tf index 3429442a9c..895750c4be 100644 --- a/cluster.tf +++ b/cluster.tf @@ -291,6 +291,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index e211c69bf6..f153d61d74 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -349,6 +349,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index e8d40bb54a..18dec1ba3b 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -349,6 +349,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 5752bbaee2..aab67d6d1b 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -349,6 +349,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index f64bae3fdb..a7224d24ae 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -349,6 +349,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 210a883ad0..4c30546a92 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -291,6 +291,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium") diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 097fc722bd..802ce4fa64 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -291,6 +291,11 @@ resource "google_container_cluster" "primary" { name = "default-pool" initial_node_count = var.initial_node_count + management { + auto_repair = lookup(var.cluster_autoscaling, "auto_repair", true) + auto_upgrade = lookup(var.cluster_autoscaling, "auto_upgrade", true) + } + node_config { image_type = lookup(var.node_pools[0], "image_type", "COS_CONTAINERD") machine_type = lookup(var.node_pools[0], "machine_type", "e2-medium")