feat: Make cluster name easy to override

guerzon · Nov 16, 2024 · ef7c0d8 · ef7c0d8
1 parent dc12867
commit ef7c0d8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/vaultwarden-kubernetes/eks/addons.tf b/vaultwarden-kubernetes/eks/addons.tf
@@ -53,7 +53,7 @@ resource "helm_release" "aws_lb_controller" {
 
   set {
     name  = "clusterName"
-    value = "vaultwarden-${var.environment}-${var.eks_cluster_name}"
+    value = var.eks_cluster_name
   }
 
   set {

diff --git a/vaultwarden-kubernetes/eks/main.tf b/vaultwarden-kubernetes/eks/main.tf
@@ -1,5 +1,5 @@
 resource "aws_eks_cluster" "this" {
-  name     = "vaultwarden-${var.environment}-${var.eks_cluster_name}"
+  name     = var.eks_cluster_name
   version  = var.k8s_version
   role_arn = aws_iam_role.cluster.arn
   vpc_config {

diff --git a/vaultwarden-kubernetes/eks/variables.tf b/vaultwarden-kubernetes/eks/variables.tf
@@ -12,6 +12,7 @@ variable "k8s_version" {
 variable "eks_cluster_name" {
   description = "Name of the EKS cluster"
   type        = string
+  default     = "vaultwarden-eks"
 }
 
 variable "subnet_ids" {

diff --git a/vaultwarden-kubernetes/network/subnet.tf b/vaultwarden-kubernetes/network/subnet.tf
@@ -6,9 +6,9 @@ resource "aws_subnet" "private" {
   availability_zone = var.availability_zones[count.index]
 
   tags = {
-    Name                                                                           = "vaultwarden-${var.environment}-private-${count.index + 1}",
-    "kubernetes.io/role/internal-elb"                                              = 1,
-    "kubernetes.io/cluster/vaultwarden-${var.environment}-${var.eks_cluster_name}" = "owned"
+    Name                                            = "vaultwarden-${var.environment}-private-${count.index + 1}",
+    "kubernetes.io/role/internal-elb"               = 1,
+    "kubernetes.io/cluster/${var.eks_cluster_name}" = "owned"
   }
 }
 
@@ -20,8 +20,8 @@ resource "aws_subnet" "public" {
   availability_zone = var.availability_zones[count.index]
 
   tags = {
-    Name                                                                           = "vaultwarden-${var.environment}-public-${count.index + 1}",
-    "kubernetes.io/role/elb"                                                       = 1,
-    "kubernetes.io/cluster/vaultwarden-${var.environment}-${var.eks_cluster_name}" = "owned"
+    Name                                            = "vaultwarden-${var.environment}-public-${count.index + 1}",
+    "kubernetes.io/role/elb"                        = 1,
+    "kubernetes.io/cluster/${var.eks_cluster_name}" = "owned"
   }
 }
diff --git a/vaultwarden-kubernetes/network/variables.tf b/vaultwarden-kubernetes/network/variables.tf
@@ -27,4 +27,5 @@ variable "public_subnets" {
 variable "eks_cluster_name" {
   description = "Name of the EKS cluster"
   type        = string
+  default     = "vaultwarden-eks"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ resource "helm_release" "aws_lb_controller" { @@
       set {
         name  = "clusterName"
-        value = "vaultwarden-${var.environment}-${var.eks_cluster_name}"
+        value = var.eks_cluster_name
       }
       set {
@@ Expand Down @@