CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2024-12-24 18:19:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix azure provider warning, rename a public_ip field

Browse Source 
* 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+
* https://github.com/terraform-providers/terraform-provider-azurerm/pull/2576
This commit is contained in:
Dalton Hubble 2019-01-27 17:52:35 -08:00
parent e9659a8539
commit eb08593eae
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -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)) * 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 #### Addons
* Update nginx-ingress from v0.21.0 to v0.22.0 * Update nginx-ingress from v0.21.0 to v0.22.0

8
azure/container-linux/kubernetes/controllers.tf
View File

@ -121,10 +121,10 @@ resource "azurerm_public_ip" "controllers" {
count = "${var.controller_count}" count = "${var.controller_count}"
resource_group_name = "${azurerm_resource_group.cluster.name}" resource_group_name = "${azurerm_resource_group.cluster.name}"
name = "${var.cluster_name}-controller-${count.index}" name = "${var.cluster_name}-controller-${count.index}"
location = "${azurerm_resource_group.cluster.location}" location = "${azurerm_resource_group.cluster.location}"
sku = "Standard" sku = "Standard"
public_ip_address_allocation = "static" allocation_method = "Static"
} }
# Controller Ignition configs # Controller Ignition configs

16
azure/container-linux/kubernetes/lb.tf
View File

@ -17,20 +17,20 @@ resource "azurerm_dns_a_record" "apiserver" {
resource "azurerm_public_ip" "apiserver-ipv4" { resource "azurerm_public_ip" "apiserver-ipv4" {
resource_group_name = "${azurerm_resource_group.cluster.name}" resource_group_name = "${azurerm_resource_group.cluster.name}"
name = "${var.cluster_name}-apiserver-ipv4" name = "${var.cluster_name}-apiserver-ipv4"
location = "${var.region}" location = "${var.region}"
sku = "Standard" sku = "Standard"
public_ip_address_allocation = "static" allocation_method = "Static"
} }
# Static IPv4 address for the ingress frontend # Static IPv4 address for the ingress frontend
resource "azurerm_public_ip" "ingress-ipv4" { resource "azurerm_public_ip" "ingress-ipv4" {
resource_group_name = "${azurerm_resource_group.cluster.name}" resource_group_name = "${azurerm_resource_group.cluster.name}"
name = "${var.cluster_name}-ingress-ipv4" name = "${var.cluster_name}-ingress-ipv4"
location = "${var.region}" location = "${var.region}"
sku = "Standard" sku = "Standard"
public_ip_address_allocation = "static" allocation_method = "Static"
} }
# Network Load Balancer for apiservers and ingress # Network Load Balancer for apiservers and ingress

2
azure/container-linux/kubernetes/require.tf
View File

@ -5,7 +5,7 @@ terraform {
} }
provider "azurerm" { provider "azurerm" {
version = "~> 1.19" version = "~> 1.21"
} }
provider "local" { provider "local" {