Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new Azure subnet to set address_prefixes list #730

Merged
merged 1 commit into from May 19, 2020
Merged

Use new Azure subnet to set address_prefixes list #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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