refactor: ♻️ create and use eks-cluster module

Author: Falltrades

html-db-website/aws-eks/README.md

@@ -10,16 +10,11 @@ This is an example repository containing Terraform code. It contains the code to
 ├── README.md
 └── terraform
     ├── files
-    │   ├── alb-policy.json
-    │   ├── alb-values.yaml
     │   └── html-db-values.yaml
-    ├── iam.tf
     ├── kubernetes.tf          # We are deploying Kubernetes objects here.
     ├── main.tf
-    ├── network.tf
     ├── outputs.tf
     ├── provider.tf
-    ├── security_group.tf
     └── variables.tf
 ```
 
@@ -73,7 +68,7 @@ export TF_VAR_db_password=
 
 Use this command to get merge the kubeconfig with `~/.kube/config`:
 ```shell
-aws eks update-kubeconfig --name nginx-cluster --region us-east-1
+aws eks update-kubeconfig --name html-db --region us-east-1
 ```
 
 You may need to delete `validatingwebhookconfigurations` and `mutatingwebhookconfigurations` during `terraform destroy`.

html-db-website/aws-eks/terraform/kubernetes.tf

@@ -1,41 +1,5 @@
-resource "kubernetes_service_account_v1" "alb_controller" {
-  metadata {
-    name      = "aws-load-balancer-controller"
-    namespace = "kube-system"
-
-    annotations = {
-      "eks.amazonaws.com/role-arn" = aws_iam_role.alb_controller.arn
-    }
-  }
-}
-
-resource "helm_release" "alb_controller" {
-  depends_on = [
-    aws_eks_cluster.nginx,
-    aws_eks_fargate_profile.nginx,
-    aws_eks_node_group.system_nodes,
-    kubernetes_service_account_v1.alb_controller
-  ]
-
-  name       = "aws-load-balancer-controller"
-  repository = "https://aws.github.io/eks-charts"
-  chart      = "aws-load-balancer-controller"
-  namespace  = "kube-system"
-
-  values = [
-    templatefile("${path.module}/files/alb-values.yaml", {
-      CLUSTER_NAME         = aws_eks_cluster.nginx.name
-      SERVICE_ACCOUNT_NAME = kubernetes_service_account_v1.alb_controller.metadata[0].name
-      AWS_REGION           = var.aws_region
-      VPC_ID               = aws_vpc.eks.id
-      SUBNET_1             = aws_subnet.eks[0].id
-      SUBNET_2             = aws_subnet.eks[1].id
-    })
-  ]
-}
-
 resource "helm_release" "html-db" {
-  depends_on = [helm_release.alb_controller]
+  depends_on = [module.eks_cluster]
 
   name          = "html-db"
   repository    = "https://falltrades.github.io/cloud-example"
@@ -47,9 +11,9 @@ resource "helm_release" "html-db" {
 
   values = [
     templatefile("${path.module}/files/html-db-values.yaml", {
-      SUBNET_1     = aws_subnet.public[0].id
-      SUBNET_2     = aws_subnet.public[1].id
-      ALB_SG_ID    = aws_security_group.alb.id
+      SUBNET_1     = module.eks_cluster.public_subnets[0]
+      SUBNET_2     = module.eks_cluster.public_subnets[1]
+      ALB_SG_ID    = module.eks_cluster.alb_security_group_id
       DB_NAME      = var.db_name
       DB_USER      = var.db_username
       DB_PASSWORD  = var.db_password

html-db-website/aws-eks/terraform/main.tf

@@ -1,47 +1,4 @@
-resource "aws_eks_cluster" "nginx" {
-  depends_on = [aws_iam_role_policy_attachment.eks_cluster]
-
-  name     = "nginx-cluster"
-  role_arn = aws_iam_role.eks_cluster.arn
-
-  vpc_config {
-    subnet_ids              = aws_subnet.eks[*].id
-    endpoint_public_access  = true
-    endpoint_private_access = false
-  }
+module "eks_cluster" {
+  source       = "../../../terraform-modules/aws/eks-cluster"
+  cluster_name = "html-db"
 }
-
-resource "aws_eks_fargate_profile" "nginx" {
-  depends_on = [aws_eks_cluster.nginx]
-
-  cluster_name           = aws_eks_cluster.nginx.name
-  fargate_profile_name   = "nginx-fargate"
-  pod_execution_role_arn = aws_iam_role.fargate.arn
-  subnet_ids             = aws_subnet.eks[*].id
-
-  selector {
-    namespace = "default"
-
-    labels = {
-      app = "nginx"
-    }
-  }
-}
-
-resource "aws_eks_node_group" "system_nodes" {
-  depends_on = [aws_eks_cluster.nginx]
-
-  cluster_name    = aws_eks_cluster.nginx.name
-  node_group_name = "system-nodes"
-  node_role_arn   = aws_iam_role.eks_nodes.arn
-  subnet_ids      = aws_subnet.eks[*].id
-
-  scaling_config {
-    desired_size = 1
-    max_size     = 1
-    min_size     = 1
-  }
-
-  instance_types = ["t3.medium"]
-}
-

html-db-website/aws-eks/terraform/outputs.tf

@@ -1,4 +1,3 @@
-# Wait for the Ingress to be created by Helm, then read its status
 data "kubernetes_ingress_v1" "html_db_ingress" {
   depends_on = [helm_release.html-db]
   metadata {

html-db-website/aws-eks/terraform/provider.tf

@@ -5,18 +5,6 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 6.0"
     }
-    kubernetes = {
-      source   = "hashicorp/kubernetes"
-      version  = "~> 3.0.1"
-    }
-    helm = {
-      source   = "hashicorp/helm"
-      version  = "~> 3.1.1"
-    }
-    tls = {
-      source   = "hashicorp/tls"
-      version  = "~> 4.2.1"
-    }
   }
 }
 
@@ -28,20 +16,20 @@ provider "aws" {
   skip_requesting_account_id  = true
 }
 
+data "aws_eks_cluster_auth" "cluster" {
+  name = module.eks_cluster.cluster_name
+}
+
 provider "kubernetes" {
-  host                   = aws_eks_cluster.nginx.endpoint
-  cluster_ca_certificate = base64decode(
-    aws_eks_cluster.nginx.certificate_authority[0].data
-  )
-  token = data.aws_eks_cluster_auth.nginx.token
+  host                   = module.eks_cluster.cluster_endpoint
+  cluster_ca_certificate = base64decode(module.eks_cluster.cluster_ca_data)
+  token                  = data.aws_eks_cluster_auth.cluster.token
 }
 
 provider "helm" {
   kubernetes = {
-    host                   = aws_eks_cluster.nginx.endpoint
-    cluster_ca_certificate = base64decode(
-      aws_eks_cluster.nginx.certificate_authority[0].data
-    )
-    token = data.aws_eks_cluster_auth.nginx.token
+    host                   = module.eks_cluster.cluster_endpoint
+    cluster_ca_certificate = base64decode(module.eks_cluster.cluster_ca_data)
+    token                  = data.aws_eks_cluster_auth.cluster.token
   }
 }

html-db-website/aws-eks/terraform/security_group.tf

@@ -9,16 +9,10 @@ This is an example repository containing Terraform. It contains the code to depl
 │   └── architecture.dot.png   # Generated with https://github.com/patrickchugh/terravision.
 ├── README.md
 └── terraform
-    ├── files
-    │   ├── alb-policy.json
-    │   └── alb-values.yaml
-    ├── iam.tf
     ├── kubernetes.tf          # We are deploying Kubernetes object here.
     ├── main.tf
-    ├── network.tf
     ├── outputs.tf
     ├── provider.tf
-    ├── security_group.tf
     └── variables.tf
 ```
 
@@ -66,7 +60,7 @@ This is an example repository containing Terraform. It contains the code to depl
 
 Use this command to get merge the kubeconfig with `~/.kube/config`:
 ```shell
-aws eks update-kubeconfig --name nginx-cluster --region us-east-1
+aws eks update-kubeconfig --name nginx --region us-east-1
 ```
 
 You may need to delete `validatingwebhookconfigurations` and `mutatingwebhookconfigurations` during `terraform destroy`.