fixup! fix: do not uninstall k3s during upgrade

xunleii · May 31, 2020 · 52b3d80 · 52b3d80
1 parent c8db59c
commit 52b3d80
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/agent_nodes.tf b/agent_nodes.tf
@@ -230,7 +230,7 @@ resource null_resource agents_annotation {
   triggers = {
     agent_name       = local.agents_metadata[split(var.separator, each.key)[0]].name
     annotation_name  = split(var.separator, each.key)[1]
-    on_install       = null_resource.agents_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.agents_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     // Because some fields must be used on destruction, we need to store them into the current
@@ -290,7 +290,7 @@ resource null_resource agents_label {
   triggers = {
     agent_name       = local.agents_metadata[split(var.separator, each.key)[0]].name
     label_name       = split(var.separator, each.key)[1]
-    on_install       = null_resource.agents_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.agents_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     // Because some fields must be used on destruction, we need to store them into the current
@@ -350,7 +350,7 @@ resource null_resource agents_taint {
   triggers = {
     agent_name       = local.agents_metadata[split(var.separator, each.key)[0]].name
     taint_name       = split(var.separator, each.key)[1]
-    on_install       = null_resource.agents_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.agents_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     // Because some fields must be used on destruction, we need to store them into the current

diff --git a/server_nodes.tf b/server_nodes.tf
@@ -270,7 +270,7 @@ resource null_resource servers_annotation {
   triggers = {
     server_name      = local.servers_metadata[split(var.separator, each.key)[0]].name
     annotation_name  = split(var.separator, each.key)[1]
-    on_install       = null_resource.servers_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.servers_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     connection_json = base64encode(jsonencode(local.root_server_connection))
@@ -327,7 +327,7 @@ resource null_resource servers_label {
   triggers = {
     server_name      = local.servers_metadata[split(var.separator, each.key)[0]].name
     label_name       = split(var.separator, each.key)[1]
-    on_install       = null_resource.servers_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.servers_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     connection_json = base64encode(jsonencode(local.root_server_connection))
@@ -385,7 +385,7 @@ resource null_resource servers_taint {
     server_name      = local.servers_metadata[split(var.separator, each.key)[0]].name
     taint_name       = split(var.separator, each.key)[1]
     connection_json  = base64encode(jsonencode(local.root_server_connection))
-    on_install       = null_resource.servers_install[split(var.separator, each.key)[0]].id
+    on_install       = null_resource.servers_uninstall[split(var.separator, each.key)[0]].id
     on_value_changes = each.value
 
     connection_json = base64encode(jsonencode(local.root_server_connection))