Upgrade terraform to Kubernetes 1.21. (#2326)

googleforgames · Oct 21, 2021 · 9c69726 · 9c69726
1 parent fcee1c1
commit 9c69726
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build/terraform/prow/module.tf b/build/terraform/prow/module.tf
@@ -31,7 +31,7 @@ resource "google_container_cluster" "prow-build-cluster" {
   project            = var.project
   location           = "us-west1-c"
   description        = "Prow cluster to run tests for Agones"
-  min_master_version = "1.20"
+  min_master_version = "1.21"
   initial_node_count = 8
   node_config {
     machine_type = "e2-standard-4"

diff --git a/install/terraform/modules/aks/variables.tf b/install/terraform/modules/aks/variables.tf
@@ -28,13 +28,13 @@ variable "disk_size" {
 
 # VMSS is used, so it is unpredictable how NICs will be given to VMs
 # So let Azure to create NICs with Public IPs as gameservers require
-# Azure Managment SDK can be used to obtain these IPs and map Agones GameServers internal IPs to public 
+# Azure Managment SDK can be used to obtain these IPs and map Agones GameServers internal IPs to public
 variable "enable_node_public_ip" {
   default = true
 }
 
 variable "kubernetes_version" {
-  default = "1.20.7"
+  default = "1.21.2"
 }
 
 variable "machine_type" {

diff --git a/install/terraform/modules/eks/eks.tf b/install/terraform/modules/eks/eks.tf
@@ -86,7 +86,7 @@ module "eks" {
   cluster_name    = var.cluster_name
   subnets         = module.vpc.public_subnets
   vpc_id          = module.vpc.vpc_id
-  cluster_version = "1.20"
+  cluster_version = "1.21"
 
   worker_groups_launch_template = [
     {

diff --git a/install/terraform/modules/gke/cluster.tf b/install/terraform/modules/gke/cluster.tf
@@ -29,7 +29,7 @@ locals {
   initialNodeCount        = lookup(var.cluster, "initialNodeCount", "4")
   network                 = lookup(var.cluster, "network", "default")
   subnetwork              = lookup(var.cluster, "subnetwork", "")
-  kubernetesVersion       = lookup(var.cluster, "kubernetesVersion", "1.20")
+  kubernetesVersion       = lookup(var.cluster, "kubernetesVersion", "1.21")
   windowsInitialNodeCount = lookup(var.cluster, "windowsInitialNodeCount", "0")
   windowsMachineType      = lookup(var.cluster, "windowsMachineType", "e2-standard-4")
 }

diff --git a/install/terraform/modules/gke/variables.tf b/install/terraform/modules/gke/variables.tf
@@ -32,7 +32,7 @@ variable "cluster" {
     "project"                 = "agones"
     "network"                 = "default"
     "subnetwork"              = ""
-    "kubernetesVersion"       = "1.20"
+    "kubernetesVersion"       = "1.21"
     "windowsInitialNodeCount" = "0"
     "windowsMachineType"      = "e2-standard-4"
   }