Skip to content

Commit 2e89e16

Browse files
committed
Remove Azure admin_password (disabled) now that its optional
* Requires terraform-provider-azurerm v1.16.0 or higher hashicorp/terraform-provider-azurerm#1958
1 parent 55bb4df commit 2e89e16

File tree

4 files changed

+34
-6
lines changed

4 files changed

+34
-6
lines changed

CHANGES.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ Notable changes between versions.
1212
* Raise default CoreDNS replica count to the larger of 2 or the number of controller nodes ([#313](https://github.com/poseidon/typhoon/pull/313))
1313
* Add AntiAffinity preferred rule to favor spreading CoreDNS pods
1414

15+
#### Azure
16+
17+
* Remove admin_password field (disabled) since it is now optional
18+
* Require `terraform-provider-azurerm` v1.16+ (action required)
19+
1520
#### DigitalOcean
1621

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

1924
#### Addons
2025

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Terraform version and plugin versions
2+
3+
terraform {
4+
required_version = ">= 0.11.0"
5+
}
6+
7+
provider "azurerm" {
8+
version = "~> 1.16"
9+
}
10+
11+
provider "local" {
12+
version = "~> 1.0"
13+
}
14+
15+
provider "null" {
16+
version = "~> 1.0"
17+
}
18+
19+
provider "template" {
20+
version = "~> 1.0"
21+
}
22+
23+
provider "tls" {
24+
version = "~> 1.0"
25+
}
26+

azure/container-linux/kubernetes/workers/workers.tf

+1-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ resource "azurerm_virtual_machine_scale_set" "workers" {
3737
os_profile {
3838
computer_name_prefix = "${var.name}-worker-"
3939
admin_username = "core"
40-
41-
# Required by Azure, but password auth is disabled below
42-
admin_password = ""
43-
custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}"
40+
custom_data = "${element(data.ct_config.worker-ignitions.*.rendered, count.index)}"
4441
}
4542

4643
# Azure mandates setting an ssh_key, even though Ignition custom_data handles it too

docs/cl/azure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Configure the Azure provider in a `providers.tf` file.
5858

5959
```tf
6060
provider "azurerm" {
61-
version = "1.13.0"
61+
version = "1.16.0"
6262
alias = "default"
6363
}
6464

0 commit comments

Comments
 (0)