vsphere-agents: delete any conflicting vm/template before starting

Before trying to create a new VM/template with a given name, delete any pre-existing vm/template that might pose as a conflict
ginglis13 · Dec 12, 2023 · 96bc97d · 96bc97d
1 parent 12044ec
commit 96bc97d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...erocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs b/...erocket/agents/src/bin/vsphere-k8s-cluster-resource-agent/vsphere_k8s_cluster_provider.rs
@@ -284,9 +284,16 @@ async fn create_vsphere_k8s_cluster(
     serde_json::to_writer_pretty(&import_spec_file, &import_spec)
         .context(*resources, "Failed to write out OVA import spec file")?;
 
+    // Delete any conflicting VM/template
+    let vm_template_name = format!("{}-eksa-vmtemplate", &config.name);
+    let _ = Command::new("govc")
+        .arg("vm.destroy")
+        .arg(&vm_template_name)
+        .status()
+        .context(*resources, "Failed to launch govc process")?;
+
     // Import OVA and create a template out of it
     info!("Importing OVA and creating a VM template out of it");
-    let vm_template_name = format!("{}-eksa-vmtemplate", &config.name);
     let import_ova_output = Command::new("govc")
         .arg("import.ova")
         .arg("-options=/local/ova.importspec")

diff --git a/bottlerocket/agents/src/bin/vsphere-vm-resource-agent/vsphere_vm_provider.rs b/bottlerocket/agents/src/bin/vsphere-vm-resource-agent/vsphere_vm_provider.rs
@@ -294,6 +294,14 @@ impl Create for VMCreator {
         serde_json::to_writer_pretty(&import_spec_file, &import_spec)
             .context(resources, "Failed to write out OVA import spec file")?;
 
+        // Delete any conflicting VM/template
+        let vm_template_name = format!("{}-node-vmtemplate", vsphere_cluster.name);
+        let _ = Command::new("govc")
+            .arg("vm.destroy")
+            .arg(&vm_template_name)
+            .status()
+            .context(resources, "Failed to launch govc process")?;
+
         info!("Importing OVA");
         memo.current_status = "Importing OVA".to_string();
         client
@@ -302,7 +310,6 @@ impl Create for VMCreator {
             .context(resources, "Error sending cluster creation message")?;
         // Import OVA and create a template out of it
         info!("Importing OVA and creating a VM template out of it");
-        let vm_template_name = format!("{}-node-vmtemplate", vsphere_cluster.name);
         let import_ova_output = Command::new("govc")
             .arg("import.ova")
             .arg("-options=/local/ova.importspec")