Skip to content

Commit

Permalink
Merge pull request #3 from adamrushuk/fix-version-constraints
Browse files Browse the repository at this point in the history
Fix version constraints
  • Loading branch information
adamrushuk authored Jul 31, 2021
2 parents 9374fc1 + 62f11f0 commit e7196ac
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "2.53.0"
version = "2.70.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
12 changes: 4 additions & 8 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
}

0 comments on commit e7196ac

Please sign in to comment.