prepare release

Signed-off-by: Kevin Lefevre <[email protected]>

.pre-commit-config.yaml

@@ -1,14 +1,19 @@
 repos:
   - repo: https://github.com/gitguardian/gg-shield
-    rev: v1.11.0
+    rev: v1.12.0
     hooks:
       - id: ggshield
         language_version: python3
         stages: [commit]
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.64.1
+    rev: v1.74.1
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
       - id: terraform_tflint
       - id: terragrunt_fmt
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-merge-conflict
+      - id: end-of-file-fixer

.tool-versions

@@ -1,5 +1,6 @@
-terragrunt 0.38.1
-terraform 1.2.3
+terragrunt 0.38.5
+terraform 1.2.5
 terraform-docs 0.16.0
 tflint 0.34.1
 tfsec 0.63.1
+kubectl 1.22.1

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

@@ -17,7 +17,7 @@ include "eks" {
 }
 
 terraform {
-  source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v7.0.0"
+  source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v8.1.0"
 }
 
 generate "provider-local" {
@@ -60,7 +60,7 @@ inputs = {
 
   aws-for-fluent-bit = {
     enabled                          = true
-    containers_log_retention_in_days = 14
+    containers_log_retention_in_days = 365
   }
 
   aws-ebs-csi-driver = {
@@ -72,7 +72,11 @@ inputs = {
   }
 
   aws-load-balancer-controller = {
-    enabled = true
+    enabled      = true
+    extra_values = <<-EXTRA_VALUES
+      image:
+        repository: 602401143452.dkr.ecr.eu-west-1.amazonaws.com/amazon/aws-load-balancer-controller
+      EXTRA_VALUES
   }
 
   csi-external-snapshotter = {
@@ -81,7 +85,7 @@ inputs = {
 
   metrics-server = {
     enabled       = true
-    allowed_cidrs = dependency.vpc.outputs.private_subnets_cidr_blocks
+    allowed_cidrs = dependency.vpc.outputs.intra_subnets_cidr_blocks
   }
 
   npd = {
@@ -98,4 +102,11 @@ inputs = {
     enabled = true
   }
 
+  velero = {
+    enabled = true
+    extra_values = <<-EXTRA_VALUES
+      nodeSelector:
+        kubernetes.io/arch: amd64
+      EXTRA_VALUES
+  }
 }

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

@@ -21,7 +21,7 @@ include "eks" {
 }
 
 terraform {
-  source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v7.0.0"
+  source = "github.com/particuleio/terraform-kubernetes-addons.git//modules/aws?ref=v8.1.0"
 }
 
 generate "provider-local" {
@@ -75,17 +75,17 @@ inputs = {
 
   cluster-autoscaler = {
     enabled      = true
-    version      = "v1.21.2"
+    version      = "v1.22.2"
     extra_values = <<-EXTRA_VALUES
-      extraArgs:
-        scale-down-utilization-threshold: 0.7
-      EXTRA_VALUES
+    extraArgs:
+      scale-down-utilization-threshold: 0.7
+    EXTRA_VALUES
   }
 
   external-dns = {
     external-dns = {
       enabled = true
-    }
+    },
   }
 
   # For this to work:
@@ -97,38 +97,19 @@ inputs = {
     repository            = "teks"
     branch                = "flux"
     repository_visibility = "public"
-    version               = "v0.27.1"
+    version               = "v0.31.3"
     auto_image_update     = true
   }
 
-  ingress-nginx = {
-    enabled       = true
-    use_nlb_ip    = true
-    allowed_cidrs = dependency.vpc.outputs.private_subnets_cidr_blocks
-    extra_values  = <<-EXTRA_VALUES
-      controller:
-        ingressClassResource:
-          enabled: true
-          default: true
-        replicaCount: 2
-        minAvailable: 1
-        kind: "Deployment"
-        resources:
-          requests:
-            cpu: 100m
-            memory: 64Mi
-      EXTRA_VALUES
-  }
-
   kube-prometheus-stack = {
     enabled                     = true
-    allowed_cidrs               = dependency.vpc.outputs.private_subnets_cidr_blocks
+    allowed_cidrs               = dependency.vpc.outputs.intra_subnets_cidr_blocks
     thanos_sidecar_enabled      = true
     thanos_bucket_force_destroy = true
     extra_values                = <<-EXTRA_VALUES
       grafana:
         image:
-          tag: 8.3.4
+          tag: 9.0.3
         deploymentStrategy:
           type: Recreate
         ingress:
@@ -227,6 +208,34 @@ inputs = {
     ]
   }
 
+  ingress-nginx = {
+    enabled       = true
+    use_nlb_ip    = true
+    allowed_cidrs = dependency.vpc.outputs.intra_subnets_cidr_blocks
+    extra_values  = <<-EXTRA_VALUES
+      controller:
+        ingressClassResource:
+          enabled: true
+          default: true
+        replicaCount: 2
+        minAvailable: 1
+        kind: "Deployment"
+        resources:
+          requests:
+            cpu: 300m
+            memory: 128Mi
+        service:
+          annotations:
+            service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: preserve_client_ip.enabled=true
+      defaultBackend:
+        enabled: true
+        replicaCount: 2
+        minAvailable: 0
+        nodeSelector:
+          kubernetes.io/arch: amd64
+      EXTRA_VALUES
+  }
+
   promtail = {
     enabled = true
     wait    = false