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.

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

Allow setting extra values to cluster-autoscaler Helm chart #45

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [5.2.0] - 2024-02-16

- Allow setting extra values to cluster-autoscaler Helm chart.

## [5.1.0] - 2024-02-15

- Allow configuring NodeAffinity for ingress-nginx controller.
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,12 @@ module "eks_main" {
}
]

helm_ingress_nginx_enabled = true
helm_cluster_autoscaler_enabled = true
helm_metrics_server_enabled = true
helm_cert_manager_enabled = true
ingress_node_affinity = {
helm_ingress_nginx_enabled = true
helm_cluster_autoscaler_enabled = true
cluster_autoscaler_extra_helm_values = file("${path.root}/resources/helm/values/cluster-autoscaler.yaml")
helm_metrics_server_enabled = true
helm_cert_manager_enabled = true
ingress_node_affinity = {
enabled = true,
label_key = "nodegroup",
label_value = "${var.env}-eks-spot"
Expand Down Expand Up @@ -253,6 +254,7 @@ module "eks_main" {
| helm\_cluster\_autoscaler\_enabled | Set if cluster-autoscaler Helm chart will be installed on the cluster. | `bool` | `false` | no |
| cluster\_autoscaler\_chart\_version | Set the version for the chart | `string` | `9.16.1` | no |
| cluster\_autoscaler\_priority\_class\_name | allows you to set a priority class | `string` | `""` | no |
| cluster\_autoscaler\_extra\_helm\_values | Raw YAML containing additional cluster-autoscaler Helm values | `string` | `""` | no |
| helm\_metrics\_server\_enabled | Set if metrics-server Helm chart will be installed on the cluster. | `bool` | `false` | no |
| metrics\_server\_chart\_version | Set the version for the chart | `string` | `1.6.1` | no |
| metrics\_server\_priority\_class\_name | allows you to set a priority class | `string` | `""` | no |
Expand Down
2 changes: 2 additions & 0 deletions helm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ resource "helm_release" "cluster_autoscaler" {
value = var.cluster_autoscaler_priority_class_name
}

values = [var.cluster_autoscaler_extra_helm_values]

depends_on = [time_sleep.wait_20_seconds]

}
Expand Down
4 changes: 4 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ variable "cluster_autoscaler_priority_class_name" {
default = ""
}

variable "cluster_autoscaler_extra_helm_values" {
default = ""
}

# metrics-server
variable "helm_metrics_server_enabled" {
default = false
Expand Down