Skip to content

Commit f2b9262

Browse files
authored
Merge pull request #3 from quixio/bug/createefssc
removed condition of the creation of the efs storage class
2 parents 3fbd0d7 + 04eed5c commit f2b9262

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
################################################################################
2+
# Kubernetes StorageClass for EBS (gp3)
3+
################################################################################
4+
5+
resource "kubernetes_storage_class_v1" "ebs" {
6+
count = var.create_ebs_storage_class ? 1 : 0
7+
8+
metadata {
9+
name = var.ebs_storage_class_name
10+
annotations = var.ebs_storage_class_is_default ? {
11+
"storageclass.kubernetes.io/is-default-class" = "true"
12+
} : null
13+
}
14+
15+
storage_provisioner = "ebs.csi.aws.com"
16+
reclaim_policy = var.ebs_storage_class_reclaim_policy
17+
volume_binding_mode = var.ebs_storage_class_volume_binding_mode
18+
allow_volume_expansion = var.ebs_storage_class_allow_volume_expansion
19+
20+
parameters = {
21+
type = var.ebs_volume_type
22+
}
23+
}

modules/quix-eks-dependencies/efs.tf

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ resource "helm_release" "efs_csi" {
7878
################################################################################
7979

8080
resource "kubernetes_storage_class_v1" "efs" {
81-
count = var.create_efs_storage_class && var.enable_efs_csi_addon ? 1 : 0
81+
count = var.create_efs_storage_class ? 1 : 0
8282

8383
metadata {
8484
name = var.efs_storage_class_name
@@ -102,28 +102,4 @@ resource "kubernetes_storage_class_v1" "efs" {
102102
error_message = "efs_file_system_id must be provided when create_efs_storage_class is enabled."
103103
}
104104
}
105-
}
106-
107-
################################################################################
108-
# Kubernetes StorageClass for EBS (gp3)
109-
################################################################################
110-
111-
resource "kubernetes_storage_class_v1" "ebs" {
112-
count = var.create_ebs_storage_class ? 1 : 0
113-
114-
metadata {
115-
name = var.ebs_storage_class_name
116-
annotations = var.ebs_storage_class_is_default ? {
117-
"storageclass.kubernetes.io/is-default-class" = "true"
118-
} : null
119-
}
120-
121-
storage_provisioner = "ebs.csi.aws.com"
122-
reclaim_policy = var.ebs_storage_class_reclaim_policy
123-
volume_binding_mode = var.ebs_storage_class_volume_binding_mode
124-
allow_volume_expansion = var.ebs_storage_class_allow_volume_expansion
125-
126-
parameters = {
127-
type = var.ebs_volume_type
128-
}
129-
}
105+
}

0 commit comments

Comments
 (0)