Skip to content

Commit b951aff

Browse files
DrFaust92DrFaust92
committed
add data cache count
Signed-off-by: drfaust92 <[email protected]>
1 parent 7a11b85 commit b951aff

File tree

16 files changed

+58
-50
lines changed

16 files changed

+58
-50
lines changed

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,10 @@ The node_pools variable takes the following parameters:
353353
| initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional |
354354
| insecure_kubelet_readonly_port_enabled | (boolean) Whether or not to enable the insecure Kubelet readonly port. | null | Optional |
355355
| key | The key required for the taint | | Required |
356-
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
357-
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
356+
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
357+
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
358358
| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
359+
| ephemeral_storage_local_ssd_data_cache_count | Number of raw-block local NVMe SSD disks to be attached to the node utilized for GKE Data Cache. | 0 | Optional |
359360
| local_nvme_ssd_count | Number of raw-block local NVMe SSD disks to be attached to the node.Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe SSD disks to be attached to the node. | 0 | Optional |
360361
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
361362
| min_cpu_platform | Minimum CPU platform to be used by the nodes in the pool. The nodes may be scheduled on the specified or newer CPU platform. | " " | Optional |

‎autogen/main/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,10 @@ The node_pools variable takes the following parameters:
228228
| initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional |
229229
| insecure_kubelet_readonly_port_enabled | (boolean) Whether or not to enable the insecure Kubelet readonly port. | null | Optional |
230230
| key | The key required for the taint | | Required |
231-
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
232-
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
231+
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
232+
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
233233
| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
234+
| ephemeral_storage_local_ssd_data_cache_count | Number of raw-block local NVMe SSD disks to be attached to the node utilized for GKE Data Cache. | 0 | Optional |
234235
{% if beta_cluster %}
235236
| local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
236237
{% endif %}

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ locals {
864864
"max_run_duration",
865865
"flex_start",
866866
"local_ssd_ephemeral_storage_count",
867-
"data_cache_count",
867+
"ephemeral_storage_local_ssd_data_cache_count",
868868
]
869869
}
870870

