Skip to content

Commit

Permalink
feat: Update cluster-autoscaler to version 9.21.0 (#907)
Browse files Browse the repository at this point in the history
Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
  • Loading branch information
florentio and bryantbiggs committed Sep 24, 2022
1 parent 4ddf74b commit c700df9
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 20 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ jobs:
uses: clowdhaus/terraform-min-max@v1.0.7
if: steps.changes.outputs.src== 'true'

- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
# TODO - remove hardcoded version once optional attributes are resolved/removed
- name: Pre-commit Terraform 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.6.0
if: steps.changes.outputs.src== 'true'
with:
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
terraform-version: 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
tflint-version: ${{ env.TFLINT_VERSION }}
3 changes: 2 additions & 1 deletion docs/add-ons/cluster-autoscaler.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ enable_cluster_autoscaler = true

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

```
```hcl
clusterAutoscaler = {
enable = true
serviceAccountName = "<service_account_name>"
}
```
2 changes: 0 additions & 2 deletions modules/irsa/versions.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
terraform {
required_version = ">= 1.0.0"

experiments = [module_variable_optional_attrs]

required_providers {
aws = {
source = "hashicorp/aws"
Expand Down
3 changes: 2 additions & 1 deletion modules/kubernetes-addons/cluster-autoscaler/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module "helm_addon" {
helm_config = merge({
name = local.name
chart = local.name
version = "9.19.1"
version = "9.21.0"
repository = "https://kubernetes.github.io/autoscaler"
namespace = local.namespace
description = "Cluster AutoScaler helm Chart deployment configuration."
Expand Down Expand Up @@ -74,6 +74,7 @@ data "aws_iam_policy_document" "cluster_autoscaler" {
"ec2:DescribeInstanceTypes",
"eks:DescribeNodegroup",
]

condition {
test = "StringEquals"
variable = "autoscaling:ResourceTag/k8s.io/cluster-autoscaler/${var.addon_context.eks_cluster_id}"
Expand Down
7 changes: 3 additions & 4 deletions modules/kubernetes-addons/kyverno/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ No resources.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <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 |
| <a name="input_enable_kyverno"></a> [enable\_kyverno](#input\_enable\_kyverno) | Enable Kyverno | `bool` | `false` | no |
| <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 |
| <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 |
| <a name="input_enable_kyverno_policies"></a> [enable\_kyverno\_policies](#input\_enable\_kyverno\_policies) | Enable Kyverno policies | `bool` | `false` | no |
| <a name="input_enable_kyverno_policy_reporter"></a> [enable\_kyverno\_policy\_reporter](#input\_enable\_kyverno\_policy\_reporter) | Enable Kyverno UI | `bool` | `false` | no |
| <a name="input_kyverno_helm_config"></a> [kyverno\_helm\_config](#input\_kyverno\_helm\_config) | Helm provider config for the Kyverno | `any` | `{}` | no |
| <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 |
| <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 |
| <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 |
| <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 |

## Outputs

Expand Down
12 changes: 3 additions & 9 deletions modules/kubernetes-addons/kyverno/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,20 @@ variable "kyverno_policy_reporter_helm_config" {
default = {}
}

variable "enable_kyverno" {
description = "Enable Kyverno"
default = false
type = bool
}

variable "enable_kyverno_policies" {
description = "Enable Kyverno policies. Requires `enable_kyverno` to be `true`"
description = "Enable Kyverno policies"
type = bool
default = false
}

variable "enable_kyverno_policy_reporter" {
description = "Enable Kyverno UI. Requires `enable_kyverno` to be `true`"
description = "Enable Kyverno UI"
type = bool
default = false
}

variable "manage_via_gitops" {
description = "Determines if the add-on should be managed via GitOps."
description = "Determines if the add-on should be managed via GitOps"
type = bool
default = false
}
Expand Down
1 change: 0 additions & 1 deletion modules/kubernetes-addons/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@ module "kyverno" {
addon_context = local.addon_context
manage_via_gitops = var.argocd_manage_add_ons

enable_kyverno = var.enable_kyverno
kyverno_helm_config = var.kyverno_helm_config

enable_kyverno_policies = var.enable_kyverno_policies
Expand Down

0 comments on commit c700df9

Please sign in to comment.