diff --git a/CHANGES.md b/CHANGES.md index 533c6639..b78e41ff 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,16 +7,20 @@ Notable changes between versions. * Kubernetes [v1.25.3](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.25.md#v1253) * Switch Kubernetes registry from `k8s.gcr.io` to `registry.k8s.io` for addons -### Flatcar Linux +### Azure -* Switch from Azure Hypervisor gen1 to gen2 (**action required**) ([#1248](https://github.com/poseidon/typhoon/pull/1248)) - * Run `az vm image terms accept --publish kinvolk --offer flatcar-container-linux-free --plan stable-gen2` * Change default Azure `worker_type` from [`Standard_DS1_v2`](https://learn.microsoft.com/en-us/azure/virtual-machines/dv2-dsv2-series#dsv2-series) to [`Standard_D2as_v5`](https://learn.microsoft.com/en-us/azure/virtual-machines/dasv5-dadsv5-series#dasv5-series) ([#1248](https://github.com/poseidon/typhoon/pull/1248)) * Get 2 VCPU, 7 GiB, 12500Mbps (vs 1 VCPU, 3.5GiB, 750 Mbps) * Small increase in pay-as-you-go price ($53.29 -> $62.78) * Small increase in spot price ($5.64/mo -> $7.37/mo) * Change from Intel to AMD EPYC (`D2as_v5` cheaper than `D2s_v5`) +### Flatcar Linux + +* Switch from Azure Hypervisor gen1 to gen2 (**action required**) ([#1248](https://github.com/poseidon/typhoon/pull/1248)) + * Run `az vm image terms accept --publish kinvolk --offer flatcar-container-linux-free --plan stable-gen2` + + ### Addons * Update Prometheus from v2.38.0 to [v2.39.1](https://github.com/prometheus/prometheus/releases/tag/v2.39.1) diff --git a/azure/fedora-coreos/kubernetes/variables.tf b/azure/fedora-coreos/kubernetes/variables.tf index 68bc5880..75c82fa9 100644 --- a/azure/fedora-coreos/kubernetes/variables.tf +++ b/azure/fedora-coreos/kubernetes/variables.tf @@ -43,7 +43,7 @@ variable "controller_type" { variable "worker_type" { type = string description = "Machine type for workers (see `az vm list-skus --location centralus`)" - default = "Standard_DS1_v2" + default = "Standard_D2as_v5" } variable "os_image" { diff --git a/azure/fedora-coreos/kubernetes/workers/variables.tf b/azure/fedora-coreos/kubernetes/workers/variables.tf index 44fa04ef..338995c1 100644 --- a/azure/fedora-coreos/kubernetes/workers/variables.tf +++ b/azure/fedora-coreos/kubernetes/workers/variables.tf @@ -41,7 +41,7 @@ variable "worker_count" { variable "vm_type" { type = string description = "Machine type for instances (see `az vm list-skus --location centralus`)" - default = "Standard_DS1_v2" + default = "Standard_D2as_v5" } variable "os_image" { diff --git a/docs/fedora-coreos/azure.md b/docs/fedora-coreos/azure.md index 17df31a8..f9f428ae 100644 --- a/docs/fedora-coreos/azure.md +++ b/docs/fedora-coreos/azure.md @@ -240,7 +240,7 @@ Reference the DNS zone with `azurerm_dns_zone.clusters.name` and its resource gr | controller_count | Number of controllers (i.e. masters) | 1 | 1 | | worker_count | Number of workers | 1 | 3 | | controller_type | Machine type for controllers | "Standard_B2s" | See below | -| worker_type | Machine type for workers | "Standard_DS1_v2" | See below | +| worker_type | Machine type for workers | "Standard_D2as_v5" | See below | | disk_size | Size of the disk in GB | 30 | 100 | | worker_priority | Set priority to Spot to use reduced cost surplus capacity, with the tradeoff that instances can be deallocated at any time | Regular | Spot | | controller_snippets | Controller Butane snippets | [] | [example](/advanced/customization/#usage) |