Skip to content

Commit 296ccb8

Browse files
committedJun 2, 2023
new release
Signed-off-by: Kevin Lefevre <[email protected]>
1 parent dc9e98e commit 296ccb8

File tree

7 files changed

+40
-34
lines changed

7 files changed

+40
-34
lines changed
 

‎.tflint.hcl

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1-
plugin "aws" {
2-
enabled = true
3-
version = "0.21.1"
4-
source = "github.com/terraform-linters/tflint-ruleset-aws"
1+
plugin "terraform" {
2+
enabled = true
3+
version = "0.2.2"
4+
source = "github.com/terraform-linters/tflint-ruleset-terraform"
5+
}
6+
rule "terraform_naming_convention" {
7+
enabled = false
8+
}
9+
10+
rule "terraform_unused_declarations" {
11+
enabled = false
12+
}
13+
14+
rule "terraform_standard_module_structure" {
15+
enabled = false
16+
}
17+
18+
rule "terraform_documented_outputs" {
19+
enabled = false
20+
}
21+
22+
rule "terraform_unused_required_providers" {
23+
enabled = false
524
}

‎terragrunt/dependency-blocks/eks.hcl

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ dependency "eks" {
88
cluster_name = "cluster-name"
99
cluster_oidc_issuer_url = "https://oidc.eks.eu-west-3.amazonaws.com/id/0000000000000000"
1010
node_groups = {}
11-
aws_auth_configmap_yaml = yamlencode("")
11+
cluster_oidc_issuer_url = "oidc"
12+
oidc_provider_arn = "arn:::"
13+
cluster_endpoint = "endpoint"
14+
eks_managed_node_groups = {
15+
initial = {
16+
iam_role_arn = "arn:::"
17+
}
18+
}
1219
}
1320
}

‎terragrunt/live/production/eu-west-1/clusters/demo/eks-addons-critical/terragrunt.hcl

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ include "eks" {
1616
merge_strategy = "deep"
1717
}
1818

19+
1920
terraform {
20-
source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v12.0.0"
21+
#source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v12.0.0"
22+
source = "/home/klefevre/git/particuleio/terraform-kubernetes-addons//modules/aws"
2123
}
2224

2325
generate "provider-local" {

‎terragrunt/live/production/eu-west-1/clusters/demo/eks-addons/terragrunt.hcl

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ include "eks" {
2121
}
2222

2323
terraform {
24-
source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v12.0.0"
24+
#source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v12.0.0"
25+
source = "/home/klefevre/git/particuleio/terraform-kubernetes-addons//modules/aws"
2526
}
2627

2728
generate "provider-local" {

‎terragrunt/live/production/eu-west-1/datasources/data.tf

-23
This file was deleted.

‎terragrunt/live/production/eu-west-1/datasources/terragrunt.hcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include "root" {
55
}
66

77
terraform {
8-
source = "."
8+
source = "../../../../modules/datasources"
99
}
1010

1111
inputs = {}

‎terragrunt/snippets/eks-asg-tags/eks-asg-tags.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ locals {
1515
"k8s.io/cluster-autoscaler/${local.cluster_name}" = "owned"
1616
}
1717

18-
mng_ca_tags_taints_defaults = try(local.mng_defaults.taints, []) != [] ? {
18+
mng_ca_tags_taints_defaults = length(try(local.mng_defaults.taints, [])) != 0 ? {
1919
for taint in local.mng_defaults.taints : "k8s.io/cluster-autoscaler/node-template/taint/${taint.key}" => "${taint.value}:${local.taint_effects[taint.effect]}"
2020
} : {}
2121

@@ -29,7 +29,7 @@ locals {
2929

3030
mng_ca_tags_taints = { for mng_key, mng_value in local.mngs : mng_key => merge(
3131
{ for taint in mng_value.taints : "k8s.io/cluster-autoscaler/node-template/taint/${taint.key}" => "${taint.value}:${local.taint_effects[taint.effect]}" }
32-
) if try(mng_value.taints, []) != []
32+
) if length(try(mng_value.taints, [])) != 0
3333
}
3434

3535
mng_ca_tags_labels = { for mng_key, mng_value in local.mngs : mng_key => merge(
@@ -71,7 +71,7 @@ locals {
7171

7272
data "aws_autoscaling_group" "node_groups" {
7373
for_each = module.eks_managed_node_group
74-
name = each.value.node_group_resources.0.autoscaling_groups.0.name
74+
name = each.value.node_group_resources[0].autoscaling_groups[0].name
7575
}
7676

7777
resource "aws_autoscaling_group_tag" "mng_ca" {

0 commit comments

Comments
 (0)
Please sign in to comment.