feature(trieve-aws): simplified trieve terraform for easier cloud native

install

Author: cdxker

terraform/aws/trieve-aws/main.tf

@@ -11,19 +11,6 @@ provider "aws" {
   region = var.aws_region
 }
 
-data "aws_vpc" "existing" {
-  count = var.create_vpc ? 0 : 1
-
-  filter {
-    name   = "vpc-id"
-    values = [var.vpc_id]
-  }
-}
-
-locals {
-  vpc = var.create_vpc ? module.vpc.vpc_id : var.vpc_id
-}
-
 # VPC Module
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
@@ -60,7 +47,7 @@ module "eks" {
   version = "~> 19.0"
 
   cluster_name    = var.name
-  cluster_version = "1.28"
+  cluster_version = "1.32"
 
   vpc_id     = module.vpc.vpc_id
   subnet_ids = module.vpc.private_subnets
@@ -76,24 +63,6 @@ module "eks" {
       ami_type       = "AL2_x86_64"
     }
 
-    qdrant = {
-      min_size     = var.qdrant_min_size
-      max_size     = var.qdrant_max_size
-      desired_size = var.qdrant_desired_capacity
-
-      instance_types = [var.instance_type_qdrant]
-      capacity_type  = "ON_DEMAND"
-      ami_type       = "AL2_x86_64"
-
-      taints = [
-        {
-          key    = "qdrant-node"
-          value  = "present"
-          effect = "NO_SCHEDULE"
-        }
-      ]
-    }
-
     gpu = {
       min_size     = var.gpu_min_size
       max_size     = var.gpu_max_size
@@ -130,103 +99,3 @@ module "eks" {
     }
   }
 }
