Merge pull request #15 from jonchenn/cert

fix gke version
GoogleCloudPlatform · Oct 31, 2022 · 89c1930 · 89c1930
2 parents 6e85c98 + 9d32db4
commit 89c1930
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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