From 662578b61f6dcb931ad43afd9cfd45d921efbe17 Mon Sep 17 00:00:00 2001 From: Adam Rush Date: Sat, 31 Jul 2021 08:35:46 +0100 Subject: [PATCH 1/3] Bumped azurerm to v2.70.0 --- test/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/versions.tf b/test/versions.tf index d2fda6e..742521b 100644 --- a/test/versions.tf +++ b/test/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "2.53.0" + version = "2.70.0" } } } From f0bc5fb92ddc3b7a61dad8709af69c3b401b71f3 Mon Sep 17 00:00:00 2001 From: Adam Rush Date: Sat, 31 Jul 2021 08:36:19 +0100 Subject: [PATCH 2/3] Changed version constraints to min required. Removed nested provider block --- versions.tf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/versions.tf b/versions.tf index 9a55706..aeec249 100644 --- a/versions.tf +++ b/versions.tf @@ -9,27 +9,23 @@ terraform { # https://github.com/terraform-providers/terraform-provider-azurerm/releases azurerm = { source = "hashicorp/azurerm" - version = "~> 2.0" + version = ">= 2.0" } # https://github.com/terraform-providers/terraform-provider-azuread/releases azuread = { source = "hashicorp/azuread" - version = "~> 1.0" + version = ">= 1.0" } random = { source = "hashicorp/random" - version = "~> 2.0" + version = ">= 2.0" } tls = { source = "hashicorp/tls" - version = "~> 2.0" + version = ">= 2.0" } } } - -provider "azurerm" { - features {} -} From 62f11f043f73a46330b2dc63b95e82b0136d8817 Mon Sep 17 00:00:00 2001 From: Adam Rush Date: Sat, 31 Jul 2021 08:41:45 +0100 Subject: [PATCH 3/3] Changed default AKS version to v1.20.7 --- README.md | 2 +- examples/basic/main.tf | 2 +- test/main.tf | 2 +- variables.tf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cccfd26..743a5ab 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The main resources used are: ## Prereqs This example was developed using Terraform version `0.13`. -It may not work out-of-the-box using other versions. +It may not work out-of-the-box using older versions. This example expects you already have [Terraform installed](https://learn.hashicorp.com/tutorials/terraform/install-cli). diff --git a/examples/basic/main.tf b/examples/basic/main.tf index 9320d8b..3cc9f80 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -13,7 +13,7 @@ locals { # version used for both main AKS API service, and default node pool # https://github.com/Azure/AKS/releases # az aks get-versions --location uksouth --output table - kubernetes_version = "1.18.14" + kubernetes_version = "1.20.7" location = "uksouth" resource_group_name = "${random_string.aks.result}-rg-azurerm-kubernetes-cluster" name = "${random_string.aks.result}-aks-cluster" diff --git a/test/main.tf b/test/main.tf index 42389c5..f3820ba 100644 --- a/test/main.tf +++ b/test/main.tf @@ -3,7 +3,7 @@ locals { # version used for both main AKS API service, and default node pool # https://github.com/Azure/AKS/releases # az aks get-versions --location uksouth --output table - kubernetes_version = "1.18.14" + kubernetes_version = "1.20.7" prefix = "rush" location = "uksouth" resource_group_name = "${local.prefix}-rg-azurerm-kubernetes-cluster" diff --git a/variables.tf b/variables.tf index b708d55..8dfeb68 100644 --- a/variables.tf +++ b/variables.tf @@ -24,7 +24,7 @@ variable "aks_admin_group_member_name" { variable "kubernetes_version" { description = "Version for both main AKS API service, and default node pool" type = string - default = "1.18.14" + default = "1.20.7" } variable "sla_sku" {