-
-resource "aws_db_subnet_group" "database" {
-  name       = "${var.name}-db-subnet-group"
-  subnet_ids = concat(module.vpc.public_subnets, module.vpc.private_subnets)
-
-  tags = {
-    Name = "${var.name}-db-subnet-group"
-  }
-}
-
-resource "aws_security_group" "postgres" {
-  name   = "postgres"
-  vpc_id = module.vpc.vpc_id
-
-  ingress {
-    from_port   = 5432
-    to_port     = 5432
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-  egress {
-    from_port   = 5432
-    to_port     = 5432
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-}
-
-# RDS Module
-module "db" {
-  source  = "terraform-aws-modules/rds/aws"
-  version = "6.10.0"
-
-  count = var.use_rds ? 1 : 0
-
-  identifier = "${var.name}-rds"
-
-  engine               = "postgres"
-  engine_version       = "14"
-  family               = "postgres14"
-  major_engine_version = "14"
-  instance_class       = var.rds_instance_size
-
-  allocated_storage = var.rds_storage_size_gb
-
-  db_name  = "trieve"
-  username = "trieve"
-  port     = 5432
-
-  multi_az             = false
-  db_subnet_group_name = aws_db_subnet_group.database.name
-  vpc_security_group_ids = [aws_security_group.postgres.id]
-
-  maintenance_window = "Mon:00:00-Mon:03:00"
-  backup_window = "03:00-06:00"
-
-  manage_master_user_password = false
-  password = var.rds_master_password
-
-  # Disable backups to create DB faster
-  backup_retention_period = 0
-
-  tags = {
-    Name = "${var.name}-rds"
-  }
-}
-
-resource "aws_security_group" "redis" {
-  name   = "redis"
-  vpc_id = module.vpc.vpc_id
-
-  ingress {
-    from_port   = 6379
-    to_port     = 6379
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
-}
-
-resource "aws_elasticache_subnet_group" "redis_subnet_group" {
-  name       = "${var.name}-redis-security-group"
-  subnet_ids = module.vpc.private_subnets
-}
-
-resource "aws_elasticache_cluster" "cache_cluster" {
-  cluster_id           = "${var.name}-redis-cluster"
-  engine               = "redis"
-  node_type            = var.instance_type_redis
-  num_cache_nodes      = var.cluster_size_redis
-  parameter_group_name = "default.redis7"
-  engine_version       = "7.1"
-  security_group_ids   = [aws_security_group.redis.id]
-  subnet_group_name    = aws_elasticache_subnet_group.redis_subnet_group.name
-}
-
-output "redis_output" {
-  value = aws_elasticache_cluster.cache_cluster.cache_nodes[0].address
-}

terraform/aws/trieve-aws/variables.tf

@@ -1,8 +1,3 @@
-variable "vpc_id" {
-  type    = string
-  default = ""
-}
-
 variable "create_vpc" {
   type    = bool
   default = true
@@ -13,34 +8,6 @@ variable "aws_region" {
   default = "us-west-2"
 }
 
-variable "use_rds" {
-  type    = bool
-  default = true
-}
-
-variable "rds_instance_size" {
-  type    = string
-  default = "db.t3.medium"
-}
-
-variable "rds_storage_size_gb" {
-  type    = number
-  default = 100
-}
-
-variable "rds_engine" { default = "postgres" }
-
-variable "rds_engine_version" { default = "14" }
-
-variable "rds_family" { default = "postgres14" }
-
-variable "rds_major_engine_version" { default = "14" }
-
-variable "use_elasticache" {
-  type    = bool
-  default = true
-}
-
 variable "name" {
   type    = string
   default = "eks-nodes"
@@ -66,39 +33,11 @@ variable "gpu_desired_capacity" {
   default = 1
 }
 
-variable "instance_type_qdrant" {
-  type    = string
-  default = "r5.8xlarge"
-}
-
-variable "qdrant_max_size" {
-  type    = number
-  default = 4
-}
-
-variable "qdrant_min_size" {
-  type    = number
-  default = 4
-}
-
-variable "qdrant_desired_capacity" {
-  type    = number
-  default = 4
-}
-
 variable "instance_type_standard" {
   type    = string
   default = "t3.2xlarge"
 }
 
-variable "instance_type_redis" { default = "cache.t3.medium" }
-
-variable "engine_version_redis" { default = "6.x" }
-
-variable "family_redis" { default = "redis6.x" }
-
-variable "cluster_size_redis" { default = 1 }
-
 variable "standard_max_size" {
   type    = number
   default = 3
@@ -114,24 +53,8 @@ variable "standard_desired_capacity" {
   default = 2
 }
 
-variable "ebs_optimized" {
-  type    = bool
-  default = false
-}
-
-variable "public_ip" {
-  type    = bool
-  default = false
-}
-
 variable "install_alb_controller" {
   type        = bool
   default     = true
   description = "Whether to install the AWS Load Balancer Controller"
 }
-
-variable "pod_identity_version" { default = "v1.2.0-eksbuild.1" }
-
-variable "rds_master_password" {
-  type = string
-}

terraform/aws/trieve.tf

@@ -2,57 +2,19 @@ module "trieve" {
   source = "./trieve-aws"
 
   # General Configuration
-  aws_region = "us-east-2"
+  aws_region = "us-east-1"
   name = "trieve-aws-cluster"
 
-  # VPC Configuration
-  create_vpc = true
-
-  # RDS Configuration
-  use_rds             = true
-  rds_instance_size   = "db.t3.small"
-  rds_storage_size_gb = 20
-  rds_engine          = "postgres"
-  rds_engine_version  = "14"
-  rds_family          = "postgres14"
-  rds_major_engine_version = "14"
-  rds_master_password = "makeamoresecurepasswordrighthere"
-
-  # Elasticache Configuration
-  use_elasticache = true
-
-  instance_type_redis  = "cache.m5.2xlarge"
-  cluster_size_redis = 1
-
   # EKS Node Group Configuration
-  instance_type_gpu    = "g5.xlarge"
+  instance_type_gpu    = "g6.xlarge"
   gpu_max_size         = 8
   gpu_min_size         = 1
   gpu_desired_capacity = 5
 
-  instance_type_qdrant    = "m5.xlarge"
-  qdrant_max_size         = 8
-  qdrant_min_size         = 0
-  qdrant_desired_capacity = 8
-
   instance_type_standard = "c7a.xlarge"
   standard_max_size      = 3
   standard_min_size      = 0
   standard_desired_capacity = 1
-
-  # EBS Config
-  ebs_optimized = false
-
-  # Use public IP for the cluster
-  public_ip = false
-
   # Application Load Balancer
   install_alb_controller = true
-
-  # Pod Identity
-  pod_identity_version = "v1.2.0-eksbuild.1"
-}
-
-output "redis" {
-  value = module.trieve.redis_output
 }