Skip to content

Commit

Permalink
Fix azure provider warning, rename a public_ip field
Browse files Browse the repository at this point in the history
* azurerm_public_ip (used internally) added a field `allocation_method`
to replace the field `public_ip_address_allocation` (deprecated)
* Require terraform-provider-azurerm v1.21+
* hashicorp/terraform-provider-azurerm#2576
  • Loading branch information
dghubble committed Jan 28, 2019
1 parent e9659a8 commit eb08593
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions azure/container-linux/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions azure/container-linux/kubernetes/lb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure/container-linux/kubernetes/require.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
}

provider "azurerm" {
version = "~> 1.19"
version = "~> 1.21"
}

provider "local" {
Expand Down

0 comments on commit eb08593

Please sign in to comment.