diff --git a/CHANGES.md b/CHANGES.md index 18649d5e..c1b0d7d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,6 +10,10 @@ Notable changes between versions. * Remove optional variable `networking`. Only flannel works on Digital Ocean. +#### Google Cloud + +* Add `disk_size` variable for setting instance disk size in GB + ## v1.9.6 * Kubernetes [v1.9.6](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.9.md#v196) diff --git a/docs/google-cloud.md b/docs/google-cloud.md index d4a0c421..ea154511 100644 --- a/docs/google-cloud.md +++ b/docs/google-cloud.md @@ -256,6 +256,7 @@ resource "google_dns_managed_zone" "zone-for-clusters" { | worker_count | Number of workers | 1 | 3 | | machine_type | Machine type for compute instances | "n1-standard-1" | See below | | os_image | Container Linux image for compute instances | "coreos-stable" | "coreos-stable-1632-3-0-v20180215" | +| disk_size | Size of the disk in GB | 40 | 100 | | worker_preemptible | If enabled, Compute Engine will terminate workers randomly within 24 hours | false | true | | controller_clc_snippets | Controller Container Linux Config snippets | [] | | | worker_clc_snippets | Worker Container Linux Config snippets | [] | | diff --git a/google-cloud/container-linux/kubernetes/cluster.tf b/google-cloud/container-linux/kubernetes/cluster.tf index cd8a0841..5515892d 100644 --- a/google-cloud/container-linux/kubernetes/cluster.tf +++ b/google-cloud/container-linux/kubernetes/cluster.tf @@ -10,6 +10,7 @@ module "controllers" { count = "${var.controller_count}" machine_type = "${var.machine_type}" os_image = "${var.os_image}" + disk_size = "${var.disk_size}" # configuration networking = "${var.networking}" @@ -31,6 +32,7 @@ module "workers" { count = "${var.worker_count}" machine_type = "${var.machine_type}" os_image = "${var.os_image}" + disk_size = "${var.disk_size}" preemptible = "${var.worker_preemptible}" # configuration diff --git a/google-cloud/container-linux/kubernetes/controllers/variables.tf b/google-cloud/container-linux/kubernetes/controllers/variables.tf index c261eb2c..b42bab52 100644 --- a/google-cloud/container-linux/kubernetes/controllers/variables.tf +++ b/google-cloud/container-linux/kubernetes/controllers/variables.tf @@ -43,7 +43,7 @@ variable "os_image" { variable "disk_size" { type = "string" default = "40" - description = "The size of the disk in gigabytes." + description = "Size of the disk in GB" } # configuration diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/container-linux/kubernetes/variables.tf index 78f3b8ee..46812a2e 100644 --- a/google-cloud/container-linux/kubernetes/variables.tf +++ b/google-cloud/container-linux/kubernetes/variables.tf @@ -46,6 +46,12 @@ variable "os_image" { description = "Container Linux image for compute instances (e.g. coreos-stable)" } +variable "disk_size" { + type = "string" + default = "40" + description = "Size of the disk in GB" +} + variable "worker_preemptible" { type = "string" default = "false" diff --git a/google-cloud/container-linux/kubernetes/workers/variables.tf b/google-cloud/container-linux/kubernetes/workers/variables.tf index 70bf80cb..59ccfe9f 100644 --- a/google-cloud/container-linux/kubernetes/workers/variables.tf +++ b/google-cloud/container-linux/kubernetes/workers/variables.tf @@ -43,7 +43,7 @@ variable "os_image" { variable "disk_size" { type = "string" default = "40" - description = "The size of the disk in gigabytes." + description = "Size of the disk in GB" } variable "preemptible" {