Skip to content

Commit f05a8cc

Browse files
authored
Ensure resources are created after cluster API becomes available (#1233)
* Ensure resources are created after cluster API becomes available * Let module generate kubeconfig, since they use the exec plugin now
1 parent a85e5b9 commit f05a8cc

File tree

2 files changed

+4
-49
lines changed

2 files changed

+4
-49
lines changed

kubernetes/test-infra/eks/kubernetes-config/main.tf

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
resource "kubernetes_config_map" "name" {
2+
depends_on = [var.cluster_name]
23
metadata {
34
name = "aws-auth"
45
namespace = "kube-system"
@@ -12,59 +13,15 @@ resource "kubernetes_config_map" "name" {
1213
}
1314
}
1415

15-
# Optional: this kubeconfig file is only used for manual CLI access to the cluster.
16-
resource "null_resource" "generate-kubeconfig" {
17-
provisioner "local-exec" {
18-
command = "aws eks update-kubeconfig --name ${var.cluster_name} --kubeconfig ${path.root}/kubeconfig"
19-
}
20-
}
21-
2216
resource "kubernetes_namespace" "test" {
17+
depends_on = [var.cluster_name]
2318
metadata {
2419
name = "test"
2520
}
2621
}
2722

28-
resource "kubernetes_deployment" "test" {
29-
metadata {
30-
name = "test"
31-
namespace= kubernetes_namespace.test.metadata.0.name
32-
}
33-
spec {
34-
replicas = 2
35-
selector {
36-
match_labels = {
37-
app = "test"
38-
}
39-
}
40-
template {
41-
metadata {
42-
labels = {
43-
app = "test"
44-
}
45-
}
46-
spec {
47-
container {
48-
image = "nginx:1.19.4"
49-
name = "nginx"
50-
51-
resources {
52-
limits = {
53-
memory = "512M"
54-
cpu = "1"
55-
}
56-
requests = {
57-
memory = "256M"
58-
cpu = "50m"
59-
}
60-
}
61-
}
62-
}
63-
}
64-
}
65-
}
66-
6723
resource helm_release nginx_ingress {
24+
depends_on = [var.cluster_name]
6825
name = "nginx-ingress-controller"
6926

7027
repository = "https://charts.bitnami.com/bitnami"

kubernetes/test-infra/eks/main.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ module "cluster" {
7575
cluster_name = module.vpc.cluster_name
7676
cluster_version = var.kubernetes_version
7777
manage_aws_auth = false # Managed in ./kubernetes-config/main.tf instead.
78-
# This kubeconfig expires in 15 minutes, so we'll use an exec block instead.
79-
# See ./kubernetes-config/main.tf provider block for details.
80-
write_kubeconfig = false
78+
write_kubeconfig = true
8179

8280
workers_group_defaults = {
8381
root_volume_type = "gp2"

0 commit comments

Comments
 (0)