cleanup and tflint fixes

Author: clstokes

terraform/aws/aws-eks-operator/main.tf

@@ -1,19 +1,17 @@
 locals {
-  name = basename(path.cwd)
+  name = "example-${basename(path.cwd)}"
 
   aws_tags = {
     Name = local.name
   }
 
   // Modify these to use your own VPC
-  vpc_cidr_block = module.vpc.vpc_cidr_block
   vpc_id         = module.vpc.vpc_id
   subnet_ids     = module.vpc.private_subnets
 
   # EKS cluster configuration
   cluster_version    = "1.34" # TODO: omit this?
   node_instance_type = "t3.medium"
-  node_capacity_type = "ON_DEMAND"
   desired_size       = 2
   max_size           = 2
   min_size           = 1
@@ -22,7 +20,7 @@ locals {
   operator_name                 = "${local.name}-operator"
   operator_version              = "1.92.4"
   tailscale_oauth_client_id     = var.tailscale_oauth_client_id
-  tailscale_oauth_client_secret = var.tailscale_oauth_client_secret # TODO: use https://tailscale.com/kb/1236/kubernetes-operator#installation-with-workload-identity-federation
+  tailscale_oauth_client_secret = var.tailscale_oauth_client_secret
 }
 
 // Remove this to use your own VPC.
@@ -51,8 +49,9 @@ module "eks" {
     }
   }
 
-  # Optional
-  endpoint_public_access = true # TODO: remove?
+  # Once the Tailscale operator is installed, `endpoint_public_access` can be disabled.
+  # This is left enabled for the sake of easy adoption. 
+  endpoint_public_access = true
 
   # Optional: Adds the current caller identity as an administrator via cluster access entry
   enable_cluster_creator_admin_permissions = true

terraform/aws/aws-eks-operator/outputs.tf

@@ -21,4 +21,4 @@ output "cmd_kubeconfig_aws" {
   value = "aws eks update-kubeconfig --region ${data.aws_region.current.region} --name ${module.eks.cluster_name}"
 }
 
-data "aws_region" "current" {} # TODO: move? or remove?
+data "aws_region" "current" {}