diff --git a/examples/full-cluster-tf-upgrade/1.25/eks-console-access.tf b/examples/full-cluster-tf-upgrade/1.25/eks-console-access.tf index f590c3f..5ed3866 100644 --- a/examples/full-cluster-tf-upgrade/1.25/eks-console-access.tf +++ b/examples/full-cluster-tf-upgrade/1.25/eks-console-access.tf @@ -36,13 +36,14 @@ data "http" "cluster_roles" { resource "null_resource" "cluster_roles" { for_each = local.cluster_roles_map triggers = { - roles = join(",", [each.key, each.value.url]) - } - provisioner "local-exec" { - command = "test -d setup || mkdir setup" + roles = join(",", [each.key, each.value.url]) + directory = null_resource.setup_directory.triggers.directory } + # provisioner "local-exec" { + # command = "test -d setup || mkdir setup" + # } provisioner "local-exec" { - command = "echo '${data.http.cluster_roles[each.key].body}' > setup/${each.value.name}.yaml" + command = "echo '${data.http.cluster_roles[each.key].body}' > ${self.triggers.directory}/${each.value.name}.yaml" } } diff --git a/examples/full-cluster-tf-upgrade/1.25/setup-directory.tf b/examples/full-cluster-tf-upgrade/1.25/setup-directory.tf new file mode 100644 index 0000000..141d2a9 --- /dev/null +++ b/examples/full-cluster-tf-upgrade/1.25/setup-directory.tf @@ -0,0 +1,10 @@ +resource "null_resource" "setup_directory" { + triggers = { + directory = format("%v/setup", path.root) + keypair_name = local.keypair_name + } + + provisioner "local-exec" { + command = "test -d ${self.triggers.directory} || mkdir -p ${self.triggers.directory}" + } +} diff --git a/examples/full-cluster-tf-upgrade/1.25/tf-run.data b/examples/full-cluster-tf-upgrade/1.25/tf-run.data index 586fd35..0ed3247 100644 --- a/examples/full-cluster-tf-upgrade/1.25/tf-run.data +++ b/examples/full-cluster-tf-upgrade/1.25/tf-run.data @@ -1,4 +1,4 @@ -VERSION 1.4.5 +VERSION 1.4.6 REMOTE-STATE COMMENT make sure the private-lb subnet and container subnets are tagged properly (see README.md) STOP then continue with at step %%NEXT%% (tag:subnets-verified) @@ -31,6 +31,7 @@ TAG setup-complete POLICY TAG ec2-key +null_resource.setup_directory module.cluster_key_pair time_static.timestamp local_sensitive_file.ssh_private_key local_sensitive_file.ssh_public_key local_file.gitignore local_sensitive_file.gitsecret_script ## null_resource.generate_keypair ## aws_key_pair.cluster_keypair