-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
feat: Update addons to latest supported versions #1096
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -2,13 +2,13 @@ locals { | |||
name = "aws-load-balancer-controller" | ||||
service_account_name = "${local.name}-sa" | ||||
|
||||
# https://github.com/aws/eks-charts/blob/master/stable/aws-load-balancer-controller/Chart.yaml | ||||
default_helm_config = { | ||||
name = local.name | ||||
chart = local.name | ||||
repository = "https://aws.github.io/eks-charts" | ||||
version = "1.4.3" | ||||
version = "1.4.5" | ||||
namespace = "kube-system" | ||||
timeout = "1200" | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as argo, I want to say there's a reason why we increased the timeout for specific addons, but I also remember there were times where the addons were trying to be deployed before nodes were even provisioned. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. default already for helm-addon
|
||||
values = local.default_helm_values | ||||
description = "aws-load-balancer-controller Helm Chart for ingress resources" | ||||
} | ||||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,25 @@ | ||
module "helm_addon" { | ||
source = "../helm-addon" | ||
helm_config = local.helm_config | ||
source = "../helm-addon" | ||
|
||
# https://github.com/projectcalico/calico/blob/master/charts/tigera-operator/Chart.yaml | ||
helm_config = merge( | ||
{ | ||
name = "calico" | ||
chart = "tigera-operator" | ||
repository = "https://docs.projectcalico.org/charts" | ||
version = "v3.24.3" | ||
namespace = "tigera-operator" | ||
values = [ | ||
<<-EOT | ||
installation: | ||
kubernetesProvider: "EKS" | ||
EOT | ||
] | ||
create_namespace = true | ||
description = "calico helm Chart deployment configuration" | ||
}, | ||
var.helm_config | ||
) | ||
manage_via_gitops = var.manage_via_gitops | ||
addon_context = var.addon_context | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
output "argocd_gitops_config" { | ||
description = "Configuration used for managing the add-on with ArgoCD" | ||
value = var.manage_via_gitops ? local.argocd_gitops_config : null | ||
value = var.manage_via_gitops ? { enable = true } : null | ||
} |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,3 @@ | ||
terraform { | ||
required_version = ">= 1.0.0" | ||
|
||
required_providers { | ||
aws = { | ||
source = "hashicorp/aws" | ||
version = ">= 3.72" | ||
} | ||
kubernetes = { | ||
source = "hashicorp/kubernetes" | ||
version = ">= 2.10" | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My brain is telling me there's a reason why we set this timeout to be longer than the default, @askulkarni2 may know better
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the helm-addon already defaults to this so its redundant here
terraform-aws-eks-blueprints/modules/kubernetes-addons/helm-addon/main.tf
Line 7 in 0529549