Skip to content

Commit

Permalink
Use new Azure subnet to set address_prefixes list
Browse files Browse the repository at this point in the history
* Update Azure subnet `address_prefix` to `azure_prefixes` list
* Fix warning that `address_prefix` is deprecated
* Require `terraform-provider-azurerm` v2.8.0+ (action required)

Rel: hashicorp/terraform-provider-azurerm#6493
  • Loading branch information
dghubble committed May 19, 2020
1 parent 2578be1 commit ff4187a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Notable changes between versions.
* Fix Terraform plan error when `controller_count` exceeds AWS zones (e.g. 5 controllers) ([#714](https://github.com/poseidon/typhoon/pull/714))
* Regressed in v1.17.1 ([#605](https://github.com/poseidon/typhoon/pull/605))

### Azure

* Update Azure subnets to set `address_prefixes` list ([#730](https://github.com/poseidon/typhoon/pull/730))
* Fix warning that `address_prefix` is deprecated
* Require `terraform-provider-azurerm` v2.8.0+ (action required)

### Fedora CoreOS

* Fix Calico `install-cni` crashloop on Pod restarts ([#724](https://github.com/poseidon/typhoon/pull/724))
Expand Down
4 changes: 2 additions & 2 deletions azure/container-linux/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ resource "azurerm_linux_virtual_machine" "controllers" {
for_each = local.flavor == "flatcar" ? [1] : []

content {
name = local.channel
name = local.channel
publisher = "kinvolk"
product = "flatcar-container-linux-free"
product = "flatcar-container-linux-free"
}
}

Expand Down
4 changes: 2 additions & 2 deletions azure/container-linux/kubernetes/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource "azurerm_subnet" "controller" {

name = "controller"
virtual_network_name = azurerm_virtual_network.network.name
address_prefix = cidrsubnet(var.host_cidr, 1, 0)
address_prefixes = [cidrsubnet(var.host_cidr, 1, 0)]
}

resource "azurerm_subnet_network_security_group_association" "controller" {
Expand All @@ -34,7 +34,7 @@ resource "azurerm_subnet" "worker" {

name = "worker"
virtual_network_name = azurerm_virtual_network.network.name
address_prefix = cidrsubnet(var.host_cidr, 1, 1)
address_prefixes = [cidrsubnet(var.host_cidr, 1, 1)]
}

resource "azurerm_subnet_network_security_group_association" "worker" {
Expand Down
2 changes: 1 addition & 1 deletion azure/container-linux/kubernetes/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
terraform {
required_version = "~> 0.12.6"
required_providers {
azurerm = "~> 2.0"
azurerm = "~> 2.8"
ct = "~> 0.3"
template = "~> 2.1"
null = "~> 2.1"
Expand Down
4 changes: 2 additions & 2 deletions azure/container-linux/kubernetes/workers/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "workers" {
for_each = local.flavor == "flatcar" ? [1] : []

content {
name = local.channel
name = local.channel
publisher = "kinvolk"
product = "flatcar-container-linux-free"
product = "flatcar-container-linux-free"
}
}

Expand Down
4 changes: 2 additions & 2 deletions azure/fedora-coreos/kubernetes/network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource "azurerm_subnet" "controller" {

name = "controller"
virtual_network_name = azurerm_virtual_network.network.name
address_prefix = cidrsubnet(var.host_cidr, 1, 0)
address_prefixes = [cidrsubnet(var.host_cidr, 1, 0)]
}

resource "azurerm_subnet_network_security_group_association" "controller" {
Expand All @@ -34,7 +34,7 @@ resource "azurerm_subnet" "worker" {

name = "worker"
virtual_network_name = azurerm_virtual_network.network.name
address_prefix = cidrsubnet(var.host_cidr, 1, 1)
address_prefixes = [cidrsubnet(var.host_cidr, 1, 1)]
}

resource "azurerm_subnet_network_security_group_association" "worker" {
Expand Down
2 changes: 1 addition & 1 deletion azure/fedora-coreos/kubernetes/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
terraform {
required_version = "~> 0.12.6"
required_providers {
azurerm = "~> 2.0"
azurerm = "~> 2.8"
ct = "~> 0.3"
template = "~> 2.1"
null = "~> 2.1"
Expand Down

0 comments on commit ff4187a

Please sign in to comment.