Skip to content

Commit f43f649

Browse files
authored
fix: optional quotas and labels (#678)
1 parent 1ab4fb8 commit f43f649

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

modules/aws-eks-teams/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ No modules.
147147
| [kubernetes_cluster_role.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role) | resource |
148148
| [kubernetes_cluster_role_binding.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/cluster_role_binding) | resource |
149149
| [kubernetes_namespace.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
150-
| [kubernetes_resource_quota.team_compute_quota](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/resource_quota) | resource |
151-
| [kubernetes_resource_quota.team_object_quota](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/resource_quota) | resource |
150+
| [kubernetes_resource_quota.this](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/resource_quota) | resource |
152151
| [kubernetes_role.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/role) | resource |
153152
| [kubernetes_role_binding.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/role_binding) | resource |
154153
| [kubernetes_service_account.team](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/service_account) | resource |

modules/aws-eks-teams/main.tf

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,23 @@ resource "kubernetes_namespace" "team" {
55
for_each = var.application_teams
66
metadata {
77
name = each.key
8-
labels = each.value["labels"]
8+
labels = try(each.value["labels"], {})
99
}
1010
}
1111

1212
# ---------------------------------------------------------------------------------------------------------------------
1313
# Quotas
1414
# ---------------------------------------------------------------------------------------------------------------------
15-
resource "kubernetes_resource_quota" "team_compute_quota" {
15+
resource "kubernetes_resource_quota" "this" {
1616
for_each = var.application_teams
17-
metadata {
18-
name = "compute-quota"
19-
namespace = kubernetes_namespace.team[each.key].metadata[0].name
20-
}
21-
spec {
22-
hard = {
23-
"requests.cpu" = each.value["quota"]["requests.cpu"]
24-
"requests.memory" = each.value["quota"]["requests.memory"]
25-
"limits.cpu" = each.value["quota"]["limits.cpu"]
26-
"limits.memory" = each.value["quota"]["limits.memory"]
27-
}
28-
}
29-
}
3017

31-
resource "kubernetes_resource_quota" "team_object_quota" {
32-
for_each = var.application_teams
3318
metadata {
34-
name = "object-quota"
19+
name = "quotas"
3520
namespace = kubernetes_namespace.team[each.key].metadata[0].name
3621
}
22+
3723
spec {
38-
hard = {
39-
"pods" = each.value["quota"]["pods"]
40-
"secrets" = each.value["quota"]["secrets"]
41-
"services" = each.value["quota"]["services"]
42-
}
24+
hard = try(each.value.quota, {})
4325
}
4426
}
4527

0 commit comments

Comments
 (0)