resolve merge conflict

squareops · Jul 20, 2023 · 3808f84 · 3808f84
1 parent 07a302b
commit 3808f84
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -44,6 +44,7 @@ module "eks_bootstrap" {
     private_subnet_name    = "private-subnet-name"
     instance_capacity_type = ["on-demand"]
     excluded_instance_type = ["nano", "micro", "small"]
+    instance_hypervisor    = ["nitro"]
   }
   cert_manager_letsencrypt_email                = "email@email.com"
   internal_ingress_nginx_enabled                = true