-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat!: add service_externalips option, and add default for autoscaling location_policy #1440
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -202,6 +202,10 @@ resource "google_container_cluster" "primary" { | |
} | ||
} | ||
|
||
service_external_ips_config { | ||
enabled = var.service_externalips | ||
} | ||
|
||
addons_config { | ||
http_load_balancing { | ||
disabled = !var.http_load_balancing | ||
|
@@ -616,8 +620,9 @@ resource "google_container_node_pool" "windows_pools" { | |
dynamic "autoscaling" { | ||
for_each = lookup(each.value, "autoscaling", true) ? [each.value] : [] | ||
content { | ||
min_node_count = lookup(autoscaling.value, "min_count", 1) | ||
max_node_count = lookup(autoscaling.value, "max_count", 100) | ||
min_node_count = lookup(autoscaling.value, "min_count", 1) | ||
max_node_count = lookup(autoscaling.value, "max_count", 100) | ||
location_policy = "BALANCED" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like an unrelated change? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unrelated to external ips yes, but this was something I've seen happen in clusters as of 1.24 - they get this default value from the provider, but this module will remove it on the next plan + apply. I can separate into second PR (and make it a var) if you'd like! |
||
} | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -96,6 +96,12 @@ variable "http_load_balancing" { | |||||
default = true | ||||||
} | ||||||
|
||||||
variable "service_externalips" { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. sure, sounds good - I will make some changes locally and update! |
||||||
type = bool | ||||||
description = "Whether external ips specified by a service will be allowed in this cluster" | ||||||
default = false | ||||||
} | ||||||
|
||||||
variable "datapath_provider" { | ||||||
type = string | ||||||
description = "The desired datapath provider for this cluster. By default, `DATAPATH_PROVIDER_UNSPECIFIED` enables the IPTables-based kube-proxy implementation. `ADVANCED_DATAPATH` enables Dataplane-V2 feature." | ||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this a dynamic block if enabled?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure! let me include in the changes I'll make locally