Skip to content

Commit c700df9

Browse files
feat: Update cluster-autoscaler to version 9.21.0 (#907)
Co-authored-by: Bryant Biggs <[email protected]>
1 parent 4ddf74b commit c700df9

File tree

7 files changed

+13
-20
lines changed

7 files changed

+13
-20
lines changed

.github/workflows/pre-commit.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,11 @@ jobs:
125125
uses: clowdhaus/[email protected]
126126
if: steps.changes.outputs.src== 'true'
127127

128-
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
128+
# TODO - remove hardcoded version once optional attributes are resolved/removed
129+
- name: Pre-commit Terraform 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
129130
uses: clowdhaus/terraform-composite-actions/[email protected]
130131
if: steps.changes.outputs.src== 'true'
131132
with:
132-
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
133+
terraform-version: 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
133134
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
134135
tflint-version: ${{ env.TFLINT_VERSION }}

docs/add-ons/cluster-autoscaler.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ enable_cluster_autoscaler = true
1919

2020
The following properties are made available for use when managing the add-on via GitOps.
2121

22-
```
22+
```hcl
2323
clusterAutoscaler = {
2424
enable = true
25+
serviceAccountName = "<service_account_name>"
2526
}
2627
```

modules/irsa/versions.tf

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
terraform {
22
required_version = ">= 1.0.0"
33

4-
experiments = [module_variable_optional_attrs]
5-
64
required_providers {
75
aws = {
86
source = "hashicorp/aws"

modules/kubernetes-addons/cluster-autoscaler/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module "helm_addon" {
1212
helm_config = merge({
1313
name = local.name
1414
chart = local.name
15-
version = "9.19.1"
15+
version = "9.21.0"
1616
repository = "https://kubernetes.github.io/autoscaler"
1717
namespace = local.namespace
1818
description = "Cluster AutoScaler helm Chart deployment configuration."
@@ -74,6 +74,7 @@ data "aws_iam_policy_document" "cluster_autoscaler" {
7474
"ec2:DescribeInstanceTypes",
7575
"eks:DescribeNodegroup",
7676
]
77+
7778
condition {
7879
test = "StringEquals"
7980
variable = "autoscaling:ResourceTag/k8s.io/cluster-autoscaler/${var.addon_context.eks_cluster_id}"

modules/kubernetes-addons/kyverno/README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,12 @@ No resources.
3535
| Name | Description | Type | Default | Required |
3636
|------|-------------|------|---------|:--------:|
3737
| <a name="input_addon_context"></a> [addon\_context](#input\_addon\_context) | Input configuration for the addon | <pre>object({<br> aws_caller_identity_account_id = string<br> aws_caller_identity_arn = string<br> aws_eks_cluster_endpoint = string<br> aws_partition_id = string<br> aws_region_name = string<br> eks_cluster_id = string<br> eks_oidc_issuer_url = string<br> eks_oidc_provider_arn = string<br> tags = map(string)<br> })</pre> | n/a | yes |
38-
| <a name="input_enable_kyverno"></a> [enable\_kyverno](#input\_enable\_kyverno) | Enable Kyverno | `bool` | `false` | no |
39-
| <a name="input_enable_kyverno_policies"></a> [enable\_kyverno\_policies](#input\_enable\_kyverno\_policies) | Enable Kyverno policies. Requires `enable_kyverno` to be `true` | `bool` | `false` | no |
40-
| <a name="input_enable_kyverno_policy_reporter"></a> [enable\_kyverno\_policy\_reporter](#input\_enable\_kyverno\_policy\_reporter) | Enable Kyverno UI. Requires `enable_kyverno` to be `true` | `bool` | `false` | no |
38+
| <a name="input_enable_kyverno_policies"></a> [enable\_kyverno\_policies](#input\_enable\_kyverno\_policies) | Enable Kyverno policies | `bool` | `false` | no |
39+
| <a name="input_enable_kyverno_policy_reporter"></a> [enable\_kyverno\_policy\_reporter](#input\_enable\_kyverno\_policy\_reporter) | Enable Kyverno UI | `bool` | `false` | no |
4140
| <a name="input_kyverno_helm_config"></a> [kyverno\_helm\_config](#input\_kyverno\_helm\_config) | Helm provider config for the Kyverno | `any` | `{}` | no |
4241
| <a name="input_kyverno_policies_helm_config"></a> [kyverno\_policies\_helm\_config](#input\_kyverno\_policies\_helm\_config) | Helm provider config for the Kyverno baseline policies | `any` | `{}` | no |
4342
| <a name="input_kyverno_policy_reporter_helm_config"></a> [kyverno\_policy\_reporter\_helm\_config](#input\_kyverno\_policy\_reporter\_helm\_config) | Helm provider config for the Kyverno policy reporter UI | `any` | `{}` | no |
44-
| <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps. | `bool` | `false` | no |
43+
| <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps | `bool` | `false` | no |
4544

4645
## Outputs
4746

modules/kubernetes-addons/kyverno/variables.tf

+3-9
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,20 @@ variable "kyverno_policy_reporter_helm_config" {
1616
default = {}
1717
}
1818

19-
variable "enable_kyverno" {
20-
description = "Enable Kyverno"
21-
default = false
22-
type = bool
23-
}
24-
2519
variable "enable_kyverno_policies" {
26-
description = "Enable Kyverno policies. Requires `enable_kyverno` to be `true`"
20+
description = "Enable Kyverno policies"
2721
type = bool
2822
default = false
2923
}
3024

3125
variable "enable_kyverno_policy_reporter" {
32-
description = "Enable Kyverno UI. Requires `enable_kyverno` to be `true`"
26+
description = "Enable Kyverno UI"
3327
type = bool
3428
default = false
3529
}
3630

3731
variable "manage_via_gitops" {
38-
description = "Determines if the add-on should be managed via GitOps."
32+
description = "Determines if the add-on should be managed via GitOps"
3933
type = bool
4034
default = false
4135
}

modules/kubernetes-addons/main.tf

-1
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ module "kyverno" {
572572
addon_context = local.addon_context
573573
manage_via_gitops = var.argocd_manage_add_ons
574574

575-
enable_kyverno = var.enable_kyverno
576575
kyverno_helm_config = var.kyverno_helm_config
577576

578577
enable_kyverno_policies = var.enable_kyverno_policies

0 commit comments

Comments
 (0)