eks & var condition fix

README.md

@@ -63,8 +63,6 @@ aws eks update-kubeconfig --region <REGION> --name <EKS_CLUSTER_NAME>
 │       ├── [ 930]  main.tf
 │       ├── [ 259]  outputs.tf
 │       ├── [ 374]  terraform.tf
-│       ├── [   0]  terraform.tfstate
-│       ├── [6.7K]  terraform.tfstate.backup
 │       └── [ 330]  variables.tf
 ├── [4.0K]  modules/
 │   ├── [4.0K]  examples/

global/ghAction/terraform.tf

@@ -11,5 +11,9 @@ terraform {
       source  = "hashicorp/aws"
       version = "5.50.0"
     }
+    tls = {
+      source  = "hashicorp/tls"
+      version = "4.0.5"
+    }
   }
 }

global/ghAction/variables.tf

@@ -8,7 +8,7 @@ variable "allowed_repos_branches" {
   default = [
     {
       org    = "ujstor"
-      repo   = "aws-asg-tf"
+      repo   = "aws-terrafrom"
       branch = "master"
     }
   ]

modules/modules/cluster/asg-rolling-deploy/variables.tf

@@ -11,16 +11,31 @@ variable "image_id" {
 variable "instance_type" {
   description = "The type of instance to start"
   type        = string
+
+  validation {
+    condition     = contains(["t2.micro", "t3.micro"], var.instance_type)
+    error_message = "Only free tier instances are supported | t2.micro, t3.micro"
+  }
 }
 
 variable "min_size" {
   description = "The minimum size of the Auto Scaling group"
   type        = number
+
+  validation {
+    condition     = var.min_size > 0
+    error_message = "ASG can be empty or we'll have an outage!"
+  }
 }
 
 variable "max_size" {
   description = "The maximum size of the Auto Scaling group"
   type        = number
+
+  validation {
+    condition     = var.max_size <= 10
+    error_message = "ASG must have 10 or less instances to keep costs down"
+  }
 }
 
 variable "custom_tags" {

modules/modules/eks-cluster/variables.tf

@@ -7,15 +7,6 @@ variable "min_size" {
   description = "Minimum number of nodes to have in the EKS cluster"
   type        = number
 
-  validation {
-    condition     = var.min_size > 0
-    error_message = "ASG can be empty or we'll have an outage!"
-  }
-
-  validation {
-    condition     = var.max_size <= 10
-    error_message = "ASG must have 10 or less instances to keep costs down"
-  }
 }
 
 variable "max_size" {
@@ -31,9 +22,4 @@ variable "desired_size" {
 variable "instance_types" {
   description = "The types of EC2 instances to run in the node group"
   type        = list(string)
-
-  validation {
-    condition     = contains(["t2.micro", "t3.micro"], var.instance_types)
-    error_message = "Only free tier instances are supported | t2.micro, t3.micro"
-  }
 }

prod/data-stores/mysql/main.tf

@@ -1,5 +1,6 @@
 module "mysql_primary" {
-  source = "../../../modules/modules/data-stores/mysql/"
+  source = "github.com/ujstor/aws-terraform//modules/modules/data-stores/mysql?ref=v0.1.3"
+  # source = "../../../modules/modules/data-stores/mysql/"
 
   providers = {
     aws = aws.primary

prod/services/eks-cluster/main.tf

@@ -1,5 +1,6 @@
 module "eks_cluster" {
-  source       = "../../../modules/modules/eks-cluster/"
+  source = "github.com/ujstor/aws-terraform//modules/modules/eks-cluster?ref=v0.1.3"
+  # source       = "../../../modules/modules/eks-cluster/"
   name         = "example-eks-cluster"
   min_size     = 3
   max_size     = 6
@@ -9,7 +10,8 @@ module "eks_cluster" {
 }
 
 module "simple_webapp" {
-  source = "../../../modules/services/k8s"
+  source = "github.com/ujstor/aws-terraform//modules/modules/k8s?ref=v0.1.3"
+  # source = "../../../modules/modules/k8s"
 
   name           = "portfolio-webapp"
   image          = "ujstor/portfolio-web-go:1.2.0"

prod/services/hello-world-app/main.tf

@@ -1,16 +1,15 @@
 module "webserver_cluster" {
-  source = "../../../modules/modules/services/hello-world-app"
+  source = "github.com/ujstor/aws-terraform//modules/modules/services/hello-world-app?ref=v0.1.3"
+  # source = "../../../modules/modules/services/hello-world-app"
 
   environment            = "prod"
   image_id               = data.aws_ami.ubuntu.id
   db_remote_state_bucket = "tf-state-ujstor"
   db_remote_state_key    = "prod/data-stores/mysql/terraform.tfstate"
 
-  server_text = "New server text from prod"
-
   instance_type = "t3.micro"
   min_size      = 2
-  max_size      = 10
+  max_size      = 11
 
   custom_tags = {
     Owner     = "team-foo"

stage/data-stores/mysql/main.tf

@@ -1,5 +1,6 @@
 module "mysql_db_stage" {
-  source = "../../../modules/modules/data-stores/mysql"
+  source = "github.com/ujstor/aws-terraform//modules/modules/data-stores/mysql?ref=v0.1.3"
+  # source = "../../../modules/modules/data-stores/mysql"
 
   providers = {
     aws = aws.stage

stage/services/hello-world-app/main.tf

@@ -1,5 +1,6 @@
 module "hello-world-app" {
-  source = "github.com/ujstor/aws-terraform//modules/modules/services/hello-world-app?ref=v0.1.0"
+  source = "github.com/ujstor/aws-terraform//modules/modules/services/hello-world-app?ref=v0.1.3"
+  # source = "../../../modules/modules/services/hello-world-app/"
 
   providers = {
     aws = aws.stage
@@ -12,9 +13,8 @@ module "hello-world-app" {
   db_remote_state_bucket = "tf-state-ujstor"
   db_remote_state_key    = "stage/data-stores/mysql/terraform.tfstate"
 
-  server_text = "New server text from stage"
-  min_size    = 2
-  max_size    = 5
+  min_size = 2
+  max_size = 5
 
   custom_tags = {
     Owner     = "team-foo"

stage/services/k8s/main.tf

@@ -1,5 +1,6 @@
 module "simple_webapp" {
-  source = "../../../modules/modules/k8s/"
+  source = "github.com/ujstor/aws-terraform//modules/modules/k8s?ref=v0.1.3"
+  # source = "../../../modules/modules/k8s/"
 
   name           = "portfolio-webapp"
   image          = "ujstor/portfolio-web-go:1.2.0"