update

terraform-modules · Aug 8, 2023 · baea4d2 · baea4d2
1 parent 1cde487
commit baea4d2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf b/examples/full-cluster-tf-upgrade/1.25/ec2-keypair.tf
@@ -49,7 +49,6 @@ module "key_pair" {
     {
       "Name"        = local.keypair_name
       "launch_time" = time_static.timestamp.rfc3339
-      "launch_vpc"  = local.vpc_label
     }
   )
 }
@@ -63,14 +62,14 @@ resource "local_sensitive_file" "ssh_private_key" {
   content              = format("%v\n", module.key_pair.private_key_openssh)
   directory_permission = "0700"
   file_permission      = "0600"
-  filename             = format("%v/%v", null_resource.setup_directory.triggers.directory, null_resource.setup_directory.triggers.keypair_name)
+  filename             = format("%v/%v", null_resource.setup_directory.triggers.directory, local.keypair_name)
 }
 
 resource "local_sensitive_file" "ssh_public_key" {
   content              = format("%v\n", module.key_pair.public_key_openssh)
   directory_permission = "0700"
   file_permission      = "0600"
-  filename             = format("%v/%v.pub", null_resource.setup_directory.triggers.directory, null_resource.setup_directory.triggers.keypair_name)
+  filename             = format("%v/%v.pub", null_resource.setup_directory.triggers.directory, local.keypair_name)
 }
 
 resource "local_file" "gitignore" {
@@ -80,14 +79,14 @@ resource "local_file" "gitignore" {
   filename             = format("%v/%v", null_resource.setup_directory.triggers.directory, ".gitignore")
 }
 
-resource "local_sensitive_file" "gitsecret_script" {
-  content = templatefile("${path.module}/templates/manage-git-secret.sh.tpl", {
-    ssh_key_directory        = null_resource.setup_directory.triggers.directory
-    ssh_private_key_filename = local_sensitive_file.ssh_private_key[0].filename
-    ssh_public_key_filename  = local_sensitive_file.ssh_public_key[0].filename
-  })
-  directory_permission = "0700"
-  file_permission      = "0755"
-  filename             = format("%v/%v", null_resource.setup_directory.triggers.directory, "manage-git-secret.sh")
-}
-
+#resource "local_sensitive_file" "gitsecret_script" {
+#  content = templatefile("${path.module}/templates/manage-git-secret.sh.tpl", {
+#    ssh_key_directory        = null_resource.setup_directory.triggers.directory
+#    ssh_private_key_filename = local_sensitive_file.ssh_private_key.filename
+#    ssh_public_key_filename  = local_sensitive_file.ssh_public_key.filename
+#  })
+#  directory_permission = "0700"
+#  file_permission      = "0755"
+#  filename             = format("%v/%v", null_resource.setup_directory.triggers.directory, "manage-git-secret.sh")
+#}
+#
diff --git a/examples/full-cluster-tf-upgrade/1.25/setup-directory.tf b/examples/full-cluster-tf-upgrade/1.25/setup-directory.tf
@@ -1,7 +1,6 @@
 resource "null_resource" "setup_directory" {
   triggers = {
-    directory    = format("%v/setup", path.root)
-    keypair_name = local.keypair_name
+    directory = format("%v/setup", path.root)
   }
 
   provisioner "local-exec" {

diff --git 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.6
+VERSION 1.4.7
 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)
@@ -32,7 +32,7 @@ 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
+module.cluster_key_pair time_static.timestamp local_sensitive_file.ssh_private_key local_sensitive_file.ssh_public_key local_file.gitignore 
 ## null_resource.generate_keypair
 ## aws_key_pair.cluster_keypair
 

diff --git a/examples/full-cluster-tf-upgrade/1.25/tf-run.destroy.data b/examples/full-cluster-tf-upgrade/1.25/tf-run.destroy.data
@@ -1,4 +1,4 @@
-VERSION 1.0.2
+VERSION 1.0.3
 BACKUP-STATE
 COMMAND tf-init
 COMMAND tf-state list
@@ -10,7 +10,7 @@ aws_eks_node_group.eks-nodegroup aws_eks_cluster.eks_cluster aws_iam_openid_conn
 ## aws_key_pair.cluster_keypair
 ## null_resource.generate_keypair
 
-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
+module.cluster_key_pair time_static.timestamp local_sensitive_file.ssh_private_key local_sensitive_file.ssh_public_key local_file.gitignore 
 
 module.role_cluster-admin module.role_eks-cluster module.role_eks-nodegroup
 module.group_cluster-admin.aws_iam_group.this