@@ -1116,10 +1116,10 @@ resource "google_container_node_pool" "windows_pools" {
11161116
disk_type = lookup(each.value, "disk_type", "pd-standard")
11171117

11181118
dynamic "ephemeral_storage_local_ssd_config" {
1119-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
1119+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
11201120
content {
11211121
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
1122-
data_cache_count = lookup(each.value, "data_cache_count", 0)
1122+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
11231123
}
11241124
}
11251125
{% if beta_cluster %}

‎cluster.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -819,10 +819,10 @@ resource "google_container_node_pool" "pools" {
819819
disk_type = lookup(each.value, "disk_type", "pd-standard")
820820

821821
dynamic "ephemeral_storage_local_ssd_config" {
822-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
822+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
823823
content {
824824
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
825-
data_cache_count = lookup(each.value, "data_cache_count", 0)
825+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
826826
}
827827
}
828828

@@ -1185,10 +1185,10 @@ resource "google_container_node_pool" "windows_pools" {
11851185
disk_type = lookup(each.value, "disk_type", "pd-standard")
11861186

11871187
dynamic "ephemeral_storage_local_ssd_config" {
1188-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
1188+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
11891189
content {
11901190
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
1191-
data_cache_count = lookup(each.value, "data_cache_count", 0)
1191+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
11921192
}
11931193
}
11941194

‎modules/beta-private-cluster-update-variant/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,10 @@ The node_pools variable takes the following parameters:
406406
| initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional |
407407
| insecure_kubelet_readonly_port_enabled | (boolean) Whether or not to enable the insecure Kubelet readonly port. | null | Optional |
408408
| key | The key required for the taint | | Required |
409-
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
410-
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
409+
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
410+
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
411411
| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
412+
| ephemeral_storage_local_ssd_data_cache_count | Number of raw-block local NVMe SSD disks to be attached to the node utilized for GKE Data Cache. | 0 | Optional |
412413
| local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
413414
| local_nvme_ssd_count | Number of raw-block local NVMe SSD disks to be attached to the node.Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe SSD disks to be attached to the node. | 0 | Optional |
414415
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ locals {
743743
"max_run_duration",
744744
"flex_start",
745745
"local_ssd_ephemeral_storage_count",
746-
"data_cache_count",
746+
"ephemeral_storage_local_ssd_data_cache_count",
747747
]
748748
}
749749

@@ -972,10 +972,10 @@ resource "google_container_node_pool" "pools" {
972972
disk_type = lookup(each.value, "disk_type", "pd-standard")
973973

974974
dynamic "ephemeral_storage_local_ssd_config" {
975-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
975+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
976976
content {
977977
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
978-
data_cache_count = lookup(each.value, "data_cache_count", 0)
978+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
979979
}
980980
}
981981
dynamic "ephemeral_storage_config" {
@@ -1352,10 +1352,10 @@ resource "google_container_node_pool" "windows_pools" {
13521352
disk_type = lookup(each.value, "disk_type", "pd-standard")
13531353

13541354
dynamic "ephemeral_storage_local_ssd_config" {
1355-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
1355+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
13561356
content {
13571357
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
1358-
data_cache_count = lookup(each.value, "data_cache_count", 0)
1358+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
13591359
}
13601360
}
13611361
dynamic "ephemeral_storage_config" {

‎modules/beta-private-cluster/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,10 @@ The node_pools variable takes the following parameters:
384384
| initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional |
385385
| insecure_kubelet_readonly_port_enabled | (boolean) Whether or not to enable the insecure Kubelet readonly port. | null | Optional |
386386
| key | The key required for the taint | | Required |
387-
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
388-
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
387+
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
388+
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
389389
| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
390+
| ephemeral_storage_local_ssd_data_cache_count | Number of raw-block local NVMe SSD disks to be attached to the node utilized for GKE Data Cache. | 0 | Optional |
390391
| local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
391392
| local_nvme_ssd_count | Number of raw-block local NVMe SSD disks to be attached to the node.Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe SSD disks to be attached to the node. | 0 | Optional |
392393
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,10 @@ resource "google_container_node_pool" "pools" {
886886
disk_type = lookup(each.value, "disk_type", "pd-standard")
887887

888888
dynamic "ephemeral_storage_local_ssd_config" {
889-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
889+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
890890
content {
891891
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
892-
data_cache_count = lookup(each.value, "data_cache_count", 0)
892+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
893893
}
894894
}
895895
dynamic "ephemeral_storage_config" {
@@ -1265,10 +1265,10 @@ resource "google_container_node_pool" "windows_pools" {
12651265
disk_type = lookup(each.value, "disk_type", "pd-standard")
12661266

12671267
dynamic "ephemeral_storage_local_ssd_config" {
1268-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
1268+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
12691269
content {
12701270
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
1271-
data_cache_count = lookup(each.value, "data_cache_count", 0)
1271+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
12721272
}
12731273
}
12741274
dynamic "ephemeral_storage_config" {

‎modules/beta-public-cluster-update-variant/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,10 @@ The node_pools variable takes the following parameters:
392392
| initial_node_count | The initial number of nodes for the pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Changing this will force recreation of the resource. Defaults to the value of min_count | " " | Optional |
393393
| insecure_kubelet_readonly_port_enabled | (boolean) Whether or not to enable the insecure Kubelet readonly port. | null | Optional |
394394
| key | The key required for the taint | | Required |
395-
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
396-
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
395+
| logging_variant | The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. | DEFAULT | Optional |
396+
| local_ssd_count | The amount of local SSD disks that will be attached to each cluster node and may be used as a `hostpath` volume or a `local` PersistentVolume. | 0 | Optional |
397397
| local_ssd_ephemeral_storage_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
398+
| ephemeral_storage_local_ssd_data_cache_count | Number of raw-block local NVMe SSD disks to be attached to the node utilized for GKE Data Cache. | 0 | Optional |
398399
| local_ssd_ephemeral_count | The amount of local SSD disks that will be attached to each cluster node and assigned as scratch space as an `emptyDir` volume. If unspecified, ephemeral storage is backed by the cluster node boot disk. | 0 | Optional |
399400
| local_nvme_ssd_count | Number of raw-block local NVMe SSD disks to be attached to the node.Each local SSD is 375 GB in size. If zero, it means no raw-block local NVMe SSD disks to be attached to the node. | 0 | Optional |
400401
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |

‎modules/beta-public-cluster-update-variant/cluster.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ locals {
721721
"max_run_duration",
722722
"flex_start",
723723
"local_ssd_ephemeral_storage_count",
724-
"data_cache_count",
724+
"ephemeral_storage_local_ssd_data_cache_count",
725725
]
726726
}
727727

@@ -950,10 +950,10 @@ resource "google_container_node_pool" "pools" {
950950
disk_type = lookup(each.value, "disk_type", "pd-standard")
951951

952952
dynamic "ephemeral_storage_local_ssd_config" {
953-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
953+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
954954
content {
955955
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
956-
data_cache_count = lookup(each.value, "data_cache_count", 0)
956+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
957957
}
958958
}
959959
dynamic "ephemeral_storage_config" {
@@ -1330,10 +1330,10 @@ resource "google_container_node_pool" "windows_pools" {
13301330
disk_type = lookup(each.value, "disk_type", "pd-standard")
13311331

13321332
dynamic "ephemeral_storage_local_ssd_config" {
1333-
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "data_cache_count", 0) > 0 ? [1] : []
1333+
for_each = lookup(each.value, "local_ssd_ephemeral_storage_count", 0) > 0 || lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0) > 0 ? [1] : []
13341334
content {
13351335
local_ssd_count = lookup(each.value, "local_ssd_ephemeral_storage_count", 0)
1336-
data_cache_count = lookup(each.value, "data_cache_count", 0)
1336+
data_cache_count = lookup(each.value, "ephemeral_storage_local_ssd_data_cache_count", 0)
13371337
}
13381338
}
13391339
dynamic "ephemeral_storage_config" {

0 commit comments

Comments
 (0)