diff --git a/CHANGES.md b/CHANGES.md index efc9bdb5b..eac5c847b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,11 @@ Notable changes between versions. * Add `ingress_zone_id` output with the NLB DNS name's Route53 zone for use in alias records ([#380](https://github.com/poseidon/typhoon/pull/380)) +#### Azure + +* Fix azure provider warning, `public_ip` `allocation_method` replaces `public_ip_address_allocation` + * Require `terraform-provider-azurerm` v1.21+ (action required) + #### Addons * Update nginx-ingress from v0.21.0 to v0.22.0 diff --git a/azure/container-linux/kubernetes/controllers.tf b/azure/container-linux/kubernetes/controllers.tf index b929b7789..ffa05a1ec 100644 --- a/azure/container-linux/kubernetes/controllers.tf +++ b/azure/container-linux/kubernetes/controllers.tf @@ -121,10 +121,10 @@ resource "azurerm_public_ip" "controllers" { count = "${var.controller_count}" resource_group_name = "${azurerm_resource_group.cluster.name}" - name = "${var.cluster_name}-controller-${count.index}" - location = "${azurerm_resource_group.cluster.location}" - sku = "Standard" - public_ip_address_allocation = "static" + name = "${var.cluster_name}-controller-${count.index}" + location = "${azurerm_resource_group.cluster.location}" + sku = "Standard" + allocation_method = "Static" } # Controller Ignition configs diff --git a/azure/container-linux/kubernetes/lb.tf b/azure/container-linux/kubernetes/lb.tf index c15b5906b..d010937fc 100644 --- a/azure/container-linux/kubernetes/lb.tf +++ b/azure/container-linux/kubernetes/lb.tf @@ -17,20 +17,20 @@ resource "azurerm_dns_a_record" "apiserver" { resource "azurerm_public_ip" "apiserver-ipv4" { resource_group_name = "${azurerm_resource_group.cluster.name}" - name = "${var.cluster_name}-apiserver-ipv4" - location = "${var.region}" - sku = "Standard" - public_ip_address_allocation = "static" + name = "${var.cluster_name}-apiserver-ipv4" + location = "${var.region}" + sku = "Standard" + allocation_method = "Static" } # Static IPv4 address for the ingress frontend resource "azurerm_public_ip" "ingress-ipv4" { resource_group_name = "${azurerm_resource_group.cluster.name}" - name = "${var.cluster_name}-ingress-ipv4" - location = "${var.region}" - sku = "Standard" - public_ip_address_allocation = "static" + name = "${var.cluster_name}-ingress-ipv4" + location = "${var.region}" + sku = "Standard" + allocation_method = "Static" } # Network Load Balancer for apiservers and ingress diff --git a/azure/container-linux/kubernetes/require.tf b/azure/container-linux/kubernetes/require.tf index 5d350636e..f85cf7b49 100644 --- a/azure/container-linux/kubernetes/require.tf +++ b/azure/container-linux/kubernetes/require.tf @@ -5,7 +5,7 @@ terraform { } provider "azurerm" { - version = "~> 1.19" + version = "~> 1.21" } provider "local" {