Pass bastion instance id around so it can be templated

Author: Secretions

modules/eks/submodules/k8s/main.tf

@@ -20,7 +20,7 @@ locals {
       k8s_tunnel_port                       = random_integer.port.result
       aws_auth_yaml                         = basename(local.aws_auth_filename)
       ssh_pvt_key_path                      = var.ssh_key.path
-      ssh_extra_args                        = var.ssh_extra_args
+      ssh_extra_args                        = var.bastion_info != null templatestring(var.ssh_extra_args, {bastion_instance_id = var.bastion.instance_id}) : ""
       eks_cluster_arn                       = var.eks_info.cluster.arn
       bastion_user                          = var.bastion_info != null ? var.bastion_info.user : ""
       bastion_public_ip                     = var.bastion_info != null ? var.bastion_info.public_ip : ""

modules/eks/submodules/k8s/variables.tf

@@ -6,6 +6,7 @@ variable "bastion_info" {
     ssh_bastion_command = Command to ssh onto bastion.
   EOF
   type = object({
+    instance_id         = string
     user                = string
     public_ip           = string
     security_group_id   = string

modules/eks/variables.tf

@@ -99,6 +99,7 @@ variable "node_iam_policies" {
 
 variable "bastion_info" {
   description = <<EOF
+    instance_id         = Bastion instance id
     user                = Bastion username.
     public_ip           = Bastion public ip.
     security_group_id   = Bastion sg id.

modules/infra/submodules/bastion/outputs.tf

@@ -1,6 +1,7 @@
 output "info" {
   description = "Bastion information."
   value = {
+    instance_id         = aws_instance.bastion.id
     user                = var.bastion.username
     public_ip           = aws_eip.bastion.public_ip
     security_group_id   = aws_security_group.bastion.id