Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Haswell minimum CPU platform requirement #439

Merged
merged 1 commit into from
Mar 28, 2019
Merged

Remove Haswell minimum CPU platform requirement #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
View file
Open in desktop
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 ([#439](https://github.com/poseidon/typhoon/pull/439))
* Google Cloud API implements `min_cpu_platform` to mean "use exactly this CPU". Revert [#405](https://github.com/poseidon/typhoon/pull/405) added in v1.13.4.
* Fix error creating clusters in new regions without Haswell (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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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