Skip to content

Commit 345ce9f

Browse files
authored
feat: Update default chart versions to latest minor version supported (#364)
1 parent 077b8bc commit 345ce9f

File tree

9 files changed

+129
-141
lines changed

9 files changed

+129
-141
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ repos:
55
- id: trailing-whitespace
66
args: ['--markdown-linebreak-ext=md']
77
- id: end-of-file-fixer
8+
- id: trailing-whitespace
89
- id: check-merge-conflict
910
- id: detect-private-key
1011
- id: detect-aws-credentials
1112
args: ['--allow-missing-credentials']
1213
- repo: https://github.com/antonbabenko/pre-commit-terraform
13-
rev: v1.86.0
14+
rev: v1.88.0
1415
hooks:
1516
- id: terraform_fmt
1617
- id: terraform_docs

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ Terraform module to deploy Kubernetes addons on Amazon EKS clusters.
55
## Usage
66

77
```hcl
8-
module "eks" {
9-
source = "terraform-aws-modules/eks/aws"
10-
11-
cluster_name = "my-cluster"
12-
cluster_version = "1.27"
13-
14-
... truncated for brevity
15-
}
16-
178
module "eks_blueprints_addons" {
189
source = "aws-ia/eks-blueprints-addons/aws"
1910
version = "~> 1.0" #ensure to update this to the latest/desired version
@@ -51,6 +42,15 @@ module "eks_blueprints_addons" {
5142
Environment = "dev"
5243
}
5344
}
45+
46+
module "eks" {
47+
source = "terraform-aws-modules/eks/aws"
48+
49+
cluster_name = "my-cluster"
50+
cluster_version = "1.29"
51+
52+
... truncated for brevity
53+
}
5454
```
5555

5656
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

docs/addons/aws-load-balancer-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ kubectl create ingress example-ingress --class alb --rule="/*=example-svc:80" \
8181
```
8282

8383
```sh
84-
kubectl get ingress
84+
kubectl get ingress
8585
NAME CLASS HOSTS ADDRESS PORTS AGE
8686
example-ingress alb * k8s-example-ingress-7e0d6f03e7-1234567890.us-west-2.elb.amazonaws.com 80 4m9s
8787
```

docs/addons/bottlerocket.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
"shutdown-grace-period" = "30s"
6868
"shutdown-grace-period-for-critical-pods" = "30s"
6969
[settings.kubernetes.eviction-hard]
70-
"memory.available" = "20%"
70+
"memory.available" = "20%"
7171
[settings.kubernetes.node-labels]
7272
"bottlerocket.aws/updater-interface-version" = "2.0.0"
7373
```
@@ -158,7 +158,7 @@ replicaset.apps/brupop-controller-deployment-58d46595cc 1 1 1
158158
159159
$ kubectl describe apiservices.apiregistration.k8s.io v2.brupop.bottlerocket.aws
160160
Name: v2.brupop.bottlerocket.aws
161-
Namespace:
161+
Namespace:
162162
Labels: kube-aggregator.kubernetes.io/automanaged=true
163163
Annotations: <none>
164164
API Version: apiregistration.k8s.io/v1
@@ -188,7 +188,7 @@ Events: <none>
188188
$ kubectl label node ip-10-0-34-87.us-west-2.compute.internal bottlerocket.aws/updater-interface-version=2.0.0
189189
node/ip-10-0-34-87.us-west-2.compute.internal labeled
190190
191-
$ kubectl get nodes -L bottlerocket.aws/updater-interface-version
191+
$ kubectl get nodes -L bottlerocket.aws/updater-interface-version
192192
NAME STATUS ROLES AGE VERSION UPDATER-INTERFACE-VERSION
193193
ip-10-0-34-87.us-west-2.compute.internal Ready <none> 34h v1.28.1-eks-d91a302 2.0.0
194194
```
@@ -197,6 +197,6 @@ ip-10-0-34-87.us-west-2.compute.internal Ready <none>
197197

198198
```bash
199199
kubectl get nodes
200-
NAME STATUS ROLES AGE VERSION
200+
NAME STATUS ROLES AGE VERSION
201201
ip-10-0-34-87.us-west-2.compute.internal Ready <none> 34h v1.28.4-eks-d91a302
202202
```

docs/amazon-eks-addons.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ module "eks_blueprints_addons" {
350350
topologyKey = "kubernetes.io/hostname"
351351
}
352352
]
353-
}
353+
}
354354
355355
}
356356
@@ -363,6 +363,6 @@ module "eks_blueprints_addons" {
363363
cpu = "100m"
364364
memory = "150Mi"
365365
}
366-
})
366+
})
367367
}
368368
```

main.tf

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ module "argo_rollouts" {
8484
namespace = try(var.argo_rollouts.namespace, "argo-rollouts")
8585
create_namespace = try(var.argo_rollouts.create_namespace, true)
8686
chart = try(var.argo_rollouts.chart, "argo-rollouts")
87-
chart_version = try(var.argo_rollouts.chart_version, "2.31.3")
87+
chart_version = try(var.argo_rollouts.chart_version, "2.34.3")
8888
repository = try(var.argo_rollouts.repository, "https://argoproj.github.io/argo-helm")
8989
values = try(var.argo_rollouts.values, [])
9090

@@ -140,7 +140,7 @@ module "argo_workflows" {
140140
namespace = try(var.argo_workflows.namespace, "argo-workflows")
141141
create_namespace = try(var.argo_workflows.create_namespace, true)
142142
chart = try(var.argo_workflows.chart, "argo-workflows")
143-
chart_version = try(var.argo_workflows.chart_version, "0.36.1")
143+
chart_version = try(var.argo_workflows.chart_version, "0.40.14")
144144
repository = try(var.argo_workflows.repository, "https://argoproj.github.io/argo-helm")
145145
values = try(var.argo_workflows.values, [])
146146

@@ -191,13 +191,12 @@ module "argocd" {
191191
create_release = var.create_kubernetes_resources
192192

193193
# https://github.com/argoproj/argo-helm/blob/main/charts/argo-cd/Chart.yaml
194-
# (there is no official helm chart for argocd)
195194
name = try(var.argocd.name, "argo-cd")
196195
description = try(var.argocd.description, "A Helm chart to install the ArgoCD")
197196
namespace = try(var.argocd.namespace, "argocd")
198197
create_namespace = try(var.argocd.create_namespace, true)
199198
chart = try(var.argocd.chart, "argo-cd")
200-
chart_version = try(var.argocd.chart_version, "5.42.1")
199+
chart_version = try(var.argocd.chart_version, "5.55.0") # TODO - v6.x
201200
repository = try(var.argocd.repository, "https://argoproj.github.io/argo-helm")
202201
values = try(var.argocd.values, [])
203202

@@ -245,13 +244,12 @@ module "argo_events" {
245244
create = var.enable_argo_events
246245

247246
# https://github.com/argoproj/argo-helm/tree/main/charts/argo-events
248-
# (there is no official helm chart for argo-events)
249247
name = try(var.argo_events.name, "argo-events")
250248
description = try(var.argo_events.description, "A Helm chart to install the Argo Events")
251249
namespace = try(var.argo_events.namespace, "argo-events")
252250
create_namespace = try(var.argo_events.create_namespace, true)
253251
chart = try(var.argo_events.chart, "argo-events")
254-
chart_version = try(var.argo_events.chart_version, "2.4.0")
252+
chart_version = try(var.argo_events.chart_version, "2.4.3")
255253
repository = try(var.argo_events.repository, "https://argoproj.github.io/argo-helm")
256254
values = try(var.argo_events.values, [])
257255

@@ -312,7 +310,7 @@ module "aws_cloudwatch_metrics" {
312310
namespace = local.aws_cloudwatch_metrics_namespace
313311
create_namespace = try(var.aws_cloudwatch_metrics.create_namespace, true)
314312
chart = try(var.aws_cloudwatch_metrics.chart, "aws-cloudwatch-metrics")
315-
chart_version = try(var.aws_cloudwatch_metrics.chart_version, "0.0.9")
313+
chart_version = try(var.aws_cloudwatch_metrics.chart_version, "0.0.10")
316314
repository = try(var.aws_cloudwatch_metrics.repository, "https://aws.github.io/eks-charts")
317315
values = try(var.aws_cloudwatch_metrics.values, [])
318316

@@ -481,7 +479,7 @@ module "aws_efs_csi_driver" {
481479
namespace = local.aws_efs_csi_driver_namespace
482480
create_namespace = try(var.aws_efs_csi_driver.create_namespace, false)
483481
chart = try(var.aws_efs_csi_driver.chart, "aws-efs-csi-driver")
484-
chart_version = try(var.aws_efs_csi_driver.chart_version, "2.4.8")
482+
chart_version = try(var.aws_efs_csi_driver.chart_version, "2.5.6")
485483
repository = try(var.aws_efs_csi_driver.repository, "https://kubernetes-sigs.github.io/aws-efs-csi-driver/")
486484
values = try(var.aws_efs_csi_driver.values, [])
487485

@@ -658,7 +656,7 @@ module "aws_for_fluentbit" {
658656
namespace = local.aws_for_fluentbit_namespace
659657
create_namespace = try(var.aws_for_fluentbit.create_namespace, false)
660658
chart = try(var.aws_for_fluentbit.chart, "aws-for-fluent-bit")
661-
chart_version = try(var.aws_for_fluentbit.chart_version, "0.1.30")
659+
chart_version = try(var.aws_for_fluentbit.chart_version, "0.1.32")
662660
repository = try(var.aws_for_fluentbit.repository, "https://aws.github.io/eks-charts")
663661
values = try(var.aws_for_fluentbit.values, [])
664662

@@ -1054,7 +1052,7 @@ module "aws_fsx_csi_driver" {
10541052
namespace = local.aws_fsx_csi_driver_namespace
10551053
create_namespace = try(var.aws_fsx_csi_driver.create_namespace, false)
10561054
chart = try(var.aws_fsx_csi_driver.chart, "aws-fsx-csi-driver")
1057-
chart_version = try(var.aws_fsx_csi_driver.chart_version, "1.7.0")
1055+
chart_version = try(var.aws_fsx_csi_driver.chart_version, "1.9.0")
10581056
repository = try(var.aws_fsx_csi_driver.repository, "https://kubernetes-sigs.github.io/aws-fsx-csi-driver/")
10591057
values = try(var.aws_fsx_csi_driver.values, [])
10601058

@@ -1418,7 +1416,7 @@ module "aws_load_balancer_controller" {
14181416
# namespace creation is false here as kube-system already exists by default
14191417
create_namespace = try(var.aws_load_balancer_controller.create_namespace, false)
14201418
chart = try(var.aws_load_balancer_controller.chart, "aws-load-balancer-controller")
1421-
chart_version = try(var.aws_load_balancer_controller.chart_version, "1.6.0")
1419+
chart_version = try(var.aws_load_balancer_controller.chart_version, "1.7.1")
14221420
repository = try(var.aws_load_balancer_controller.repository, "https://aws.github.io/eks-charts")
14231421
values = try(var.aws_load_balancer_controller.values, [])
14241422

@@ -1673,7 +1671,7 @@ module "aws_node_termination_handler" {
16731671
value = local.region
16741672
},
16751673
{ name = "queueURL"
1676-
value = module.aws_node_termination_handler_sqs.queue_url
1674+
value = try(module.aws_node_termination_handler_sqs.queue_url, "")
16771675
},
16781676
{
16791677
name = "enableSqsTerminationDraining"
@@ -1755,7 +1753,7 @@ module "aws_privateca_issuer" {
17551753
namespace = local.aws_privateca_issuer_namespace
17561754
create_namespace = try(var.aws_privateca_issuer.create_namespace, false)
17571755
chart = try(var.aws_privateca_issuer.chart, "aws-privateca-issuer")
1758-
chart_version = try(var.aws_privateca_issuer.chart_version, "v1.2.5")
1756+
chart_version = try(var.aws_privateca_issuer.chart_version, "v1.2.7")
17591757
repository = try(var.aws_privateca_issuer.repository, "https://cert-manager.github.io/aws-privateca-issuer")
17601758
values = try(var.aws_privateca_issuer.values, [])
17611759

@@ -1873,7 +1871,7 @@ module "cert_manager" {
18731871
namespace = local.cert_manager_namespace
18741872
create_namespace = try(var.cert_manager.create_namespace, true)
18751873
chart = try(var.cert_manager.chart, "cert-manager")
1876-
chart_version = try(var.cert_manager.chart_version, "v1.12.3")
1874+
chart_version = try(var.cert_manager.chart_version, "v1.14.3")
18771875
repository = try(var.cert_manager.repository, "https://charts.jetstack.io")
18781876
values = try(var.cert_manager.values, [])
18791877

@@ -1964,9 +1962,10 @@ locals {
19641962
"1.23" = "v1.23.1"
19651963
"1.24" = "v1.24.3"
19661964
"1.25" = "v1.25.3"
1967-
"1.26" = "v1.26.4"
1968-
"1.27" = "v1.27.3"
1969-
"1.28" = "v1.28.0"
1965+
"1.26" = "v1.26.6"
1966+
"1.27" = "v1.27.5"
1967+
"1.28" = "v1.28.2"
1968+
"1.29" = "v1.20.0"
19701969
}
19711970
}
19721971

@@ -2025,7 +2024,7 @@ module "cluster_autoscaler" {
20252024
namespace = local.cluster_autoscaler_namespace
20262025
create_namespace = try(var.cluster_autoscaler.create_namespace, false)
20272026
chart = try(var.cluster_autoscaler.chart, "cluster-autoscaler")
2028-
chart_version = try(var.cluster_autoscaler.chart_version, "9.29.1")
2027+
chart_version = try(var.cluster_autoscaler.chart_version, "9.35.0")
20292028
repository = try(var.cluster_autoscaler.repository, "https://kubernetes.github.io/autoscaler")
20302029
values = try(var.cluster_autoscaler.values, [])
20312030

@@ -2251,7 +2250,7 @@ module "external_dns" {
22512250
namespace = local.external_dns_namespace
22522251
create_namespace = try(var.external_dns.create_namespace, true)
22532252
chart = try(var.external_dns.chart, "external-dns")
2254-
chart_version = try(var.external_dns.chart_version, "1.13.0")
2253+
chart_version = try(var.external_dns.chart_version, "1.14.3")
22552254
repository = try(var.external_dns.repository, "https://kubernetes-sigs.github.io/external-dns/")
22562255
values = try(var.external_dns.values, ["provider: aws"])
22572256

@@ -2403,7 +2402,7 @@ module "external_secrets" {
24032402
namespace = local.external_secrets_namespace
24042403
create_namespace = try(var.external_secrets.create_namespace, true)
24052404
chart = try(var.external_secrets.chart, "external-secrets")
2406-
chart_version = try(var.external_secrets.chart_version, "0.9.1")
2405+
chart_version = try(var.external_secrets.chart_version, "0.9.13")
24072406
repository = try(var.external_secrets.repository, "https://charts.external-secrets.io")
24082407
values = try(var.external_secrets.values, [])
24092408

@@ -2636,7 +2635,7 @@ module "gatekeeper" {
26362635
namespace = try(var.gatekeeper.namespace, "gatekeeper-system")
26372636
create_namespace = try(var.gatekeeper.create_namespace, true)
26382637
chart = try(var.gatekeeper.chart, "gatekeeper")
2639-
chart_version = try(var.gatekeeper.chart_version, "3.12.0")
2638+
chart_version = try(var.gatekeeper.chart_version, "3.15.0")
26402639
repository = try(var.gatekeeper.repository, "https://open-policy-agent.github.io/gatekeeper/charts")
26412640
values = try(var.gatekeeper.values, [])
26422641

@@ -2692,7 +2691,7 @@ module "ingress_nginx" {
26922691
namespace = try(var.ingress_nginx.namespace, "ingress-nginx")
26932692
create_namespace = try(var.ingress_nginx.create_namespace, true)
26942693
chart = try(var.ingress_nginx.chart, "ingress-nginx")
2695-
chart_version = try(var.ingress_nginx.chart_version, "4.7.1")
2694+
chart_version = try(var.ingress_nginx.chart_version, "4.10.0")
26962695
repository = try(var.ingress_nginx.repository, "https://kubernetes.github.io/ingress-nginx")
26972696
values = try(var.ingress_nginx.values, [])
26982697

@@ -3016,7 +3015,7 @@ module "karpenter" {
30163015
namespace = local.karpenter_namespace
30173016
create_namespace = try(var.karpenter.create_namespace, true)
30183017
chart = try(var.karpenter.chart, "karpenter")
3019-
chart_version = try(var.karpenter.chart_version, "v0.32.1")
3018+
chart_version = try(var.karpenter.chart_version, "0.35.0")
30203019
repository = try(var.karpenter.repository, "oci://public.ecr.aws/karpenter")
30213020
values = try(var.karpenter.values, [])
30223021

@@ -3111,7 +3110,7 @@ module "kube_prometheus_stack" {
31113110
namespace = try(var.kube_prometheus_stack.namespace, "kube-prometheus-stack")
31123111
create_namespace = try(var.kube_prometheus_stack.create_namespace, true)
31133112
chart = try(var.kube_prometheus_stack.chart, "kube-prometheus-stack")
3114-
chart_version = try(var.kube_prometheus_stack.chart_version, "48.2.3")
3113+
chart_version = try(var.kube_prometheus_stack.chart_version, "48.2.3") # TODO 56.x
31153114
repository = try(var.kube_prometheus_stack.repository, "https://prometheus-community.github.io/helm-charts")
31163115
values = try(var.kube_prometheus_stack.values, [])
31173116

@@ -3167,7 +3166,7 @@ module "metrics_server" {
31673166
namespace = try(var.metrics_server.namespace, "kube-system")
31683167
create_namespace = try(var.metrics_server.create_namespace, false)
31693168
chart = try(var.metrics_server.chart, "metrics-server")
3170-
chart_version = try(var.metrics_server.chart_version, "3.11.0")
3169+
chart_version = try(var.metrics_server.chart_version, "3.12.0")
31713170
repository = try(var.metrics_server.repository, "https://kubernetes-sigs.github.io/metrics-server/")
31723171
values = try(var.metrics_server.values, [])
31733172

@@ -3223,7 +3222,7 @@ module "secrets_store_csi_driver" {
32233222
namespace = try(var.secrets_store_csi_driver.namespace, "kube-system")
32243223
create_namespace = try(var.secrets_store_csi_driver.create_namespace, false)
32253224
chart = try(var.secrets_store_csi_driver.chart, "secrets-store-csi-driver")
3226-
chart_version = try(var.secrets_store_csi_driver.chart_version, "1.3.4")
3225+
chart_version = try(var.secrets_store_csi_driver.chart_version, "1.4.1")
32273226
repository = try(var.secrets_store_csi_driver.repository, "https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts")
32283227
values = try(var.secrets_store_csi_driver.values, [])
32293228

@@ -3279,7 +3278,7 @@ module "secrets_store_csi_driver_provider_aws" {
32793278
namespace = try(var.secrets_store_csi_driver_provider_aws.namespace, "kube-system")
32803279
create_namespace = try(var.secrets_store_csi_driver_provider_aws.create_namespace, false)
32813280
chart = try(var.secrets_store_csi_driver_provider_aws.chart, "secrets-store-csi-driver-provider-aws")
3282-
chart_version = try(var.secrets_store_csi_driver_provider_aws.chart_version, "0.3.4")
3281+
chart_version = try(var.secrets_store_csi_driver_provider_aws.chart_version, "0.3.6")
32833282
repository = try(var.secrets_store_csi_driver_provider_aws.repository, "https://aws.github.io/secrets-store-csi-driver-provider-aws")
32843283
values = try(var.secrets_store_csi_driver_provider_aws.values, [])
32853284

@@ -3392,7 +3391,7 @@ module "velero" {
33923391
namespace = local.velero_namespace
33933392
create_namespace = try(var.velero.create_namespace, true)
33943393
chart = try(var.velero.chart, "velero")
3395-
chart_version = try(var.velero.chart_version, "3.2.0") # TODO - 4.0.0 is out
3394+
chart_version = try(var.velero.chart_version, "3.2.0") # TODO - 6.0
33963395
repository = try(var.velero.repository, "https://vmware-tanzu.github.io/helm-charts/")
33973396
values = try(var.velero.values, [])
33983397

@@ -3515,7 +3514,7 @@ module "vpa" {
35153514
namespace = try(var.vpa.namespace, "vpa")
35163515
create_namespace = try(var.vpa.create_namespace, true)
35173516
chart = try(var.vpa.chart, "vpa")
3518-
chart_version = try(var.vpa.chart_version, "1.7.5") # TODO - 2.0.0 is out
3517+
chart_version = try(var.vpa.chart_version, "1.7.5") # TODO - 4.0
35193518
repository = try(var.vpa.repository, "https://charts.fairwinds.com/stable")
35203519
values = try(var.vpa.values, [])
35213520

@@ -3607,7 +3606,7 @@ module "aws_gateway_api_controller" {
36073606
namespace = local.aws_gateway_api_controller_namespace
36083607
create_namespace = try(var.aws_gateway_api_controller.create_namespace, true)
36093608
chart = try(var.aws_gateway_api_controller.chart, "aws-gateway-controller-chart")
3610-
chart_version = try(var.aws_gateway_api_controller.chart_version, "v0.0.16")
3609+
chart_version = try(var.aws_gateway_api_controller.chart_version, "v0.0.18") # TODO - 1.0
36113610
repository = try(var.aws_gateway_api_controller.repository, "oci://public.ecr.aws/aws-application-networking-k8s")
36123611
values = try(var.aws_gateway_api_controller.values, [])
36133612

@@ -3684,6 +3683,7 @@ module "aws_gateway_api_controller" {
36843683
################################################################################
36853684
# Bottlerocket Update Operator
36863685
################################################################################
3686+
36873687
locals {
36883688
wait_for_cert_manager = try(var.cert_manager.wait, false) ? [module.cert_manager] : []
36893689
}

0 commit comments

Comments
 (0)