Remove Azure admin_password (disabled) now that its optional

* Requires terraform-provider-azurerm v1.16.0 or higher
https://github.com/terraform-providers/terraform-provider-azurerm/pull/1958
This commit is contained in:
Dalton Hubble 2018-10-13 21:55:46 -07:00
parent 55bb4dfba6
commit 2e89e161e9
4 changed files with 34 additions and 6 deletions

View File

@ -12,9 +12,14 @@ Notable changes between versions.
* Raise default CoreDNS replica count to the larger of 2 or the number of controller nodes ([#313](https://github.com/poseidon/typhoon/pull/313)) * Raise default CoreDNS replica count to the larger of 2 or the number of controller nodes ([#313](https://github.com/poseidon/typhoon/pull/313))
* Add AntiAffinity preferred rule to favor spreading CoreDNS pods * Add AntiAffinity preferred rule to favor spreading CoreDNS pods
#### Azure
* Remove admin_password field (disabled) since it is now optional
* Require `terraform-provider-azurerm` v1.16+ (action required)
#### DigitalOcean #### DigitalOcean
* Require terraform-provider-digitalocean plugin 1.0 (or higher but < 2.0) * Require `terraform-provider-digitalocean` v1.0+ (action required)
#### Addons #### Addons

View File

@ -0,0 +1,26 @@
# Terraform version and plugin versions
terraform {
required_version = ">= 0.11.0"
}
provider "azurerm" {
version = "~> 1.16"
}
provider "local" {
version = "~> 1.0"
}
provider "null" {
version = "~> 1.0"
}
provider "template" {
version = "~> 1.0"
}
provider "tls" {
version = "~> 1.0"
}

View File

@ -37,9 +37,6 @@ resource "azurerm_virtual_machine_scale_set" "workers" {
os_profile { os_profile {
computer_name_prefix = "${var.name}-worker-" computer_name_prefix = "${var.name}-worker-"
admin_username = "core" admin_username = "core"
# Required by Azure, but password auth is disabled below
admin_password = ""
custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}" custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}"
} }

View File

@ -58,7 +58,7 @@ Configure the Azure provider in a `providers.tf` file.
```tf ```tf
provider "azurerm" { provider "azurerm" {
version = "1.13.0" version = "1.16.0"
alias = "default" alias = "default"
} }