Skip to content

Commit a0cfbae

Browse files
authored
Merge pull request terraform-google-modules#60 from egnyte/OPS-31744
Add initial_node_count var for node_pool block
2 parents fe67e90 + 653a0b6 commit a0cfbae

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
1010
* Set `horizontal_pod_autoscaling` to `true` by default. #42
1111
* Add `remove_default_node_pool` set to `false` by default #15
1212
* Allow arbitrary key-value pairs to be set on node pool metadata. #52
13+
* Add `initial_node_count` parameter to node_pool block. #60
1314

1415
## [v0.4.0] - 2018-12-19
1516
### Added

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ module "gke" {
3030
3131
node_pools = [
3232
{
33-
name = "default-node-pool"
34-
machine_type = "n1-standard-2"
35-
min_count = 1
36-
max_count = 100
37-
disk_size_gb = 100
38-
disk_type = "pd-standard"
39-
image_type = "COS"
40-
auto_repair = true
41-
auto_upgrade = true
42-
service_account = "project-service-account@<PROJECT ID>.iam.gserviceaccount.com"
43-
preemptible = false
33+
name = "default-node-pool"
34+
machine_type = "n1-standard-2"
35+
min_count = 1
36+
max_count = 100
37+
disk_size_gb = 100
38+
disk_type = "pd-standard"
39+
image_type = "COS"
40+
auto_repair = true
41+
auto_upgrade = true
42+
service_account = "project-service-account@<PROJECT ID>.iam.gserviceaccount.com"
43+
preemptible = false
44+
initial_node_count = 80
4445
},
4546
]
4647

cluster_regional.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ resource "google_container_node_pool" "pools" {
9595
region = "${var.region}"
9696
cluster = "${var.name}"
9797
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version)}"
98-
initial_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"
98+
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
9999

100100
autoscaling {
101101
min_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"

cluster_zonal.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ resource "google_container_node_pool" "zonal_pools" {
9595
zone = "${var.zones[0]}"
9696
cluster = "${var.name}"
9797
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version)}"
98-
initial_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"
98+
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
9999

100100
autoscaling {
101101
min_node_count = "${lookup(var.node_pools[count.index], "min_count", 1)}"

0 commit comments

Comments
 (0)