Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adds local_nvme_ssd_block_config to beta-public-cluster #1912

Merged
merged 24 commits into from
Apr 12, 2024
+116 −2
Merged

feat: adds local_nvme_ssd_block_config to beta-public-cluster #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3fcef77
Update cluster.tf
matilote Jul 4, 2023
ba93f63
add local nvme block in autogen templates instead
matilote Jul 7, 2023
9896a4c
update modules with make build
matilote Dec 12, 2023
7cdf727
Merge branch 'terraform-google-modules:master' into master
matilote Dec 12, 2023
0ce5e0e
Merge branch 'master' into master
matilote Feb 26, 2024
0c0382c
feat: add direct fleet registration option (#1878)
apeabody Feb 26, 2024
2a0bd9e
chore(master): release 30.1.0 (#1865)
release-please[bot] Mar 5, 2024
f3f4bf5
feat: add cross project fleet service agent (#1896)
apeabody Mar 8, 2024
153d23f
chore(master): release 30.2.0 (#1897)
release-please[bot] Mar 8, 2024
7bef577
fix: make master_ipv4_cidr_block optional for autopilot (#1902)
cloud-pharaoh Mar 15, 2024
c52a5ab
chore(deps): Update go modules and/or dev-tools (#1889)
renovate[bot] Mar 21, 2024
90d4a3a
chore(deps): Update nginx Docker tag to v1.25.4 (#1877)
renovate[bot] Mar 22, 2024
d74c232
Merge branch 'terraform-google-modules:master' into master
fl0-m Mar 23, 2024
d7e430d
Merge branch 'master' into master
fl0-m Apr 3, 2024
2c2a452
Merge branch 'master' into master
fl0-m Apr 4, 2024
1b8bcfe
Update autogen/main/cluster.tf.tmpl
fl0-m Apr 8, 2024
bae2b81
Update autogen/main/README.md
fl0-m Apr 8, 2024
28140ed
Enable nvme ssd for non beta clusters
fl0-m Apr 8, 2024
18c898d
Merge branch 'master' into master
fl0-m Apr 8, 2024
049e1f1
run codegen
fl0-m Apr 8, 2024
0b934e4
Update autogen/main/cluster.tf.tmpl
fl0-m Apr 12, 2024
b694395
Update autogen/main/cluster.tf.tmpl
fl0-m Apr 12, 2024
86939df
keep ephemeral_storage_config in beta
fl0-m Apr 12, 2024
9a2bf7e
Merge branch 'master' into master
fl0-m Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ The node_pools variable takes the following parameters:
| key | The key required for the taint | | Required |
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
3 changes: 1 addition & 2 deletions autogen/main/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,8 @@ The node_pools variable takes the following parameters:
| key | The key required for the taint | | Required |
| 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 |
| 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 |
{% if beta_cluster %}
fl0-m marked this conversation as resolved.
Show resolved Hide resolved
| 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 |
{% endif %}
| 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 |
fl0-m marked this conversation as resolved.
Show resolved Hide resolved
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
7 changes: 7 additions & 0 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,13 @@ resource "google_container_node_pool" "windows_pools" {
}
{% endif %}

fl0-m marked this conversation as resolved.
Show resolved Hide resolved
dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
14 changes: 14 additions & 0 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,13 @@ resource "google_container_node_pool" "pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -776,6 +783,13 @@ resource "google_container_node_pool" "windows_pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
1 change: 1 addition & 0 deletions modules/beta-private-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ The node_pools variable takes the following parameters:
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,6 +733,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -968,6 +975,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
1 change: 1 addition & 0 deletions modules/beta-private-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ The node_pools variable takes the following parameters:
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -892,6 +899,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
1 change: 1 addition & 0 deletions modules/beta-public-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ The node_pools variable takes the following parameters:
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -949,6 +956,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
1 change: 1 addition & 0 deletions modules/beta-public-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ The node_pools variable takes the following parameters:
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -873,6 +880,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
2 changes: 2 additions & 0 deletions modules/private-cluster-update-variant/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ The node_pools variable takes the following parameters:
| key | The key required for the taint | | Required |
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,13 @@ resource "google_container_node_pool" "pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -871,6 +878,13 @@ resource "google_container_node_pool" "windows_pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down
2 changes: 2 additions & 0 deletions modules/private-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,8 @@ The node_pools variable takes the following parameters:
| key | The key required for the taint | | Required |
| 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 |
| 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 |
| 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 |
| 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 |
| machine_type | The name of a Google Compute Engine machine type | e2-medium | Optional |
| 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 |
| max_count | Maximum number of nodes in the NodePool. Must be >= min_count. Cannot be used with total limits. | 100 | Optional |
Expand Down
14 changes: 14 additions & 0 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,13 @@ resource "google_container_node_pool" "pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down Expand Up @@ -795,6 +802,13 @@ resource "google_container_node_pool" "windows_pools" {
disk_type = lookup(each.value, "disk_type", "pd-standard")


dynamic "local_nvme_ssd_block_config" {
for_each = lookup(each.value, "local_nvme_ssd_count", 0) > 0 ? [1] : []
content {
local_ssd_count = local_nvme_ssd_block_config.value
}
}

service_account = lookup(
each.value,
"service_account",
Expand Down