From ca39a1dca3a89d6257ae2f51fdaef36ab55e8252 Mon Sep 17 00:00:00 2001 From: Edvin Norling Date: Tue, 22 Feb 2022 13:27:44 +0100 Subject: [PATCH] Upgrade azurerm to 2.97.0 --- CHANGELOG.md | 1 + modules/azure/aks-global/README.md | 56 +++++++++++++-------------- modules/azure/aks-global/main.tf | 2 +- modules/azure/aks/README.md | 36 ++++++++--------- modules/azure/aks/main.tf | 2 +- modules/kubernetes/aks-core/README.md | 8 ++-- modules/kubernetes/aks-core/main.tf | 2 +- 7 files changed, 54 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9685e3c2..59138764c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - [#548](https://github.com/XenitAB/terraform-modules/pull/548) Enable grafana-agent in Prometheus. - [#558](https://github.com/XenitAB/terraform-modules/pull/558) Add ClusterRole `kubectl get nodes` to tenants. - [#560](https://github.com/XenitAB/terraform-modules/pull/560) Add SecretProviderClass CRD to ClusterRole `custom_resource_edit`. +- [#563](https://github.com/XenitAB/terraform-modules/pull/563) Upgrade azurerm provider in aks to 2.97.0 ### Changed diff --git a/modules/azure/aks-global/README.md b/modules/azure/aks-global/README.md index 5793e1d4a..d35225e74 100644 --- a/modules/azure/aks-global/README.md +++ b/modules/azure/aks-global/README.md @@ -8,7 +8,7 @@ This module is used to create resources that are used by AKS clusters. |------|---------| | [terraform](#requirement\_terraform) | 0.15.3 | | [azuread](#requirement\_azuread) | 1.6.0 | -| [azurerm](#requirement\_azurerm) | 2.82.0 | +| [azurerm](#requirement\_azurerm) | 2.97.0 | | [random](#requirement\_random) | 3.1.0 | | [tls](#requirement\_tls) | 3.1.0 | @@ -17,7 +17,7 @@ This module is used to create resources that are used by AKS clusters. | Name | Version | |------|---------| | [azuread](#provider\_azuread) | 1.6.0 | -| [azurerm](#provider\_azurerm) | 2.82.0 | +| [azurerm](#provider\_azurerm) | 2.97.0 | | [random](#provider\_random) | 3.1.0 | | [tls](#provider\_tls) | 3.1.0 | @@ -42,29 +42,29 @@ No modules. | [azuread_group_member.resource_group_owner](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/resources/group_member) | resource | | [azuread_group_member.resource_group_reader](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/resources/group_member) | resource | | [azuread_service_principal.helm_operator](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/resources/service_principal) | resource | -| [azurerm_container_registry.acr](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/container_registry) | resource | -| [azurerm_dns_zone.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/dns_zone) | resource | -| [azurerm_key_vault_access_policy.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/key_vault_access_policy) | resource | -| [azurerm_key_vault_secret.ssh_key](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/key_vault_secret) | resource | -| [azurerm_public_ip_prefix.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/public_ip_prefix) | resource | -| [azurerm_role_assignment.aad_pod_identity](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.acr_pull](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.acr_push](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.acr_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.external_dns_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.external_dns_msi](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.external_dns_rg_read](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.external_storage_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.velero_msi](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.velero_rg_read](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_storage_account.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/storage_account) | resource | -| [azurerm_storage_container.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/storage_container) | resource | -| [azurerm_user_assigned_identity.aad_pod_identity](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/user_assigned_identity) | resource | -| [azurerm_user_assigned_identity.external_dns](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/user_assigned_identity) | resource | -| [azurerm_user_assigned_identity.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/user_assigned_identity) | resource | -| [azurerm_user_assigned_identity.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/user_assigned_identity) | resource | +| [azurerm_container_registry.acr](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/container_registry) | resource | +| [azurerm_dns_zone.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/dns_zone) | resource | +| [azurerm_key_vault_access_policy.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/key_vault_access_policy) | resource | +| [azurerm_key_vault_secret.ssh_key](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/key_vault_secret) | resource | +| [azurerm_public_ip_prefix.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/public_ip_prefix) | resource | +| [azurerm_role_assignment.aad_pod_identity](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.acr_pull](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.acr_push](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.acr_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.external_dns_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.external_dns_msi](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.external_dns_rg_read](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.external_storage_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.velero_msi](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.velero_rg_read](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_storage_account.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/storage_account) | resource | +| [azurerm_storage_container.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/storage_container) | resource | +| [azurerm_user_assigned_identity.aad_pod_identity](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/user_assigned_identity) | resource | +| [azurerm_user_assigned_identity.external_dns](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/user_assigned_identity) | resource | +| [azurerm_user_assigned_identity.velero](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/user_assigned_identity) | resource | +| [azurerm_user_assigned_identity.xenit](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/user_assigned_identity) | resource | | [random_password.helm_operator](https://registry.terraform.io/providers/hashicorp/random/3.1.0/docs/resources/password) | resource | | [tls_private_key.ssh_key](https://registry.terraform.io/providers/hashicorp/tls/3.1.0/docs/resources/private_key) | resource | | [azuread_group.acr_pull](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/data-sources/group) | data source | @@ -73,9 +73,9 @@ No modules. | [azuread_group.resource_group_contributor](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/data-sources/group) | data source | | [azuread_group.resource_group_owner](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/data-sources/group) | data source | | [azuread_group.resource_group_reader](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/data-sources/group) | data source | -| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/client_config) | data source | -| [azurerm_key_vault.core](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/key_vault) | data source | -| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/resource_group) | data source | +| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/client_config) | data source | +| [azurerm_key_vault.core](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/key_vault) | data source | +| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/resource_group) | data source | ## Inputs diff --git a/modules/azure/aks-global/main.tf b/modules/azure/aks-global/main.tf index 7e36eb8ba..06443675d 100644 --- a/modules/azure/aks-global/main.tf +++ b/modules/azure/aks-global/main.tf @@ -9,7 +9,7 @@ terraform { required_providers { azurerm = { - version = "2.82.0" + version = "2.97.0" source = "hashicorp/azurerm" } azuread = { diff --git a/modules/azure/aks/README.md b/modules/azure/aks/README.md index b2fe2210b..bf0f16907 100644 --- a/modules/azure/aks/README.md +++ b/modules/azure/aks/README.md @@ -15,7 +15,7 @@ https://pumpingco.de/blog/modify-aks-default-node-pool-in-terraform-without-rede |------|---------| | [terraform](#requirement\_terraform) | 0.15.3 | | [azuread](#requirement\_azuread) | 1.6.0 | -| [azurerm](#requirement\_azurerm) | 2.82.0 | +| [azurerm](#requirement\_azurerm) | 2.97.0 | | [random](#requirement\_random) | 3.1.0 | ## Providers @@ -23,7 +23,7 @@ https://pumpingco.de/blog/modify-aks-default-node-pool-in-terraform-without-rede | Name | Version | |------|---------| | [azuread](#provider\_azuread) | 1.6.0 | -| [azurerm](#provider\_azurerm) | 2.82.0 | +| [azurerm](#provider\_azurerm) | 2.97.0 | ## Modules @@ -34,22 +34,22 @@ No modules. | Name | Type | |------|------| | [azuread_group_member.aks_managed_identity](https://registry.terraform.io/providers/hashicorp/azuread/1.6.0/docs/resources/group_member) | resource | -| [azurerm_kubernetes_cluster.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/kubernetes_cluster) | resource | -| [azurerm_kubernetes_cluster_node_pool.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/kubernetes_cluster_node_pool) | resource | -| [azurerm_role_assignment.aks_managed_identity_noderg_managed_identity_operator](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.aks_managed_identity_noderg_virtual_machine_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.azure_metrics](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.azure_metrics_aks_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.azure_metrics_lb_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.cluster_admin](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.cluster_view](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.edit](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_role_assignment.view](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/role_assignment) | resource | -| [azurerm_user_assigned_identity.azure_metrics](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/resources/user_assigned_identity) | resource | -| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/client_config) | data source | -| [azurerm_resource_group.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/resource_group) | data source | -| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/resource_group) | data source | -| [azurerm_subnet.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/subnet) | data source | +| [azurerm_kubernetes_cluster.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/kubernetes_cluster) | resource | +| [azurerm_kubernetes_cluster_node_pool.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/kubernetes_cluster_node_pool) | resource | +| [azurerm_role_assignment.aks_managed_identity_noderg_managed_identity_operator](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.aks_managed_identity_noderg_virtual_machine_contributor](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.azure_metrics](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.azure_metrics_aks_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.azure_metrics_lb_reader](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.cluster_admin](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.cluster_view](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.edit](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_role_assignment.view](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/role_assignment) | resource | +| [azurerm_user_assigned_identity.azure_metrics](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/resources/user_assigned_identity) | resource | +| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/client_config) | data source | +| [azurerm_resource_group.aks](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/resource_group) | data source | +| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/resource_group) | data source | +| [azurerm_subnet.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/subnet) | data source | ## Inputs diff --git a/modules/azure/aks/main.tf b/modules/azure/aks/main.tf index 091dc8788..cf73cc6c6 100644 --- a/modules/azure/aks/main.tf +++ b/modules/azure/aks/main.tf @@ -17,7 +17,7 @@ terraform { required_providers { azurerm = { - version = "2.82.0" + version = "2.97.0" source = "hashicorp/azurerm" } azuread = { diff --git a/modules/kubernetes/aks-core/README.md b/modules/kubernetes/aks-core/README.md index 7a81ff489..20f25faac 100644 --- a/modules/kubernetes/aks-core/README.md +++ b/modules/kubernetes/aks-core/README.md @@ -8,7 +8,7 @@ This module is used to create AKS clusters. |------|---------| | [terraform](#requirement\_terraform) | 0.15.3 | | [azuread](#requirement\_azuread) | 1.6.0 | -| [azurerm](#requirement\_azurerm) | 2.82.0 | +| [azurerm](#requirement\_azurerm) | 2.97.0 | | [flux](#requirement\_flux) | 0.5.1 | | [github](#requirement\_github) | 4.17.0 | | [helm](#requirement\_helm) | 2.3.0 | @@ -20,7 +20,7 @@ This module is used to create AKS clusters. | Name | Version | |------|---------| -| [azurerm](#provider\_azurerm) | 2.82.0 | +| [azurerm](#provider\_azurerm) | 2.97.0 | | [helm](#provider\_helm) | 2.3.0 | | [kubernetes](#provider\_kubernetes) | 2.6.1 | @@ -83,8 +83,8 @@ This module is used to create AKS clusters. | [kubernetes_role_binding.top](https://registry.terraform.io/providers/hashicorp/kubernetes/2.6.1/docs/resources/role_binding) | resource | | [kubernetes_role_binding.view](https://registry.terraform.io/providers/hashicorp/kubernetes/2.6.1/docs/resources/role_binding) | resource | | [kubernetes_service_account.tenant](https://registry.terraform.io/providers/hashicorp/kubernetes/2.6.1/docs/resources/service_account) | resource | -| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/client_config) | data source | -| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.82.0/docs/data-sources/resource_group) | data source | +| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/client_config) | data source | +| [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/data-sources/resource_group) | data source | ## Inputs diff --git a/modules/kubernetes/aks-core/main.tf b/modules/kubernetes/aks-core/main.tf index 8eb21e82f..db7866c3b 100644 --- a/modules/kubernetes/aks-core/main.tf +++ b/modules/kubernetes/aks-core/main.tf @@ -9,7 +9,7 @@ terraform { required_providers { azurerm = { - version = "2.82.0" + version = "2.97.0" source = "hashicorp/azurerm" } azuread = {