Merge pull request terraform-google-modules#339 from terraform-google…

…-modules/feature/local-ssd-count Add support for local_ssd_count in node config
WALTER-GROUP · Nov 20, 2019 · 152bc32 · 152bc32
2 parents 19f88b5 + 4f018c2
commit 152bc32
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ Extending the adopted spec, each change should have a link to its corresponding
 * Support for setting node_locations on node pools. [#303]
 * Fix for specifying  `node_count` on node pools when autoscaling is disabled. [#311]
 * Added submodule for installing Anthos Config Management. [#268]
+* Support for `local_ssd_count` in node pool configuration. [#244]
 
 ## [v5.1.1] - 2019-10-25
 
@@ -245,6 +246,7 @@ In either case, upgrading to module version `v1.0.0` will trigger a recreation o
 [#238]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/238
 [#241]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/241
 [#250]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/250
+[#244]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/244
 [#236]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/236
 [#217]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/217
 [#234]: https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/pull/234

diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ module "gke" {
       machine_type       = "n1-standard-2"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/autogen/README.md b/autogen/README.md
@@ -60,6 +60,7 @@ module "gke" {
       {% endif %}
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/autogen/cluster.tf.tmpl b/autogen/cluster.tf.tmpl
@@ -384,8 +384,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/cluster.tf b/cluster.tf
@@ -185,8 +185,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -50,6 +50,7 @@ module "gke" {
       machine_type      = "n1-standard-2"
       min_count         = 1
       max_count         = 2
+      local_ssd_count   = 0
       disk_size_gb      = 30
       disk_type         = "pd-standard"
       accelerator_count = 1

diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -51,6 +51,7 @@ module "gke" {
       node_locations     = "us-central1-b,us-central1-c"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -352,8 +352,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -51,6 +51,7 @@ module "gke" {
       node_locations     = "us-central1-b,us-central1-c"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -280,8 +280,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -46,6 +46,7 @@ module "gke" {
       node_locations     = "us-central1-b,us-central1-c"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -275,8 +275,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -48,6 +48,7 @@ module "gke" {
       machine_type       = "n1-standard-2"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -262,8 +262,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",

diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -48,6 +48,7 @@ module "gke" {
       machine_type       = "n1-standard-2"
       min_count          = 1
       max_count          = 100
+      local_ssd_count    = 0
       disk_size_gb       = 100
       disk_type          = "pd-standard"
       image_type         = "COS"

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -190,8 +190,10 @@ resource "google_container_node_pool" "pools" {
       var.node_pools_tags[var.node_pools[count.index]["name"]],
     )
 
-    disk_size_gb = lookup(var.node_pools[count.index], "disk_size_gb", 100)
-    disk_type    = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+    local_ssd_count = lookup(var.node_pools[count.index], "local_ssd_count", 0)
+    disk_size_gb    = lookup(var.node_pools[count.index], "disk_size_gb", 100)
+    disk_type       = lookup(var.node_pools[count.index], "disk_type", "pd-standard")
+
     service_account = lookup(
       var.node_pools[count.index],
       "service_account",