C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

terraform/gcp: Allow to use preemptible VM instances (#8480)

Browse source
This commit is contained in:
Mathieu Parent 2022-01-31 09:30:24 +01:00 committed by GitHub
parent ababcd5481
commit 3562d3378b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/terraform/gcp/README.md
View file

@ -80,8 +80,12 @@ ansible-playbook -i contrib/terraform/gcs/inventory.ini cluster.yml -b -v
* `prefix`: Prefix to use for all resources, required to be unique for all clusters in the same project *(Defaults to `default`)* * `prefix`: Prefix to use for all resources, required to be unique for all clusters in the same project *(Defaults to `default`)*
* `master_sa_email`: Service account email to use for the master nodes *(Defaults to `""`, auto generate one)* * `master_sa_email`: Service account email to use for the master nodes *(Defaults to `""`, auto generate one)*
* `master_sa_scopes`: Service account email to use for the master nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)* * `master_sa_scopes`: Service account email to use for the master nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)*
* `master_preemptible`: Enable [preemptible](https://cloud.google.com/compute/docs/instances/preemptible)
for the master nodes *(Defaults to `false`)*
* `worker_sa_email`: Service account email to use for the worker nodes *(Defaults to `""`, auto generate one)* * `worker_sa_email`: Service account email to use for the worker nodes *(Defaults to `""`, auto generate one)*
* `worker_sa_scopes`: Service account email to use for the worker nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)* * `worker_sa_scopes`: Service account email to use for the worker nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)*
* `worker_preemptible`: Enable [preemptible](https://cloud.google.com/compute/docs/instances/preemptible)
for the worker nodes *(Defaults to `false`)*
An example variables file can be found `tfvars.json` An example variables file can be found `tfvars.json`

2
contrib/terraform/gcp/main.tf
View file

@ -23,8 +23,10 @@ module "kubernetes" {
master_sa_email = var.master_sa_email master_sa_email = var.master_sa_email
master_sa_scopes = var.master_sa_scopes master_sa_scopes = var.master_sa_scopes
master_preemptible = var.master_preemptible
worker_sa_email = var.worker_sa_email worker_sa_email = var.worker_sa_email
worker_sa_scopes = var.worker_sa_scopes worker_sa_scopes = var.worker_sa_scopes
worker_preemptible = var.worker_preemptible
ssh_whitelist = var.ssh_whitelist ssh_whitelist = var.ssh_whitelist
api_server_whitelist = var.api_server_whitelist api_server_whitelist = var.api_server_whitelist

10
contrib/terraform/gcp/modules/kubernetes-cluster/main.tf
View file

@ -231,6 +231,11 @@ resource "google_compute_instance" "master" {
lifecycle { lifecycle {
ignore_changes = [attached_disk] ignore_changes = [attached_disk]
} }
scheduling {
preemptible = var.master_preemptible
automatic_restart = !var.master_preemptible
}
} }
resource "google_compute_forwarding_rule" "master_lb" { resource "google_compute_forwarding_rule" "master_lb" {
@ -328,6 +333,11 @@ resource "google_compute_instance" "worker" {
lifecycle { lifecycle {
ignore_changes = [attached_disk] ignore_changes = [attached_disk]
} }
scheduling {
preemptible = var.worker_preemptible
automatic_restart = !var.worker_preemptible
}
} }
resource "google_compute_address" "worker_lb" { resource "google_compute_address" "worker_lb" {

8
contrib/terraform/gcp/modules/kubernetes-cluster/variables.tf
View file

@ -27,6 +27,10 @@ variable "master_sa_scopes" {
type = list(string) type = list(string)
} }
variable "master_preemptible" {
type = bool
}
variable "worker_sa_email" { variable "worker_sa_email" {
type = string type = string
} }
@ -35,6 +39,10 @@ variable "worker_sa_scopes" {
type = list(string) type = list(string)
} }
variable "worker_preemptible" {
type = bool
}
variable "ssh_pub_key" {} variable "ssh_pub_key" {}
variable "ssh_whitelist" { variable "ssh_whitelist" {

10
contrib/terraform/gcp/variables.tf
View file

@ -44,6 +44,11 @@ variable "master_sa_scopes" {
default = ["https://www.googleapis.com/auth/cloud-platform"] default = ["https://www.googleapis.com/auth/cloud-platform"]
} }
variable "master_preemptible" {
type = bool
default = false
}
variable "worker_sa_email" { variable "worker_sa_email" {
type = string type = string
default = "" default = ""
@ -54,6 +59,11 @@ variable "worker_sa_scopes" {
default = ["https://www.googleapis.com/auth/cloud-platform"] default = ["https://www.googleapis.com/auth/cloud-platform"]
} }
variable "worker_preemptible" {
type = bool
default = false
}
variable ssh_pub_key { variable ssh_pub_key {
description = "Path to public SSH key file which is injected into the VMs." description = "Path to public SSH key file which is injected into the VMs."
type = string type = string