Skip to content

Commit

Permalink
Merge pull request #228 from aztfmod/0.14
Browse files Browse the repository at this point in the history 
Update azurerm to 2.43.0 and fix for terraform 0.14.*
  • Loading branch information
@arnaudlh
arnaudlh authored Jan 15, 2021
2 parents 632c501 + b7b17f2 commit 1873ebe
Show file tree
Hide file tree
Showing 91 changed files with 123 additions and 126 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**/terraform.tfstate.d
**/terraform.tfstate.backup
**/.terraform.tfstate.lock.info
**/*.lock.hcl
**/~*.*
**/*.log
**/backend.azurerm.tf
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ You can customize the examples execution by modifying the variables as follow:
| terraform | >= 0.13 |
| azuread | ~> 1.0.0 |
| azurecaf | ~> 1.1.0 |
| azurerm | ~> 2.40.0 |
| azurerm | ~> 2.43.0 |
| external | ~> 1.2.0 |
| null | ~> 2.1.0 |
| random | ~> 2.2.1 |
Expand Down
2 changes: 1 addition & 1 deletion examples/app_gateway/100-simple-app-gateway/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/app_gateway/101-private-public/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/app_insights/100-all-attributes/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/app_insights/100-simple/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/automation/100-simple-automation-account/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/azure_ad/201-groups-and-roles/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion ...te/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/container_registry/100-simple-acr/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/container_registry/200-acr-private-link/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
4 changes: 2 additions & 2 deletions examples/compute/kubernetes_services/101-single-cluster/aks.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ aks_clusters = {
type = "SystemAssigned"
}

kubernetes_version = "1.17.11"
kubernetes_version = "1.19.6"
vnet_key = "spoke_aks_re1"

network_policy = {
Expand Down Expand Up @@ -55,7 +55,7 @@ aks_clusters = {
max_pods = 30
node_count = 1
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "system services"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
6 changes: 3 additions & 3 deletions examples/compute/kubernetes_services/102-multi-nodepools/aks.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aks_clusters = {
type = "SystemAssigned"
}

kubernetes_version = "1.17.11"
kubernetes_version = "1.19.6"

#lz_key = "networking_spoke_aks"
vnet_key = "spoke_aks_re1"
Expand Down Expand Up @@ -41,7 +41,7 @@ aks_clusters = {
max_pods = 30
node_count = 1
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "system services"
}
Expand All @@ -59,7 +59,7 @@ aks_clusters = {
node_count = 1
enable_auto_scaling = false
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "user services"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
8 changes: 4 additions & 4 deletions examples/compute/kubernetes_services/103-multi-clusters/aks.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aks_clusters = {
type = "SystemAssigned"
}

kubernetes_version = "1.17.11"
kubernetes_version = "1.19.6"

lz_key = "networking_spoke_aks"
vnet_key = "spoke_aks_re1"
Expand Down Expand Up @@ -43,7 +43,7 @@ aks_clusters = {
max_pods = 30
node_count = 3
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "system services"
}
Expand All @@ -69,7 +69,7 @@ aks_clusters = {
type = "SystemAssigned"
}

kubernetes_version = "1.17.11"
kubernetes_version = "1.19.6"

lz_key = "networking_spoke_aks"
vnet_key = "spoke_aks_re2"
Expand Down Expand Up @@ -102,7 +102,7 @@ aks_clusters = {
max_pods = 30
node_count = 3
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "system services"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
6 changes: 3 additions & 3 deletions examples/compute/kubernetes_services/104-private-cluster/aks.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ aks_clusters = {
type = "SystemAssigned"
}

kubernetes_version = "1.17.11"
kubernetes_version = "1.19.6"

lz_key = "networking_spoke_aks"
vnet_key = "spoke_aks_re1"
Expand Down Expand Up @@ -51,7 +51,7 @@ aks_clusters = {
max_pods = 30
node_count = 2
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "system services"
}
Expand All @@ -69,7 +69,7 @@ aks_clusters = {
node_count = 2
enable_auto_scaling = false
os_disk_size_gb = 512
orchestrator_version = "1.17.11"
orchestrator_version = "1.19.6"
tags = {
"project" = "user services"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/proximity_placement_group/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/databricks/100-simple-databricks/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/datalake/101-datalake-storage/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/eventhub_namespace/100-simple-evh/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
2 changes: 1 addition & 1 deletion examples/keyvault/101-keyvault-policies/standalone/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 2.40.0"
version = "~> 2.43.0"
}
azuread = {
source = "hashicorp/azuread"
Expand Down
Loading

0 comments on commit 1873ebe

Please sign in to comment.