fix: wait for VPC resource controller before deploying workloads (#914)

Author: eytanaim

terraform/eks/default/data.tf

@@ -8,4 +8,13 @@ data "aws_eks_cluster_auth" "this" {
 
 data "aws_eks_cluster_auth" "cluster" {
   name = module.retail_app_eks.eks_cluster_id
+}
+
+data "kubernetes_service" "ui_service" {
+  depends_on = [helm_release.ui]
+
+  metadata {
+    name      = "ui"
+    namespace = "ui"
+  }
 }

terraform/eks/default/kubernetes.tf

@@ -57,9 +57,20 @@ resource "time_sleep" "workloads" {
   ]
 }
 
+# Wait for VPC Resource Controller to attach trunk ENIs to nodes
+data "kubernetes_nodes" "vpc_ready_nodes" {
+  depends_on = [time_sleep.workloads]
+
+  metadata {
+    labels = {
+      "vpc.amazonaws.com/has-trunk-attached" = "true"
+    }
+  }
+}
+
 resource "kubernetes_namespace_v1" "catalog" {
   depends_on = [
-    time_sleep.workloads
+    data.kubernetes_nodes.vpc_ready_nodes
   ]
 
   metadata {
@@ -91,7 +102,7 @@ resource "helm_release" "catalog" {
 
 resource "kubernetes_namespace_v1" "carts" {
   depends_on = [
-    time_sleep.workloads
+    data.kubernetes_nodes.vpc_ready_nodes
   ]
 
   metadata {
@@ -121,7 +132,7 @@ resource "helm_release" "carts" {
 
 resource "kubernetes_namespace_v1" "checkout" {
   depends_on = [
-    time_sleep.workloads
+    data.kubernetes_nodes.vpc_ready_nodes
   ]
 
   metadata {
@@ -152,7 +163,7 @@ resource "helm_release" "checkout" {
 
 resource "kubernetes_namespace_v1" "orders" {
   depends_on = [
-    time_sleep.workloads
+    data.kubernetes_nodes.vpc_ready_nodes
   ]
 
   metadata {
@@ -189,7 +200,7 @@ resource "helm_release" "orders" {
 
 resource "kubernetes_namespace_v1" "ui" {
   depends_on = [
-    time_sleep.workloads
+    data.kubernetes_nodes.vpc_ready_nodes
   ]
 
   metadata {
@@ -249,7 +260,7 @@ resource "null_resource" "restart_pods" {
     }
 
     command = <<-EOT
-      kubectl delete pod -A -l app.kuberneres.io/owner=retail-store-sample --kubeconfig <(echo $KUBECONFIG | base64 -d)
+      kubectl delete pod -A -l app.kubernetes.io/owner=retail-store-sample --kubeconfig <(echo $KUBECONFIG | base64 -d)
     EOT
   }
 }

terraform/eks/default/output.tf

@@ -2,3 +2,11 @@ output "configure_kubectl" {
   description = "Command to update kubeconfig for this cluster"
   value       = module.retail_app_eks.configure_kubectl
 }
+
+output "retail_app_url" {
+  description = "URL to access the retail store application"
+  value = try(
+    "http://${data.kubernetes_service.ui_service.status[0].load_balancer[0].ingress[0].hostname}",
+    "LoadBalancer provisioning - run: kubectl get svc -n ui ui"
+  )
+}