Skip to content

Commit

Permalink
Remove Haswell minimum CPU platform requirement
Browse files Browse the repository at this point in the history
* Google Cloud API implements `min_cpu_platform` to mean
"use exactly this CPU"
* Fix error creating clusters in newer regions lacking Haswell
platform (e.g. europe-west2) (#438)
* Reverts #405, added in v1.13.4
* Original goal of ignoring old Ivy/Sandy bridge CPUs in older regions
will be achieved shortly anyway. Google Cloud is deprecating those CPUs
in April 2019
* https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform#how_selecting_a_minimum_cpu_platform_works
  • Loading branch information
dghubble committed Mar 28, 2019
1 parent 5a1bc42 commit a53210a
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Notable changes between versions.

## Latest

#### Google Cloud

* Remove Haswell minimum CPU platform requirement
* Google Cloud API implements `min_cpu_platform` to mean "use exactly this CPU". Reverts [#405](https://github.com/poseidon/typhoon/pull/405) added in v1.13.4.
* Fix error creating clusters in newer regions lacking Haswell platform (e.g. europe-west2) ([#438](https://github.com/poseidon/typhoon/issues/438))

## v1.13.5

* Kubernetes [v1.13.5](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md#v1135)
Expand Down
4 changes: 2 additions & 2 deletions bare-metal/container-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ variable "cluster_domain_suffix" {
}

variable "download_protocol" {
type = "string"
default = "https"
type = "string"
default = "https"
description = "Protocol iPXE should use to download the kernel and initrd. Defaults to https, which requires iPXE compiled with crypto support. Unused if cached_install is true."
}

Expand Down
7 changes: 3 additions & 4 deletions google-cloud/container-linux/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ 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}"
min_cpu_platform = "Intel Haswell"
name = "${var.cluster_name}-controller-${count.index}"
zone = "${element(local.zones, count.index)}"
machine_type = "${var.controller_type}"

metadata = {
user-data = "${element(data.ct_config.controller-ignitions.*.rendered, count.index)}"
Expand Down
7 changes: 3 additions & 4 deletions google-cloud/container-linux/kubernetes/workers/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ 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}"
min_cpu_platform = "Intel Haswell"
name_prefix = "${var.name}-worker-"
description = "Worker Instance template"
machine_type = "${var.machine_type}"

metadata = {
user-data = "${data.ct_config.worker-ignition.rendered}"
Expand Down
7 changes: 3 additions & 4 deletions google-cloud/fedora-atomic/kubernetes/controllers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ 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}"
min_cpu_platform = "Intel Haswell"
name = "${var.cluster_name}-controller-${count.index}"
zone = "${element(local.zones, count.index)}"
machine_type = "${var.controller_type}"

metadata = {
user-data = "${element(data.template_file.controller-cloudinit.*.rendered, count.index)}"
Expand Down
7 changes: 3 additions & 4 deletions google-cloud/fedora-atomic/kubernetes/workers/workers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ 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}"
min_cpu_platform = "Intel Haswell"
name_prefix = "${var.name}-worker-"
description = "Worker Instance template"
machine_type = "${var.machine_type}"

metadata = {
user-data = "${data.template_file.worker-cloudinit.rendered}"
Expand Down

0 comments on commit a53210a

Please sign in to comment.