From 16f24d6fdb29fda71405f84c5f97db0c5b3f1eab Mon Sep 17 00:00:00 2001
From: Robert Bailey <robertbailey@google.com>
Date: Fri, 18 Jun 2021 00:10:47 +0000
Subject: [PATCH] Upgrade terraform to Kubernetes 1.19.

---
 build/terraform/prow/module.tf             | 2 +-
 install/terraform/modules/aks/aks.tf       | 2 +-
 install/terraform/modules/eks/eks.tf       | 4 ++--
 install/terraform/modules/gke/cluster.tf   | 2 +-
 install/terraform/modules/gke/variables.tf | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/terraform/prow/module.tf b/build/terraform/prow/module.tf
index 2d1eca92a7..7b8f510ecb 100644
--- a/build/terraform/prow/module.tf
+++ b/build/terraform/prow/module.tf
@@ -25,7 +25,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.18"
+  min_master_version = "1.19"
   initial_node_count = 8
   node_config {
     machine_type = "e2-standard-4"
diff --git a/install/terraform/modules/aks/aks.tf b/install/terraform/modules/aks/aks.tf
index 81ccdbe9ea..8bba4e8348 100644
--- a/install/terraform/modules/aks/aks.tf
+++ b/install/terraform/modules/aks/aks.tf
@@ -60,7 +60,7 @@ resource "azurerm_kubernetes_cluster" "agones" {
   resource_group_name = azurerm_resource_group.agones_rg.name
   dns_prefix          = "agones"
 
-  kubernetes_version = "1.18.14"
+  kubernetes_version = "1.19.11"
 
   default_node_pool {
     name                  = "default"
diff --git a/install/terraform/modules/eks/eks.tf b/install/terraform/modules/eks/eks.tf
index d523387a6e..09f42b6150 100644
--- a/install/terraform/modules/eks/eks.tf
+++ b/install/terraform/modules/eks/eks.tf
@@ -81,7 +81,7 @@ module "eks" {
   cluster_name    = var.cluster_name
   subnets         = module.vpc.public_subnets
   vpc_id          = module.vpc.vpc_id
-  cluster_version = "1.18"
+  cluster_version = "1.19"
 
   worker_groups_launch_template = [
     {
@@ -109,4 +109,4 @@ module "eks" {
       public_ip            = true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/install/terraform/modules/gke/cluster.tf b/install/terraform/modules/gke/cluster.tf
index da3cc51157..a77fe9ef45 100644
--- 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.18")
+  kubernetesVersion       = lookup(var.cluster, "kubernetesVersion", "1.19")
   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
index f836f8dcf6..6b88a914b3 100644
--- 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.18"
+    "kubernetesVersion"       = "1.19"
     "windowsInitialNodeCount" = "0"
     "windowsMachineType"      = "e2-standard-4"
   }