From 38095e25d36a9e8d2e940165ea22c51a9972c796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 9 Nov 2021 14:42:35 +0100 Subject: [PATCH] chore(aks): update Kubernetes version to 1.21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Last non-preview supported version Signed-off-by: Raphaël Pinson --- .../ROOT/pages/references/applications/traefik.adoc | 2 +- .../pages/references/terraform_modules/aks/azure.adoc | 10 +++++----- modules/aks/azure/variables.tf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/modules/ROOT/pages/references/applications/traefik.adoc b/docs/modules/ROOT/pages/references/applications/traefik.adoc index 4f2814cfef..96a5960315 100644 --- a/docs/modules/ROOT/pages/references/applications/traefik.adoc +++ b/docs/modules/ROOT/pages/references/applications/traefik.adoc @@ -17,6 +17,6 @@ cluster Ingress Controller. |=== |Key |Type |Default |Description |traefik |object -|`{"additionalArguments":["--metrics.prometheus=true","--serversTransport.insecureSkipVerify=true"],"deployment":{"replicas":2},"logs":{"access":{"enabled":true}}}` +|`{"additionalArguments":["--metrics.prometheus=true","--serversTransport.insecureSkipVerify=true"],"deployment":{"replicas":2},"logs":{"access":{"enabled":true}},"tlsOptions":{"default":{"minVersion":"VersionTLS12"}}}` |Values passed to the traefik chart |=== diff --git a/docs/modules/ROOT/pages/references/terraform_modules/aks/azure.adoc b/docs/modules/ROOT/pages/references/terraform_modules/aks/azure.adoc index fff686cc35..5abbb9fd79 100644 --- a/docs/modules/ROOT/pages/references/terraform_modules/aks/azure.adoc +++ b/docs/modules/ROOT/pages/references/terraform_modules/aks/azure.adoc @@ -11,7 +11,7 @@ The `aks/azure` Terraform module provides a way to install and configure: |=== |Name |Version |[[requirement_terraform]] <> |>= 0.13 -|[[requirement_azuread]] <> |~> 1.5 +|[[requirement_azuread]] <> |~> 2.0 |[[requirement_azurerm]] <> |~> 2.62 |[[requirement_helm]] <> |~> 2.0 |[[requirement_kubernetes]] <> |~> 2.0 @@ -25,7 +25,7 @@ The `aks/azure` Terraform module provides a way to install and configure: [cols="a,a",options="header,autowidth"] |=== |Name |Version -|[[provider_azuread]] <> |~> 1.5 +|[[provider_azuread]] <> |~> 2.0 |[[provider_azurerm]] <> |~> 2.62 |[[provider_random]] <> |~> 3.0 |=== @@ -45,7 +45,6 @@ The `aks/azure` Terraform module provides a way to install and configure: |=== |Name |Type |https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application[azuread_application.oauth2_apps] |resource -|https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application_app_role[azuread_application_app_role.argocd_admin] |resource |https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application_password[azuread_application_password.oauth2_apps] |resource |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_cname_record[azurerm_dns_cname_record.wildcard] |resource |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster_node_pool[azurerm_kubernetes_cluster_node_pool.this] |resource @@ -60,8 +59,9 @@ The `aks/azure` Terraform module provides a way to install and configure: |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/user_assigned_identity[azurerm_user_assigned_identity.kube_prometheus_stack_prometheus] |resource |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/user_assigned_identity[azurerm_user_assigned_identity.this] |resource |https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.grafana_admin_password] |resource -|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/password[random_password.oauth2_apps] |resource |https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string[random_string.storage_account] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/uuid[random_uuid.argocd_app_role] |resource +|https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/uuid[random_uuid.resource_app_id] |resource |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config[azurerm_client_config.current] |data source |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/dns_zone[azurerm_dns_zone.this] |data source |https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/kubernetes_cluster[azurerm_kubernetes_cluster.cluster] |data source @@ -166,7 +166,7 @@ list(object({ |[[input_kubernetes_version]] <> |Specify which Kubernetes release to use. |`string` -|`"1.20.7"` +|`"1.21.2"` |no |[[input_network_policy]] <> diff --git a/modules/aks/azure/variables.tf b/modules/aks/azure/variables.tf index 4bf49b044c..a05ba1abb2 100644 --- a/modules/aks/azure/variables.tf +++ b/modules/aks/azure/variables.tf @@ -6,7 +6,7 @@ variable "base_domain" { variable "kubernetes_version" { description = "Specify which Kubernetes release to use." type = string - default = "1.20.7" + default = "1.21.2" } variable "resource_group_name" {