google: Configure controller and worker disk sizes

* Add `controller_disk_size` and `worker_disk_size` variables
* Remove `disk_size` variable

google-cloud/flatcar-linux/kubernetes/controllers.tf

@@ -44,7 +44,7 @@ resource "google_compute_instance" "controllers" {
 
     initialize_params {
       image = data.google_compute_image.flatcar-linux.self_link
-      size  = var.disk_size
+      size  = var.controller_disk_size
     }
   }
 

google-cloud/flatcar-linux/kubernetes/variables.tf

@@ -22,30 +22,6 @@ variable "dns_zone_name" {
 
 # instances
 
-variable "controller_count" {
-  type        = number
-  description = "Number of controllers (i.e. masters)"
-  default     = 1
-}
-
-variable "worker_count" {
-  type        = number
-  description = "Number of workers"
-  default     = 1
-}
-
-variable "controller_type" {
-  type        = string
-  description = "Machine type for controllers (see `gcloud compute machine-types list`)"
-  default     = "n1-standard-1"
-}
-
-variable "worker_type" {
-  type        = string
-  description = "Machine type for controllers (see `gcloud compute machine-types list`)"
-  default     = "n1-standard-1"
-}
-
 variable "os_image" {
   type        = string
   description = "Flatcar Linux image for compute instances (flatcar-stable, flatcar-beta, flatcar-alpha)"
@@ -57,7 +33,37 @@ variable "os_image" {
   }
 }
 
-variable "disk_size" {
+variable "controller_count" {
+  type        = number
+  description = "Number of controllers (i.e. masters)"
+  default     = 1
+}
+
+variable "controller_type" {
+  type        = string
+  description = "Machine type for controllers (see `gcloud compute machine-types list`)"
+  default     = "n1-standard-1"
+}
+
+variable "controller_disk_size" {
+  type        = number
+  description = "Size of the disk in GB"
+  default     = 30
+}
+
+variable "worker_count" {
+  type        = number
+  description = "Number of workers"
+  default     = 1
+}
+
+variable "worker_type" {
+  type        = string
+  description = "Machine type for controllers (see `gcloud compute machine-types list`)"
+  default     = "n1-standard-1"
+}
+
+variable "worker_disk_size" {
   type        = number
   description = "Size of the disk in GB"
   default     = 30

google-cloud/flatcar-linux/kubernetes/workers.tf

@@ -9,7 +9,7 @@ module "workers" {
   worker_count = var.worker_count
   machine_type = var.worker_type
   os_image     = var.os_image
-  disk_size    = var.disk_size
+  disk_size    = var.worker_disk_size
   preemptible  = var.worker_preemptible
 
   # configuration