From deeede2f70f0bc1cccf78dfa1870b6180d1b1a03 Mon Sep 17 00:00:00 2001
From: Mark Mandel <markmandel@google.com>
Date: Mon, 8 Feb 2021 20:58:16 -0800
Subject: [PATCH] Upgrade Terraform to 1.18

Upgrade the Terraform scripts for all Kubernetes clusters to 1.18

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

diff --git a/build/terraform/prow/module.tf b/build/terraform/prow/module.tf
index 8546f3c8a1..fcb2ec01b4 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.17"
+  min_master_version = "1.18"
   initial_node_count = 8
   node_config {
     machine_type = "n1-standard-4"
diff --git a/install/terraform/modules/aks/aks.tf b/install/terraform/modules/aks/aks.tf
index ff5ce2d92b..bc69ebb403 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.17.13"
+  kubernetes_version = "1.18.14"
 
   default_node_pool {
     name                = "default"
diff --git a/install/terraform/modules/eks/eks.tf b/install/terraform/modules/eks/eks.tf
index 3a4bb70946..d523387a6e 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.17"
+  cluster_version = "1.18"
 
   worker_groups_launch_template = [
     {
diff --git a/install/terraform/modules/gke/cluster.tf b/install/terraform/modules/gke/cluster.tf
index 02dfb7e485..b1fa0bcb52 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.17")
+  kubernetesVersion = lookup(var.cluster, "kubernetesVersion", "1.18")
 }
 
 # echo command used for debugging purpose
diff --git a/install/terraform/modules/gke/variables.tf b/install/terraform/modules/gke/variables.tf
index 62b7695307..499838c644 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.17"
+    "kubernetesVersion" = "1.18"
   }
 }