Changes to cert-manager and test/add sh scripts

awslabs · May 1, 2024 · cd6c19c · cd6c19c
1 parent 5bb6a28
commit cd6c19c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/streaming/redpanda/addons.tf b/streaming/redpanda/addons.tf
@@ -63,6 +63,10 @@ resource "kubernetes_storage_class" "ebs_csi_encrypted_gp3_storage_class" {
 #---------------------------------------
 # Redpanda Config
 #---------------------------------------
+data "aws_secretsmanager_secret_version" "redpanada_password_version" {
+  secret_id  = aws_secretsmanager_secret.redpanada_password.id
+  depends_on = [aws_secretsmanager_secret_version.redpanada_password_version]
+}
 
 resource "random_password" "redpanada_password" {
   length  = 16
@@ -72,14 +76,21 @@ resource "aws_secretsmanager_secret" "redpanada_password" {
   name                    = "redpanda_password-1234"
   recovery_window_in_days = 0
 }
-resource "aws_secretsmanager_secret_version" "redpanada_password" {
+resource "aws_secretsmanager_secret_version" "redpanada_password_version" {
   secret_id     = aws_secretsmanager_secret.redpanada_password.id
   secret_string = random_password.redpanada_password.result
 }
 
 #---------------------------------------------------------------
 # Grafana Admin credentials resources
 #---------------------------------------------------------------
+
+data "aws_secretsmanager_secret_version" "grafana_password_version" {
+  secret_id  = aws_secretsmanager_secret.redpanada_password.id
+  depends_on = [aws_secretsmanager_secret_version.grafana_password_version]
+}
+
+
 resource "random_string" "random_suffix" {
   length  = 10
   special = false
@@ -135,11 +146,11 @@ module "eks_blueprints_addons" {
       most_recent = true
     }
   }
-  enable_aws_load_balancer_controller = true
-  enable_cluster_autoscaler           = true
-  enable_metrics_server               = true
-  enable_aws_cloudwatch_metrics       = true
-  enable_cert_manager                 = true
+  enable_cluster_autoscaler     = true
+  enable_metrics_server         = true
+  enable_aws_cloudwatch_metrics = true
+  enable_cert_manager           = true
+
 
 
   #---------------------------------------
@@ -162,6 +173,9 @@ module "eks_blueprints_addons" {
         value = "ClusterFirstWithHostNet"
       }
     ]
+
+    tags = local.tags
+
   }
 
 

diff --git a/streaming/redpanda/cleanup.sh b/streaming/redpanda/cleanup.sh
@@ -6,8 +6,10 @@ read -p "Enter the region: " region
 export AWS_DEFAULT_REGION=$region
 
 targets=(
-  "module.eks_data_addons"
   "module.eks_blueprints_addons"
+  "module.ebs_csi_driver_irsa"
+  "module.eks"
+  "module.vpc"
 )
 
 for target in "${targets[@]}"

diff --git a/streaming/redpanda/main.tf b/streaming/redpanda/main.tf
@@ -6,15 +6,6 @@ data "aws_availability_zones" "available" {}
 data "aws_caller_identity" "current" {}
 data "aws_partition" "current" {}
 
-data "aws_secretsmanager_secret_version" "redpanada_password_version" {
-  secret_id  = aws_secretsmanager_secret.redpanada_password.id
-  depends_on = [aws_secretsmanager_secret_version.redpanada_password]
-}
-data "aws_secretsmanager_secret_version" "grafana_password_version" {
-  secret_id  = aws_secretsmanager_secret.redpanada_password.id
-  depends_on = [aws_secretsmanager_secret_version.grafana_password_version]
-}
-
 
 ################################################################################
 # Local Variables
@@ -79,7 +70,7 @@ module "eks" {
     core_node_group = {
       name           = "core-mng-01"
       description    = "Core EKS managed node group"
-      instance_types = ["m5.large"]
+      instance_types = ["m5.xlarge"]
       min_size       = 3
       max_size       = 6
       desired_size   = 3
@@ -89,15 +80,6 @@ module "eks" {
       #---------------------------------------------------------------
 
     }
-    redpanda_node_group = {
-      name           = "redpanda-mng-01"
-      description    = "Redpanda EKS Managed Node Group"
-      instance_types = ["c5d.large"]
-      min_size       = 3
-      max_size       = 6
-      desired_size   = 3
-
-    }
 
   }