DMVP-1040 have dependency to wait till eks gets ready before installi…

…ng complete-cluster helm charts on it

.pre-commit-config.yaml

@@ -0,0 +1,27 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.2.0
+  hooks:
+    - id: check-added-large-files
+    - id: check-merge-conflict
+    - id: check-vcs-permalinks
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+      args: [--markdown-linebreak-ext=md]
+      exclude: CHANGELOG.md
+    - id: check-yaml
+    - id: check-merge-conflict
+    - id: check-executables-have-shebangs
+    - id: check-case-conflict
+    - id: mixed-line-ending
+      args: [--fix=lf]
+    - id: detect-aws-credentials
+      args: ['--allow-missing-credentials']
+    - id: detect-private-key
+- repo: https://github.com/antonbabenko/pre-commit-terraform
+  rev: v1.62.3
+  hooks:
+    - id: terraform_fmt
+    - id: terraform_docs
+  args:
+      - '--args=--lockfile=false'

README.md

@@ -8,8 +8,8 @@ Those include:
 - external secrets
 - metrics to cloudwatch
 
-# How to run
-```
+## How to run
+```hcl
 data "aws_availability_zones" "available" {}
 
 locals {
@@ -37,36 +37,30 @@ locals {
   log_group_name  = "fluent-bit-cloudwatch-env"
 }
 
+
 # Minimum
 
-module "prod_complete_cluster" {
-  source = "../"
-  ### VPC
+module "cluster_min" {
+  source  = "dasmeta/eks/aws"
+  version = "0.1.1"
+
+  cluster_name        = local.cluster_name
+  users               = local.users
   vpc_name            = local.vpc_name
   cidr                = local.cidr
   availability_zones  = local.availability_zones
   private_subnets     = local.private_subnets
   public_subnets      = local.public_subnets
   public_subnet_tags  = local.public_subnet_tags
   private_subnet_tags = local.private_subnet_tags
-  ### EKS
-  cluster_name              = local.cluster_name
-  manage_aws_auth           = true
-  cluster_enabled_log_types = local.cluster_enabled_log_types
-  users                     = local.users
-
-  alb_log_bucket_name = local.alb_log_bucket_name
-  fluent_bit_name     = local.fluent_bit_name
-  log_group_name      = local.log_group_name
-  metrics_server_name = "metrics-server"
-
 }
 
 
-# Max
+# Max @TODO: the max param passing setup needs to be checked/fixed
 
-module "prod_complete_cluster" {
-  source  = "dasmeta/modules/aws//modules/complete-eks-cluste"
+module "cluster_max" {
+  source  = "dasmeta/eks/aws"
+  version = "0.1.1"
 
   ### VPC
   vpc_name              = local.vpc_name

githooks/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo 'Start git pre-commit hooks and checks... ';
+pre-commit run -a;
+echo 'End git pre-commit hooks and checks... ';

main.tf

@@ -42,9 +42,9 @@ module "cloudwatch-metrics" {
   oidc_provider_arn           = module.eks-cluster.oidc_provider_arn
   cluster_name                = var.cluster_name
 
-  # providers = {
-  #   kubernetes = kubernetes
-  # }
+  depends_on = [
+    module.eks-cluster
+  ]
 }
 
 module "alb-ingress-controller" {
@@ -57,9 +57,9 @@ module "alb-ingress-controller" {
   alb_log_bucket_name         = var.alb_log_bucket_name != "" ? var.alb_log_bucket_name : "${var.cluster_name}-ingress-controller-log-bucket"
   alb_log_bucket_prefix       = var.alb_log_bucket_prefix != "" ? var.alb_log_bucket_prefix : var.cluster_name
 
-  # providers = {
-  #   kubernetes = kubernetes
-  # }
+  depends_on = [
+    module.eks-cluster
+  ]
 }
 
 module "fluent-bit" {
@@ -72,27 +72,27 @@ module "fluent-bit" {
   oidc_provider_arn           = module.eks-cluster.oidc_provider_arn
 
   region = data.aws_region.current.name
-  # providers = {
-  #   kubernetes = kubernetes
-  # }
+
+  depends_on = [
+    module.eks-cluster
+  ]
 }
 
 module "metrics-server" {
-  # count = var.enable_metrics_server == true ? 1 : 0
-
   source = "./modules/metrics-server"
   name   = var.metrics_server_name != "" ? var.metrics_server_name : "${var.cluster_name}-metrics-server"
 
-  # providers = {
-  #   kubernetes = kubernetes
-  # }
+  depends_on = [
+    module.eks-cluster
+  ]
 }
 
 module "external-secrets-prod" {
   source = "./modules/external-secrets"
 
   namespace = var.external_secrets_namespace
-  # providers = {
-  #   kubernetes = kubernetes
-  # }
+
+  depends_on = [
+    module.eks-cluster
+  ]
 }

modules/eks/main.tf

@@ -42,7 +42,7 @@ module "eks-cluster" {
   aws_auth_roles            = var.map_roles
 
   tags = {
-    "k8s.io/cluster-autoscaler/dasmeta-test-new3" = "owned"
-    "k8s.io/cluster-autoscaler/enabled"           = "true"
+    "k8s.io/cluster-autoscaler/${var.cluster_name}" = "owned"
+    "k8s.io/cluster-autoscaler/enabled"             = "true"
   }
 }

variables.tf

@@ -49,13 +49,8 @@ variable "manage_aws_auth" {
 }
 
 variable "worker_groups" {
-  type = any
-  default = {
-    default = {
-      instance_type = "t3.medium"
-      asg_max_size  = 1
-    }
-  }
+  type        = any
+  default     = {}
   description = "Worker groups."
 }