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

Jump to bottom

Fix misspellings in comments and min_cpu_platform #1207

Merged
merged 6 commits into from
Apr 15, 2022
Merged

Fix misspellings in comments and min_cpu_platform #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f30c4d
propagate enable_gcfs
sasha-s Feb 18, 2022
7a4417f
move changes to autogen
sasha-s Mar 11, 2022
1850658
Fix misspellings in comments and min_cpu_platform
sasha-s Apr 8, 2022
945d103
Merge branch 'master' into cleanup
sasha-s Apr 14, 2022
7e51c9d
Merge branch 'master' into cleanup
bharathkkb Apr 14, 2022
68860e1
Merge branch 'master' into cleanup
sasha-s Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
4 changes: 2 additions & 2 deletions autogen/safer-cluster/main.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module "gke" {

initial_node_count = var.initial_node_count

// We suggest removing the default node pull, as it cannot be modified without
// We suggest removing the default node pool, as it cannot be modified without
// destroying the cluster.
remove_default_node_pool = true

Expand All @@ -103,7 +103,7 @@ module "gke" {

// We either:
// - Create a dedicated service account with minimal permissions to run nodes.
// All applications shuold run with an identity defined via Workload Identity anyway.
// All applications should run with an identity defined via Workload Identity anyway.
// - Use a service account passed as a parameter to the module, in case the user
// wants to maintain control of their service accounts.
create_service_account = var.compute_engine_service_account == "" ? true : false
Expand Down
2 changes: 1 addition & 1 deletion cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -503,7 +503,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -484,7 +484,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ resource "google_container_node_pool" "pools" {
node_config {
image_type = lookup(each.value, "image_type", "COS_CONTAINERD")
machine_type = lookup(each.value, "machine_type", "e2-medium")
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
gcfs_config {
enabled = lookup(each.value, "enable_gcfs", false)
}
Expand Down
4 changes: 2 additions & 2 deletions modules/safer-cluster-update-variant/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module "gke" {

initial_node_count = var.initial_node_count

// We suggest removing the default node pull, as it cannot be modified without
// We suggest removing the default node pool, as it cannot be modified without
// destroying the cluster.
remove_default_node_pool = true

Expand All @@ -99,7 +99,7 @@ module "gke" {

// We either:
// - Create a dedicated service account with minimal permissions to run nodes.
// All applications shuold run with an identity defined via Workload Identity anyway.
// All applications should run with an identity defined via Workload Identity anyway.
// - Use a service account passed as a parameter to the module, in case the user
// wants to maintain control of their service accounts.
create_service_account = var.compute_engine_service_account == "" ? true : false
Expand Down
4 changes: 2 additions & 2 deletions modules/safer-cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module "gke" {

initial_node_count = var.initial_node_count

// We suggest removing the default node pull, as it cannot be modified without
// We suggest removing the default node pool, as it cannot be modified without
// destroying the cluster.
remove_default_node_pool = true

Expand All @@ -99,7 +99,7 @@ module "gke" {

// We either:
// - Create a dedicated service account with minimal permissions to run nodes.
// All applications shuold run with an identity defined via Workload Identity anyway.
// All applications should run with an identity defined via Workload Identity anyway.
// - Use a service account passed as a parameter to the module, in case the user
// wants to maintain control of their service accounts.
create_service_account = var.compute_engine_service_account == "" ? true : false
Expand Down