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.

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

Use new Azure network_interface_backend_address_pool_association #332

Merged
merged 1 commit into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ Notable changes between versions.

#### Azure

* Add `primary` field to `ip_configuration`. Required by `terraform-provider-azurerm` v1.17+ ([#331](https://github.com/poseidon/typhoon/pull/331))
* Use new `azurerm_network_interface_backend_address_pool_association` ([#332](https://github.com/poseidon/typhoon/pull/332))
* Require `terraform-provider-azurerm` v1.17+ (action required)
* Add `primary` field to `ip_configuration` needed by v1.17+ ([#331](https://github.com/poseidon/typhoon/pull/331))

#### Addons

Expand Down
10 changes: 7 additions & 3 deletions azure/container-linux/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,16 @@ resource "azurerm_network_interface" "controllers" {

# public IPv4
public_ip_address_id = "${element(azurerm_public_ip.controllers.*.id, count.index)}"

# backend address pool to which the NIC should be added
load_balancer_backend_address_pools_ids = ["${azurerm_lb_backend_address_pool.controller.id}"]
}
}

# Add controller NICs to the controller backend address pool
resource "azurerm_network_interface_backend_address_pool_association" "controllers" {
network_interface_id = "${azurerm_network_interface.controllers.id}"
ip_configuration_name = "ip0"
backend_address_pool_id = "${azurerm_lb_backend_address_pool.controller.id}"
}

# Controller public IPv4 addresses
resource "azurerm_public_ip" "controllers" {
count = "${var.controller_count}"
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.16"
version = "~> 1.17"
}

provider "local" {
Expand Down
1 change: 0 additions & 1 deletion azure/container-linux/kubernetes/workers/ingress.tf

This file was deleted.