Update default override instance types to work with Cluster Autoscaler (#425)

This commit is contained in:
刘相轩
2019-07-08 17:18:13 +08:00
committed by Max Williams
parent 65901984e5
commit 4b1df0c0af
4 changed files with 13 additions and 8 deletions

View File

@@ -17,6 +17,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
### Changed ### Changed
- Update default override instance types to work with Cluster Autoscaler (by @nauxliu on behalf of RightCapital)
- Write your awesome change here (by @you) - Write your awesome change here (by @you)
# History # History

View File

@@ -27,3 +27,7 @@ To install the chart, simply run helm with the `--values` option:
``` ```
helm install stable/cluster-autoscaler --values=path/to/your/values-file.yaml helm install stable/cluster-autoscaler --values=path/to/your/values-file.yaml
``` ```
## See More
[Using AutoScalingGroup MixedInstancesPolicy](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md#using-autoscalinggroup-mixedinstancespolicy)

View File

@@ -58,7 +58,7 @@ module "eks" {
worker_groups_launch_template_mixed = [ worker_groups_launch_template_mixed = [
{ {
name = "spot-1" name = "spot-1"
override_instance_types = ["m5.large", "c5.large", "t3.large", "r5.large"] override_instance_types = ["m5.large", "m5a.large", "m5d.large", "m5ad.large"]
spot_instance_pools = 4 spot_instance_pools = 4
asg_max_size = 5 asg_max_size = 5
asg_desired_capacity = 5 asg_desired_capacity = 5

View File

@@ -73,7 +73,7 @@ locals {
root_encrypted = "" # Whether the volume should be encrypted or not root_encrypted = "" # Whether the volume should be encrypted or not
eni_delete = true # Delete the ENI on termination (if set to false you will have to manually delete before destroying) eni_delete = true # Delete the ENI on termination (if set to false you will have to manually delete before destroying)
# Settings for launch templates with mixed instances policy # Settings for launch templates with mixed instances policy
override_instance_types = ["m5.large", "c5.large", "t3.large", "r5.large"] # A list of override instance types for mixed instances policy override_instance_types = ["m5.large", "m5a.large", "m5d.large", "m5ad.large"] # A list of override instance types for mixed instances policy
on_demand_allocation_strategy = "prioritized" # Strategy to use when launching on-demand instances. Valid values: prioritized. on_demand_allocation_strategy = "prioritized" # Strategy to use when launching on-demand instances. Valid values: prioritized.
on_demand_base_capacity = "0" # Absolute minimum amount of desired capacity that must be fulfilled by on-demand instances on_demand_base_capacity = "0" # Absolute minimum amount of desired capacity that must be fulfilled by on-demand instances
on_demand_percentage_above_base_capacity = "0" # Percentage split between on-demand and Spot instances above the base on-demand capacity on_demand_percentage_above_base_capacity = "0" # Percentage split between on-demand and Spot instances above the base on-demand capacity