Merge pull request #404 from binbashar/feature/terraform-aws-eks-1.18

apps-devstg/us-east-1/k8s-eks-v1.17 adjustments @binbashar/leverage-ref-architecture-aws-admin @binbashar/leverage-ref-architecture-aws-dev merging to unblock related projects. Look forward to the teams feedback 🙏🏼
binbashar · Jul 14, 2022 · a3fa977 · a3fa977
2 parents b50bb17 + 937612f
commit a3fa977
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/apps-devstg/us-east-1/k8s-eks-v1.17/k8s-resources/apps.auto.tfvars b/apps-devstg/us-east-1/k8s-eks-v1.17/k8s-resources/apps.auto.tfvars
@@ -2,7 +2,7 @@
 # Ingress
 #------------------------------------------------------------------------------
 enable_private_ingress = true
-#enable_public_ingress  = true
+enable_public_ingress  = false
 
 #------------------------------------------------------------------------------
 # Certificate Manager
@@ -13,7 +13,7 @@ enable_certmanager = true
 # External DNS sync
 #------------------------------------------------------------------------------
 enable_private_dns_sync = true
-#enable_public_dns_sync  = true
+enable_public_dns_sync  = false
 
 #------------------------------------------------------------------------------
 # Secrets Management
@@ -36,12 +36,17 @@ enable_prometheus_dependencies = false
 #------------------------------------------------------------------------------
 # IngressMonitorController
 #------------------------------------------------------------------------------
-#enable_ingressmonitorcontroller = true
-#imc = {
-#  uptimerobot_apikey        = "APIKEY"
-#  uptimerobot_alertcontacts = "uptimerobot_alertcontacts"
-#  emojivoto_endpoint        = false
-#}
+enable_ingressmonitorcontroller = false
+imc = {
+  uptimerobot_apikey        = "APIKEY"
+  uptimerobot_alertcontacts = "uptimerobot_alertcontacts"
+  emojivoto_endpoint        = false
+}
+
+#------------------------------------------------------------------------------
+# CICD | ArgoCD
+#------------------------------------------------------------------------------
+enable_cicd = true
 
 #------------------------------------------------------------------------------
 # Kubernetes Dashboard
@@ -50,25 +55,20 @@ enable_kubernetes_dashboard        = false
 kubernetes_dashboard_ingress_class = "ingress-nginx-private"
 kubernetes_dashboard_hosts         = "kubernetes-dashboard.us-east-1.devstg.aws.binbash.com.ar"
 
-#------------------------------------------------------------------------------
-# CICD | ArgoCD
-#------------------------------------------------------------------------------
-enable_cicd = true
-
 #------------------------------------------------------------------------------
 # Backups
 #------------------------------------------------------------------------------
-#enable_backups = true
-#schedules = {
-#  cluster-backup = {
-#    target   = "all-cluster"
-#    schedule = "0 * * * *"
-#    ttl      = "24h"
-#  }
-#  argo-backup = {
-#    target             = "argcd"
-#    schedule           = "0 0/6 * * *"
-#    ttl                = "24h"
-#    includedNamespaces = ["argo-cd"]
-#  }
-#}
+enable_backups = false
+schedules = {
+  cluster-backup = {
+    target   = "all-cluster"
+    schedule = "0 * * * *"
+    ttl      = "24h"
+  }
+  argo-backup = {
+    target             = "argcd"
+    schedule           = "0 0/6 * * *"
+    ttl                = "24h"
+    includedNamespaces = ["argo-cd"]
+  }
+}
diff --git a/apps-devstg/us-east-1/k8s-eks-v1.17/k8s-resources/variables.tf b/apps-devstg/us-east-1/k8s-eks-v1.17/k8s-resources/variables.tf
@@ -21,16 +21,6 @@ variable "enable_public_dns_sync" {
   default = false
 }
 
-variable "enable_prometheus_dependencies" {
-  type    = bool
-  default = false
-}
-
-variable "enable_grafana_dependencies" {
-  type    = bool
-  default = false
-}
-
 variable "enable_certmanager" {
   type    = bool
   default = true
@@ -46,11 +36,6 @@ variable "enable_cicd" {
   default = false
 }
 
-variable "enable_kubernetes_dashboard" {
-  type    = bool
-  default = true
-}
-
 variable "enable_hpa_scaling" {
   type    = bool
   default = false
@@ -91,6 +76,21 @@ variable "enable_ingressmonitorcontroller" {
   default = false
 }
 
+variable "enable_prometheus_dependencies" {
+  type    = bool
+  default = false
+}
+
+variable "enable_grafana_dependencies" {
+  type    = bool
+  default = false
+}
+
+variable "enable_kubernetes_dashboard" {
+  type    = bool
+  default = true
+}
+
 variable "kubernetes_dashboard_ingress_class" {
   type    = string
   default = "ingress-nginx-private"