diff --git a/CHANGES.md b/CHANGES.md index a3aa360e..3617d74a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,12 @@ Notable changes between versions. * Recommend updating [terraform-provider-matchbox](https://github.com/coreos/terraform-provider-matchbox) plugin from v0.2.2 to [v0.2.3](https://github.com/coreos/terraform-provider-matchbox/releases/tag/v0.2.3) ([#402](https://github.com/poseidon/typhoon/pull/402)) +#### Google Cloud + +* Set the minimum CPU platform to Intel Haswell ([#405](https://github.com/poseidon/typhoon/pull/405)) + * Haswell or better is available in every zone (no price change) + * A few zones still default to Sandy/Ivy Bridge (shifts in April 2019) + #### Addons * Improve Prometheus rules and alerts ([#404](https://github.com/poseidon/typhoon/pull/404)) diff --git a/google-cloud/container-linux/kubernetes/controllers.tf b/google-cloud/container-linux/kubernetes/controllers.tf index 1a6ff048..26fb7fb0 100644 --- a/google-cloud/container-linux/kubernetes/controllers.tf +++ b/google-cloud/container-linux/kubernetes/controllers.tf @@ -31,9 +31,10 @@ locals { resource "google_compute_instance" "controllers" { count = "${var.controller_count}" - name = "${var.cluster_name}-controller-${count.index}" - zone = "${element(local.zones, count.index)}" - machine_type = "${var.controller_type}" + name = "${var.cluster_name}-controller-${count.index}" + zone = "${element(local.zones, count.index)}" + machine_type = "${var.controller_type}" + min_cpu_platform = "Intel Haswell" metadata { user-data = "${element(data.ct_config.controller-ignitions.*.rendered, count.index)}" diff --git a/google-cloud/container-linux/kubernetes/workers/workers.tf b/google-cloud/container-linux/kubernetes/workers/workers.tf index 511f1128..10b0e41e 100644 --- a/google-cloud/container-linux/kubernetes/workers/workers.tf +++ b/google-cloud/container-linux/kubernetes/workers/workers.tf @@ -23,9 +23,10 @@ resource "google_compute_region_instance_group_manager" "workers" { # Worker instance template resource "google_compute_instance_template" "worker" { - name_prefix = "${var.name}-worker-" - description = "Worker Instance template" - machine_type = "${var.machine_type}" + name_prefix = "${var.name}-worker-" + description = "Worker Instance template" + machine_type = "${var.machine_type}" + min_cpu_platform = "Intel Haswell" metadata { user-data = "${data.ct_config.worker-ignition.rendered}" diff --git a/google-cloud/fedora-atomic/kubernetes/controllers.tf b/google-cloud/fedora-atomic/kubernetes/controllers.tf index f3d40a0a..28e84b8e 100644 --- a/google-cloud/fedora-atomic/kubernetes/controllers.tf +++ b/google-cloud/fedora-atomic/kubernetes/controllers.tf @@ -31,9 +31,10 @@ locals { resource "google_compute_instance" "controllers" { count = "${var.controller_count}" - name = "${var.cluster_name}-controller-${count.index}" - zone = "${element(local.zones, count.index)}" - machine_type = "${var.controller_type}" + name = "${var.cluster_name}-controller-${count.index}" + zone = "${element(local.zones, count.index)}" + machine_type = "${var.controller_type}" + min_cpu_platform = "Intel Haswell" metadata { user-data = "${element(data.template_file.controller-cloudinit.*.rendered, count.index)}" diff --git a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf index 08fde627..180556e8 100644 --- a/google-cloud/fedora-atomic/kubernetes/workers/workers.tf +++ b/google-cloud/fedora-atomic/kubernetes/workers/workers.tf @@ -23,9 +23,10 @@ resource "google_compute_region_instance_group_manager" "workers" { # Worker instance template resource "google_compute_instance_template" "worker" { - name_prefix = "${var.name}-worker-" - description = "Worker Instance template" - machine_type = "${var.machine_type}" + name_prefix = "${var.name}-worker-" + description = "Worker Instance template" + machine_type = "${var.machine_type}" + min_cpu_platform = "Intel Haswell" metadata { user-data = "${data.template_file.worker-cloudinit.rendered}"