From f56eb5a75d2ff1c0470397b8af83ba610fda6584 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Mon, 25 Nov 2024 12:12:04 +0300 Subject: [PATCH 01/16] fix: added node security group additional rule to allow all traffic inside the group --- terraform/modules/aws-eks/main.tf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/terraform/modules/aws-eks/main.tf b/terraform/modules/aws-eks/main.tf index edbe3e1..42f5ebb 100644 --- a/terraform/modules/aws-eks/main.tf +++ b/terraform/modules/aws-eks/main.tf @@ -42,6 +42,17 @@ module "eks" { node_security_group_tags = { "karpenter.sh/discovery" = var.name } + node_security_group_additional_rules = { + ingress_allow_all_traffic_inside = { + description = "Allow all traffic inside security group" + protocol = "all" + from_port = 0 + to_port = 0 + type = "ingress" + self = true + } + } + self_managed_node_group_defaults = { ami_type = "AL2023_ARM_64_STANDARD" block_device_mappings = { From 33dadd0441df66a03a69f338964083ea0fcf928c Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Mon, 25 Nov 2024 16:17:29 +0300 Subject: [PATCH 02/16] fix: added depends on for external secrets and loki, update helm chart version for external secrets --- terraform/modules/k8s-addons/eks-external-secrets.tf | 1 + terraform/modules/k8s-addons/eks-loki-stack.tf | 5 ++++- terraform/modules/k8s-addons/helm-releases.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/terraform/modules/k8s-addons/eks-external-secrets.tf b/terraform/modules/k8s-addons/eks-external-secrets.tf index 5d14fee..2a59371 100644 --- a/terraform/modules/k8s-addons/eks-external-secrets.tf +++ b/terraform/modules/k8s-addons/eks-external-secrets.tf @@ -154,4 +154,5 @@ resource "helm_release" "external_secrets" { local.external_secrets_values ] + depends_on = [helm_release.aws_loadbalancer_controller] } diff --git a/terraform/modules/k8s-addons/eks-loki-stack.tf b/terraform/modules/k8s-addons/eks-loki-stack.tf index 3c22eb6..b358690 100644 --- a/terraform/modules/k8s-addons/eks-loki-stack.tf +++ b/terraform/modules/k8s-addons/eks-loki-stack.tf @@ -180,5 +180,8 @@ resource "helm_release" "loki_stack" { local.loki_stack_values ] - depends_on = [kubectl_manifest.kube_prometheus_stack_operator_crds] + depends_on = [ + kubectl_manifest.kube_prometheus_stack_operator_crds, + helm_release.aws_loadbalancer_controller + ] } diff --git a/terraform/modules/k8s-addons/helm-releases.yaml b/terraform/modules/k8s-addons/helm-releases.yaml index 16710c9..fd6a4eb 100644 --- a/terraform/modules/k8s-addons/helm-releases.yaml +++ b/terraform/modules/k8s-addons/helm-releases.yaml @@ -39,7 +39,7 @@ releases: enabled: true chart: external-secrets repository: https://charts.external-secrets.io - chart_version: 0.10.0 + chart_version: 0.10.4 namespace: external-secrets - id: gitlab-runner enabled: false From 4ba8d1c8ef5bbdb6618a6ae12b9f9eb73d51a1ad Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 11 Dec 2024 15:03:44 +0300 Subject: [PATCH 03/16] fix: Removed unnecessary for this PR changes --- terraform/modules/k8s-addons/eks-external-secrets.tf | 2 -- terraform/modules/k8s-addons/eks-loki-stack.tf | 5 +---- terraform/modules/k8s-addons/helm-releases.yaml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/terraform/modules/k8s-addons/eks-external-secrets.tf b/terraform/modules/k8s-addons/eks-external-secrets.tf index 2a59371..cedf7e0 100644 --- a/terraform/modules/k8s-addons/eks-external-secrets.tf +++ b/terraform/modules/k8s-addons/eks-external-secrets.tf @@ -153,6 +153,4 @@ resource "helm_release" "external_secrets" { values = [ local.external_secrets_values ] - - depends_on = [helm_release.aws_loadbalancer_controller] } diff --git a/terraform/modules/k8s-addons/eks-loki-stack.tf b/terraform/modules/k8s-addons/eks-loki-stack.tf index b358690..3c22eb6 100644 --- a/terraform/modules/k8s-addons/eks-loki-stack.tf +++ b/terraform/modules/k8s-addons/eks-loki-stack.tf @@ -180,8 +180,5 @@ resource "helm_release" "loki_stack" { local.loki_stack_values ] - depends_on = [ - kubectl_manifest.kube_prometheus_stack_operator_crds, - helm_release.aws_loadbalancer_controller - ] + depends_on = [kubectl_manifest.kube_prometheus_stack_operator_crds] } diff --git a/terraform/modules/k8s-addons/helm-releases.yaml b/terraform/modules/k8s-addons/helm-releases.yaml index fd6a4eb..16710c9 100644 --- a/terraform/modules/k8s-addons/helm-releases.yaml +++ b/terraform/modules/k8s-addons/helm-releases.yaml @@ -39,7 +39,7 @@ releases: enabled: true chart: external-secrets repository: https://charts.external-secrets.io - chart_version: 0.10.4 + chart_version: 0.10.0 namespace: external-secrets - id: gitlab-runner enabled: false From 7ce0cd93b50eb1a7f09084fcdc13cbdda339a760 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 11 Dec 2024 15:04:42 +0300 Subject: [PATCH 04/16] fix: Removed unnecessary for this PR changes --- terraform/modules/k8s-addons/eks-external-secrets.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/modules/k8s-addons/eks-external-secrets.tf b/terraform/modules/k8s-addons/eks-external-secrets.tf index cedf7e0..5d14fee 100644 --- a/terraform/modules/k8s-addons/eks-external-secrets.tf +++ b/terraform/modules/k8s-addons/eks-external-secrets.tf @@ -153,4 +153,5 @@ resource "helm_release" "external_secrets" { values = [ local.external_secrets_values ] + } From a0f37a747d820d91e64036b232cdb308e9895df0 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Sun, 15 Dec 2024 10:43:32 +0300 Subject: [PATCH 05/16] some changes --- .../demo/common/aws-acm/.terraform.lock.hcl | 3 ++- .../demo/common/aws-r53/.terraform.lock.hcl | 3 ++- terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml | 2 +- .../demo/k8s-addons/.terraform.lock.hcl | 19 +++++++++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl index c798843..c4bad43 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl @@ -3,8 +3,9 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.58.0" - constraints = "5.58.0" + constraints = ">= 4.40.0, 5.58.0" hashes = [ + "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl index c798843..d1e84ce 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl @@ -3,8 +3,9 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.58.0" - constraints = "5.58.0" + constraints = ">= 2.49.0, 5.58.0" hashes = [ + "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml index ce05d24..0f02131 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml @@ -1,5 +1,5 @@ --- -name : "maddevs" +name : "valmd" environment: "demo" domain_name: "maddevs.org" diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl index d9e4b49..facc9ab 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl @@ -1,9 +1,12 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. provider "registry.terraform.io/gavinbunney/kubectl" { version = "1.14.0" constraints = "1.14.0" hashes = [ "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", + "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", "zh:0c351afd91d9e994a71fe64bbd1662d0024006b3493bb61d46c23ea3e42a7cf5", @@ -20,6 +23,7 @@ provider "registry.terraform.io/hashicorp/aws" { version = "5.58.0" constraints = "5.58.0" hashes = [ + "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", @@ -40,9 +44,9 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.3" - constraints = "2.3.3" + version = "2.3.3" hashes = [ + "h1:H+3QlVPs/7CDa3I4KU/a23wYeGeJxeBlgvR7bfK1t1w=", "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", @@ -64,6 +68,7 @@ provider "registry.terraform.io/hashicorp/helm" { constraints = "2.13.2" hashes = [ "h1:KHLdE3Xb4XbLCWwCSArYcXulYyBJKTFizaIzBiYVJxQ=", + "h1:nlSqCo0PajJzjSlx0lXNUq1YcOr8p9b3ahcUUYN2pEg=", "zh:06c0663031ef5aa19e238fe50be5d3cbf5fb00548d2b26e779c607dfd2dc69a7", "zh:1850b8f2e729553ba8b96d69dce035b814ce959c6805c25484f407c4e720c497", "zh:1ec76814a99461cd79ee4c879ed455ab338a3cb9e63fbe9308f91b5515e72e42", @@ -83,6 +88,7 @@ provider "registry.terraform.io/hashicorp/http" { version = "3.4.2" constraints = "3.4.2" hashes = [ + "h1:eqo0hkFNrixeaT93PC5NiU893s7rUwwOMeqnCjjj3u0=", "h1:vaoPfsLm6mOk6avKTrWi35o+9p4fEeZAY3hzYoXVTfo=", "zh:0ba051c9c8659ce0fec94a3d50926745f11759509c4d6de0ad5f5eb289f0edd9", "zh:23e6760e8406fef645913bf47bfab1ca984c1c5805d2bb0ef8310b16913d29cd", @@ -104,6 +110,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { constraints = "2.30.0" hashes = [ "h1:+Je5UPTWMmO4eG5ep1WfujkXQI9tDk0OsMU4olU76Bg=", + "h1:wRVWY3sK32BNInDOlQnoGSmL638f3jjLFypCAotwpc8=", "zh:06531333a72fe6d2829f37a328e08a3fc4ed66226344a003b62418a834ac6c69", "zh:34480263939ef5007ce65c9f4945df5cab363f91e5260ae552bcd9f2ffeed444", "zh:59e71f9177da570c33507c44828288264c082d512138c5755800f2cd706c62bc", @@ -120,10 +127,10 @@ provider "registry.terraform.io/hashicorp/kubernetes" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.2" - constraints = "3.6.2" + version = "3.6.2" hashes = [ "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", + "h1:wmG0QFjQ2OfyPy6BB7mQ57WtoZZGGV07uAPQeDmIrAE=", "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", @@ -140,9 +147,9 @@ provider "registry.terraform.io/hashicorp/random" { } provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.5" - constraints = "4.0.5" + version = "4.0.5" hashes = [ + "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", From c3bd6382a72c3fda17e3625b07161798c28f5fb9 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Mon, 16 Dec 2024 17:40:33 +0300 Subject: [PATCH 06/16] Disabled AWS LBC ServiceMutatorWebhook --- .../modules/k8s-addons/eks-aws-loadbalancer-controller.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf index 395451b..191a128 100644 --- a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf +++ b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf @@ -428,6 +428,10 @@ resource "helm_release" "aws_loadbalancer_controller" { name = "webhookTLS.key" value = tls_private_key.aws_loadbalancer_controller_webhook[0].private_key_pem } + set { + name = "enableServiceMutatorWebhook" + value = "false" + } } From ac25173860f3635edf883334051fed6172b4f8b8 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Tue, 24 Dec 2024 13:31:58 +0300 Subject: [PATCH 07/16] Update .terraform.lock.hcl file --- .../demo/k8s-addons/.terraform.lock.hcl | 86 +++++++++---------- terragrunt/terragrunt.hcl | 2 +- 2 files changed, 40 insertions(+), 48 deletions(-) diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl index facc9ab..8040a3d 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/.terraform.lock.hcl @@ -5,7 +5,6 @@ provider "registry.terraform.io/gavinbunney/kubectl" { version = "1.14.0" constraints = "1.14.0" hashes = [ - "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", @@ -24,7 +23,6 @@ provider "registry.terraform.io/hashicorp/aws" { constraints = "5.58.0" hashes = [ "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", @@ -44,22 +42,21 @@ provider "registry.terraform.io/hashicorp/aws" { } provider "registry.terraform.io/hashicorp/external" { - version = "2.3.3" + version = "2.3.4" hashes = [ - "h1:H+3QlVPs/7CDa3I4KU/a23wYeGeJxeBlgvR7bfK1t1w=", - "h1:gShzO1rJtADK9tDZMvMgjciVAzsBh39LNjtThCwX1Hg=", - "zh:03d81462f9578ec91ce8e26f887e34151eda0e100f57e9772dbea86363588239", - "zh:37ec2a20f6a3ec3a0fd95d3f3de26da6cb9534b30488bc45723e118a0911c0d8", - "zh:4eb5b119179539f2749ce9de0e1b9629d025990f062f4f4dddc161562bb89d37", - "zh:5a31bb58414f41bee5e09b939012df5b88654120b0238a89dfd6691ba197619a", - "zh:6221a05e52a6a2d4f520ffe7cbc741f4f6080e0855061b0ed54e8be4a84eb9b7", + "h1:XWkRZOLKMjci9/JAtE8X8fWOt7A4u+9mgXSUjc4Wuyo=", + "zh:037fd82cd86227359bc010672cd174235e2d337601d4686f526d0f53c87447cb", + "zh:0ea1db63d6173d01f2fa8eb8989f0809a55135a0d8d424b08ba5dabad73095fa", + "zh:17a4d0a306566f2e45778fbac48744b6fd9c958aaa359e79f144c6358cb93af0", + "zh:298e5408ab17fd2e90d2cd6d406c6d02344fe610de5b7dae943a58b958e76691", + "zh:38ecfd29ee0785fd93164812dcbe0664ebbe5417473f3b2658087ca5a0286ecb", + "zh:59f6a6f31acf66f4ea3667a555a70eba5d406c6e6d93c2c641b81d63261eeace", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8bb068496b4679bef625e4710d9f3432e301c3a56602271f04e60eadf7f8a94c", - "zh:94742aa5378bab626ce34f79bcef6a373e4f86ea7a8b762e9f71270a899e0d00", - "zh:a485831b5a525cd8f40e8982fa37da40ff70b1ae092c8b755fcde123f0b1238d", - "zh:a647ff16d071eabcabd87ea8183eb90a775a0294ddd735d742075d62fff09193", - "zh:b74710c5954aaa3faf262c18d36a8c2407862d9f842c63e7fa92fa4de3d29df6", - "zh:fa73d83edc92af2e551857594c2232ba6a9e3603ad34b0a5940865202c08d8d7", + "zh:ad0279dfd09d713db0c18469f585e58d04748ca72d9ada83883492e0dd13bd58", + "zh:c69f66fd21f5e2c8ecf7ca68d9091c40f19ad913aef21e3ce23836e91b8cbb5f", + "zh:d4a56f8c48aa86fc8e0c233d56850f5783f322d6336f3bf1916e293246b6b5d4", + "zh:f2b394ebd4af33f343835517e80fc876f79361f4688220833bc3c77655dd2202", + "zh:f31982f29f12834e5d21e010856eddd19d59cd8f449adf470655bfd19354377e", ] } @@ -67,7 +64,6 @@ provider "registry.terraform.io/hashicorp/helm" { version = "2.13.2" constraints = "2.13.2" hashes = [ - "h1:KHLdE3Xb4XbLCWwCSArYcXulYyBJKTFizaIzBiYVJxQ=", "h1:nlSqCo0PajJzjSlx0lXNUq1YcOr8p9b3ahcUUYN2pEg=", "zh:06c0663031ef5aa19e238fe50be5d3cbf5fb00548d2b26e779c607dfd2dc69a7", "zh:1850b8f2e729553ba8b96d69dce035b814ce959c6805c25484f407c4e720c497", @@ -89,7 +85,6 @@ provider "registry.terraform.io/hashicorp/http" { constraints = "3.4.2" hashes = [ "h1:eqo0hkFNrixeaT93PC5NiU893s7rUwwOMeqnCjjj3u0=", - "h1:vaoPfsLm6mOk6avKTrWi35o+9p4fEeZAY3hzYoXVTfo=", "zh:0ba051c9c8659ce0fec94a3d50926745f11759509c4d6de0ad5f5eb289f0edd9", "zh:23e6760e8406fef645913bf47bfab1ca984c1c5805d2bb0ef8310b16913d29cd", "zh:3c69fde4548bfe65b968534c4df8d699648c921d6a065b97fec5faece73a442b", @@ -109,7 +104,6 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.30.0" constraints = "2.30.0" hashes = [ - "h1:+Je5UPTWMmO4eG5ep1WfujkXQI9tDk0OsMU4olU76Bg=", "h1:wRVWY3sK32BNInDOlQnoGSmL638f3jjLFypCAotwpc8=", "zh:06531333a72fe6d2829f37a328e08a3fc4ed66226344a003b62418a834ac6c69", "zh:34480263939ef5007ce65c9f4945df5cab363f91e5260ae552bcd9f2ffeed444", @@ -127,41 +121,39 @@ provider "registry.terraform.io/hashicorp/kubernetes" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.2" + version = "3.6.3" hashes = [ - "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", - "h1:wmG0QFjQ2OfyPy6BB7mQ57WtoZZGGV07uAPQeDmIrAE=", - "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", - "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", - "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", - "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", - "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", - "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", - "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "h1:Fnaec9vA8sZ8BXVlN3Xn9Jz3zghSETIKg7ch8oXhxno=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", - "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", - "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", - "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.5" + version = "4.0.6" hashes = [ - "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", - "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", - "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", - "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", - "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", - "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", - "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", - "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", - "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", - "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", - "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", - "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", - "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "h1:dYSb3V94K5dDMtrBRLPzBpkMTPn+3cXZ/kIJdtFL+2M=", + "zh:10de0d8af02f2e578101688fd334da3849f56ea91b0d9bd5b1f7a243417fdda8", + "zh:37fc01f8b2bc9d5b055dc3e78bfd1beb7c42cfb776a4c81106e19c8911366297", + "zh:4578ca03d1dd0b7f572d96bd03f744be24c726bfd282173d54b100fd221608bb", + "zh:6c475491d1250050765a91a493ef330adc24689e8837a0f07da5a0e1269e11c1", + "zh:81bde94d53cdababa5b376bbc6947668be4c45ab655de7aa2e8e4736dfd52509", + "zh:abdce260840b7b050c4e401d4f75c7a199fafe58a8b213947a258f75ac18b3e8", + "zh:b754cebfc5184873840f16a642a7c9ef78c34dc246a8ae29e056c79939963c7a", + "zh:c928b66086078f9917aef0eec15982f2e337914c5c4dbc31dd4741403db7eb18", + "zh:cded27bee5f24de6f2ee0cfd1df46a7f88e84aaffc2ecbf3ff7094160f193d50", + "zh:d65eb3867e8f69aaf1b8bb53bd637c99c6b649ba3db16ded50fa9a01076d1a27", + "zh:ecb0c8b528c7a619fa71852bb3fb5c151d47576c5aab2bf3af4db52588722eeb", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terragrunt/terragrunt.hcl b/terragrunt/terragrunt.hcl index c5c9907..2a1fab3 100644 --- a/terragrunt/terragrunt.hcl +++ b/terragrunt/terragrunt.hcl @@ -1,5 +1,5 @@ terragrunt_version_constraint = ">= 0.58" -skip = true +skip = false locals { remote_state_bucket_region = get_env("TF_REMOTE_STATE_BUCKET_REGION") From abd0dcbc03fbf0b64fbb680b6b95e1b3589a8ed8 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Tue, 24 Dec 2024 15:28:51 +0300 Subject: [PATCH 08/16] Changed root terragrunt.hcl file to root.hcl --- terragrunt/ACCOUNT_ID/aws-users-password-policy/terragrunt.hcl | 2 +- .../ACCOUNT_ID/us-east-1/demo/common/aws-acm/terragrunt.hcl | 2 +- .../ACCOUNT_ID/us-east-1/demo/common/aws-eks/terragrunt.hcl | 2 +- .../ACCOUNT_ID/us-east-1/demo/common/aws-r53/terragrunt.hcl | 2 +- .../ACCOUNT_ID/us-east-1/demo/common/aws-vpc/terragrunt.hcl | 2 +- terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl | 2 +- terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl | 2 +- terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl | 2 +- terragrunt/{terragrunt.hcl => root.hcl} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename terragrunt/{terragrunt.hcl => root.hcl} (100%) diff --git a/terragrunt/ACCOUNT_ID/aws-users-password-policy/terragrunt.hcl b/terragrunt/ACCOUNT_ID/aws-users-password-policy/terragrunt.hcl index fdd3117..ec9a116 100644 --- a/terragrunt/ACCOUNT_ID/aws-users-password-policy/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/aws-users-password-policy/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/terragrunt.hcl index 2eaa9e4..420f32d 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/terragrunt.hcl index f866e94..3f4c0a5 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/terragrunt.hcl index 78b9121..a4fecc3 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/terragrunt.hcl index 39822f4..17700b2 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl index 57147fd..7120772 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/k8s-addons/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl index cac7531..74cbdee 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl index 9ddf03c..f5cefd1 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl @@ -1,5 +1,5 @@ include "root" { - path = find_in_parent_folders() + path = find_in_parent_folders("root.hcl") expose = true } diff --git a/terragrunt/terragrunt.hcl b/terragrunt/root.hcl similarity index 100% rename from terragrunt/terragrunt.hcl rename to terragrunt/root.hcl From 8ccd64698e28ccc7d8917eb3319a7c19e6fb2c88 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Tue, 24 Dec 2024 17:30:14 +0300 Subject: [PATCH 09/16] updated providers versions --- .../demo/common/aws-vpc/.terraform.lock.hcl | 35 +++++++++---------- terragrunt/root.hcl | 10 +++--- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/.terraform.lock.hcl index f675e55..3ec0562 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-vpc/.terraform.lock.hcl @@ -2,25 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 5.30.0, 5.58.0" + version = "5.82.2" + constraints = ">= 5.30.0, 5.82.2" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", ] } diff --git a/terragrunt/root.hcl b/terragrunt/root.hcl index 2a1fab3..939580e 100644 --- a/terragrunt/root.hcl +++ b/terragrunt/root.hcl @@ -6,11 +6,11 @@ locals { remote_state_bucket = get_env("TF_REMOTE_STATE_BUCKET") tf_providers = { - aws = "5.58.0" - kubernetes = "2.30.0" - kubectl = "1.14.0" - helm = "2.13.2" - http = "3.4.2" + aws = "5.82.2" + kubernetes = "2.35.1" + kubectl = "2.1.3" + helm = "2.17.0" + http = "3.4.5" } } From 32a95bea5d08e4c11956b150b3fb03467e90a1a6 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Tue, 24 Dec 2024 17:49:27 +0300 Subject: [PATCH 10/16] updated aws vpc module --- terraform/modules/aws-vpc/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/modules/aws-vpc/main.tf b/terraform/modules/aws-vpc/main.tf index 8a8d9ec..ed1c9e5 100644 --- a/terraform/modules/aws-vpc/main.tf +++ b/terraform/modules/aws-vpc/main.tf @@ -9,7 +9,7 @@ locals { module "vpc" { source = "terraform-aws-modules/vpc/aws" - version = "5.8.1" + version = "5.17.0" name = var.name cidr = var.cidr @@ -84,7 +84,7 @@ module "vpc" { module "vpc_gateway_endpoints" { source = "terraform-aws-modules/vpc/aws//modules/vpc-endpoints" - version = "5.8.1" + version = "5.17.0" vpc_id = module.vpc.vpc_id From 7465400ba48253d82cd27371cebf510917292d58 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 25 Dec 2024 12:53:31 +0300 Subject: [PATCH 11/16] fix: prepared code update and aws-vpc module --- .../modules/k8s-addons/eks-aws-loadbalancer-controller.tf | 5 ----- terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf index 191a128..4e3911a 100644 --- a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf +++ b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf @@ -428,11 +428,6 @@ resource "helm_release" "aws_loadbalancer_controller" { name = "webhookTLS.key" value = tls_private_key.aws_loadbalancer_controller_webhook[0].private_key_pem } - set { - name = "enableServiceMutatorWebhook" - value = "false" - } - } resource "kubernetes_ingress_v1" "default" { diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml index 0f02131..ce05d24 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/env.yaml @@ -1,5 +1,5 @@ --- -name : "valmd" +name : "maddevs" environment: "demo" domain_name: "maddevs.org" From 2bb85aa76f75a956d0a50e78ca281c36f5dfed2b Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 25 Dec 2024 12:55:24 +0300 Subject: [PATCH 12/16] fix: added empty line --- terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf index 4e3911a..395451b 100644 --- a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf +++ b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf @@ -428,6 +428,7 @@ resource "helm_release" "aws_loadbalancer_controller" { name = "webhookTLS.key" value = tls_private_key.aws_loadbalancer_controller_webhook[0].private_key_pem } + } resource "kubernetes_ingress_v1" "default" { From 5e37691ef721f5240126ab7f28fdc9f881130052 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 25 Dec 2024 15:42:08 +0300 Subject: [PATCH 13/16] fix: update acm, route52, eks, karpenter modules --- terraform/modules/aws-acm/main.tf | 2 +- terraform/modules/aws-eks/main.tf | 6 +- terraform/modules/aws-r53/main.tf | 2 +- terraform/modules/k8s-karpenter/main.tf | 2 +- .../demo/common/aws-acm/.terraform.lock.hcl | 35 ++-- .../demo/common/aws-eks/.terraform.lock.hcl | 174 +++++++++--------- .../demo/common/aws-r53/.terraform.lock.hcl | 35 ++-- .../demo/karpenter/.terraform.lock.hcl | 154 ++++++++-------- .../us-east-1/demo/karpenter/terragrunt.hcl | 2 +- 9 files changed, 201 insertions(+), 211 deletions(-) diff --git a/terraform/modules/aws-acm/main.tf b/terraform/modules/aws-acm/main.tf index 9a6070a..b67912c 100644 --- a/terraform/modules/aws-acm/main.tf +++ b/terraform/modules/aws-acm/main.tf @@ -10,7 +10,7 @@ data "aws_acm_certificate" "main" { module "acm" { source = "terraform-aws-modules/acm/aws" - version = "5.0.1" + version = "5.1.1" create_certificate = var.create_acm_certificate diff --git a/terraform/modules/aws-eks/main.tf b/terraform/modules/aws-eks/main.tf index 42f5ebb..4fe7cc5 100644 --- a/terraform/modules/aws-eks/main.tf +++ b/terraform/modules/aws-eks/main.tf @@ -1,7 +1,7 @@ #tfsec:ignore:aws-vpc-no-public-egress-sgr tfsec:ignore:aws-eks-enable-control-plane-logging tfsec:ignore:aws-eks-encrypt-secrets tfsec:ignore:aws-eks-no-public-cluster-access tfsec:ignore:aws-eks-no-public-cluster-access-to-cidr module "eks" { source = "terraform-aws-modules/eks/aws" - version = "20.20.0" + version = "20.31.6" cluster_name = var.name cluster_version = var.eks_cluster_version @@ -131,7 +131,7 @@ module "eks" { module "vpc_cni_irsa" { source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks" - version = "5.39.1" + version = "5.48.0" role_name = "${var.name}-vpc-cni" attach_vpc_cni_policy = true @@ -149,7 +149,7 @@ module "vpc_cni_irsa" { module "aws_ebs_csi_driver" { source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks" - version = "5.39.1" + version = "5.48.0" role_name = "${var.name}-aws-ebs-csi-driver" attach_ebs_csi_policy = true diff --git a/terraform/modules/aws-r53/main.tf b/terraform/modules/aws-r53/main.tf index a544ea0..b360e01 100644 --- a/terraform/modules/aws-r53/main.tf +++ b/terraform/modules/aws-r53/main.tf @@ -7,7 +7,7 @@ data "aws_route53_zone" "main" { module "r53_zone" { source = "terraform-aws-modules/route53/aws//modules/zones" - version = "2.11.1" + version = "4.1.0" create = var.create_r53_zone diff --git a/terraform/modules/k8s-karpenter/main.tf b/terraform/modules/k8s-karpenter/main.tf index cf2d459..9d6770f 100644 --- a/terraform/modules/k8s-karpenter/main.tf +++ b/terraform/modules/k8s-karpenter/main.tf @@ -34,7 +34,7 @@ module "this" { count = local.karpenter.enabled ? 1 : 0 source = "terraform-aws-modules/eks/aws//modules/karpenter" - version = "20.17.2" + version = "20.31.6" cluster_name = var.eks_cluster_id diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl index c4bad43..a390a9c 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-acm/.terraform.lock.hcl @@ -2,25 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 4.40.0, 5.58.0" + version = "5.82.2" + constraints = ">= 4.40.0, 5.82.2" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", ] } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/.terraform.lock.hcl index 6708a20..987ea6d 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-eks/.terraform.lock.hcl @@ -2,132 +2,124 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 4.0.0, >= 4.33.0, >= 5.58.0, 5.58.0" + version = "5.82.2" + constraints = ">= 4.0.0, >= 4.33.0, >= 5.81.0, 5.82.2" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", ] } provider "registry.terraform.io/hashicorp/cloudinit" { - version = "2.3.4" + version = "2.3.5" constraints = ">= 2.0.0" hashes = [ - "h1:S3j8poSaLbaftlKq2STBkQEkZH253ZLaHhBHBifdpBQ=", - "h1:cVIIhnXweOHavu1uV2bdKScTjLbM1WnKM/25wqYBJWo=", - "zh:09f1f1e1d232da96fbf9513b0fb5263bc2fe9bee85697aa15d40bb93835efbeb", - "zh:381e74b90d7a038c3a8dcdcc2ce8c72d6b86da9f208a27f4b98cabe1a1032773", - "zh:398eb321949e28c4c5f7c52e9b1f922a10d0b2b073b7db04cb69318d24ffc5a9", - "zh:4a425679614a8f0fe440845828794e609b35af17db59134c4f9e56d61e979813", - "zh:4d955d8608ece4984c9f1dacda2a59fdb4ea6b0243872f049b388181aab8c80a", + "h1:HCoabXm6NQwCivl1q24+l9VUufc2mFqNeulsQBA9iFg=", + "zh:17c20574de8eb925b0091c9b6a4d859e9d6e399cd890b44cfbc028f4f312ac7a", + "zh:348664d9a900f7baf7b091cf94d657e4c968b240d31d9e162086724e6afc19d5", + "zh:5a876a468ffabff0299f8348e719cb704daf81a4867f8c6892f3c3c4add2c755", + "zh:6ef97ee4c8c6a69a3d36746ba5c857cf4f4d78f32aa3d0e1ce68f2ece6a5dba5", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:a48fbee1d58d55a1f4c92c2f38c83a37c8b2f2701ed1a3c926cefb0801fa446a", - "zh:b748fe6631b16a1dafd35a09377c3bffa89552af584cf95f47568b6cd31fc241", - "zh:d4b931f7a54603fa4692a2ec6e498b95464babd2be072bed5c7c2e140a280d99", - "zh:f1c9337fcfe3a7be39d179eb7986c22a979cfb2c587c05f1b3b83064f41785c5", - "zh:f58fc57edd1ee3250a28943cd84de3e4b744cdb52df0356a53403fc240240636", - "zh:f5f50de0923ff530b03e1bca0ac697534d61bb3e5fc7f60e13becb62229097a9", + "zh:8283e5a785e3c518a440f6ac6e7cc4fc07fe266bf34974246f4e2ef05762feda", + "zh:a44eb5077950168b571b7eb65491246c00f45409110f0f172cc3a7605f19dba9", + "zh:aa0806cbff72b49c1b389c0b8e6904586e5259c08dabb7cb5040418568146530", + "zh:bec4613c3beaad9a7be7ca99cdb2852073f782355b272892e6ee97a22856aec1", + "zh:d7fe368577b6c8d1ae44c751ed42246754c10305c7f001cc0109833e95aa107d", + "zh:df2409fc6a364b1f0a0f8a9cd8a86e61e80307996979ce3790243c4ce88f2915", + "zh:ed3c263396ff1f4d29639cc43339b655235acf4d06296a7c120a80e4e0fd6409", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.30.0" - constraints = "2.30.0" + version = "2.35.1" + constraints = "2.35.1" hashes = [ - "h1:+Je5UPTWMmO4eG5ep1WfujkXQI9tDk0OsMU4olU76Bg=", - "h1:wRVWY3sK32BNInDOlQnoGSmL638f3jjLFypCAotwpc8=", - "zh:06531333a72fe6d2829f37a328e08a3fc4ed66226344a003b62418a834ac6c69", - "zh:34480263939ef5007ce65c9f4945df5cab363f91e5260ae552bcd9f2ffeed444", - "zh:59e71f9177da570c33507c44828288264c082d512138c5755800f2cd706c62bc", - "zh:6e979b0c07326f9c8d1999096a920322d22261ca61d346b3a9775283d00a2fa5", - "zh:73e3f228de0077b5c0a84ec5b1ada507fbb3456cba35a6b5758723f77715b7af", - "zh:79e0de985159c056f001cc47a654620d51f5d55f554bcbcde1fe7d52f667db40", - "zh:8accb9100f609377db42e3ced42cc9d5c36065a06644dfb21d3893bb8d4797fd", - "zh:9f99aa0bf5caa4223a7dbf5d22d71c16083e782c4eea4b0130abfd6e6f1cec18", - "zh:bcb2ad76ad05ec23f8da62231a2360d1f70bbcd28abd06b8458a9e2f17da7873", - "zh:bce317d7790c2d3c4e724726dc78070db28daf7d861faa646fc891fe28842a29", - "zh:ed0a8e7fa8a1c419a19840b421d18200c3a63cf16ccbcbc400cb375d5397f615", + "h1:Av0Wk8g2XjY2oap7nyWNHEgfCRfphdJvrkqJjEM2ZKM=", + "zh:12212ca5ae47823ce14bfafb909eeb6861faf1e2435fb2fc4a8b334b3544b5f5", + "zh:3f49b3d77182df06b225ab266667de69681c2e75d296867eb2cf06a8f8db768c", + "zh:40832494d19f8a2b3cd0c18b80294d0b23ef6b82f6f6897b5fe00248a9997460", + "zh:739a5ddea61a77925ee7006a29c8717377a2e9d0a79a0bbd98738d92eec12c0d", + "zh:a02b472021753627c5c39447a56d125a32214c29ff9108fc499f2dcdf4f1cc4f", + "zh:b78865b3867065aa266d6758c9601a2756741478f5735a838c20d633d65e085b", + "zh:d362e87464683f5632790e66920ea803adb54c2bc0cb24b6fd9a314d2b1efffd", + "zh:d98206fe88c2c9a52b8d2d0cb2c877c812a4a51d19f9d8428e63cbd5fd8a304d", + "zh:dfa320946b1ce3f3615c42b3447a28dc9f604c06d8b9a6fe289855ab2ade4d11", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fc1debd2e695b5222d2ccc8b24dab65baba4ee2418ecce944e64d42e79474cb5", + "zh:fdaf960443720a238c09e519aeb30faf74f027ac5d1e0a309c3b326888e031d7", ] } provider "registry.terraform.io/hashicorp/null" { - version = "3.2.2" + version = "3.2.3" constraints = ">= 3.0.0" hashes = [ - "h1:IMVAUHKoydFrlPrl9OzasDnw/8ntZFerCC9iXw1rXQY=", - "h1:vWAsYRd7MjYr3adj8BVKRohVfHpWQdvkIwUQ2Jf5FVM=", - "h1:zT1ZbegaAYHwQa+QwIFugArWikRJI9dqohj8xb0GY88=", - "zh:3248aae6a2198f3ec8394218d05bd5e42be59f43a3a7c0b71c66ec0df08b69e7", - "zh:32b1aaa1c3013d33c245493f4a65465eab9436b454d250102729321a44c8ab9a", - "zh:38eff7e470acb48f66380a73a5c7cdd76cc9b9c9ba9a7249c7991488abe22fe3", - "zh:4c2f1faee67af104f5f9e711c4574ff4d298afaa8a420680b0cb55d7bbc65606", - "zh:544b33b757c0b954dbb87db83a5ad921edd61f02f1dc86c6186a5ea86465b546", - "zh:696cf785090e1e8cf1587499516b0494f47413b43cb99877ad97f5d0de3dc539", - "zh:6e301f34757b5d265ae44467d95306d61bef5e41930be1365f5a8dcf80f59452", + "h1:+AnORRgFbRO6qqcfaQyeX80W0eX3VmjadjnUFUJTiXo=", + "zh:22d062e5278d872fe7aed834f5577ba0a5afe34a3bdac2b81f828d8d3e6706d2", + "zh:23dead00493ad863729495dc212fd6c29b8293e707b055ce5ba21ee453ce552d", + "zh:28299accf21763ca1ca144d8f660688d7c2ad0b105b7202554ca60b02a3856d3", + "zh:55c9e8a9ac25a7652df8c51a8a9a422bd67d784061b1de2dc9fe6c3cb4e77f2f", + "zh:756586535d11698a216291c06b9ed8a5cc6a4ec43eee1ee09ecd5c6a9e297ac1", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:913a929070c819e59e94bb37a2a253c228f83921136ff4a7aa1a178c7cce5422", - "zh:aa9015926cd152425dbf86d1abdbc74bfe0e1ba3d26b3db35051d7b9ca9f72ae", - "zh:bb04798b016e1e1d49bcc76d62c53b56c88c63d6f2dfe38821afef17c416a0e1", - "zh:c23084e1b23577de22603cff752e59128d83cfecc2e6819edadd8cf7a10af11e", + "zh:9d5eea62fdb587eeb96a8c4d782459f4e6b73baeece4d04b4a40e44faaee9301", + "zh:a6355f596a3fb8fc85c2fb054ab14e722991533f87f928e7169a486462c74670", + "zh:b5a65a789cff4ada58a5baffc76cb9767dc26ec6b45c00d2ec8b1b027f6db4ed", + "zh:db5ab669cf11d0e9f81dc380a6fdfcac437aea3d69109c7aef1a5426639d2d65", + "zh:de655d251c470197bcbb5ac45d289595295acb8f829f6c781d4a75c8c8b7c7dd", + "zh:f5c68199f2e6076bce92a12230434782bf768103a427e9bb9abee99b116af7b5", ] } provider "registry.terraform.io/hashicorp/time" { - version = "0.11.2" + version = "0.12.1" constraints = ">= 0.9.0" hashes = [ - "h1:bC4b7n4g30ciIn5w6b66mXSTIo2CH6XQbp+gBdDvlYs=", - "h1:qg3O4PmHnlPcvuZ2LvzOYEAPGOKtccgD5kPdQPZw094=", - "zh:02588b5b8ba5d31e86d93edc93b306bcbf47c789f576769245968cc157a9e8c5", - "zh:088a30c23796133678d1d6614da5cf5544430570408a17062288b58c0bd67ac8", - "zh:0df5faa072d67616154d38021934d8a8a316533429a3f582df3b4b48c836cf89", - "zh:12edeeaef96c47f694bd1ba7ead6ccdb96028b25df352eea4bc5e40de7a59177", - "zh:1e859504a656a6e988f07b908e6ffe946b28bfb56889417c0a07ea9605a3b7b0", - "zh:64a6ae0320d4956c4fdb05629cfcebd03bcbd2206e2d733f2f18e4a97f4d5c7c", + "h1:6BhxSYBJdBBKyuqatOGkuPKVenfx6UmLdiI13Pb3his=", + "zh:090023137df8effe8804e81c65f636dadf8f9d35b79c3afff282d39367ba44b2", + "zh:26f1e458358ba55f6558613f1427dcfa6ae2be5119b722d0b3adb27cd001efea", + "zh:272ccc73a03384b72b964918c7afeb22c2e6be22460d92b150aaf28f29a7d511", + "zh:438b8c74f5ed62fe921bd1078abe628a6675e44912933100ea4fa26863e340e9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:924d137959193bf7aee6ebf241fbb9aec46d6eef828c5cf8d3c588770acae7b2", - "zh:b3cc76281a4faa9c2293a2460fc6962f6539e900994053f85185304887dddab8", - "zh:cbb40c791d4a1cdba56cffa43a9c0ed8e69930d49aa6bd931546b18c36e3b720", - "zh:d227d43594f8cb3d24f1fdd71382f14502cbe2a6deaddbc74242656bb5b38daf", - "zh:d4840641c46176bb9d70ba3aff09de749282136c779996b546c81e5ff701bbf6", + "zh:85c8bd8eefc4afc33445de2ee7fbf33a7807bc34eb3734b8eefa4e98e4cddf38", + "zh:98bbe309c9ff5b2352de6a047e0ec6c7e3764b4ed3dfd370839c4be2fbfff869", + "zh:9c7bf8c56da1b124e0e2f3210a1915e778bab2be924481af684695b52672891e", + "zh:d2200f7f6ab8ecb8373cda796b864ad4867f5c255cff9d3b032f666e4c78f625", + "zh:d8c7926feaddfdc08d5ebb41b03445166df8c125417b28d64712dccd9feef136", + "zh:e2412a192fc340c61b373d6c20c9d805d7d3dee6c720c34db23c2a8ff0abd71b", + "zh:e6ac6bba391afe728a099df344dbd6481425b06d61697522017b8f7a59957d44", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.5" + version = "4.0.6" constraints = ">= 3.0.0" hashes = [ - "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", - "h1:yLqz+skP3+EbU3yyvw8JqzflQTKDQGsC9QyZAg+S4dg=", - "h1:zeG5RmggBZW/8JWIVrdaeSJa0OG62uFX5HY1eE8SjzY=", - "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", - "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", - "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", - "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", - "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", - "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", - "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", - "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", - "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", - "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", - "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", + "h1:dYSb3V94K5dDMtrBRLPzBpkMTPn+3cXZ/kIJdtFL+2M=", + "zh:10de0d8af02f2e578101688fd334da3849f56ea91b0d9bd5b1f7a243417fdda8", + "zh:37fc01f8b2bc9d5b055dc3e78bfd1beb7c42cfb776a4c81106e19c8911366297", + "zh:4578ca03d1dd0b7f572d96bd03f744be24c726bfd282173d54b100fd221608bb", + "zh:6c475491d1250050765a91a493ef330adc24689e8837a0f07da5a0e1269e11c1", + "zh:81bde94d53cdababa5b376bbc6947668be4c45ab655de7aa2e8e4736dfd52509", + "zh:abdce260840b7b050c4e401d4f75c7a199fafe58a8b213947a258f75ac18b3e8", + "zh:b754cebfc5184873840f16a642a7c9ef78c34dc246a8ae29e056c79939963c7a", + "zh:c928b66086078f9917aef0eec15982f2e337914c5c4dbc31dd4741403db7eb18", + "zh:cded27bee5f24de6f2ee0cfd1df46a7f88e84aaffc2ecbf3ff7094160f193d50", + "zh:d65eb3867e8f69aaf1b8bb53bd637c99c6b649ba3db16ded50fa9a01076d1a27", + "zh:ecb0c8b528c7a619fa71852bb3fb5c151d47576c5aab2bf3af4db52588722eeb", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl index d1e84ce..2bf6d79 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/common/aws-r53/.terraform.lock.hcl @@ -2,25 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 2.49.0, 5.58.0" + version = "5.82.2" + constraints = ">= 4.36.0, 5.82.2" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", ] } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/.terraform.lock.hcl index ea6f4da..019a4c2 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/.terraform.lock.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/.terraform.lock.hcl @@ -1,107 +1,107 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/gavinbunney/kubectl" { - version = "1.14.0" - constraints = "1.14.0" +provider "registry.terraform.io/alekc/kubectl" { + version = "2.1.3" + constraints = "2.1.3" hashes = [ - "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", - "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", - "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", - "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", - "zh:0c351afd91d9e994a71fe64bbd1662d0024006b3493bb61d46c23ea3e42a7cf5", - "zh:39f1a0aa1d589a7e815b62b5aa11041040903b061672c4cfc7de38622866cbc4", - "zh:428d3a321043b78e23c91a8d641f2d08d6b97f74c195c654f04d2c455e017de5", - "zh:4baf5b1de2dfe9968cc0f57fd4be5a741deb5b34ee0989519267697af5f3eee5", - "zh:6131a927f9dffa014ab5ca5364ac965fe9b19830d2bbf916a5b2865b956fdfcf", - "zh:c62e0c9fd052cbf68c5c2612af4f6408c61c7e37b615dc347918d2442dd05e93", - "zh:f0beffd7ce78f49ead612e4b1aefb7cb6a461d040428f514f4f9cc4e5698ac65", + "h1:AymCb0DCWzmyLqn1qEhVs2pcFUZGT/kxPK+I/BObFH8=", + "zh:0e601ae36ebc32eb8c10aff4c48c1125e471fa09f5668465af7581c9057fa22c", + "zh:1773f08a412d1a5f89bac174fe1efdfd255ecdda92d31a2e31937e4abf843a2f", + "zh:1da2db1f940c5d34e31c2384c7bd7acba68725cc1d3ba6db0fec42efe80dbfb7", + "zh:20dc810fb09031bcfea4f276e1311e8286d8d55705f55433598418b7bcc76357", + "zh:326a01c86ba90f6c6eb121bacaabb85cfa9059d6587aea935a9bbb6d3d8e3f3f", + "zh:5a3737ea1e08421fe3e700dc833c6fd2c7b8c3f32f5444e844b3fe0c2352757b", + "zh:5f490acbd0348faefea273cb358db24e684cbdcac07c71002ee26b6cfd2c54a0", + "zh:777688cda955213ba637e2ac6b1994e438a5af4d127a34ecb9bb010a8254f8a8", + "zh:7acc32371053592f55ee0bcbbc2f696a8466415dea7f4bc5a6573f03953fc926", + "zh:81f0108e2efe5ae71e651a8826b61d0ce6918811ccfdc0e5b81b2cfb0f7f57fe", + "zh:88b785ea7185720cf40679cb8fa17e57b8b07fd6322cf2d4000b835282033d81", + "zh:89d833336b5cd027e671b46f9c5bc7d10c5109e95297639bbec8001da89aa2f7", + "zh:df108339a89d4372e5b13f77bd9d53c02a04362fb5d85e1d9b6b47292e30821c", + "zh:e8a2e3a5c50ca124e6014c361d72a9940d8e815f37ae2d1e9487ac77c3043013", ] } provider "registry.terraform.io/hashicorp/aws" { - version = "5.58.0" - constraints = ">= 5.57.0, 5.58.0" + version = "5.82.2" + constraints = ">= 5.81.0, 5.82.2" hashes = [ - "h1:6vsFc7SmmlElqg3k0X6azrO0yarM7UPCUF4XsAYryjA=", - "h1:XnAwb/MGeP7sxz/0SKLQF1ujaP7Bg15ol+ca7KZruio=", - "zh:15e9be54a8febe8e560362b10967cb60b680ca3f78fe207d7209b76e076f59d3", - "zh:240f6899a2cec259aa2729ce031f6af2b453f90a8b59118bb2571c54acc65db8", - "zh:2b6e8e2ab1a3dce1001503dba6086a128bb2a71652b0d0b3b107db665b7d6881", - "zh:579b0ed95247a0bd8bfb3fac7fb767547dde76026c578f4f184b5743af5e32cc", - "zh:6adcd10fd12be0be9eb78a89e745a5b77ae0d8b3522cd782456a71178aad8ccb", - "zh:7f829cef82f0a02faa97d0fbe1417a40b73fc5142e883b12eebc5b71015efac9", - "zh:81977f001998c9096f7b59710996e159774a9313c1bc03db3beb81c3e016ebef", + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a5d98ac6fab6e6c85164ca7dd38f94a1e44bd70c0e8354c61f7fbabf698957cd", - "zh:c27fa4fed50f6f83ca911bef04f05d635a7b7a01a89dc8fc5d66a277588f08df", - "zh:d4042bdf86ca6dc10e0cca91c4fcc592b12572d26185b3d37bbbb9e2026ac68b", - "zh:d536482cf4ace0d49a2a86c931150921649beae59337d0c02a785879fe943cf3", - "zh:e205f8243274a621fb9ef2b5e2c71e84c1670be1d23697739439f5a831fa620f", - "zh:eb76ce0c77fd76c47f57122c91c4fcf0f72c01423538ed7833eaa7eeaae2edf6", - "zh:ffe04e494af6cc7348ceb8d85f4c1d5a847a44510827b4496513c810a4d9196d", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", ] } provider "registry.terraform.io/hashicorp/helm" { - version = "2.13.2" - constraints = "2.13.2" + version = "2.17.0" + constraints = "2.17.0" hashes = [ - "h1:KHLdE3Xb4XbLCWwCSArYcXulYyBJKTFizaIzBiYVJxQ=", - "h1:nlSqCo0PajJzjSlx0lXNUq1YcOr8p9b3ahcUUYN2pEg=", - "zh:06c0663031ef5aa19e238fe50be5d3cbf5fb00548d2b26e779c607dfd2dc69a7", - "zh:1850b8f2e729553ba8b96d69dce035b814ce959c6805c25484f407c4e720c497", - "zh:1ec76814a99461cd79ee4c879ed455ab338a3cb9e63fbe9308f91b5515e72e42", - "zh:78546b2f0b2e9072370c017d8056a2ffda908c2e463d2792244e4be6562ab772", - "zh:9205eef438aa3d5e49505655b7c300f7cecfa30f8fa37ed84679f674420403f2", - "zh:9335c7300675e5088ab4090af3c8150701c0bb8ea67ad23ebd753f6ab3a922a9", - "zh:9722d8b419e9615a04b8fc9acb50e52d6ba988c7565cc517bc16faa0a9e895b3", - "zh:aa93d9fc7db91f261b6e41970453926341eaa4222c1b8d507cdeabd0be0af4eb", - "zh:c59a2af538de99c37e4ffe988f33633a9fb064e5360230adac5f6eb0fd473be8", - "zh:d6323f61f255131a7d9f5a645982eb0f0d12f685270f54beade95c0b51a7a6c9", - "zh:e7f46dd2aac9537d20aaac217806f2ebb3a347aaf6bbd28192c042286103635c", + "h1:K5FEjxvDnxb1JF1kG1xr8J3pNGxoaR3Z0IBG9Csm/Is=", + "zh:06fb4e9932f0afc1904d2279e6e99353c2ddac0d765305ce90519af410706bd4", + "zh:104eccfc781fc868da3c7fec4385ad14ed183eb985c96331a1a937ac79c2d1a7", + "zh:129345c82359837bb3f0070ce4891ec232697052f7d5ccf61d43d818912cf5f3", + "zh:3956187ec239f4045975b35e8c30741f701aa494c386aaa04ebabffe7749f81c", + "zh:66a9686d92a6b3ec43de3ca3fde60ef3d89fb76259ed3313ca4eb9bb8c13b7dd", + "zh:88644260090aa621e7e8083585c468c8dd5e09a3c01a432fb05da5c4623af940", + "zh:a248f650d174a883b32c5b94f9e725f4057e623b00f171936dcdcc840fad0b3e", + "zh:aa498c1f1ab93be5c8fbf6d48af51dc6ef0f10b2ea88d67bcb9f02d1d80d3930", + "zh:bf01e0f2ec2468c53596e027d376532a2d30feb72b0b5b810334d043109ae32f", + "zh:c46fa84cc8388e5ca87eb575a534ebcf68819c5a5724142998b487cb11246654", + "zh:d0c0f15ffc115c0965cbfe5c81f18c2e114113e7a1e6829f6bfd879ce5744fbb", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/http" { - version = "3.4.2" - constraints = "3.4.2" + version = "3.4.5" + constraints = "3.4.5" hashes = [ - "h1:eqo0hkFNrixeaT93PC5NiU893s7rUwwOMeqnCjjj3u0=", - "h1:vaoPfsLm6mOk6avKTrWi35o+9p4fEeZAY3hzYoXVTfo=", - "zh:0ba051c9c8659ce0fec94a3d50926745f11759509c4d6de0ad5f5eb289f0edd9", - "zh:23e6760e8406fef645913bf47bfab1ca984c1c5805d2bb0ef8310b16913d29cd", - "zh:3c69fde4548bfe65b968534c4df8d699648c921d6a065b97fec5faece73a442b", - "zh:41c7f9a8c117704b7a8fa96a57ebfb92b72129d9625128eeb0dee7d5a09d1110", - "zh:59d09d2e00727df10565cc82a33250b44201fcd353eb2b1579507a5a0adcce18", + "h1:ceAVZEuaQd7jQX13qf5w7hy3ioiXpuwUaaDRsnAiMLM=", + "zh:2072006c177efc101471f3d5eb8e1d8e6c68778cbfd6db3d3f22f59cfe6ce6ae", + "zh:3ac4cc0efe11ee054300769cfcc37491433937a8824621d1f8f7a18e7401da87", + "zh:63997e5457c9ddf9cfff17bd7bf9f083cbeff3105452045662109dd6be499ef9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:c95b2f63d4357b3068531b90d9dca62a32551d7693defb7ab14b650b5d139c57", - "zh:cc0a3bbd3026191b35f417d3a8f26bdfad376d15be9e8d99a8803487ca5b0105", - "zh:d1185c6abb3ba25123fb7df1ad7dbe2b9cd8f43962628da551040fbe1934656f", - "zh:dfb26fccab7ecdc150f67415e6cfe19d699dc43e8bf5722f36032b17b46a0fbe", - "zh:eb1fcc00073bc0463f64e49600a73d925b1a0c0ae5b94dd7b67d3ebac248a113", - "zh:ec9b9ad69cf790cb0603a1036d758063bbbc35c0c75f72dd04a1eddaf46ad010", + "zh:826819bb8ab7d6e3095f597083d5b1ab93d1854312b9e1b6c18288fff9664f34", + "zh:8ad74e7d8ec2e226a73d49c7c317108f61a4cb803972fb3f945d1709d5115fcd", + "zh:a609ca9e0c91d250ac80295e39d5f524e8c0872d33ba8fde3c3e41893b4b015d", + "zh:ae07d19babc452f63f6a6511b944990e819dc20687b6c8f01d1676812f5ada53", + "zh:b7c827dc32a1a5d77185a78cd391b01217894b384f58169f98a96d683730d8ce", + "zh:d045e3db9f5e39ce78860d3fd94e04604fcbe246f6fe346ee50a971f936e9ccd", + "zh:ec28f9b52c74edd47eebbb5c254a6df5706360cde5ccd65097976efca23a2977", + "zh:f24982eaa7d34fd66554c3cf94873713a0dff14da9ea4c4be0cc76f1a6146d59", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.30.0" - constraints = "2.30.0" + version = "2.35.1" + constraints = "2.35.1" hashes = [ - "h1:+Je5UPTWMmO4eG5ep1WfujkXQI9tDk0OsMU4olU76Bg=", - "h1:wRVWY3sK32BNInDOlQnoGSmL638f3jjLFypCAotwpc8=", - "zh:06531333a72fe6d2829f37a328e08a3fc4ed66226344a003b62418a834ac6c69", - "zh:34480263939ef5007ce65c9f4945df5cab363f91e5260ae552bcd9f2ffeed444", - "zh:59e71f9177da570c33507c44828288264c082d512138c5755800f2cd706c62bc", - "zh:6e979b0c07326f9c8d1999096a920322d22261ca61d346b3a9775283d00a2fa5", - "zh:73e3f228de0077b5c0a84ec5b1ada507fbb3456cba35a6b5758723f77715b7af", - "zh:79e0de985159c056f001cc47a654620d51f5d55f554bcbcde1fe7d52f667db40", - "zh:8accb9100f609377db42e3ced42cc9d5c36065a06644dfb21d3893bb8d4797fd", - "zh:9f99aa0bf5caa4223a7dbf5d22d71c16083e782c4eea4b0130abfd6e6f1cec18", - "zh:bcb2ad76ad05ec23f8da62231a2360d1f70bbcd28abd06b8458a9e2f17da7873", - "zh:bce317d7790c2d3c4e724726dc78070db28daf7d861faa646fc891fe28842a29", - "zh:ed0a8e7fa8a1c419a19840b421d18200c3a63cf16ccbcbc400cb375d5397f615", + "h1:Av0Wk8g2XjY2oap7nyWNHEgfCRfphdJvrkqJjEM2ZKM=", + "zh:12212ca5ae47823ce14bfafb909eeb6861faf1e2435fb2fc4a8b334b3544b5f5", + "zh:3f49b3d77182df06b225ab266667de69681c2e75d296867eb2cf06a8f8db768c", + "zh:40832494d19f8a2b3cd0c18b80294d0b23ef6b82f6f6897b5fe00248a9997460", + "zh:739a5ddea61a77925ee7006a29c8717377a2e9d0a79a0bbd98738d92eec12c0d", + "zh:a02b472021753627c5c39447a56d125a32214c29ff9108fc499f2dcdf4f1cc4f", + "zh:b78865b3867065aa266d6758c9601a2756741478f5735a838c20d633d65e085b", + "zh:d362e87464683f5632790e66920ea803adb54c2bc0cb24b6fd9a314d2b1efffd", + "zh:d98206fe88c2c9a52b8d2d0cb2c877c812a4a51d19f9d8428e63cbd5fd8a304d", + "zh:dfa320946b1ce3f3615c42b3447a28dc9f604c06d8b9a6fe289855ab2ade4d11", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fc1debd2e695b5222d2ccc8b24dab65baba4ee2418ecce944e64d42e79474cb5", + "zh:fdaf960443720a238c09e519aeb30faf74f027ac5d1e0a309c3b326888e031d7", ] } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl index 74cbdee..f25265a 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/karpenter/terragrunt.hcl @@ -38,7 +38,7 @@ terraform { version = "${include.root.locals.tf_providers.kubernetes}" } kubectl = { - source = "gavinbunney/kubectl" + source = "alekc/kubectl" version = "${include.root.locals.tf_providers.kubectl}" } helm = { From 02c4de20a2293465be367e4820d73ab72d2ed974 Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 25 Dec 2024 16:57:16 +0300 Subject: [PATCH 14/16] fix:updated ebs encryption --- .../demo/ebs-encryption/.terraform.lock.hcl | 25 +++++++++++++++++++ .../{ => demo}/ebs-encryption/terragrunt.hcl | 6 +++++ .../ebs-encryption/.terraform.lock.hcl | 23 ----------------- 3 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/.terraform.lock.hcl rename terragrunt/ACCOUNT_ID/us-east-1/{ => demo}/ebs-encryption/terragrunt.hcl (85%) delete mode 100644 terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/.terraform.lock.hcl diff --git a/terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/.terraform.lock.hcl new file mode 100644 index 0000000..a3fa96c --- /dev/null +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.82.2" + constraints = "5.82.2" + hashes = [ + "h1:RuPaHbllUB8a2TGTyc149wJfoh6zhIEjUvFYKR6iP2E=", + "zh:0262fc96012fb7e173e1b7beadd46dfc25b1dc7eaef95b90e936fc454724f1c8", + "zh:397413613d27f4f54d16efcbf4f0a43c059bd8d827fe34287522ae182a992f9b", + "zh:436c0c5d56e1da4f0a4c13129e12a0b519d12ab116aed52029b183f9806866f3", + "zh:4d942d173a2553d8d532a333a0482a090f4e82a2238acf135578f163b6e68470", + "zh:624aebc549bfbce06cc2ecfd8631932eb874ac7c10eb8466ce5b9a2fbdfdc724", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:9e632dee2dfdf01b371cca7854b1ec63ceefa75790e619b0642b34d5514c6733", + "zh:a07567acb115b60a3df8f6048d12735b9b3bcf85ec92a62f77852e13d5a3c096", + "zh:ab7002df1a1be6432ac0eb1b9f6f0dd3db90973cd5b1b0b33d2dae54553dfbd7", + "zh:bc1ff65e2016b018b3e84db7249b2cd0433cb5c81dc81f9f6158f2197d6b9fde", + "zh:bcad84b1d767f87af6e1ba3dc97fdb8f2ad5de9224f192f1412b09aba798c0a8", + "zh:cf917dceaa0f9d55d9ff181b5dcc4d1e10af21b6671811b315ae2a6eda866a2a", + "zh:d8e90ecfb3216f3cc13ccde5a16da64307abb6e22453aed2ac3067bbf689313b", + "zh:d9054e0e40705df729682ad34c20db8695d57f182c65963abd151c6aba1ab0d3", + "zh:ecf3a4f3c57eb7e89f71b8559e2a71e4cdf94eea0118ec4f2cb37e4f4d71a069", + ] +} diff --git a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl b/terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/terragrunt.hcl similarity index 85% rename from terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl rename to terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/terragrunt.hcl index f5cefd1..3c577c6 100644 --- a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/terragrunt.hcl +++ b/terragrunt/ACCOUNT_ID/us-east-1/demo/ebs-encryption/terragrunt.hcl @@ -3,6 +3,11 @@ include "root" { expose = true } +include "env" { + path = find_in_parent_folders("env.hcl") + expose = true +} + include "region" { path = find_in_parent_folders("region.hcl") expose = true @@ -30,5 +35,6 @@ terraform { } inputs = { + name = include.env.locals.name enable = include.region.locals.region_values.aws_ebs_encryption_by_default } diff --git a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/.terraform.lock.hcl b/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/.terraform.lock.hcl deleted file mode 100644 index 615dbb5..0000000 --- a/terragrunt/ACCOUNT_ID/us-east-1/ebs-encryption/.terraform.lock.hcl +++ /dev/null @@ -1,23 +0,0 @@ - -provider "registry.terraform.io/hashicorp/aws" { - version = "5.49.0" - constraints = "5.49.0" - hashes = [ - "h1:RZtXnBRpO4LNmmz0tXJQLa2heqk9VFGblFZtRCZkm/M=", - "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", - "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", - "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", - "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", - "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", - "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", - "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", - "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", - "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", - "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", - "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", - "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", - "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", - "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", - ] -} From 3fa0e6280f28d49236591ad538b9c95929c7dcce Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Wed, 25 Dec 2024 16:59:01 +0300 Subject: [PATCH 15/16] fix: removed unused and depricated attribute skip --- terragrunt/root.hcl | 1 - 1 file changed, 1 deletion(-) diff --git a/terragrunt/root.hcl b/terragrunt/root.hcl index 939580e..cd95fe8 100644 --- a/terragrunt/root.hcl +++ b/terragrunt/root.hcl @@ -1,5 +1,4 @@ terragrunt_version_constraint = ">= 0.58" -skip = false locals { remote_state_bucket_region = get_env("TF_REMOTE_STATE_BUCKET_REGION") From be12707b64113b6024e72e0be3018d6dc6ee07bf Mon Sep 17 00:00:00 2001 From: Valentin Khramtsov Date: Thu, 26 Dec 2024 16:27:41 +0300 Subject: [PATCH 16/16] fix: updated enabled applications in k8s-addons --- .../eks-aws-loadbalancer-controller.tf | 3 +- .../modules/k8s-addons/eks-loki-stack.tf | 3 + .../modules/k8s-addons/helm-releases.yaml | 10 +- .../demo/k8s-addons/.terraform.lock.hcl | 149 +++++++++--------- .../us-east-1/demo/k8s-addons/terragrunt.hcl | 2 +- 5 files changed, 88 insertions(+), 79 deletions(-) diff --git a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf index 395451b..813c7ae 100644 --- a/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf +++ b/terraform/modules/k8s-addons/eks-aws-loadbalancer-controller.tf @@ -137,6 +137,7 @@ module "aws_iam_aws_loadbalancer_controller" { "elasticloadbalancing:DescribeLoadBalancerAttributes", "elasticloadbalancing:DescribeListeners", "elasticloadbalancing:DescribeListenerCertificates", + "elasticloadbalancing:DescribeListenerAttributes", "elasticloadbalancing:DescribeSSLPolicies", "elasticloadbalancing:DescribeRules", "elasticloadbalancing:DescribeTargetGroups", @@ -437,7 +438,6 @@ resource "kubernetes_ingress_v1" "default" { metadata { name = "${local.ingress_nginx.name}-controller" annotations = { - "kubernetes.io/ingress.class" = "alb" "alb.ingress.kubernetes.io/scheme" = "internet-facing" "alb.ingress.kubernetes.io/tags" = "Environment=${local.env},Name=${local.name},Cluster=${local.eks_cluster_id}" "alb.ingress.kubernetes.io/certificate-arn" = "${local.ssl_certificate_arn}" @@ -450,6 +450,7 @@ resource "kubernetes_ingress_v1" "default" { namespace = module.ingress_nginx_namespace[count.index].name } spec { + ingress_class_name = "alb" rule { http { path { diff --git a/terraform/modules/k8s-addons/eks-loki-stack.tf b/terraform/modules/k8s-addons/eks-loki-stack.tf index 3c22eb6..b9fb70b 100644 --- a/terraform/modules/k8s-addons/eks-loki-stack.tf +++ b/terraform/modules/k8s-addons/eks-loki-stack.tf @@ -10,6 +10,9 @@ locals { loki_stack_values = <