set more cluster properties, remove unused outputs

Author: clstokes

terraform/aws/aws-eks-operator/README.md

@@ -65,7 +65,7 @@ kubectl logs -n tailscale -l app.kubernetes.io/name=$(terraform output -raw oper
 After deployment, configure kubectl to access your cluster using Tailscale:
 
 ```shell
-tailscale configure kubeconfig ${terraform output -raw operator_name}
+tailscale configure kubeconfig $(terraform output -raw ha_proxy_service_name)
 ```
 
 ```shell

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

@@ -1,5 +1,6 @@
 locals {
-  name = "example-${basename(path.cwd)}"
+  name                    = "example-${basename(path.cwd)}"
+  name_with_random_suffix = "${local.name}-${random_integer.operator_name_suffix.result}"
 
   aws_tags = {
     Name = local.name
@@ -10,6 +11,7 @@ locals {
   subnet_ids = module.vpc.private_subnets
 
   # EKS cluster configuration
+  cluster_name       = local.name_with_random_suffix
   cluster_version    = data.aws_eks_cluster_versions.latest.cluster_versions[0].cluster_version
   node_instance_type = "t3.medium"
   desired_size       = 2
@@ -18,7 +20,7 @@ locals {
 
   # Tailscale Operator configuration
   namespace_name                = "tailscale"
-  operator_name                 = "${local.name}-${random_integer.operator_name_suffix.result}"
+  operator_name                 = local.name_with_random_suffix
   operator_version              = "1.92.4"
   tailscale_oauth_client_id     = var.tailscale_oauth_client_id
   tailscale_oauth_client_secret = var.tailscale_oauth_client_secret
@@ -45,7 +47,7 @@ module "eks" {
   source  = "terraform-aws-modules/eks/aws"
   version = ">= 21.0, < 22.0"
 
-  name               = local.name
+  name               = local.cluster_name
   kubernetes_version = local.cluster_version
 
   tags = local.aws_tags
@@ -78,6 +80,11 @@ module "eks" {
       name           = substr(local.name, 0, 20)
       instance_types = [local.node_instance_type]
 
+      labels = {}
+
+      launch_template_name = local.name
+      launch_template_tags = local.aws_tags
+
       desired_size = local.desired_size
       max_size     = local.max_size
       min_size     = local.min_size

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

@@ -18,22 +18,22 @@ output "operator_name" {
   value       = helm_release.tailscale_operator.name
 }
 
-output "cmd_kubeconfig_tailscale" {
-  description = "Command to configure kubeconfig for Tailscale access to the EKS cluster"
-  value       = "tailscale configure kubeconfig ${helm_release.tailscale_operator.name}"
+output "ha_proxy_service_name" {
+  description = "Configured name of the Tailscale operator HA Service Proxy"
+  value       = local.ha_proxy_service_name
 }
 
 output "cmd_kubeconfig_aws" {
   description = "Command to configure kubeconfig for public access to the EKS cluster"
   value       = "aws eks update-kubeconfig --region ${data.aws_region.current.region} --name ${module.eks.cluster_name}"
 }
 
-output "cmd_kubectl_ha_proxy_apply" {
-  description = "Command to deploy the Tailscale high availability API server proxy - https://tailscale.com/kb/1437/kubernetes-operator-api-server-proxy#configuring-a-high-availability-api-server-proxy"
-  value       = "OPERATOR_NAME=${helm_release.tailscale_operator.name} envsubst < tailscale-api-server-ha-proxy.yaml | kubectl apply -f -"
+output "cmd_kubeconfig_tailscale" {
+  description = "Command to configure kubeconfig for Tailscale access to the EKS cluster"
+  value       = "tailscale configure kubeconfig ${helm_release.tailscale_operator.name}"
 }
 
-output "cmd_kubectl_ha_proxy_delete" {
-  description = "Command to delete the Tailscale high availability API server proxy - https://tailscale.com/kb/1437/kubernetes-operator-api-server-proxy#configuring-a-high-availability-api-server-proxy"
-  value       = "OPERATOR_NAME=${helm_release.tailscale_operator.name} envsubst < tailscale-api-server-ha-proxy.yaml | kubectl delete -f -"
+output "cmd_kubeconfig_tailscale_ha" {
+  description = "Command to configure kubeconfig for Tailscale access to the EKS cluster using the HA Service Proxy"
+  value       = "tailscale configure kubeconfig ${local.ha_proxy_service_name}"
 }