Skip to content

feat(main): take node_config_defaults out of beta #2098

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

Closed
wants to merge 4 commits into from
Closed

feat(main): take node_config_defaults out of beta #2098

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
578d8eb
feat(main): take `node_config_defaults` out of beta
wyardley Sep 14, 2024
87a2db2
Merge branch 'master' into wyardley/promote_node_config_defaults_ga
apeabody Sep 16, 2024
b5da085
Merge branch 'master' into wyardley/promote_node_config_defaults_ga
apeabody Sep 19, 2024
eea2044
Merge branch 'master' into wyardley/promote_node_config_defaults_ga
wyardley Sep 25, 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
4 changes: 2 additions & 2 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,6 @@ resource "google_container_cluster" "primary" {
}
}
}
{% if beta_cluster %}

node_pool_defaults {
node_config_defaults {
Expand All @@ -674,13 +673,14 @@ resource "google_container_cluster" "primary" {
}
{% endif %}
{% if autopilot_cluster != true %}
{% if beta_cluster %}
gcfs_config {
enabled = var.enable_gcfs
}
{% endif %}
{% endif %}
}
}
{% endif %}
{% if beta_cluster %}

depends_on = [google_project_iam_member.service_agent]
Expand Down
5 changes: 5 additions & 0 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,11 @@ resource "google_container_cluster" "primary" {
}
}
}

node_pool_defaults {
node_config_defaults {
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this is obviously useless as it is. but idea is to pave the way for #2082 once some of the other upstream issues are resolved.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, I'm also interested in the "test coverage". The alternative would be to make this a dynamic block.

}
}
/******************************************
Create Container Cluster node pools
Expand Down
5 changes: 5 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 @@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
}
}
}

node_pool_defaults {
node_config_defaults {
}
}
}
/******************************************
Create Container Cluster node pools
Expand Down
5 changes: 5 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 @@ -520,6 +520,11 @@ resource "google_container_cluster" "primary" {
}
}
}

node_pool_defaults {
node_config_defaults {
}
}
}
/******************************************
Create Container Cluster node pools
Expand Down