Skip to content

Commit 85a0fca

Browse files
bryantbiggsbryantbiggs
authored
feat: Update addons to latest supported versions (#1096)
1 parent 3a16188 commit 85a0fca

File tree

130 files changed

+559
-908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+559
-908
lines changed

‎.github/workflows/pre-commit.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
TERRAFORM_DOCS_VERSION: v0.16.0
1414
TFSEC_VERSION: v1.22.0
1515
TF_PLUGIN_CACHE_DIR: ${{ github.workspace }}/.terraform.d/plugin-cache
16-
TFLINT_VERSION: v0.38.1
16+
TFLINT_VERSION: v0.42.1
1717

1818
concurrency:
1919
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'

‎examples/ai-ml/ray/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ module "s3_bucket" {
210210
data "aws_iam_policy_document" "irsa_policy" {
211211
statement {
212212
actions = ["s3:ListBucket"]
213-
resources = ["${module.s3_bucket.s3_bucket_arn}"]
213+
resources = [module.s3_bucket.s3_bucket_arn]
214214
}
215215
statement {
216216
actions = ["s3:*Object"]

‎examples/analytics/spark-k8s-operator/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ module "eks_blueprints_kubernetes_addons" {
364364
aws_for_fluent_bit_cw_log_group = "/${module.eks_blueprints.eks_cluster_id}/worker-fluentbit-logs" # Optional
365365
create_namespace = true
366366
values = [templatefile("${path.module}/helm-values/aws-for-fluentbit-values.yaml", {
367-
region = "${data.aws_region.current.id}"
367+
region = data.aws_region.current.id
368368
aws_for_fluent_bit_cw_log = "/${module.eks_blueprints.eks_cluster_id}/worker-fluentbit-logs"
369369
})]
370370
set = [

‎examples/observability/amp-amg-opensearch/data.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data "aws_iam_policy_document" "opensearch_access_policy" {
4040
sid = "AdminDomainLevelAccessToOpenSearch"
4141
effect = "Allow"
4242
resources = [
43-
"${aws_elasticsearch_domain.opensearch.arn}",
43+
aws_elasticsearch_domain.opensearch.arn,
4444
"${aws_elasticsearch_domain.opensearch.arn}/*",
4545
]
4646
actions = ["es:*"]

‎locals.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ locals {
124124
platform_teams_config_map = length(var.platform_teams) > 0 ? [
125125
for platform_team_name, platform_team_data in var.platform_teams : {
126126
rolearn : "arn:${local.partition}:iam::${local.account_id}:role/${module.aws_eks.cluster_id}-${platform_team_name}-access"
127-
username : "${platform_team_name}"
127+
username : platform_team_name
128128
groups : [
129129
"system:masters"
130130
]
@@ -135,7 +135,7 @@ locals {
135135
application_teams_config_map = length(var.application_teams) > 0 ? [
136136
for team_name, team_data in var.application_teams : {
137137
rolearn : "arn:${local.partition}:iam::${local.account_id}:role/${module.aws_eks.cluster_id}-${team_name}-access"
138-
username : "${team_name}"
138+
username : team_name
139139
groups : [
140140
"${team_name}-group"
141141
]

‎modules/aws-eks-self-managed-node-groups/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
output "self_managed_nodegroup_name" {
22
description = "EKS Self Managed node group id"
3-
value = local.self_managed_node_group["node_group_name"].*
3+
value = local.self_managed_node_group["node_group_name"][*]
44
}
55

66
output "self_managed_nodegroup_iam_role_arns" {

‎modules/aws-eks-self-managed-node-groups/self-managed-launch-templates.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module "launch_template_self_managed_ng" {
33

44
eks_cluster_id = var.context.eks_cluster_id
55
launch_template_config = {
6-
"${local.lt_self_managed_group_map_key}" = {
6+
(local.lt_self_managed_group_map_key) = {
77
ami = local.custom_ami_id
88
launch_template_os = local.self_managed_node_group["launch_template_os"]
99
launch_template_prefix = local.self_managed_node_group["node_group_name"]

‎modules/aws-eks-teams/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ resource "aws_iam_role" "team_sa_irsa" {
129129
{
130130
"Effect" : "Allow",
131131
"Principal" : {
132-
"Federated" : "${local.eks_oidc_provider_arn}"
132+
"Federated" : local.eks_oidc_provider_arn
133133
},
134134
"Action" : "sts:AssumeRoleWithWebIdentity",
135135
"Condition" : {

‎modules/irsa/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ resource "aws_iam_role" "irsa" {
4343
{
4444
"Effect" : "Allow",
4545
"Principal" : {
46-
"Federated" : "${var.eks_oidc_provider_arn}"
46+
"Federated" : var.eks_oidc_provider_arn
4747
},
4848
"Action" : "sts:AssumeRoleWithWebIdentity",
4949
"Condition" : {

‎modules/kubernetes-addons/agones/locals.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ locals {
22
name = "agones"
33
namespace = "agones-system"
44

5+
# https://github.com/googleforgames/agones/blob/main/install/helm/agones/Chart.yaml
56
default_helm_config = {
67
name = local.name
78
chart = local.name
89
repository = "https://agones.dev/chart/stable"
9-
version = "1.23.0"
10+
version = "1.27.0"
1011
namespace = local.namespace
11-
timeout = "1200"
1212
description = "Agones Gaming Server Helm Chart deployment configuration"
1313
values = local.default_helm_values
1414
gameserver_minport = 7000

‎modules/kubernetes-addons/airflow/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
locals {
22
name = "airflow"
33

4+
# https://github.com/apache/airflow/blob/main/chart/Chart.yaml
45
default_helm_config = {
56
name = local.name
67
chart = local.name
78
repository = "https://airflow.apache.org"
8-
version = "1.6.0"
9+
version = "1.7.0"
910
namespace = local.name
1011
create_namespace = true
1112
values = [templatefile("${path.module}/values.yaml", {})]

‎modules/kubernetes-addons/argo-rollouts/locals.tf

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
locals {
22
name = "argo-rollouts"
33

4+
# https://github.com/argoproj/argo-helm/blob/main/charts/argo-rollouts/Chart.yaml
45
default_helm_config = {
56
name = local.name
67
chart = local.name
78
repository = "https://argoproj.github.io/argo-helm"
8-
version = "2.16.0"
9+
version = "2.21.1"
910
namespace = local.name
1011
description = "Argo Rollouts AddOn Helm Chart"
11-
values = []
12-
timeout = "1200"
1312
}
1413

1514
helm_config = merge(

‎modules/kubernetes-addons/argocd/locals.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
locals {
2-
default_helm_values = [templatefile("${path.module}/values.yaml", {})]
2+
default_helm_values = [file("${path.module}/values.yaml")]
33

44
name = "argo-cd"
55
namespace = "argocd"
66

7+
# https://github.com/argoproj/argo-helm/blob/main/charts/argo-cd/Chart.yaml
78
default_helm_config = {
89
name = local.name
910
chart = local.name
1011
repository = "https://argoproj.github.io/argo-helm"
11-
version = "4.9.14"
12+
version = "5.8.3"
1213
namespace = local.namespace
13-
timeout = 1200
1414
create_namespace = true
1515
values = local.default_helm_values
1616
description = "The ArgoCD Helm Chart deployment configuration"

‎modules/kubernetes-addons/aws-cloudwatch-metrics/locals.tf

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ locals {
33
namespace = "amazon-cloudwatch"
44
service_account_name = "cloudwatch-agent"
55

6+
# https://github.com/aws/eks-charts/blob/master/stable/aws-cloudwatch-metrics/Chart.yaml
67
default_helm_config = {
78
name = local.name
89
chart = local.name

‎modules/kubernetes-addons/aws-ebs-csi-driver/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ module "helm_addon" {
3131
source = "../helm-addon"
3232
count = var.enable_self_managed_aws_ebs_csi_driver && !var.enable_amazon_eks_aws_ebs_csi_driver ? 1 : 0
3333

34+
# https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/charts/aws-ebs-csi-driver/Chart.yaml
3435
helm_config = merge({
3536
name = local.name
3637
description = "The Amazon Elastic Block Store Container Storage Interface (CSI) Driver provides a CSI interface used by Container Orchestrators to manage the lifecycle of Amazon EBS volumes."
3738
chart = local.name
38-
version = "2.12.0"
39+
version = "2.12.1"
3940
repository = "https://kubernetes-sigs.github.io/aws-ebs-csi-driver"
4041
namespace = local.namespace
4142
values = [

‎modules/kubernetes-addons/aws-efs-csi-driver/locals.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ locals {
33
service_account_name = "efs-csi-sa"
44
namespace = "kube-system"
55

6+
# https://github.com/kubernetes-sigs/aws-efs-csi-driver/blob/master/charts/aws-efs-csi-driver/Chart.yaml
67
default_helm_config = {
78
name = local.name
89
chart = local.name
910
repository = "https://kubernetes-sigs.github.io/aws-efs-csi-driver/"
10-
version = "2.2.6"
11+
version = "2.2.9"
1112
namespace = local.namespace
12-
values = []
1313
description = "The AWS EFS CSI driver Helm chart deployment configuration"
1414
}
1515

‎modules/kubernetes-addons/aws-for-fluentbit/locals.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ locals {
1414
}
1515
]
1616

17+
# https://github.com/aws/eks-charts/blob/master/stable/aws-for-fluent-bit/Chart.yaml
1718
default_helm_config = {
1819
name = local.name
1920
chart = local.name
2021
repository = "https://aws.github.io/eks-charts"
21-
version = "0.1.18"
22+
version = "0.1.21"
2223
namespace = local.name
2324
values = local.default_helm_values
2425
description = "aws-for-fluentbit Helm Chart deployment configuration"

‎modules/kubernetes-addons/aws-fsx-csi-driver/locals.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ locals {
33
service_account_name = "fsx-csi-sa"
44
namespace = "kube-system"
55

6+
# https://github.com/kubernetes-sigs/aws-fsx-csi-driver/blob/master/charts/aws-fsx-csi-driver/Chart.yaml
67
default_helm_config = {
78
name = local.name
89
chart = local.name
910
repository = "https://kubernetes-sigs.github.io/aws-fsx-csi-driver/"
10-
version = "1.4.2"
11+
version = "1.4.4"
1112
namespace = local.namespace
12-
values = []
1313
description = "The Amazon FSx for Lustre CSI driver Helm chart deployment configuration"
1414
}
1515

‎modules/kubernetes-addons/aws-load-balancer-controller/locals.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ locals {
22
name = "aws-load-balancer-controller"
33
service_account_name = "${local.name}-sa"
44

5+
# https://github.com/aws/eks-charts/blob/master/stable/aws-load-balancer-controller/Chart.yaml
56
default_helm_config = {
67
name = local.name
78
chart = local.name
89
repository = "https://aws.github.io/eks-charts"
9-
version = "1.4.3"
10+
version = "1.4.5"
1011
namespace = "kube-system"
11-
timeout = "1200"
1212
values = local.default_helm_values
1313
description = "aws-load-balancer-controller Helm Chart for ingress resources"
1414
}

‎modules/kubernetes-addons/aws-node-termination-handler/locals.tf

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ locals {
33
name = "aws-node-termination-handler"
44
service_account_name = "${local.name}-sa"
55

6+
# https://github.com/aws/eks-charts/blob/master/stable/aws-node-termination-handler/Chart.yaml
67
default_helm_config = {
7-
name = local.name
8-
chart = local.name
9-
repository = "https://aws.github.io/eks-charts"
10-
version = "0.18.5"
11-
namespace = local.namespace
12-
timeout = "1200"
13-
create_namespace = false
14-
description = "AWS Node Termination Handler Helm Chart"
15-
values = local.default_helm_values
8+
name = local.name
9+
chart = local.name
10+
repository = "https://aws.github.io/eks-charts"
11+
version = "0.19.3"
12+
namespace = local.namespace
13+
description = "AWS Node Termination Handler Helm Chart"
14+
values = local.default_helm_values
1615
}
1716

1817
helm_config = merge(

‎modules/kubernetes-addons/aws-privateca-issuer/data.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
data "aws_iam_policy_document" "aws_privateca_issuer" {
22
statement {
33
effect = "Allow"
4-
resources = ["${var.aws_privateca_acmca_arn}"]
4+
resources = [var.aws_privateca_acmca_arn]
55
actions = [
66
"acm-pca:DescribeCertificateAuthority",
77
"acm-pca:GetCertificate",

‎modules/kubernetes-addons/aws-privateca-issuer/locals.tf

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ locals {
22
name = "aws-privateca-issuer"
33
service_account_name = "${local.name}-sa"
44

5+
# https://github.com/cert-manager/aws-privateca-issuer/blob/main/charts/aws-pca-issuer/Chart.yaml
56
default_helm_config = {
67
name = local.name
78
chart = local.name
89
repository = "https://cert-manager.github.io/aws-privateca-issuer"
910
version = "1.2.2"
1011
namespace = local.name
11-
description = "AWS PCA Issuer helm Chart deployment configuration."
12-
values = local.default_helm_values
13-
timeout = "1200"
12+
description = "AWS PCA Issuer helm Chart deployment configuration"
1413
}
1514

16-
default_helm_values = []
17-
1815
helm_config = merge(
1916
local.default_helm_config,
2017
var.helm_config

‎modules/kubernetes-addons/calico/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ For more details checkout [calico](https://projectcalico.docs.tigera.io/getting-
99
| Name | Version |
1010
|------|---------|
1111
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
12-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
13-
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
1412

1513
## Providers
1614

‎modules/kubernetes-addons/calico/locals.tf

-23
This file was deleted.

‎modules/kubernetes-addons/calico/main.tf

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
module "helm_addon" {
2-
source = "../helm-addon"
3-
helm_config = local.helm_config
2+
source = "../helm-addon"
3+
4+
# https://github.com/projectcalico/calico/blob/master/charts/tigera-operator/Chart.yaml
5+
helm_config = merge(
6+
{
7+
name = "calico"
8+
chart = "tigera-operator"
9+
repository = "https://docs.projectcalico.org/charts"
10+
version = "v3.24.3"
11+
namespace = "tigera-operator"
12+
values = [
13+
<<-EOT
14+
installation:
15+
kubernetesProvider: "EKS"
16+
EOT
17+
]
18+
create_namespace = true
19+
description = "calico helm Chart deployment configuration"
20+
},
21+
var.helm_config
22+
)
423
manage_via_gitops = var.manage_via_gitops
524
addon_context = var.addon_context
625
}

‎modules/kubernetes-addons/calico/outputs.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
output "argocd_gitops_config" {
22
description = "Configuration used for managing the add-on with ArgoCD"
3-
value = var.manage_via_gitops ? local.argocd_gitops_config : null
3+
value = var.manage_via_gitops ? { enable = true } : null
44
}

‎modules/kubernetes-addons/calico/values.yaml

-2
This file was deleted.

‎modules/kubernetes-addons/calico/versions.tf

-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
11
terraform {
22
required_version = ">= 1.0.0"
3-
4-
required_providers {
5-
aws = {
6-
source = "hashicorp/aws"
7-
version = ">= 3.72"
8-
}
9-
kubernetes = {
10-
source = "hashicorp/kubernetes"
11-
version = ">= 2.10"
12-
}
13-
}
143
}

‎modules/kubernetes-addons/cert-manager-csi-driver/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
| Name | Version |
55
|------|---------|
66
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
7-
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |
87

98
## Providers
109

0 commit comments

Comments
 (0)