Skip to content

Commit

Permalink
Remove Azure admin_password (disabled) now that its optional
Browse files Browse the repository at this point in the history
* Requires terraform-provider-azurerm v1.16.0 or higher
hashicorp/terraform-provider-azurerm#1958
  • Loading branch information
dghubble committed Oct 14, 2018
1 parent 55bb4df commit 2e89e16
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 6 deletions.
7 changes: 6 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
* 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

* Require terraform-provider-digitalocean plugin 1.0 (or higher but < 2.0)
* Require `terraform-provider-digitalocean` v1.0+ (action required)

#### Addons

Expand Down
26 changes: 26 additions & 0 deletions azure/container-linux/kubernetes/require.tf
Original file line number Diff line number Diff line change
@@ -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"
}

5 changes: 1 addition & 4 deletions azure/container-linux/kubernetes/workers/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ resource "azurerm_virtual_machine_scale_set" "workers" {
os_profile {
computer_name_prefix = "${var.name}-worker-"
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)}"
}

# Azure mandates setting an ssh_key, even though Ignition custom_data handles it too
Expand Down
2 changes: 1 addition & 1 deletion docs/cl/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Configure the Azure provider in a `providers.tf` file.

```tf
provider "azurerm" {
version = "1.13.0"
version = "1.16.0"
alias = "default"
}
Expand Down

0 comments on commit 2e89e16

Please sign in to comment.