google: Configure controller and worker disk sizes

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

CHANGES.md

@@ -12,10 +12,27 @@ Notable changes between versions.
 
 ### AWS
 
-* Add `controller_disk_type`, `controller_disk_size`, and `controller_disk_iops` variables
-* Add `worker_disk_type`, `worker_disk_size`, and `worker_disk_iops` variables and fix propagation to worker nodes
-* Remove `disk_type`, `disk_size`, and `disk_iops` variables
-* Add `controller_cpu_credits` and `worker_cpu_credits` variables to set CPU pricing mode for burstable instance types
+* Allow configuring controller and worker disks ([#1482](https://github.com/poseidon/typhoon/pull/1482))
+  * Add `controller_disk_type`, `controller_disk_size`, and `controller_disk_iops` variables
+  * Add `worker_disk_type`, `worker_disk_size`, and `worker_disk_iops` variables
+  * Remove `disk_type`, `disk_size`, and `disk_iops` variables
+  * Fix propagating settings to worker disks, previously ignored
+* Allow configuring CPU pricing model for burstable instance types ([#1482](https://github.com/poseidon/typhoon/pull/1482))
+  * Add `controller_cpu_credits` and `worker_cpu_credits` variables (`standard` or `unlimited`)
+
+```diff
+module "cluster" {
+  ...
+- disk_type = "gp3"
+- disk_size = 30
+- disk_iops = 3000
+
++ controller_disk_size   = 15
++ worker_disk_size       = 22
++ controller_cpu_credits = "standard"
++ worker_cpu_credits     = "unlimited"
+}
+```
 
 ### Azure
 
@@ -54,6 +71,12 @@ module "cluster" {
 }
 ```
 
+### Google Cloud
+
+* Allow configuring controller and worker disks ([#1486](https://github.com/poseidon/typhoon/pull/1486))
+  * Add `controller_disk_size` and `worker_disk_size` variables
+  * Remove `disk_size` variable
+
 ## v1.30.2
 
 * Kubernetes [v1.30.2](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#v1302)

google-cloud/fedora-coreos/kubernetes/controllers.tf

@@ -43,7 +43,7 @@ resource "google_compute_instance" "controllers" {
 
     initialize_params {
       image = data.google_compute_image.fedora-coreos.self_link
-      size  = var.disk_size
+      size  = var.controller_disk_size
     }
   }
 

google-cloud/fedora-coreos/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_stream" {
   type        = string
   description = "Fedora CoreOS stream for compute instances (e.g. stable, testing, next)"
@@ -57,7 +33,37 @@ variable "os_stream" {
   }
 }
 
-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/fedora-coreos/kubernetes/workers.tf

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

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