From 688a8d6a0899f6c32bcef00e31a36e77ed2dac4b Mon Sep 17 00:00:00 2001 From: Jon Chen Date: Mon, 31 Oct 2022 11:54:10 -0400 Subject: [PATCH 1/2] fix gke version --- terraform/environments/dev/main.tf | 19 ++++++++++--------- terraform/modules/gke/main.tf | 2 +- terraform/modules/gke/variables.tf | 5 +++++ terraform/modules/ingress/main.tf | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/terraform/environments/dev/main.tf b/terraform/environments/dev/main.tf index 8711ee71..4695fdfd 100644 --- a/terraform/environments/dev/main.tf +++ b/terraform/environments/dev/main.tf @@ -89,15 +89,16 @@ module "gke" { time_sleep.wait_for_project_services, module.vpc_network ] - source = "../../modules/gke" - project_id = var.project_id - cluster_name = "main-cluster" - vpc_network = "default-vpc" - region = var.region - min_node_count = 1 - max_node_count = 1 - machine_type = "n1-standard-8" - node_locations = "us-central1-a,us-central1-c,us-central1-f" + source = "../../modules/gke" + project_id = var.project_id + cluster_name = "main-cluster" + vpc_network = "default-vpc" + region = var.region + kubernetes_version = "1.22.12-gke.2300" + min_node_count = 1 + max_node_count = 1 + machine_type = "n1-standard-8" + node_locations = "us-central1-a,us-central1-c,us-central1-f" } module "ingress" { diff --git a/terraform/modules/gke/main.tf b/terraform/modules/gke/main.tf index 00e1f294..a4fb8624 100644 --- a/terraform/modules/gke/main.tf +++ b/terraform/modules/gke/main.tf @@ -54,7 +54,7 @@ module "gke" { version = "v22.1.0" project_id = var.project_id name = var.cluster_name - kubernetes_version = "1.22.10-gke.600" + kubernetes_version = var.kubernetes_version region = var.region regional = true network = var.vpc_network diff --git a/terraform/modules/gke/variables.tf b/terraform/modules/gke/variables.tf index d892b2b9..b5bfa8b4 100644 --- a/terraform/modules/gke/variables.tf +++ b/terraform/modules/gke/variables.tf @@ -63,3 +63,8 @@ variable "node_locations" { type = string default = "" } + +variable "kubernetes_version" { + type = string + default = "1.22.12-gke.2300 " +} diff --git a/terraform/modules/ingress/main.tf b/terraform/modules/ingress/main.tf index 50cd8b32..e00e953a 100644 --- a/terraform/modules/ingress/main.tf +++ b/terraform/modules/ingress/main.tf @@ -71,7 +71,7 @@ resource "kubernetes_ingress_v1" "default_ingress" { name = "default-ingress" annotations = { "kubernetes.io/ingress.class" = "nginx" - "cert-manager.io/cluster-issuer" = "module.cert_manager.cluster_issuer_name" + "cert-manager.io/cluster-issuer" = module.cert_manager.cluster_issuer_name "nginx.ingress.kubernetes.io/enable-cors" = "true" "nginx.ingress.kubernetes.io/cors-allow-methods" = "PUT,GET,POST,DELETE,OPTIONS" "nginx.ingress.kubernetes.io/cors-allow-origin" = var.cors_allow_origin From 9d32db42863b4b7ff2ea19a0d8fbfb85baa744f3 Mon Sep 17 00:00:00 2001 From: Jon Chen Date: Mon, 31 Oct 2022 11:54:56 -0400 Subject: [PATCH 2/2] fix kubernetes_version default value --- terraform/modules/gke/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/modules/gke/variables.tf b/terraform/modules/gke/variables.tf index b5bfa8b4..9ed96c6a 100644 --- a/terraform/modules/gke/variables.tf +++ b/terraform/modules/gke/variables.tf @@ -66,5 +66,5 @@ variable "node_locations" { variable "kubernetes_version" { type = string - default = "1.22.12-gke.2300 " + default = "1.22.12-gke.2300" }